派单功能优化提示

src/views/produce/components/jobBooking/index.vue

@@ -694,14 +694,20 @@
             }
           } else {
             if (this.List.length > 0) {
-              for (let i = 0; i < this.List.length; i++) {
-                for (let j = 0; this.List[i].semiProductList.length; j++) {
-                  if (!this.List[i].semiProductList[j].extInfo.engrave) {
-                    this.$message.warning('请输入刻码!');
-                    return;
-                  }
+              for (let i = 0; i < this.List[0].semiProductList.length; i++) {
+                if (!this.List[0].semiProductList[i].extInfo.engrave) {
+                  this.$message.warning('请输入刻码!');
+                  return;
                 }
               }
+              // for (let i = 0; i < this.List.length; i++) {
+              //   for (let j = 0; this.List[i].semiProductList.length; j++) {
+              //     if (!this.List[i].semiProductList[j].extInfo.engrave) {
+              //       this.$message.warning('请输入刻码!');
+              //       return;
+              //     }
+              //   }
+              // }
             }
           }
         }

src/views/produceOrder/components/releaseDialog/index.vue

@@ -178,7 +178,7 @@
               class="table"
             >
               <template v-slot:toolbar>
-                <div style="display: inline-block;" v-if="!item.isSpecialField">
+                <div style="display: inline-block" v-if="!item.isSpecialField">
                   <el-button
                     :loading="toolbarLoading"
                     type="primary"
@@ -201,7 +201,10 @@
                     保存
                   </el-button>
                 </div>
-                <div style="margin-left: 50px; display: inline-block" v-if="!item.isSpecialField">
+                <div
+                  style="margin-left: 50px; display: inline-block"
+                  v-if="!item.isSpecialField"
+                >
                   <span
                     class="text"
                     style="
@@ -233,14 +236,18 @@
                     </el-radio-button>
                   </el-radio-group>
                 </div>
-                <div v-if="item.isSpecialField" class="describe" style="color: #67c23a;">
+                <div
+                  v-if="item.isSpecialField"
+                  class="describe"
+                  style="color: #67c23a"
+                >
                   该工序已完成派单!
                 </div>
               </template>
               <template v-slot:quantity="{ row }">
                 <el-input
                   v-model="row.quantity"
-                  :disabled="permissions(row,item)"
+                  :disabled="permissions(row, item)"
                   placeholder="请输入数量"
                   type="number"
                   @input="(e) => handleQuantityInput(e, row, item)"
@@ -249,7 +256,7 @@
               <template v-slot:weight="{ row }">
                 <el-input
                   v-model="row.weight"
-                  :disabled="permissions(row,item)"
+                  :disabled="permissions(row, item)"
                   placeholder="请输入重量"
                   type="number"
                   @input="(e) => handleWeightInput(e, row, item)"
@@ -259,7 +266,7 @@
                 <el-select
                   v-model="row.teamTimeDetailId"
                   placeholder="班次"
-                  :disabled="permissions(row,item)"
+                  :disabled="permissions(row, item)"
                   @change="(e) => shiftSelection(e, row)"
                 >
                   <el-option
@@ -274,7 +281,7 @@
               <template v-slot:startTime="{ row }">
                 <el-date-picker
                   v-model="row.startTime"
-                  :disabled="permissions(row,item)"
+                  :disabled="permissions(row, item)"
                   :picker-options="{
                     disabledDate: (time) => {
                       return (
@@ -291,7 +298,7 @@
               <template v-slot:endTime="{ row }">
                 <el-date-picker
                   v-model="row.endTime"
-                  :disabled="permissions(row,item)"
+                  :disabled="permissions(row, item)"
                   :picker-options="{
                     disabledDate: (time) => {
                       return (
@@ -438,8 +445,8 @@
       },
       // 列表输入框操作 已派单的不能操作
       permissions() {
-        return (row,item) => {
-          if(item.isSpecialField) return true
+        return (row, item) => {
+          if (item.isSpecialField) return true;
           if (!row.status) return false;
           if (row.status.code == 1) return true;
         };
@@ -620,7 +627,6 @@
           // this.procTaskDis = false;
           let list = [];
           res.forEach((item, index) => {
-            console.log(item, 'item 全部 ll');
             let obj = {
               id: item.sourceTaskId, //工序 id
               name: item.name, //工序 名称
@@ -752,17 +758,23 @@
         }
         let assignees = [];
         let changeIds = [];
-        let flag = true;
+        let flag = true; // 是否填写 校验
+        let digit = true; // 数字校验
         row.selection.forEach((item) => {
-          if (
-            !item.quantity ||
-            !item.weight ||
-            !item.startTime ||
-            !item.endTime
-          ) {
+          if (!item.quantity || !item.startTime || !item.endTime) {
             flag = false;
             return;
           }
+          if (item.quantity == 0) {
+            this.$message.warning('请检查所选数据的数量不能为0');
+            digit = false;
+            return;
+          }
+          if (item.weight == 0) {
+            this.$message.warning('请检查所选数据的重量不能为0');
+            digit = false;
+            return;
+          }
           let Aobj = {
             assigneeId: item.id,
             quantity: item.quantity,
@@ -778,9 +790,13 @@
           assignees.push(Aobj);
           changeIds.push(item.changeId);
         });
+        // 校验没过 就不往下进行
+        if (!digit) {
+          return;
+        }
         if (!flag) {
           this.$message.warning(
-            '请将所选数据的 数量,重量,开始时间,完成时间 填写完毕'
+            '请将所选数据的 数量 ,开始时间,完成时间 填写完毕'
           );
           return;
         }