订单发货操作流程更改

store/src/admin/order/components/sel-confirm.vue

@@ -182,13 +182,17 @@ export default {
 				}).then(res => {
 					this.$msg('订单归类成功！')
 					setTimeout(() => {
-						this.$util.pageTo({
-							url: '/admin/order/ship',
-							query: {
-								id: this.query.id,
-								pageStatus: 6
-							}
-						})
+						this.$emit('nextPageSuccess', {
+						id: this.query.id,
+						pageStatus: 6
+					})
+						// this.$util.pageTo({
+						// 	url: '/admin/order/ship',
+						// 	query: {
+						// 		id: this.query.id,
+						// 		pageStatus: 6
+						// 	}
+						// })
 					}, 1000)
 				})
 			}

store/src/admin/order/components/sel-express-confirm.vue

@@ -123,15 +123,19 @@ export default {
 				option: 1
 			}).then(res => {
 				this.$msg('已确认')
-				setTimeout(() => {
-					this.$util.pageTo({
-						url: '/admin/order/ship',
-						query: {
-							id: this.query.id,
-							pageStatus: 5
-						}
+				this.$emit('nextPageSuccess', {
+					id: this.query.id,
+						pageStatus: 5
 					})
-				}, 1000)
+				// setTimeout(() => {
+				// 	this.$util.pageTo({
+				// 		url: '/admin/order/ship',
+				// 		query: {
+				// 			id: this.query.id,
+				// 			pageStatus: 5
+				// 		}
+				// 	})
+				// }, 1000)
 			})
 		},
 		askConfirmReachFn(){

store/src/admin/order/components/sel-order.vue

@@ -73,13 +73,17 @@ export default {
 				id: this.orderData.id,
 				option: 1
 			}).then(res => {
-				this.$util.pageTo({
-					url: '/admin/order/ship',
-					query: {
-						id: this.orderData.id,
-						pageStatus: 7
-					}
-				})
+				this.$emit('nextPageSuccess', {
+					id: this.orderData.id,
+					pageStatus: 7
+					})
+				// this.$util.pageTo({
+				// 	url: '/admin/order/ship',
+				// 	query: {
+				// 		id: this.orderData.id,
+				// 		pageStatus: 7
+				// 	}
+				// })
 			})
 		}
 	}

store/src/admin/order/components/sel-ship-manage.vue

@@ -172,13 +172,17 @@ export default {
 				id: this.orderData.id,
 				option: 1
 			}).then(res => {
-				this.$util.pageTo({
-					url: '/admin/order/ship',
-					query: {
-						id: this.orderData.id,
+				this.$emit('nextPageSuccess', {
+					id: this.orderData.id,
 						pageStatus: 7
-					}
-				})
+					})
+				// this.$util.pageTo({
+				// 	url: '/admin/order/ship',
+				// 	query: {
+				// 		id: this.orderData.id,
+				// 		pageStatus: 7
+				// 	}
+				// })
 			})
 		},
 		// moadl
@@ -203,14 +207,19 @@ export default {
 					option: 1,
 					...this.form
 				}).then(res => {
-					this.modalCancel()
-					this.$util.pageTo({
-						url: '/admin/order/ship',
-						query: {
+					
+					this.$emit('nextPageSuccess', {
 							id: this.query.id,
 							pageStatus: 3
-						}
-					})
+						})
+					this.modalCancel()
+					// this.$util.pageTo({
+					// 	url: '/admin/order/ship',
+					// 	query: {
+					// 		id: this.query.id,
+					// 		pageStatus: 3
+					// 	}
+					// })
 				})
 			}
 		},

store/src/admin/order/components/sel-ship.vue

@@ -84,13 +84,17 @@ export default {
         id: this.orderData.id,
         option: 2
       }).then(res => {
-        this.$util.pageTo({
-          url: "/admin/order/ship",
-          query: {
-            id: this.orderData.id,
+        this.$emit('nextPageSuccess', {
+           id: this.orderData.id,
             pageStatus: 7
-          }
-        });
+        })
+        // this.$util.pageTo({
+        //   url: "/admin/order/ship",
+        //   query: {
+        //     id: this.orderData.id,
+        //     pageStatus: 7
+        //   }
+        // });
       });
     },
     mobilePrintFn() {

store/src/admin/order/detail.vue

@@ -162,12 +162,12 @@
             <button
               class="admin-button-com middle"
               @click.stop="pageTo({
-						url: '/admin/order/ship',
-						query: {
-							id: data.id,
-							pageStatus: 0
-						}
-					})"
+              url: '/admin/order/ship',
+              query: {
+                id: data.id,
+                pageStatus: 0
+              }
+            })"
             >发货</button>
           </block>
         </div>

store/src/admin/order/fill-form.vue

@@ -57,13 +57,16 @@ export default {
 				...form,
 				...region
 			}).then(res => {
-				this.$util.pageTo({
-					url: '/admin/order/ship',
-					query: {
-						id: this.option.id,
-						pagestatus: 1
-					}
-				})
+				uni.navigateBack({
+				});
+				// this.$util.pageTo({
+				// 	url: '/admin/order/ship',
+				// 	type: 2,
+				// 	query: {
+				// 		id: this.option.id,
+				// 		pagestatus: 1
+				// 	}
+				// })
 			})
 		},
 		// operate

store/src/admin/order/ship.vue

@@ -29,11 +29,18 @@
 			<!-- 列表 -->
 			<!-- 选择订单 -->
 			<block v-if="showIndex == 0">
-				<sel-order :orderData="data" :query="option" />
+				<sel-order
+					@nextPageSuccess="nextPageSuccess"
+					:orderData="data" 
+					:query="option" />
 			</block>
 			<!-- 选择发货 -->
 			<block v-if="showIndex == 1">
-				<sel-ship :orderData="data" :query="option" :orderComData="orderComData" />
+				<sel-ship
+				@nextPageSuccess="nextPageSuccess"
+				:orderData="data" 
+				:query="option" 
+				:orderComData="orderComData" />
 			</block>
 			<!-- 选择自提 -->
 			<!-- <block v-if="showIndex == 2">
@@ -45,11 +52,19 @@
 			</block> -->
 			<!-- 发货选择快递送已接单 -->
 			<block v-if="showIndex == 4">
-				<sel-express-confirm :orderData="data" :query="option" :orderComData="orderComData" />
+				<sel-express-confirm
+				@nextPageSuccess="nextPageSuccess"
+				:orderData="data" 
+				:query="option" 
+				:orderComData="orderComData" />
 			</block>
 			<!-- 发货选择完成 -->
 			<block v-if="showIndex == 5">
-				<sel-confirm :orderData="data" :query="option" :orderComData="orderComData" />
+				<sel-confirm
+					@nextPageSuccess="nextPageSuccess"
+					:orderData="data" 
+					:query="option" 
+					:orderComData="orderComData" />
 			</block>
 			<!-- 发货管理完成 -->
 			<block v-if="showIndex == 6">
@@ -57,7 +72,11 @@
 			</block>
 			<!-- 有配送单-发货管理 -->
 			<block v-if="showIndex == 7">
-				<sel-ship-manage :orderData="data" :query="option" :orderComData="orderComData" />
+				<sel-ship-manage
+					@nextPageSuccess="nextPageSuccess"
+					:orderData="data" 
+					:query="option" 
+					:orderComData="orderComData" />
 			</block>
 		</div>
 	</div>
@@ -110,7 +129,15 @@ export default {
 		})
 		// this.init()
 	},
+	onShow(){
+		this.init()
+	},
 	methods: {
+		nextPageSuccess(val){
+			this.option.pageStatus = val.pageStatus;
+			this.option.id = val.id
+			this.init()
+		},
 		init() {
 			// this.showIndex = this.option.pageStatus || 0
 			this._getDet()