委外修改

src/router/index.js

@@ -79,7 +79,7 @@ const globalRoutes = [
   { path: "/outsourcingPickingDetail/:outsourcingNo", name: "outsourcingPickingDetail", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
 
   // 委外退料
-  { path: "/outsourcingReturn", name: "outsourcingReturn", component: resolve => require(["@/views/modules/outsourcing-return/index.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+   { 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 } },
 

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

@@ -68,7 +68,7 @@
           @click="goToDetail(material)"
         >
           <div class="card-title">
-            <span class="title-label">物料编码：{{ material.componentPartNo }} &nbsp;&nbsp; 行号：{{ material.lineNo }}</span>
+            <span class="title-label">物料编码：{{ material.componentPartNo }} &nbsp;&nbsp; 料行号：{{ material.lineItemNo }} </span>
           </div>
           <div class="part-desc-row">
             <span class="desc-text">{{ material.componentPartDescription }}</span>
@@ -199,7 +199,8 @@ export default {
       let params = {
         outsourcingNo:order.orderNo,
         site:this.$store.state.user.site,
-        lineNo: order.lineNo
+        lineNo: order.lineNo,
+        releaseNo: order.releaseNo,
       }
       getOutsourcingReturnOrderLineInfo(params).then(({ data }) => {
         
@@ -222,7 +223,7 @@ export default {
     },
     
     goToDetail(item) {
-      const returnableQty = item.inventoryQty - (item.invQtyToReceive || 0);
+      const returnableQty = item.qtyRequired - (item.reservedQty || 0);
       if (returnableQty <= 0) {
         this.$message.warning('该物料已无可退数量');
         return;
@@ -232,9 +233,13 @@ export default {
         name: 'outsourcingReturnPDAList',
         params: {
           orderNo: item.orderNo,
-          partNo: item.partNo,
+          partNo: item.componentPartNo,
           unissureQty: returnableQty,
-          itemNo: item.lineNo,
+          itemNo: {
+            lineNo: item.lineNo,
+            lineItemNo: item.lineItemNo,
+            releaseNo: item.releaseNo,
+          }
         },
       });
     },

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

@@ -76,7 +76,9 @@ export default {
       loading: false,
       issueList: [],
       unissureQty: 0,
-      itemNo: '',
+      itemNo: {},
+      lineNo: '',
+      lineItemNo: '',
     };
   },
   methods: {
@@ -86,9 +88,12 @@ export default {
       }
       this.loading = true;
       const params = {
-        outsourcingOrderNo: this.outsourcingOrderNo,
+        orderNo: this.outsourcingOrderNo,
         site: this.$store.state.user.site,
         partNo: this.partNo,
+        releaseNo: this.lineNo,
+        sequenceNo: this.releaseNo,
+        lineItemNo: this.lineItemNo
       };
       getUnissueMatericalForOutsourcingOrder(params)
         .then(({ data }) => {
@@ -130,6 +135,9 @@ export default {
     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.loadIssueList();
   },
 };