Merge remote-tracking branch 'origin/master'

src/utils/dict/warehouse.js

@@ -38,7 +38,10 @@ export const sceneState = [
   { code: 4, label: '领料退货入库' },
   { code: 5, label: '其他入库' },
   { code: 6, label: '销售退货入库', documentsName: '销售订单' },
-  { code: 7, label: '销售受托入库', documentsName: '受托收货单' }
+  { code: 7, label: '销售受托入库', documentsName: '受托收货单' },
+  { code: 8, label: '半成品入库', documentsName: '委外工单' },
+  { code: 9, label: '外协入库' },
+  { code: 10, label: '委外入库' }
 ];
 export const outputSceneState = [
   { code: 1, label: '退供出库' },
@@ -46,7 +49,8 @@ export const outputSceneState = [
   { code: 3, label: '销售出库' },
   { code: 4, label: '领用出库' },
   { code: 5, label: '报废出库' },
-  { code: 6, label: '委外出库' }
+  { code: 6, label: '外协出库' },
+  { code: 7, label: '委外出库' }
 ];
 // 紧急状态
 export const emergencyState = [

src/views/bpm/handleTask/components/inoutBound/detailDialog_new.vue

@@ -1537,7 +1537,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/productionWarehousing/productionWarehousing.vue

@@ -1393,7 +1393,7 @@
           pageNum: 1,
           size: 10,
           categoryLevelId: arr.categoryLevelId,
-          code: arr.assetCode
+          codeEq: arr.assetCode
         });
         newArr.push(data.list); // 将结果存储到 newArr 中
         let re = [];

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage.vue

@@ -1278,7 +1278,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage_new.vue

@@ -1241,7 +1241,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing.vue

@@ -2003,7 +2003,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/innerFillWeight.vue

@@ -1882,7 +1882,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorage.vue

@@ -1438,7 +1438,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorageQuality.vue

@@ -1941,7 +1941,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcing.vue

@@ -1403,7 +1403,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcingQuality.vue

@@ -1932,7 +1932,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outerFillWeight.vue

@@ -1871,7 +1871,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/entrustedStorage.vue

@@ -1279,7 +1279,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/procurementWarehousing.vue

@@ -2004,7 +2004,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })

src/views/bpm/stockManagement/add.vue

@@ -1661,7 +1661,7 @@
               pageNum: 1,
               size: 10,
               categoryLevelId: item.categoryLevelPathIdParent,
-              code: item.assetCode
+              codeEq: item.assetCode
             });
             newArr.push(data.list); // 将结果存储到 newArr 中
           })