Merge remote-tracking branch 'origin/master'

src/api/bpm/task.js

@@ -114,6 +114,14 @@ export function approveTaskWithVariables(data) {
   });
 }
 
+export function approveTaskWithVariablesOther(data) {
+  return request({
+    url: '/bpm/inwarehouse/assign',
+    method: 'PUT',
+    data: data
+  });
+}
+
 export function outApproveNotPass(data) {
   return request({
     url: '/bpm/outApprove/notPass',
@@ -130,7 +138,6 @@ export function outinApproveNotPass(data) {
   });
 }
 
-
 // 我的消息分页
 export async function notifyMessagePageAPI(data) {
   const res = await request({

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

@@ -441,6 +441,15 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
+            <el-table-column label="发货条码" prop="barcodes" width="130">
+              <template slot-scope="{ row }">
+                <el-input
+                  v-show="!row.isPack"
+                  v-model="row.barcodes"
+                ></el-input>
+                <span v-show="row.isPack">{{ row.barcodes }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input

src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/procurementWarehousing.vue

@@ -1370,11 +1370,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1390,6 +1396,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1404,6 +1413,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1418,12 +1430,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1443,11 +1464,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

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

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import { approveTaskWithVariablesOther } from '@/api/bpm/task';
   import outin from '@/api/warehouseManagement/outin';
   export default {
     name: '',
@@ -74,10 +74,11 @@
         console.log(storageData);
         try {
           this.isSaveLoading = true;
-          await outin.save(storageData);
-          approveTaskWithVariables({
+          let res = await outin.save(storageData);
+          approveTaskWithVariablesOther({
             id: this.taskId,
             reason: this.form.reason,
+            outInId: res.data[0],
             variables: {
               pass: true
             }

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

@@ -541,6 +541,12 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
+            <el-table-column label="发货条码" prop="barcodes" width="130">
+              <template slot-scope="{ row }">
+                <el-input v-if="!row.isPack" v-model="row.barcodes"></el-input>
+                <span v-else>{{ row.barcodes }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
@@ -2099,6 +2105,7 @@
           materialDetails: this.materialDetails(it.onlyCode),
           packingCount: it.packingCount,
           status: it.status,
+          barcodes: it.barcodes,
           result: it.result
         };
       },

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

@@ -686,6 +686,19 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
+            <el-table-column label="发货条码" prop="barcodes" width="130">
+              <template slot-scope="{ row, $index }">
+                <el-input
+                  v-if="!row.isPack"
+                  :ref="'barcodes' + $index"
+                  @keyup.native="
+                    moveFocus($event, $index, 'barcodes', '包装', row)
+                  "
+                  v-model="row.barcodes"
+                ></el-input>
+                <span v-else>{{ row.barcodes }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row, $index }">
                 <el-input
@@ -1338,9 +1351,15 @@
           case '包装':
             listLength = this.materialCodeReqList.length;
             if (row.measuringUnit != row.weightUtil) {
-              keyfield = ['materielCode', 'clientCode', 'engrave', 'weight'];
+              keyfield = [
+                'barcodes',
+                'materielCode',
+                'clientCode',
+                'engrave',
+                'weight'
+              ];
             } else {
-              keyfield = ['materielCode', 'clientCode', 'engrave'];
+              keyfield = ['barcodes', 'materielCode', 'clientCode', 'engrave'];
             }
             break;
           case '物料':
@@ -1366,11 +1385,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1386,6 +1411,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1400,6 +1428,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1414,12 +1445,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1439,11 +1479,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

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

@@ -1260,11 +1260,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1280,6 +1286,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1294,6 +1303,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1308,12 +1320,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1333,11 +1354,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

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

@@ -51,14 +51,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              prop="qualityFile"
-              label="回执附件"
-              :rules="{
+            <!-- :rules="{
                 required: true,
                 trigger: 'blur'
-              }"
-            >
+              }" -->
+            <el-form-item prop="qualityFile" label="回执附件">
               <fileUpload
                 v-model="qualityFile"
                 module="main"
@@ -1325,11 +1322,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1345,6 +1348,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1359,6 +1365,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1373,12 +1382,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1398,11 +1416,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

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

@@ -51,14 +51,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              prop="qualityFile"
-              label="回执附件"
-              :rules="{
+            <!-- :rules="{
                 required: true,
                 trigger: 'blur'
-              }"
-            >
+              }" -->
+            <el-form-item prop="qualityFile" label="回执附件">
               <fileUpload
                 v-model="qualityFile"
                 module="main"
@@ -1316,11 +1313,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1336,6 +1339,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1350,6 +1356,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1364,12 +1373,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1389,11 +1407,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

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

@@ -1260,11 +1260,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1280,6 +1286,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1294,6 +1303,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1308,12 +1320,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1333,11 +1354,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

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

@@ -63,13 +63,17 @@
         >驳回
       </el-button>
 
-      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
-        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+      <el-dropdown
+        @command="(command) => handleCommand(command)"
+        style="margin-left: 30px"
+      >
+        <span class="el-dropdown-link"
+          >更多<i class="el-icon-arrow-down el-icon--right"></i
+        ></span>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item command="cancel">作废</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-
     </div>
   </el-col>
 </template>
@@ -80,7 +84,7 @@
     approveTaskWithVariablesAPI,
     saleReturnUpdateAPI,
     updateReceiptAPI,
-    returnHandleProcessCancel,
+    returnHandleProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
   import { listAllUserBind } from '@/api/system/organization';
   import { EventBus } from './eventBus.js';
@@ -194,12 +198,17 @@
       // 外协返修质检入库
       async interiorStorageToOutsourcingQuality(data, pass) {
         console.log(data);
-        if (data.qualityInspector.qualityFile.length == 0) {
-          return this.$message.error('请上传回执附件！');
-        }
+        // if (data.qualityInspector.qualityFile.length == 0) {
+        //   return this.$message.error('请上传回执附件！');
+        // }
         let boolen = data.qualityInspectionStatus;
         if (boolen) {
-          await uploadQualityFile(data.qualityInspector);
+          if (
+            data.qualityInspector.qualityFile &&
+            data.qualityInspector.qualityFile.length > 0
+          ) {
+            await uploadQualityFile(data.qualityInspector);
+          }
           approveTaskWithVariablesAPI({
             id: this.taskId,
             reason: this.form.reason,
@@ -333,12 +342,17 @@
       // 内部生产入库质检
       async interiorProductionStorageQuality(data, pass) {
         console.log(data);
-        if (data.qualityInspector.qualityFile.length == 0) {
-          return this.$message.error('请上传回执附件！');
-        }
+        // if (data.qualityInspector.qualityFile.length == 0) {
+        //   return this.$message.error('请上传回执附件！');
+        // }
         let boolen = data.qualityInspectionStatus;
         if (boolen) {
-          await uploadQualityFile(data.qualityInspector);
+          if (
+            data.qualityInspector.qualityFile &&
+            data.qualityInspector.qualityFile.length > 0
+          ) {
+            await uploadQualityFile(data.qualityInspector);
+          }
           approveTaskWithVariablesAPI({
             id: this.taskId,
             reason: this.form.reason,
@@ -490,28 +504,31 @@
       //更多
       handleCommand(command) {
         if (command === 'cancel') {
-          this.$confirm("是否确认作废？", {
+          this.$confirm('是否确认作废？', {
             type: 'warning',
             cancelButtonText: '取消',
             confirmButtonText: '确定'
-          }).then(() => {
-            returnHandleProcessCancel({
-              id: this.taskId,
-              reason: this.form.reason,
-              businessId: this.businessId,
-            }).then(() => {
-              this.$emit('handleClose');
-            }).catch(() => {
-              this.$message.error("流程作废失败");
-            });
-          }).catch(() => {});
+          })
+            .then(() => {
+              returnHandleProcessCancel({
+                id: this.taskId,
+                reason: this.form.reason,
+                businessId: this.businessId
+              })
+                .then(() => {
+                  this.$emit('handleClose');
+                })
+                .catch(() => {
+                  this.$message.error('流程作废失败');
+                });
+            })
+            .catch(() => {});
         }
-      },
-
+      }
     },
     beforeDestroy() {
       EventBus.$off('getActiveCompValue');
-    },
+    }
   };
 </script>
 

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

@@ -1367,11 +1367,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }
@@ -1387,6 +1393,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index - 1)].value == 0) {
+              this.$refs[key + (index - 1)].value = '';
+            }
             this.$refs[key + (index - 1)].focus();
           });
         }
@@ -1401,6 +1410,9 @@
           }
           this.$refs[key + index].blur();
           this.$nextTick(() => {
+            if (this.$refs[key + (index + 1)].value == 0) {
+              this.$refs[key + (index + 1)].value = '';
+            }
             this.$refs[key + (index + 1)].focus();
           });
         }
@@ -1415,12 +1427,21 @@
           }
           this.$refs[key + index].blur();
           if (key === keyfield[0]) {
+            if (
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value == 0
+            ) {
+              this.$refs[keyfield[keyfield.length - 1] + (index - 1)].value =
+                '';
+            }
             // 当前行第一个,跳转上一行最后一个
             this.$refs[keyfield[keyfield.length - 1] + (index - 1)].focus();
           } else {
             // 跳转上一个
             const prevkeyindex = keyfield.findIndex((k) => k === key) - 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[prevkeyindex] + index].value == 0) {
+                this.$refs[keyfield[prevkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[prevkeyindex] + index].focus();
             });
           }
@@ -1440,11 +1461,17 @@
           this.$refs[key + index].blur();
           if (key === keyfield[keyfield.length - 1]) {
             // 当前行最后一个,跳转下一行第一个
+            if (this.$refs[keyfield[0] + (index + 1)].value == 0) {
+              this.$refs[keyfield[0] + (index + 1)].value = '';
+            }
             this.$refs[keyfield[0] + (index + 1)].focus();
           } else {
             // 跳转下一个
             const nextkeyindex = keyfield.findIndex((k) => k === key) + 1;
             this.$nextTick(() => {
+              if (this.$refs[keyfield[nextkeyindex] + index].value == 0) {
+                this.$refs[keyfield[nextkeyindex] + index].value = '';
+              }
               this.$refs[keyfield[nextkeyindex] + index].focus();
             });
           }

src/views/bpm/outgoingManagement/components/AssetsDialog.vue

@@ -111,16 +111,15 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="质检状态">
+        <el-col v-if="dimension != 2" :span="6">
+          <el-form-item label="质检结果">
             <el-select
-              v-if="dimension != 3 || dimension != 4"
               clearable
-              v-model="searchForm.qualityStatus"
-              placeholder="请选择质检状态"
+              v-model="searchForm.qualityResult"
+              placeholder="请选择质检结果"
             >
               <el-option
-                v-for="item in qualityStatusOption"
+                v-for="item in qualityResultOption"
                 :label="item.label"
                 :value="item.value"
                 :key="item.value"
@@ -400,7 +399,7 @@
           batchNo: '',
           engrave: '',
           barcodes: '',
-          qualityStatus: ''
+          qualityResult: ''
         },
         selectionList: [],
         materialType: '',
@@ -630,7 +629,7 @@
         this.searchForm.batchNo = '';
         this.searchForm.engrave = '';
         this.searchForm.barcodes = '';
-        this.searchForm.qualityStatus = '';
+        this.searchForm.qualityResult = '';
         this.doSearch();
       },
       doSearch() {