Merge remote-tracking branch 'origin/master'

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

@@ -98,6 +98,23 @@
                   > -->
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item
+                  prop="qualityFile"
+                  label="回执附件"
+                  :rules="{
+                    required: true,
+                    trigger: 'blur'
+                  }"
+                >
+                  <fileUpload
+                    v-model="qualityFile"
+                    module="main"
+                    :showLib="false"
+                    :limit="10"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="备注:">
                   <span>{{ infoData.remark }}</span>
@@ -463,12 +480,13 @@
                   clearable
                   v-model="row.result"
                   v-show="!row.isPack"
+                  @itemChange="packItem($event, row)"
                 />
                 <span v-if="row.isPack">
-                  <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
-                  <span v-else>让步接收</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
                 </span>
               </template>
             </el-table-column>
@@ -481,9 +499,9 @@
                   v-show="!row.isPack"
                 />
                 <span v-if="row.isPack">
-                  <span v-if="!row.status"></span>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span>
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
                 </span>
               </template>
             </el-table-column>
@@ -595,20 +613,20 @@
             <el-table-column label="质检结果" prop="result" width="120">
               <template slot-scope="{ row }">
                 <span>
-                  <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
-                  <span v-else>让步接收</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
                 </span>
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
               <template slot-scope="{ row }">
-                <span
-                  ><span v-if="!row.status"></span>
+                <span>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column
@@ -679,6 +697,7 @@
     },
     data() {
       return {
+        qualityFile: '',
         saveLoading: false,
         metailList: [],
         dateTypes: 1,
@@ -766,6 +785,14 @@
       this._getInfo();
     },
     methods: {
+      //包装结果
+      packItem(val, row) {
+        if (val.dictCode == 0) {
+          row.status = '1';
+        } else {
+          row.status = '';
+        }
+      },
       //质检物料提交
       async packMeta(data) {
         if (!data.result) {
@@ -802,9 +829,13 @@
         this.warehousingMaterialList.forEach((item) => {
           if (
             item.categoryCode == row.categoryCode &&
-            item.categoryCode == row.categoryCode
+            item.batchNo == row.batchNo
           ) {
-            packNo = item.packingCount;
+            if (this.warehousingMaterialList.length != 1) {
+              packNo = this.warehousingMaterialList.length;
+            } else {
+              packNo = item.packingCount;
+            }
           }
         });
 

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

@@ -81,6 +81,7 @@
             reason: this.form.reason,
             variables: { pass: true }
           };
+          await this.$parent.$parent.$parent.$refs.bziRef.handleSave();
           const data = await approveTaskWithVariables(params);
           if (data.data.code != '-1') {
             this.$emit('handleAudit', {

src/views/bpm/handleTask/index.vue

@@ -17,7 +17,6 @@
             }}】</span
           >
         </div>
-
         <div v-if="processInstance.processDefinition">
           <async-biz-form-component
             :taskId="listData?.taskId"
@@ -386,6 +385,7 @@
             return;
           }
           // 设置流程信息
+          console.log('==', response);
           this.processInstance = response;
           // //将业务表单，注册为动态组件
           // let formCustomCreatePath = JSON.parse(
@@ -472,12 +472,7 @@
         let text = data.status === 1 ? '通过' : '不通过';
         this.$message.success(`审批${data.title || text}成功！`);
         this.handleClose(); // 获得最新详情
-        if (data.status == 1) {
-          try {
-            console.log(11);
-            this.$refs.bziRef.handleSave();
-          } catch (error) {}
-        }
+
         // const index = this.runningTasks.indexOf(task);
         // this.$refs['form' + index][0].validate((valid) => {
         //   if (!valid) {

src/views/bpm/stockManagement/add.vue

@@ -925,12 +925,13 @@
                   clearable
                   v-model="row.result"
                   v-if="!row.isPack"
+                  @itemChange="packItem($event, row)"
                 />
                 <span v-else>
-                  <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
-                  <span v-else>让步接收</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
                 </span>
               </template>
             </el-table-column>
@@ -942,11 +943,11 @@
                   v-model="row.status"
                   v-if="!row.isPack"
                 />
-                <span v-else
-                  ><span v-if="!row.status"></span>
+                <span v-else>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
+                </span>
               </template>
             </el-table-column>
 
@@ -1111,12 +1112,14 @@
                   clearable
                   v-model="row.result"
                   v-if="!row.isMeta"
+                  @itemChange="packItem($event, row)"
                 />
-                <span v-else
-                  ><span v-if="!row.status"></span>
-                  <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                <span v-else>
+                  <span v-if="row.result == 0">合格</span>
+                  <span v-else-if="row.result == 1">不合格</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
@@ -1127,11 +1130,11 @@
                   v-model="row.status"
                   v-if="!row.isMeta"
                 />
-                <span v-else
-                  ><span v-if="!row.status"></span>
+                <span v-else>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80">
@@ -1331,6 +1334,14 @@
       this.initData();
     },
     methods: {
+      //包装结果
+      packItem(val, row) {
+        if (val.dictCode == 0) {
+          row.status = '1';
+        } else {
+          row.status = '';
+        }
+      },
       cancel() {
         this.$emit('cancel');
       },