1123

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

@@ -29,7 +29,7 @@
               {{ form.categoryLevelName }}
             </el-form-item>
             <el-form-item label="包装数量：" prop="totalPackage">
-              {{ form.detailList.length }}
+              {{ form.detailList?.length }}
             </el-form-item>
             <!-- <el-form-item label="单位：" prop="packingUnit">
               {{ form.packingUnit }}
@@ -125,6 +125,7 @@
 
     methods: {
       changeActive(item) {
+        console.log('item', item);
         this.activeComp = item.key;
         this.$emit('activeCompChange', item.key);
         // if (this.taskDefinitionKey == 'storeman' && item.key == 'storage') {

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

@@ -25,9 +25,7 @@
         size="mini"
         :loading="isSaveLoading"
         @click="storeManagerApprove"
-        v-if="
-          ['storeman'].includes(taskDefinitionKey) && activeComp == 'storage'
-        "
+        v-if="activeComp == 'storage'"
         >申请入库
       </el-button>
     </div>

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/boxTabPage.vue

@@ -76,8 +76,8 @@
           case 'tab2':
             return {
               form: this.form,
-              bizType: 7,
-              sourceBizNo: this.form.code
+              bizType: 7
+              // sourceBizNo: this.form.code
             };
         }
       },
@@ -100,9 +100,9 @@
   };
 </script>
 <style scoped lang="scss">
-.title{
- font-size: 22px;
- font-weight: 800;
- margin-top: 15px;
-}
+  .title {
+    font-size: 22px;
+    font-weight: 800;
+    margin-top: 15px;
+  }
 </style>

src/views/bpm/outgoingManagement/outbound.vue

@@ -548,7 +548,7 @@
     props: {
       form: { type: Object, default: {} },
       bizType: { type: Number, default: 1 },
-      sourceBizNo: { type: String, default: '' },
+      // sourceBizNo: { type: String, default: '' },
       type: { type: String, default: '正常出库' },
       detailList: { type: Array, default: () => [] },
       saleProductList: { type: Array, default: () => [] },
@@ -872,6 +872,7 @@
       },
       // 初始化用户信息
       async initFormData() {
+        console.log(this.form, 'ddddddddddddddddddddddddddddd123form');
         // const res = await warehouseDefinition.tree();
         // let obj = res.find(
         //   (item) =>
@@ -891,7 +892,7 @@
         // 出库类型
         this.formData.bizType = this.bizType;
         // 添加单据来源
-        this.formData.sourceBizNo = this.sourceBizNo;
+        this.formData.sourceBizNo = this.form?.code;
         // 将出库状态改成出库状态 2出库 1入库
         this.formData.type = 2;
         // 入库登记人
@@ -919,7 +920,9 @@
           let pData2 = {
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId)
+            workOrderIds: this.extractedList.map((item) => item.workOrderId),
+            taskIds: this.form.productList.map((item) => item.taskId),
+            workOrderIds: this.form.productList.map((item) => item.workOrderId)
           };
           storageApi
             .getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
@@ -952,7 +955,9 @@
           let pData2 = {
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId)
+            workOrderIds: this.extractedList.map((item) => item.workOrderId),
+            taskIds: this.form.productList.map((item) => item.taskId),
+            workOrderIds: this.form.productList.map((item) => item.workOrderId)
           };
           storageApi
             .getHierarchyFifo(this.wwType == 3 ? pData2 : pData)

src/views/bpm/stockManagement/storage.vue

@@ -1000,6 +1000,8 @@
             obj.taskId = this.detailProductList[0]?.taskId;
             obj.outsourceBatchNo = this.detailProductList[0]?.batchNo;
             obj.outsourceCode = this.detailProductList[0]?.sourceCode;
+            obj.taskId = this.detailList[0]?.taskId;
+            obj.workOrderId = this.detailList[0]?.workOrderId;
           });
           this.pickingPageNum = Math.ceil(
             this.showPackingList.length / this.pageSize
@@ -1020,12 +1022,12 @@
         deep: true
       }
     },
-   async created() {
-     await this.requestDict('不拆物料层规格');
-     await this.getFieldModel();
-     await this.getListItems();
-     await this.initFormData();
-     await this.getNowFormatDate();
+    async created() {
+      await this.requestDict('不拆物料层规格');
+      await this.getFieldModel();
+      await this.getListItems();
+      await this.initFormData();
+      await this.getNowFormatDate();
     },
     methods: {
       ...mapActions('dict', ['requestDict']),
@@ -1187,8 +1189,8 @@
                 brandNum: item.brandNum, // 牌号
                 batchNo: batchNo, // 批次号
                 supplierListOptions: supplierList[item.id], // 供应商列表
-                supplierId: '', // 供应商id
-                supplierName: '', // 供应商名称
+                supplierId: this.form.supplierId, // 供应商id
+                supplierName: this.form.supplierName, // 供应商名称
                 approvalNumber: item.approvalNumber, // 批准文号
                 packingSpecification: item.packingSpecification, // 包装规格
                 packingSpecificationOption:
@@ -1209,9 +1211,7 @@
                 warehouseId, // 仓库id
                 warehouseName, // 仓库名称
                 warehouseIds,
-                warehouseNames,
-                supplierId: this.form.supplierId,
-                supplierName: this.form.supplierName
+                warehouseNames
               };
             });
             this.$nextTick(() => {
@@ -1230,7 +1230,10 @@
           });
           console.log('codeList-----------', codeList);
           storageApi.getListByNameOrModeType({ codeList }).then(async (res) => {
-            console.log(res);
+            console.log(
+              res,
+              'ddddddddddddddddddddddddddddddddddddddddddddddddres'
+            );
             // 获取批次号
             const batchNo = await getCode('lot_number_code');
             // 获取供应商
@@ -1654,6 +1657,8 @@
               ...packingItem,
               workOrderId: this.detailProductList[0]?.workOrderId,
               taskId: this.detailProductList[0]?.taskId,
+              taskId: this.detailList[0]?.taskId,
+              workOrderId: this.detailList[0]?.workOrderId,
               outsourceBatchNo: this.detailProductList[0]?.batchNo,
               outsourceCode: this.detailProductList[0]?.sourceCode,
               materialDetailList: this.materialList.filter(