yusheng 1 rok temu
rodzic
commit
accf15cd22

+ 6 - 1
src/utils/dict/warehouse.js

@@ -144,7 +144,8 @@ export const qualityStatus = {
 export const qualityResults = {
   0: '无',
   1: '合格',
-  2: '不合格'
+  2: '不合格',
+  3:'让步接收'
 };
 
 // 质检结果下拉选项
@@ -160,5 +161,9 @@ export const qualityResultsOptions = [
   {
     label: '不合格',
     value: 2
+  },
+  {
+    label: '让步接收',
+    value:3
   }
 ];

+ 6 - 6
src/views/bpm/handleTask/components/contractBook/addDialog.vue

@@ -872,9 +872,9 @@ export default {
 
 
           this.dictChange(contractVO.type, 'init');
-          if (this.form.fileId) {
-            this.form.fileId = JSON.parse(this.form.fileId);
-          }
+          // if (this.form.fileId) {
+          //   this.form.fileId = JSON.parse(this.form.fileId);
+          // }
           this.$refs.inventoryTable &&
             this.$refs.inventoryTable.putTableValue(data);
           this.$refs.paymentListTable &&
@@ -1317,9 +1317,9 @@ export default {
           '结算方式',
           this.form.settlementMode
         );
-        if (this.form.fileId) {
-          this.form.fileId = JSON.stringify(this.form.fileId);
-        }
+        // if (this.form.fileId) {
+        //   this.form.fileId = JSON.stringify(this.form.fileId);
+        // }
         const rawDetailList =
             (this.$refs.rawDetailListRef &&
               this.$refs.rawDetailListRef.getTableValue()) ||

+ 3 - 3
src/views/bpm/handleTask/components/contractBook/detailDialog.vue

@@ -496,9 +496,9 @@ export default {
       if (data) {
         this.detailData = data;
         this.form = data.contractVO;
-        if (this.form.fileId) {
-            this.form.fileId = JSON.parse(this.form.fileId);
-          }
+        // if (this.form.fileId) {
+        //     this.form.fileId = JSON.parse(this.form.fileId);
+        //   }
         this.$refs.inventoryTabledetailRef &&
           this.$refs.inventoryTabledetailRef.putTableValue({
             ...data,

+ 3 - 0
src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -572,11 +572,14 @@
       async getTableValue() {
         return {
           form: this.form,
+          // packingList: this.$refs.procurementWarehousing &&
+          //   (await this.$refs.procurementWarehousing.getTableValue()),
           returnStorageData:
             this.$refs.add && (await this.$refs.add.getReturnStorage()),
           isAllChecked:
             this.$refs.procurementWarehousing &&
             (await this.$refs.procurementWarehousing.getStatus()),
+            
           qualityInspector:
             (this.$refs.detailDialog &&
               this.$refs.detailDialog.getQualityFile()) ||

+ 2 - 0
src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -267,6 +267,8 @@
         }
         if (this.taskDefinitionKey === 'qualityInspection' && status) {
           let arr = await this.getTableValue(); // 是否全部已检
+          // console.log(arr,'arr')
+          // return;
           if (!arr.isAllChecked) {
             return this.$message.error('请完成质检!');
           }

+ 13 - 9
src/views/bpm/stockManagement/quality.vue

@@ -8,7 +8,9 @@
             <el-form label-width="120px">
               <el-col :span="8">
                 <el-form-item label="入库单:">
-                  <span>{{ isIds?infoData?.bizNos?.toString():infoData?.bizNo}}</span>
+                  <span>{{
+                    isIds ? infoData?.bizNos?.toString() : infoData?.bizNo
+                  }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -867,6 +869,9 @@
           this.$message.error('请先完成包装和物料质检');
         }
       },
+      getTableValue() {
+        return this.packingList;
+      },
       // 选择质检结果改变质检状态
       changeWrapStatus(resultValue, row, type) {
         console.log(resultValue);
@@ -1008,10 +1013,10 @@
       async _getInfo(id) {
         if (!id) return;
         let res = null;
-        let resAll=null;
+        let resAll = null;
         if (this.isInterior) {
           res = await storageApi.getInboundDetailsById(id);
-        }else if (this.isIds) {
+        } else if (this.isIds) {
           resAll = await storageApi.getInboundDetailsByIds(id);
         } else {
           res = await storageApi.getInfoBySourceBizNo(id);
@@ -1020,18 +1025,17 @@
         if (this.isIds) {
           this.infoData = resAll[0];
           this.extInfo = resAll[0].extInfo;
-          res=resAll[0]
-          res['bizNos']=resAll.map(item=>item.bizNo)
-          res.outInDetailList=resAll.map(item=>item.outInDetailList[0])
+          res = resAll[0];
+          res['bizNos'] = resAll.map((item) => item.bizNo);
+          res.outInDetailList = resAll.map((item) => item.outInDetailList[0]);
         } else {
           this.infoData = res;
           this.extInfo = res.extInfo;
- 
         }
         this.productList = res.outInDetailList.map(
           (productItem, productIndex) => {
-            if(this.isIds){
-              productItem['bizNo']=res.bizNos[productIndex]
+            if (this.isIds) {
+              productItem['bizNo'] = res.bizNos[productIndex];
             }
             return {
               ...productItem,