pengyh 1 rok pred
rodič
commit
cedf0facf0

+ 8 - 2
src/layout/components/Navbar.vue

@@ -298,7 +298,7 @@ export default {
 				WBI: 'applicationWithoutFee',
 				WBK: 'applicationWithoutFee',
 				CRE_ORDER: 'workOrderPool',
-				SEND_MALL: 'order_list',
+				SEND_MALL: 'order_detail',
 				RP_MALL: 'order_pr',
 				CR_SALES: (paidType=='M'?'auxiliarySalesOrder':paidType=='P'?'attachmentSalesOrder':paidType=='YB'?'orderSettleManag':paidType=='MALL'?'order_list':'')
 			}
@@ -546,9 +546,15 @@ export default {
 		this.read(id)
 		this.$router.push({
 			name: this.typeFilter(type,paidType),
+			params: {
+				pageName: orderId,
+				pageType: 'detail',
+				pageCode: orderId,
+				pagePam: "operationDetails"
+			},
 			query: {
 				id: orderId,
-				activeName: "workOrderInfo",
+				orderId: orderId
 			}
 		})
 	},

+ 5 - 4
src/views/engineeringMaintenance/basicData/index.vue

@@ -148,10 +148,11 @@ export default {
 				btnType: 'text',
 				click: ({ row, index, column }) => {
 					this.$router.push({
-						name: "workOrderPool",
-						query: {
-							rpProjectRepairId:row.id
-						}
+						name: 'workOrderPool',
+						params: {
+							pageType: 'rpProjectRepairId',
+							pageCode: row.id,
+						},
 					})
 				}
 			}

+ 7 - 6
src/views/mallManagement/order/order_list/index.vue

@@ -520,12 +520,13 @@ export default {
   },
   methods: {
     queryWorkOrder(id) {
-      this.$router.push({
-        name: "workOrderPool",
-        query: {
-          saleOrderId: id,
-        }
-      })
+		this.$router.push({
+	  		name: 'workOrderPool',
+	  		params: {
+	  			pageType: 'saleOrderId',
+	  			pageCode: id,
+	  		},
+	  	})
     },
     changeTabs(tab, event) {
       // this.$refs.screenForm.resetFields();

+ 7 - 6
src/views/mallManagement/order/order_refund/index.vue

@@ -316,12 +316,13 @@ export default {
   },
   methods: {
     queryWorkOrder(id) {
-      this.$router.push({
-        name: "workOrderPool",
-        query: {
-          saleOrderId: id,
-        }
-      })
+		this.$router.push({
+			name: 'workOrderPool',
+			params: {
+				pageType: 'saleOrderId',
+				pageCode: id,
+			},
+		})
     },
     changeTabs(tab, event) {
       // this.$refs.screenForm.resetFields();

+ 6 - 4
src/views/valueAddedService/extendedWarrantyWork/index.vue

@@ -113,10 +113,12 @@ export default {
 				btnType: 'text',
 				click: ({ row, index, column }) => {
 					this.$router.push({
-					  name: "workOrderPool",
-					  query: {
-					    id: row.id,
-					  }
+						name: 'workOrderPool',
+						params: {
+							pageName: row.id,
+							pageType: 'detail',
+							pageCode: row.id,
+						},
 					})
 				}
 			}

+ 7 - 6
src/views/valueAddedService/orderSettleManag/pages/collect.vue

@@ -177,12 +177,13 @@ export default {
             return ["PAID", "REFUND"].includes(row.payStatus)
           },
           click: ({ row, index, column }) => {
-            this.$router.push({
-              name: "workOrderPool",
-              query: {
-                pgIncreItemId: row.id,
-              }
-            })
+			this.$router.push({
+				name: 'workOrderPool',
+				params: {
+					pageType: 'pgIncreItemId',
+					pageCode: row.id,
+				},
+			})
           }
         },
         refund: {

+ 7 - 6
src/views/valueAddedService/orderSettleManag/pages/offline.vue

@@ -301,12 +301,13 @@ export default {
             return ["PAID", "REFUND"].includes(row.payStatus)
           },
           click: ({ row, index, column }) => {
-            this.$router.push({
-              name: "workOrderPool",
-              query: {
-                pgIncreItemId: row.id,
-              }
-            })
+				this.$router.push({
+					name: 'workOrderPool',
+					params: {
+						pageType: 'pgIncreItemId',
+						pageCode: row.id,
+					},
+				})
           }
         },
         examine: {

+ 7 - 5
src/views/workOrder/appraise/index.vue

@@ -76,11 +76,13 @@ export default {
 						<div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
 							<span style="color:#008dd4;" onClick={() => {
 								this.$router.push({
-									name: "workOrderPool",
-									query: {
-										id: row.id,
-										activeName: "Evaluation",
-									}
+									name: 'workOrderPool',
+									params: {
+										pageName: row.id,
+										pageType: 'detail',
+										pageCode: row.id,
+										pagePam: "Evaluation"
+									},
 								})
 							}}>{row.id}</span>
 							{column.isCopy ? (

+ 5 - 4
src/views/workOrder/orderHome/index.vue

@@ -116,10 +116,11 @@
 					})
 				}else{
 					this.$router.push({
-						name: "workOrderPool",
-						query: {
-							orderStatus: type
-						}
+						name: 'workOrderPool',
+						params: {
+							pageType: 'orderStatus',
+							pageCode: type,
+						},
 					})
 				}
 				

+ 7 - 5
src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -182,11 +182,13 @@ export default {
 							})
 						} else {
 							this.$router.push({
-								name: "workOrderPool",
-								query: {
-									id: row.orderBaseId,
-									activeName: "SettleAccounts",
-								}
+								name: 'workOrderPool',
+								params: {
+									pageName: row.orderBaseId,
+									pageType: 'detail',
+									pageCode: row.orderBaseId,
+									pagePam: 'SettleAccounts'
+								},
 							})
 						}
 					}