订单重选花材流程

ghs/src/admin/billing/affirm.vue

@@ -28,7 +28,8 @@
 										<text class="item-type">{{ item.rank }}级</text>
 										<text class="item-count">
 											<text v-if="item.bigCount > 0">{{ `${item.bigCount}` }}</text>
-											<text v-if="smallCount > 0">{{ `/${smallCount}` }}</text>
+											<text v-if="item.bigCount > 0 && item.smallCount > 0">/</text>
+											<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
 										</text>
 									</view>
 								</view>

ghs/src/admin/billing/index.vue

@@ -37,9 +37,19 @@
 						"
 					>
 						<text v-if="getSelectClassById(item.classId).bigCount > 0">
-							{{ `${getSelectClassById(item.classId).bigCount}/` }}
+							{{ `${getSelectClassById(item.classId).bigCount}` }}
 						</text>
-						<text>{{ getSelectClassById(item.classId).smallCount }}</text>
+						<text
+							v-if="
+								getSelectClassById(item.classId).bigCount > 0 &&
+									getSelectClassById(item.classId).smallCount > 0
+							"
+						>
+							/
+						</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{
+							getSelectClassById(item.classId).smallCount
+						}}</text>
 					</text>
 				</div>
 			</scroll-view>

ghs/src/api/order/index.js

@@ -1,52 +1,52 @@
-import https from '@/plugins/luch-request_0.0.7/request'
+import https from "@/plugins/luch-request_0.0.7/request";
 /** *
  * 商城下单-生成订单 m
  */
 export const getList = data => {
-	return https.get('/order/list', data)
-}
+	return https.get("/order/list", data);
+};
 
 /** *
  * 订单详情 m
  */
 export const getDetail = data => {
-	return https.get('/order/detail', data)
-}
+	return https.get("/order/detail", data);
+};
 
 /** *
  * 订单评价 m
  */
 export const comment = data => {
-	return https.post('/order/comment', data)
-}
+	return https.post("/order/comment", data);
+};
 
 /** *
  * 商城下单-生成订单 m
  */
 export const createOrder = data => {
-	return https.post('/order/create-order', data)
-}
+	return https.post("/order/create-order", data);
+};
 
 /** *
  * 商城下单-相关信息 m
  */
 export const orderRelate = data => {
-	return https.get('/order/order-relate', data)
-}
+	return https.get("/order/order-relate", data);
+};
 
 /** *
  * 商城下单-余额付款 m
  */
 export const balancePay = data => {
-	return https.post('/order/balance-pay', data)
-}
+	return https.post("/order/balance-pay", data);
+};
 
 /** *
  * 商城下单-微信支付 m
  */
 export const wxPay = data => {
-	return https.post('/order/wx-pay', data)
-}
+	return https.post("/order/wx-pay", data);
+};
 
 // =====================  B 端 ========================
 
@@ -54,77 +54,84 @@ export const wxPay = data => {
  * 订单列表 b
  */
 export const getListB = data => {
-	return https.get('/order/list', data)
-}
+	return https.get("/order/list", data);
+};
 
 /** *
  * 订单详情 b
  */
 export const getDetB = data => {
-	return https.get('/order/detail', data)
-}
+	return https.get("/order/detail", data);
+};
+
+/** *
+ * 未支付订单重选花材
+ */
+export const chooseOrderProductApi = async data => {
+	return https.post("/order/choose-product", data);
+};
 
 /** *
  * 免发货 b
  */
 export const freeShipping = data => {
-	return https.get('/order/without-send', data)
-}
+	return https.get("/order/without-send", data);
+};
 
 /** *
  * 发货详情（发货、继续、查看配送） b
  */
 export const orderSendDet = data => {
-	return https.get('/order-send/detail', data)
-}
+	return https.get("/order-send/detail", data);
+};
 
 /** *
  * 发货操作-制单 b
  */
 export const printOrder = data => {
-	return https.post('/order-send/print-order', data)
-}
+	return https.post("/order-send/print-order", data);
+};
 
 /** *
  * 发货操作-发货 b
  */
 export const orderSend = data => {
-	return https.post('/order-send/deliver', data)
-}
+	return https.post("/order-send/deliver", data);
+};
 
 /** *
  * 发货操作-送达 b
  */
 export const orderReach = data => {
-	return https.post('/order-send/reach', data)
-}
+	return https.post("/order-send/reach", data);
+};
 
 /** *
  * 发货-填写收花人 b
  */
 export const updateSheet = data => {
-	return https.post('/order/update-sheet', data)
-}
+	return https.post("/order/update-sheet", data);
+};
 
 /** *
  * 发货-归类 b
  */
 export const orderClass = data => {
-	return https.post('/order/classify', data)
-}
+	return https.post("/order/classify", data);
+};
 
 /** *
  * 修改价格 b
  */
 export const orderUpdatePrice = data => {
-	return https.get('/order/update-price', data)
-}
+	return https.get("/order/update-price", data);
+};
 // =====================  new ========================
 // 计算运费
-export const freight = data => https.get('/order/freight', data)
+export const freight = data => https.get("/order/freight", data);
 // 发快递
-export const thirdSend = data => https.get('/order/third-send', data)
+export const thirdSend = data => https.get("/order/third-send", data);
 //  本店送
-export const selfSend = data => https.get('/order/self-send', data)
+export const selfSend = data => https.get("/order/self-send", data);
 
-export const reachOrder = data => https.get('/order/reach', data)
+export const reachOrder = data => https.get("/order/reach", data);

ghs/src/components/module/app-commodity.vue

@@ -16,7 +16,8 @@
 					></i>
 					<text class="num" @click="customNum" v-if="bigCount > 0 || smallCount > 0">
 						<text v-if="bigCount > 0">{{ `${bigCount}` }}</text>
-						<text v-if="smallCount > 0">{{ `/${smallCount}` }}</text>
+						<text v-if="bigCount > 0 && smallCount > 0">/</text>
+						<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
 					</text>
 					<i class="iconfont icontianjia" @click="addEvent"></i>
 				</view>

ghs/src/mixins/product.js

@@ -73,7 +73,11 @@ export default {
 			if (this.selectList) {
 				for (const item of this.selectList) {
 					const itemInfo = this.getSelectItemById(item.id, item.classId);
-					if (itemInfo) {
+					if (
+						itemInfo &&
+						!this.$util.isEmpty(itemInfo.bigPrice) &&
+						!this.$util.isEmpty(itemInfo.smallPrice)
+					) {
 						price += item.bigCount * Number(itemInfo.bigPrice);
 						price += item.smallCount * Number(itemInfo.smallPrice);
 					}

ghs/src/pages.json

@@ -160,6 +160,12 @@
 					"style": {
 						"navigationBarTitleText": "发货"
 					}
+				},
+				{
+					"path": "select",
+					"style": {
+						"navigationBarTitleText": "重选花材"
+					}
 				}
 			]
 		},
@@ -170,13 +176,13 @@
 					"path": "me/withdraw",
 					"style": {
 						"navigationBarTitleText": "提现记录"
-					}	
+					}
 				},
 				{
 					"path": "me/incomeExpenses",
 					"style": {
 						"navigationBarTitleText": "收支记录"
-					}	
+					}
 				}
 			]
 		},

ghs/src/pagesOrder/detail.vue

@@ -93,7 +93,14 @@
 						</view>
 					</view>
 					<view class="summary-bar">
-						<view class="operate-view">
+						<view
+							v-if="
+								detailInfo.status == ORDER_STATUS.NOPAY ||
+									detailInfo.status == ORDER_STATUS.UNDIS
+							"
+							class="operate-view"
+							@click="gotoSelect"
+						>
 							<text class="iconfont icongouwuche"></text>
 							重选花材
 						</view>
@@ -164,6 +171,7 @@ import stepStatus from "./components/stepStatus";
 import TuiListCell from "@/components/plugin/list-cell";
 import { getDetail, freeShipping } from "@/api/order/index";
 import productMins from "@/mixins/product";
+import { ORDER_STATUS } from "@/utils/declare";
 
 export default {
 	name: "orderDetail",
@@ -174,6 +182,7 @@ export default {
 	mixins: [productMins],
 	data() {
 		return {
+			ORDER_STATUS,
 			pageType: "order_change",
 			autoLoad: false,
 			stepActive: 0,
@@ -181,9 +190,13 @@ export default {
 				name: ""
 			},
 			detailInfo: {},
-			freeShipModal: false
+			freeShipModal: false,
+			loading: false
 		};
 	},
+	onShow() {
+		this.init();
+	},
 	methods: {
 		freeShipModalClick(e) {
 			if (e.index === 0) {
@@ -232,12 +245,41 @@ export default {
 		},
 		async init() {
 			try {
+				if (this.loading) {
+					return new Promise.reject();
+				}
+				this.loading = true;
 				const res = await getDetail({
 					id: this.option.id
 				});
 				this.detailInfo = res.data;
+
+				const { product } = this.detailInfo;
+
+				if (product) {
+					this.setSelectInfoByType({
+						type: this.pageType,
+						info: product.map(ele => {
+							return {
+								...ele,
+								bigCount: Number(ele.bigNum),
+								smallCount: Number(ele.smallNum)
+							};
+						})
+					});
+				}
+			} catch {
 			} finally {
+				this.loading = false;
 			}
+		},
+		gotoSelect() {
+			uni.navigateTo({
+				url: `/pagesOrder/select?id=${this.detailInfo.id}`,
+				success: result => {},
+				fail: () => {},
+				complete: () => {}
+			});
 		}
 	}
 };

ghs/src/pagesOrder/select.vue

@@ -37,9 +37,19 @@
 						"
 					>
 						<text v-if="getSelectClassById(item.classId).bigCount > 0">
-							{{ `${getSelectClassById(item.classId).bigCount}/` }}
+							{{ `${getSelectClassById(item.classId).bigCount}` }}
 						</text>
-						<text>{{ getSelectClassById(item.classId).smallCount }}</text>
+						<text
+							v-if="
+								getSelectClassById(item.classId).bigCount > 0 &&
+									getSelectClassById(item.classId).smallCount > 0
+							"
+						>
+							/
+						</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{
+							getSelectClassById(item.classId).smallCount
+						}}</text>
 					</text>
 				</div>
 			</scroll-view>
@@ -148,6 +158,7 @@ import FooterCart from "@/components/module/app-footer-cart";
 import ModalModule from "@/components/plugin/modal";
 
 import { COMMODITY_TYPE } from "@/utils/declare";
+import { chooseOrderProductApi } from "@/api/order/index";
 import productMins from "@/mixins/product";
 export default {
 	name: "Billing", // 开单
@@ -247,20 +258,36 @@ export default {
 				this.cancelEvent();
 			} else {
 				console.log(444, this.selectList);
-				uni.navigateTo({
-					url: "/admin/billing/affirm"
+				uni.navigateBack({
+					delta: 1
 				});
+
 				this.cancelEvent();
 			}
 		},
-		confirmSelectEvent() {
-			if (this.selectList.length > 0) {
-				uni.navigateTo({
-					url: "/admin/billing/affirm"
-				});
-			} else {
-				this.$msg("请选择花材");
-			}
+		async confirmSelectEvent() {
+			try {
+				if (this.selectList.length > 0) {
+					const product = this.selectList.map(ele => {
+						return {
+							productId: ele.id,
+							bigNum: ele.bigCount,
+							smallNum: ele.smallCount
+						};
+					});
+					let params = {
+						id: this.option.id,
+						product: JSON.stringify(product)
+					};
+					await chooseOrderProductApi(params);
+					this.$msg("修改成功");
+					uni.navigateBack({
+						delta: 1
+					});
+				} else {
+					this.$msg("请选择花材");
+				}
+			} catch (error) {}
 		},
 		change(e) {
 			if (this.tabIndex == e.index) {

ghs/src/pagesPurchase/add.vue

@@ -32,9 +32,19 @@
 						"
 					>
 						<text v-if="getSelectClassById(item.classId).bigCount > 0">
-							{{ `${getSelectClassById(item.classId).bigCount}/` }}
+							{{ `${getSelectClassById(item.classId).bigCount}` }}
 						</text>
-						<text>{{ getSelectClassById(item.classId).smallCount }}</text>
+						<text
+							v-if="
+								getSelectClassById(item.classId).bigCount > 0 &&
+									getSelectClassById(item.classId).smallCount > 0
+							"
+						>
+							/
+						</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{
+							getSelectClassById(item.classId).smallCount
+						}}</text>
 					</text>
 				</div>
 			</scroll-view>

ghs/src/pagesPurchase/components/CommodityPurchase.vue

@@ -19,7 +19,8 @@
 					></i>
 					<text class="num" @click="customNum" v-if="bigCount > 0 || smallCount > 0">
 						<text v-if="bigCount > 0">{{ `${bigCount}` }}</text>
-						<text v-if="smallCount > 0">{{ `/${smallCount}` }}</text>
+						<text v-if="bigCount > 0 && smallCount > 0">/</text>
+						<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
 					</text>
 					<i class="iconfont icontianjia" @click="addEvent"></i>
 				</view>

ghs/src/pagesPurchase/details.vue

@@ -26,7 +26,8 @@
 										<text class="item-type">b级</text>
 										<text class="item-count">
 											<text v-if="item.bigCount > 0">{{ `${item.bigCount}` }}</text>
-											<text v-if="item.smallCount > 0">{{ `/${item.smallCount}` }}</text>
+											<text v-if="item.bigCount > 0 && item.smallCount > 0">/</text>
+											<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
 										</text>
 									</view>
 								</view>

ghs/src/pagesPurchase/order.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="order-page">
-				<!-- @add="addEvent"
+		<!-- @add="addEvent"
 				isAdd
 				addText="筛选" -->
 		<view class="tabs">
@@ -41,7 +41,7 @@ import OrderItem from "./orderItem";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
 import { list } from "@/mixins";
-import { ORDER_STATUS } from "@/utils/declare";
+import { PURCHASE_ORDER_STATUS } from "@/utils/declare";
 import { getPurchaseListApi } from "@/api/purchase/index";
 export default {
 	components: {
@@ -53,7 +53,7 @@ export default {
 
 	data() {
 		return {
-			ORDER_STATUS,
+			PURCHASE_ORDER_STATUS,
 			tabIndex: 0,
 			tabs: [
 				{
@@ -115,13 +115,13 @@ export default {
 								...this.tabs[index],
 								value: allNum
 							});
-						} else if (element.key == ORDER_STATUS.CONFIRM) {
+						} else if (element.key == PURCHASE_ORDER_STATUS.CONFIRM) {
 							this.tabs[index].value = unPayNum;
-						} else if (element.key == ORDER_STATUS.UNDIS) {
+						} else if (element.key == PURCHASE_ORDER_STATUS.UNDIS) {
 							this.tabs[index].value = unSendNum;
-						} else if (element.key == ORDER_STATUS.DIS) {
+						} else if (element.key == PURCHASE_ORDER_STATUS.DIS) {
 							this.tabs[index].value = sendingNum;
-						} else if (element.key == ORDER_STATUS.DONE) {
+						} else if (element.key == PURCHASE_ORDER_STATUS.DONE) {
 							this.tabs[index].value = finishNum;
 						}
 					}
@@ -164,7 +164,7 @@ export default {
 			});
 		},
 		gotoDetails(item) {
-			if (item.status == ORDER_STATUS.CONFIRM) {
+			if (item.status == PURCHASE_ORDER_STATUS.CONFIRM) {
 				uni.navigateTo({
 					url: `/pagesPurchase/details?orderSn=${item.orderSn}`,
 					success: result => {},

ghs/src/pagesPurchase/orderItem.vue

@@ -31,7 +31,7 @@
 	</view>
 </template>
 <script>
-import { ORDER_STATUS } from "@/utils/declare";
+import { PURCHASE_ORDER_STATUS } from "@/utils/declare";
 
 export default {
 	props: {
@@ -41,7 +41,7 @@ export default {
 	},
 	data() {
 		return {
-			ORDER_STATUS
+			PURCHASE_ORDER_STATUS
 		};
 	},
 	computed: {
@@ -49,16 +49,16 @@ export default {
 			let statusName = "";
 
 			switch (this.info.status) {
-				case ORDER_STATUS.CONFIRM:
+				case PURCHASE_ORDER_STATUS.CONFIRM:
 					statusName = "待确认";
 					break;
-				case ORDER_STATUS.UNDIS:
+				case PURCHASE_ORDER_STATUS.UNDIS:
 					statusName = "待配送";
 					break;
-				case ORDER_STATUS.DIS:
+				case PURCHASE_ORDER_STATUS.DIS:
 					statusName = "配送中";
 					break;
-				case ORDER_STATUS.DONE:
+				case PURCHASE_ORDER_STATUS.DONE:
 					statusName = "已完成";
 					break;
 

ghs/src/pagesStorehouse/allot/addExDetails.vue

@@ -75,7 +75,8 @@
 								</view>
 								<view v-else-if="column.custom == 'excount'">
 									<text v-if="item.bigCount > 0">{{ `${item.bigCount}` }}</text>
-									<text v-if="item.smallCount > 0">{{ `/${item.smallCount}` }}</text>
+									<text v-if="item.bigCount > 0 && item.smallCount > 0">/</text>
+									<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
 								</view>
 								<view v-else>
 									{{ item[column.dataIndex] || "" }}

ghs/src/pagesStorehouse/allot/exSelect.vue

@@ -37,9 +37,19 @@
 						"
 					>
 						<text v-if="getSelectClassById(item.classId).bigCount > 0">
-							{{ `${getSelectClassById(item.classId).bigCount}/` }}
+							{{ `${getSelectClassById(item.classId).bigCount}` }}
 						</text>
-						<text>{{ getSelectClassById(item.classId).smallCount }}</text>
+						<text
+							v-if="
+								getSelectClassById(item.classId).bigCount > 0 &&
+									getSelectClassById(item.classId).smallCount > 0
+							"
+						>
+							/
+						</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{
+							getSelectClassById(item.classId).smallCount
+						}}</text>
 					</text>
 				</div>
 			</scroll-view>

ghs/src/pagesStorehouse/inventory/select.vue

@@ -37,9 +37,19 @@
 						"
 					>
 						<text v-if="getSelectClassById(item.classId).bigCount > 0">
-							{{ `${getSelectClassById(item.classId).bigCount}/` }}
+							{{ `${getSelectClassById(item.classId).bigCount}` }}
 						</text>
-						<text>{{ getSelectClassById(item.classId).smallCount }}</text>
+						<text
+							v-if="
+								getSelectClassById(item.classId).bigCount > 0 &&
+									getSelectClassById(item.classId).smallCount > 0
+							"
+						>
+							/
+						</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{
+							getSelectClassById(item.classId).smallCount
+						}}</text>
 					</text>
 				</div>
 			</scroll-view>

ghs/src/pagesStorehouse/inventory/update.vue

@@ -108,7 +108,8 @@
 								</view>
 								<view v-else-if="column.custom == 'inventory'">
 									<text v-if="item.bigCount > 0">{{ `${item.bigCount}` }}</text>
-									<text v-if="item.smallCount > 0">{{ `/${item.smallCount}` }}</text>
+									<text v-if="item.bigCount > 0 && item.smallCount > 0">/</text>
+									<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
 								</view>
 
 								<view v-else-if="column.custom == 'profit'">

ghs/src/utils/declare.js

@@ -24,8 +24,8 @@ export const OUT_STATUS = {
 	CANCEL: "3"
 };
 
-//订单状态：1待确认，2待配送，3配送中，4已完成
-export const ORDER_STATUS = {
+//采购订单状态：1待确认，2待配送，3配送中，4已完成
+export const PURCHASE_ORDER_STATUS = {
 	CONFIRM: "1",
 	UNDIS: "2",
 	DIS: "3",
@@ -37,3 +37,14 @@ export const INVENTORY_STATUS = {
 	DRAFT: "1",
 	DONE: "2"
 };
+
+//订单状态 0全部 1待付款 2待配送 3配送中 4待通知 5已取消 6已完成
+export const ORDER_STATUS = {
+	ALL: "0",
+	NOPAY: "1",
+	UNDIS: "2",
+	DIS: "3",
+	NOTICE: "4",
+	CANCEL: "5",
+	DONE: "6"
+};