fix：生产排产中排产数量过大报错。到货通知单输入框颜色问题。到货通知单为空报错

src/views/mes/pro/schedule/proTask.vue

@@ -47,11 +47,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="protaskList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />      
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/>
       <el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/>
       <el-table-column label="工作站编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>      
+      <el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>
       <el-table-column label="排产数量" align="center" prop="quantity" />
       <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
       <el-table-column label="开始生产时间" align="center" prop="startTime" width="180">
@@ -111,11 +111,11 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="甘特图显示颜色" prop="colorCode">
-                <el-color-picker v-model="form.colorCode"></el-color-picker>                        
+                <el-color-picker v-model="form.colorCode"></el-color-picker>
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-input v-model="form.colorCode" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />                
+            <el-input v-model="form.colorCode" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />
           </el-col>
         </el-row>
         <el-row>
@@ -229,7 +229,8 @@ export default {
           { required: true, message: "工作站不能为空", trigger: "blur" }
         ],
         quantity: [
-          { required: true, message: "排产数量不能为空", trigger: "blur" }
+          { required: true, message: "排产数量不能为空", trigger: "blur" },
+          { max: 14, message: "字段过长", trigger: "blur" }
         ],
         startTime: [
           { required: true, message: "请选择开始生产日期",trigger: "blur"}
@@ -266,23 +267,23 @@ export default {
       if(this.form.startTime !=null && this.form.duration !=null){
           let parts = this.form.startTime.split(' ');
           let startDate = new Date(parts[0]);
-          startDate = startDate.getFullYear() + '-' 
+          startDate = startDate.getFullYear() + '-'
-              + (startDate.getMonth()+1) + '-'   
+              + (startDate.getMonth()+1) + '-'
               + startDate.getDate() + ' '
-                  + parts[1].split(':')[0] + ':' 
+                  + parts[1].split(':')[0] + ':'
-                  + '00' + ':' 
+                  + '00' + ':'
                   + '00';
           this.form.startTime = startDate;
-          startDate = Date.parse(new Date(startDate))/1000; 
+          startDate = Date.parse(new Date(startDate))/1000;
           startDate += (3600)* 8 * this.form.duration; //这里以8小时为一个单位
-          let endDate = new Date(parseInt(startDate) * 1000); 
+          let endDate = new Date(parseInt(startDate) * 1000);
-          this.form.endTime =endDate.getFullYear() + '-' 
+          this.form.endTime =endDate.getFullYear() + '-'
-                        + (endDate.getMonth()+1) + '-' 
+                        + (endDate.getMonth()+1) + '-'
                         + endDate.getDate() + ' '
-                          + endDate.getHours() + ':' 
+                          + endDate.getHours() + ':'
-                          + endDate.getMinutes() + ':' 
+                          + endDate.getMinutes() + ':'
                           + endDate.getSeconds();
-          
+
 
       }
     },

src/views/mes/wm/arrivalnotice/index.vue

@@ -113,7 +113,7 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_rn_status" :value="scope.row.status"/>
         </template>
-      </el-table-column>   
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -135,7 +135,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -158,7 +158,7 @@
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -181,7 +181,7 @@
               </el-input>
               <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
             </el-form-item>
-          </el-col>               
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -213,14 +213,14 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.noticeId !=null" content-position="center">物料信息</el-divider> 
+      <el-divider v-if="form.noticeId !=null" content-position="center">物料信息</el-divider>
       <el-card shadow="always" v-if="form.noticeId !=null" class="box-card">
         <NoticeLine :noticeId="form.noticeId" :optType="optType"></NoticeLine>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="saveForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>  
+        <el-button type="primary" @click="saveForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
-        <el-button type="success" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' && form.noticeId !== null ">提 交</el-button>  
+        <el-button type="success" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' && form.noticeId !== null ">提 交</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -268,17 +268,31 @@ export default {
       // 表单校验
       rules: {
         noticeCode: [
-          { required: true, message: "入库单编号不能为空", trigger: "blur" }
+          { required: true, message: "入库单编号不能为空", trigger: "blur" },
-        ],        
+          { max: 64, message: "字段过长", trigger: "blur" }
+        ],
         noticeName: [
-          { required: true, message: "入库单名称不能为空", trigger: "blur" }
+          { required: true, message: "入库单名称不能为空", trigger: "blur" },
-        ],      
+          { max: 100, message: "字段过长", trigger: "blur" }
+        ],
+        poCode: [
+          { max: 64, message: "字段过长", trigger: "blur" }
+        ],
         vendorName: [
           { required: true, message: "请选择供应商", trigger: "blur" }
-        ],     
+        ],
         arrivalDate: [
           { required: true, message: "请选择到货日期", trigger: "blur" }
-        ],     
+        ],
+        contact: [
+          { max: 32, message: "字段过长", trigger: "blur" }
+        ],
+        tel: [
+          { max: 60, message: "字段过长", trigger: "blur" }
+        ],
+        remark: [
+          { max: 250, message: "字段过长", trigger: "blur" }
+        ]
       }
     };
   },
@@ -405,6 +419,7 @@ export default {
     },
     //供应商选择
     handleSelectVendor(){
+      this.resetForm("form");
       this.$refs.vendorSelect.showFlag = true;
     },
     //供应商选择弹出框

src/views/mes/wm/arrivalnotice/line.vue

@@ -70,7 +70,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -105,7 +105,7 @@
         <el-row>
           <el-col :span="16">
             <el-form-item label="规格型号" prop="specification">
-              <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.specification" readonly type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -195,11 +195,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        itemId: [
+        itemCode: [
-          { required: true, message: "产品物料ID不能为空", trigger: "blur" }
+          { required: true, message: "产品物料编码不能为空", trigger: "blur" }
-        ],        quantityArrival: [
+        ],
-          { required: true, message: "到货数量不能为空", trigger: "blur" }
+        quantityArrival: [
-        ],      }
+          { required: true, message: "到货数量不能为空", trigger: "blur" },
+          { max: 12, message: "字段过长", trigger: "blur" }
+        ],
+        remark: [
+          { max: 250, message: "字段过长", trigger: "blur" }
+        ]
+      }
     };
   },
   created() {
@@ -305,7 +311,7 @@ export default {
           this.form.itemCode = obj.itemCode;
           this.form.itemName = obj.itemName;
           this.form.specification = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
+          this.form.unitOfMeasure = obj.unitOfMeasure;
         }
     },
     //IQC检验单选择