fix（工序出站）：检验员必填且出站完成后清空

src/views/mes/wip/operation-out/jlIndex.vue

@@ -106,7 +106,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="showInspector === 'Y'">
-            <el-form-item label="检验员" prop="inspector">
+            <el-form-item label="检验员" prop="inspector" :rules="[{ required: true, message: '检验员不能为空', trigger: 'change'}]">
               <el-select v-model="searchForm.inspector" clearable style="width: 200px">
                 <el-option v-for="item in selectInspector" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -936,43 +936,49 @@ export default {
         }
       });
       if (found) {
-        this.$confirm(`是否确认出站？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          showLoading();
-          // 按分号分割工单字符串
-          let shopOrderList = this.searchForm.shopOrder.split(";")
-          operationOut({
-            site: this.site,
-            operation: this.searchForm.operation,
-            resrce: this.searchForm.resrce,
-            userWorkShift: this.searchForm.userWorkShift,
-            operationList: this.operationList,
-            autoOperationList: this.autoOperationList,
-            autoResource: this.getResource,
-            operationOutListDTOList: this.selectedRows,
-            shopOrderList: shopOrderList,
-            eqpCombineFeeding: this.eqpCombineFeeding,
-            inspector: this.searchForm.inspector,
-            printNum: this.searchForm.printNum
-          }).then((response) => {
-            hideLoading();
-            if (response.data.code !== 0) {
-              this.$message.error(response.data.message);
-            } else {
-              let lotNo = response.data.data.join('，');
-              this.$message.success(`工序【${this.searchForm.operation}】条码【${lotNo}】出站完成！`);
-              // 重置
-              this.searchForm.barCodeNum = ''
-              this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
-              // 获取列表数据
-              this.readOperationOutListByShopOrder(this.site, this.searchForm.shopOrder)
-            }
-          }).catch(() => {
-            hideLoading();
-          });
+        this.$refs.searchForm.validate((valid) => {
+          if (valid) {
+            this.$confirm(`是否确认出站？`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              showLoading();
+              // 按分号分割工单字符串
+              let shopOrderList = this.searchForm.shopOrder.split(";")
+              operationOut({
+                site: this.site,
+                operation: this.searchForm.operation,
+                resrce: this.searchForm.resrce,
+                userWorkShift: this.searchForm.userWorkShift,
+                operationList: this.operationList,
+                autoOperationList: this.autoOperationList,
+                autoResource: this.getResource,
+                operationOutListDTOList: this.selectedRows,
+                shopOrderList: shopOrderList,
+                eqpCombineFeeding: this.eqpCombineFeeding,
+                inspector: this.searchForm.inspector,
+                printNum: this.searchForm.printNum
+              }).then((response) => {
+                hideLoading();
+                if (response.data.code !== 0) {
+                  this.$message.error(response.data.message);
+                } else {
+                  let lotNo = response.data.data.join('，');
+                  this.$message.success(`工序【${this.searchForm.operation}】条码【${lotNo}】出站完成！`);
+                  // 重置
+                  this.searchForm.barCodeNum = ''
+                  this.searchForm.inspector = ''
+                  this.searchForm.printNum = ''
+                  this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
+                  // 获取列表数据
+                  this.readOperationOutListByShopOrder(this.site, this.searchForm.shopOrder)
+                }
+              }).catch(() => {
+                hideLoading();
+              });
+            })
+          }
         })
       }
     },
@@ -985,6 +991,8 @@ export default {
       }).then(() => {
         this.searchForm.clickCopy = ''
         this.searchForm.barCodeNum = ''
+        this.searchForm.inspector = ''
+        this.searchForm.printNum = ''
         this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
         // 获取列表数据
         if (this.searchForm.shopOrder) {

src/views/mes/wip/operation-out/jmIndex.vue

@@ -114,7 +114,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="showInspector === 'Y'">
-            <el-form-item label="检验员" prop="inspector">
+            <el-form-item label="检验员" prop="inspector" :rules="[{ required: true, message: '检验员不能为空', trigger: 'change'}]">
               <el-select v-model="searchForm.inspector" clearable style="width: 200px">
                 <el-option v-for="item in selectInspector" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -1133,6 +1133,8 @@ export default {
                   this.$message.success(`工序【${this.searchForm.operation}】条码【${lotNo}】出站完成！`);
                   // 重置
                   this.searchForm.barCodeNum = ''
+                  this.searchForm.inspector = ''
+                  this.searchForm.printNum = ''
                   this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
                   // 获取列表数据
                   this.readOperationOutListByShopOrder(this.site, this.searchForm.shopOrder)
@@ -1154,6 +1156,8 @@ export default {
       }).then(() => {
         this.searchForm.clickCopy = ''
         this.searchForm.barCodeNum = ''
+        this.searchForm.inspector = ''
+        this.searchForm.printNum = ''
         this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
         // 获取列表数据
         if (this.searchForm.shopOrder) {

src/views/mes/wip/operation-out/tbIndex.vue

@@ -152,7 +152,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="showInspector === 'Y'">
-            <el-form-item label="检验员" prop="inspector">
+            <el-form-item label="检验员" prop="inspector" :rules="[{ required: true, message: '检验员不能为空', trigger: 'change'}]">
               <el-select v-model="searchForm.inspector" clearable style="width: 200px">
                 <el-option v-for="item in selectInspector" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -1221,6 +1221,8 @@ export default {
                   this.$message.success(`工序【${this.searchForm.operation}】条码【${lotNo}】出站完成！`);
                   // 重置
                   this.searchForm.barCodeNum = ''
+                  this.searchForm.inspector = ''
+                  this.searchForm.printNum = ''
                   this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
                   // 获取列表数据
                   this.readOperationOutListByShopOrder(this.site, this.searchForm.shopOrder)
@@ -1242,6 +1244,8 @@ export default {
       }).then(() => {
         this.searchForm.clickCopy = ''
         this.searchForm.barCodeNum = ''
+        this.searchForm.inspector = ''
+        this.searchForm.printNum = ''
         this.barCodeNumIsDisabled = false; // 切换条码数禁用状态
         // 获取列表数据
         if (this.searchForm.shopOrder) {