优化

admin-update/src/views/order/components/sel-order.vue

@@ -559,13 +559,11 @@ export default {
 		cardName
 	},
 	props: {
-		orderData: {
-			type: Object,
-			default: () => {}
-		}
+		id: String
 	},
 	data() {
 		return {
+			orderData: {},
 			// draw
 			showShipManage: false,
 			shipData: [],
@@ -669,9 +667,13 @@ export default {
 				this.orderForm.latitude = res.shop.shopLat || 0;
 				this.orderForm.longitude = res.shop.shopLong || 0;
 			});
+
+			this.$service.order.info({ id: this.id }).then(res => {
+				this.orderData = res;
+			});
 		},
 		getDet() {
-			this.$service.single.orderSendDet({ id: this.orderData.id }).then(res => {
+			this.$service.single.orderSendDet({ id: this.id }).then(res => {
 				this.shipData = res;
 				this.showShipManage = true;
 			});
@@ -706,7 +708,7 @@ export default {
 		submitOrderFn() {
 			this.$service.order
 				.orderSheet({
-					id: this.orderData.id,
+					id: this.id,
 					...this.orderForm
 				})
 				.then(res => {
@@ -741,23 +743,30 @@ export default {
 		// =========================
 		//有配送单
 		hasDeliver() {
-			this.$service.single.printOrder({ id: this.orderData.id, option: 1 }).then(res => {
+			this.$service.single.printOrder({ id: this.id, option: 1 }).then(res => {
 				this.getDet();
+
+				this.$service.order.info({ id: this.id }).then(res => {
+					this.orderData = res;
+				});
 			});
 		},
 		//打单
 		async printOrderFn() {
-			await this.$service.single.printOrder({ id: this.orderData.id, option: 2 });
+			await this.$service.single.printOrder({ id: this.id, option: 2 });
 			this.getDet();
-			this.$service.order.getDeliverDetail({ id: this.orderData.id }).then(res => {
+			this.$service.order.getDeliverDetail({ id: this.id }).then(res => {
 				this.deliver.data = res;
 				this.printOrder();
 			});
 		},
 		//重打
 		rePrintOrderFn() {
-			console.log('建构执行', this.shopInfo)
-			this.printOrder();
+			// this.printOrder();
+			this.$service.order.getDeliverDetail({ id: this.id }).then(res => {
+				this.deliver.data = res;
+				this.printOrder();
+			});
 		},
 		// 填单
 		fillFormFn() {
@@ -768,7 +777,7 @@ export default {
 			this.sendMySelfConfirm = false;
 			this.shipForm.sendType = 2;
 			this.$service.single
-				.orderDeliver({ id: this.orderData.id, option: 1, ...this.shipForm })
+				.orderDeliver({ id: this.id, option: 1, ...this.shipForm })
 				.then(res => {
 					this.$message.success('已确认！');
 					this.$emit('song-success');
@@ -790,7 +799,7 @@ export default {
 			}
 			this.shipForm.sendType = 3;
 			this.$service.single
-				.orderDeliver({ id: this.orderData.id, option: 1, ...this.shipForm })
+				.orderDeliver({ id: this.id, option: 1, ...this.shipForm })
 				.then(res => {
 					this.$message.success('已提交！');
 
@@ -801,7 +810,7 @@ export default {
 		},
 		// 确认送达
 		orderReachFn() {
-			this.$service.single.orderReach({ id: this.orderData.id, option: 1 }).then(res => {
+			this.$service.single.orderReach({ id: this.id, option: 1 }).then(res => {
 				this.$message.success('已确认！');
 				this.getDet();
 				this.confirmSendVisit = false;
@@ -820,18 +829,17 @@ export default {
 				this.$message.error('请先选择分类或者用途！');
 				return false;
 			}
-			this.$service.single
-				.orderClass({ id: this.orderData.id, ...this.categoryForm })
-				.then(res => {
-					this.$message.success('订单分类成功！');
-					this.getDet();
-					// this.categoryDialog = false;
-					this.resetForm();
-				});
+			this.$service.single.orderClass({ id: this.id, ...this.categoryForm }).then(res => {
+				this.$message.success('订单分类成功！');
+				this.getDet();
+				// this.categoryDialog = false;
+				this.resetForm();
+			});
 		},
 		// 打印配置
 		printOrder() {
 			this.deliver.visible = true;
+
 			this.$nextTick(() => {
 				let LODOP = getLodop();
 				LODOP.PRINT_INIT('配送单');

admin-update/src/views/order/list.vue

@@ -56,12 +56,12 @@
 
 			<!-- 状态 -->
 			<template #table-column-status="{scope}">
-				<el v-if="scope.row.status == 1">待配送</el>
-				<el v-else-if="scope.row.status == 2">配送中</el>
-				<el v-else-if="scope.row.status == 3">待通知</el>
-				<el v-else-if="scope.row.status == 4">已取消</el>
-				<el v-else-if="scope.row.status == 5">已完成</el>
-				<el v-else>待付款</el>
+				<el-tag v-if="scope.row.status == 1">待配送</el-tag>
+				<el-tag v-else-if="scope.row.status == 2">配送中</el-tag>
+				<el-tag v-else-if="scope.row.status == 3">待通知</el-tag>
+				<el-tag v-else-if="scope.row.status == 4">已取消</el-tag>
+				<el-tag v-else-if="scope.row.status == 5">已完成</el-tag>
+				<el-tag v-else>待付款</el-tag>
 			</template>
 
 			<!-- 进度 -->
@@ -70,9 +70,9 @@
 					<el-steps
 						:space="200"
 						:active="parseInt(scope.row.currentFlow)"
+						align-center
 						finish-status="success"
 						size="mini"
-						align-center="true"
 					>
 						<el-step
 							title=""
@@ -157,7 +157,7 @@
 		<!-- 用户详情 -->
 		<order-detail ref="orderDetail" :orderOperate="optionData" />
 		<!-- 发货状态 -->
-		<sel-order ref="selOrder" :orderData="optionData" @song-success="onSongSuccess" />
+		<sel-order ref="selOrder" :id="optionData.id" @song-success="onSongSuccess" />
 	</div>
 </template>
 

huadian/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.6c7c3c55.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.582d27bb.js rel=preload as=script><link href=/js/chunk-libs.fba3356a.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6c7c3c55.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.fba3356a.js></script><script src=/js/app.582d27bb.js></script></body></html>
+			}</style><link href=/css/app.6c7c3c55.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.4d55d7f3.js rel=preload as=script><link href=/js/chunk-libs.fba3356a.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6c7c3c55.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.fba3356a.js></script><script src=/js/app.4d55d7f3.js></script></body></html>