委外修改

src/router/index.js

@@ -80,8 +80,8 @@ const globalRoutes = [
 
   // 委外退料
    { path: "/outsourcingReturn", name: "outsourcingReturn", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturn.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
-  { path: "/outsourcingReturnPDAList/:orderNo/:partNo/:unissureQty/:itemNo", name: "outsourcingReturnPDAList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
-  { path: "/outsourcingReturnPDAIssueList/:outsourcingOrderNo/:material", name: "outsourcingReturnPDAIssueList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  { path: "/outsourcingReturnPDAList", name: "outsourcingReturnPDAList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  { path: "/outsourcingReturnPDAIssueList", name: "outsourcingReturnPDAIssueList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
 
   // 客户订单发货
   {path: "/saleshipping",name: "saleshipping", component: resolve => require(["@/views/modules/sales-delivery/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
@@ -102,12 +102,12 @@ const globalRoutes = [
   // Material Requisition
   {path: "/mrissue",name: "mrissue", component: resolve => require(["@/views/modules/mr-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/mrPicking",name: "mrPicking", component: resolve => require(["@/views/modules/mr-issue/mrPicking.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
-  {path: "/mrPickingDetail/:orderNo/:lineNo/:partNo/:material",name: "mrPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/mrPickingDetail",name: "mrPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 
   // MR退料
   {path: "/mrPickingReturn", name: "mrPickingReturn", component: resolve => require(["@/views/modules/mr-issue/mrPickingReturn.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: "/mrReturnIssueList", name: "mrReturnIssueList", component: resolve => require(["@/views/modules/mr-issue/mrReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
-  {path: "/mrReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo/:issueInfo", name: "mrReturnPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  {path: "/mrReturnPickingDetail", name: "mrReturnPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   // 盘点
   {path: "/stocktaking",name: "stocktaking", component: resolve => require(["@/views/modules/inventory/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 

src/views/modules/mr-issue/mrPicking.vue

@@ -247,7 +247,7 @@ export default {
     selectMaterial(material) {
       this.$router.push({
         name: 'mrPickingDetail',
-        params: {
+        query: {
           orderNo: this.selectedMr.orderNo,
           lineNo: material.lineNo,
           partNo: material.partNo,

src/views/modules/mr-issue/mrPickingDetail.vue

@@ -370,7 +370,7 @@ export default {
 
     // 初始化MR信息
     initMrInfo() {
-      const params = this.$route.params
+      const params = this.$route.query
       this.mrInfo = {
         orderNo: this.orderNo,
         lineNo: this.lineNo,
@@ -436,12 +436,12 @@ export default {
 
   mounted() {
     // 获取路由参数
-    this.orderNo = this.$route.params.orderNo
-    this.lineNo = this.$route.params.lineNo
-    this.partNo = this.$route.params.partNo
-    this.material = this.$route.params.material
+    this.orderNo = this.$route.query.orderNo
+    this.lineNo = this.$route.query.lineNo
+    this.partNo = this.$route.query.partNo
+    this.material = this.$route.query.material
 
-    console.log('路由参数', this.$route.params)
+    console.log('路由参数', this.$route.query)
 
     if (!this.orderNo || !this.lineNo || !this.partNo) {
       this.$message.error('参数错误')

src/views/modules/mr-issue/mrReturnIssueList.vue

@@ -100,7 +100,7 @@ export default {
     goDetail(item) {
       this.$router.push({
         name: 'mrReturnPickingDetail',
-        params: {
+        query: {
           orderNo: this.orderNo,
           orderType: 'mr',
           partNo: this.partNo,

src/views/modules/mr-issue/mrReturnPickingDetail.vue

@@ -612,14 +612,14 @@ export default {
 
   mounted() {
     // 获取路由参数
-    this.orderNo = this.$route.params.orderNo
-    this.orderType = this.$route.params.orderType || 'workOrder'
-    this.partNo = this.$route.params.partNo
-    this.partDesc = this.$route.params.issueInfo.partDesc
-    this.transactionId = this.$route.params.transactionId
-    this.accountingId = this.$route.params.issueInfo.accountingId
-    this.quantity = this.$route.params.quantity
-    this.batchNo = this.$route.params.batchNo
+    this.orderNo = this.$route.query.orderNo
+    this.orderType = this.$route.query.orderType || 'workOrder'
+    this.partNo = this.$route.query.partNo
+    this.partDesc = this.$route.query.issueInfo.partDesc
+    this.transactionId = this.$route.query.transactionId
+    this.accountingId = this.$route.query.issueInfo.accountingId
+    this.quantity = this.$route.query.quantity
+    this.batchNo = this.$route.query.batchNo
     console.log(
       '订单号:',
       this.orderNo,

src/views/modules/outsourcing-return/outsourcingReturn.vue

@@ -231,7 +231,7 @@ export default {
       
       this.$router.push({
         name: 'outsourcingReturnPDAList',
-        params: {
+        query: {
           orderNo: item.orderNo,
           partNo: item.componentPartNo,
           unissureQty: returnableQty,

src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue

@@ -542,18 +542,18 @@ export default {
 
   mounted() {
     // 获取路由参数
-    console.log('路由参数:', this.$route.params.material)
-
-    this.orderNo = this.$route.params.outsourcingOrderNo
-    this.orderType = this.$route.params.material.orderType || 'outsourcingOrder'
-    this.partNo = this.$route.params.material.partNo
-    this.transactionId = this.$route.params.material.ifsTransactionID
-    this.accountingId = this.$route.params.material.ifsAccountingID
-    this.quantity = this.$route.params.material.quantity
-    this.batchNo = this.$route.params.material.batchNo
-    this.unissureQty = this.$route.params.material.unissureQty
-    this.itemNo = this.$route.params.material.itemNo
-    this.qtyReversed = this.$route.params.material.qtyReversedBy || 0
+    console.log('路由参数:', this.$route.query.material)
+
+    this.orderNo = this.$route.query.outsourcingOrderNo
+    this.orderType = this.$route.query.material.orderType || 'outsourcingOrder'
+    this.partNo = this.$route.query.material.partNo
+    this.transactionId = this.$route.query.material.ifsTransactionID
+    this.accountingId = this.$route.query.material.ifsAccountingID
+    this.quantity = this.$route.query.material.quantity
+    this.batchNo = this.$route.query.material.batchNo
+    this.unissureQty = this.$route.query.material.unissureQty
+    this.itemNo = this.$route.query.material.itemNo
+    this.qtyReversed = this.$route.query.material.qtyReversedBy || 0
 
     if (!this.orderNo) {
       this.$message.error('参数错误')

src/views/modules/outsourcing-return/outsourcingReturnPDAList.vue

@@ -113,7 +113,7 @@ export default {
     goDetail(item) {
       this.$router.push({
         name: 'outsourcingReturnPDAIssueList',
-        params: {
+        query: {
           outsourcingOrderNo: this.outsourcingOrderNo, 
           material:{
             itemNo: this.itemNo,
@@ -131,13 +131,13 @@ export default {
     },
   },
   mounted() {
-    this.outsourcingOrderNo = this.$route.params.orderNo;
-    this.partNo = this.$route.params.partNo;
-    this.unissureQty = this.$route.params.unissureQty;
-    this.itemNo = this.$route.params.itemNo;
-    this.lineNo = this.$route.params.itemNo.lineNo;
-    this.lineItemNo = this.$route.params.itemNo.lineItemNo;
-    this.releaseNo = this.$route.params.itemNo.releaseNo;
+    this.outsourcingOrderNo = this.$route.query.orderNo;
+    this.partNo = this.$route.query.partNo;
+    this.unissureQty = this.$route.query.unissureQty;
+    this.itemNo = this.$route.query.itemNo;
+    this.lineNo = this.$route.query.itemNo.lineNo;
+    this.lineItemNo = this.$route.query.itemNo.lineItemNo;
+    this.releaseNo = this.$route.query.itemNo.releaseNo;
     this.loadIssueList();
   },
 };