出库 发货单明细 id

src/views/bpm/outgoingManagement/outbound.vue

@@ -208,7 +208,9 @@
               </template>
               <!-- 操作列 -->
               <template v-if="isEdit" v-slot:action="{ row, $index }">
-                <el-link type="danger" @click="deleteProductList(row, $index)">删除</el-link>
+                <el-link type="danger" @click="deleteProductList(row, $index)"
+                  >删除</el-link
+                >
               </template>
             </ele-pro-table>
           </div>
@@ -536,7 +538,7 @@
             showOverflowTooltip: true
           }
         ];
-        
+
         // 级别 - 仅 clientEnvironmentId == 4 时显示
         if (this.clientEnvironmentId == 4) {
           columns.push({
@@ -545,7 +547,7 @@
             align: 'center'
           });
         }
-        
+
         // 型号、规格、牌号
         columns.push(
           {
@@ -567,9 +569,9 @@
             showOverflowTooltip: true
           }
         );
-        
+
         // 动态列
-        this.dColumns.forEach(item => {
+        this.dColumns.forEach((item) => {
           columns.push({
             label: item.label,
             prop: item.prop,
@@ -578,7 +580,7 @@
             showOverflowTooltip: item.showOverflowTooltip
           });
         });
-        
+
         // 批次号
         columns.push({
           label: '批次号',
@@ -586,7 +588,7 @@
           align: 'center',
           showOverflowTooltip: true
         });
-        
+
         // 包装数量、单位
         columns.push(
           {
@@ -599,7 +601,7 @@
             prop: 'packingUnit'
           }
         );
-        
+
         // 计量数量、计量单位
         columns.push(
           {
@@ -612,7 +614,7 @@
             prop: 'measureUnit'
           }
         );
-        
+
         // 重量、重量单位
         columns.push(
           {
@@ -628,7 +630,7 @@
             showOverflowTooltip: true
           }
         );
-        
+
         // 机型、颜色、锁定数量、库存
         columns.push(
           {
@@ -653,7 +655,7 @@
             showOverflowTooltip: true
           }
         );
-        
+
         // 单价 - 条件显示
         if (this.isPrice == 1) {
           columns.push({
@@ -663,7 +665,7 @@
             slot: 'price'
           });
         }
-        
+
         // 金额 - 条件显示
         if (this.isPrice == 1) {
           columns.push({
@@ -674,7 +676,7 @@
             slot: 'totalMoney'
           });
         }
-        
+
         // 采购原因 - 仅 clientEnvironmentId == 4 时显示
         if (this.clientEnvironmentId == 4) {
           columns.push({
@@ -684,7 +686,7 @@
             showOverflowTooltip: true
           });
         }
-        
+
         // 仓库、供应商、供应商代号
         columns.push(
           {
@@ -706,7 +708,7 @@
             showOverflowTooltip: true
           }
         );
-        
+
         // 操作列 - 仅在可编辑时显示
         if (this.isEdit) {
           columns.push({
@@ -717,7 +719,7 @@
             fixed: 'right'
           });
         }
-        
+
         return columns;
       }
     },
@@ -741,17 +743,18 @@
           console.log(res, 'isLocked-res');
           this.showLocked = res;
         });
-      },  
+      },
       lockRelease() {
-        storageApi.lockOrderRelease(this.formData.sourceBizNo).then((res) => {
-          console.log(res, 'lockOrderRelease-res');
+        storageApi
+          .lockOrderRelease(this.formData.sourceBizNo)
+          .then((res) => {
+            console.log(res, 'lockOrderRelease-res');
             this.$message({
               message: '释放成功',
               type: 'success'
             });
-        }).catch(() => {
-
-        });
+          })
+          .catch(() => {});
       },
       // 获取当前时间函数
       getNowDate() {
@@ -936,12 +939,8 @@
         }));
 
         // 去重合并产品列表和新产品列表
-        const uniqueProducts = [
-          ...new Map(
-            [...this.productList, ...newProducts].map((item) => [item.id, item])
-          ).values()
-        ];
-        this.productList = uniqueProducts;
+        const uniqueProducts =newProducts
+        this.productList = newProducts;
         console.log('111111111111111');
         console.log(this.productList);
         // 排序
@@ -1000,7 +999,7 @@
       async getReturnStorage() {
         return new Promise((resolve) => {
           console.log(this.formData);
-          if(this.stockError){
+          if (this.stockError) {
             return this.$message.error(this.stockErrorMsg);
           }
           this.$refs.formName.validate(async (valid) => {
@@ -1171,8 +1170,8 @@
                 console.log(res, 'form没有executorDeptId有createUserId');
                 this.$set(this.formData, 'fromUser', res.name);
                 this.$set(this.formData.extInfo, 'verifyDeptCode', res.groupId);
-                if( res.groupId){
-                  this.getStaffList({id: res.groupId})
+                if (res.groupId) {
+                  this.getStaffList({ id: res.groupId });
                 }
                 this.$set(
                   this.formData.extInfo,
@@ -1199,8 +1198,7 @@
             type: this.wwType,
             deliveryNo: this.formData.sourceBizNo,
             taskIds: this.extractedList.map((item) => item.taskId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId),
-            
+            workOrderIds: this.extractedList.map((item) => item.workOrderId)
           };
           let pData3 = {
             //销售退货处理 外协出库
@@ -1258,7 +1256,8 @@
                 warehouseId: this.bizType == 3 ? item.warehouseId : '',
                 colorKey: item.colorKey || '',
                 batchNo: item.batchNo || '',
-                categoryModel: item.modelType || ''
+                categoryModel: item.modelType || '',
+                deliveryDetailId: item.id || ''
               };
             })
           };
@@ -1268,7 +1267,7 @@
             taskIds: this.extractedList.map((item) => item.taskId),
             workOrderIds: this.extractedList.map((item) => item.workOrderId)
           };
-          console.log('111~~~~~~~~', pData)
+          console.log('111~~~~~~~~', pData);
           storageApi
             .getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
             .then((data) => {
@@ -1300,7 +1299,8 @@
                 unitPrice: item.singlePrice,
                 weight: item.singleWeight * item.totalCount || 0,
                 batchNo: item.batchNo || '',
-                taskId: item.taskId || ''
+                taskId: item.taskId || '',
+                deliveryDetailId: item.id || ''
               };
             })
           };