Merge branch 'master' into liudl

bklLiudl

2024-10-15 dd973f741617e3bbf5ecf11747ff71960991549c

 Web/src/views/wcs/wcsTask/component/editDialog.vue

@@ -14,7 +14,7 @@
               </el-form-item>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="任务号" prop="taskNo">
                     <el-input v-model="ruleForm.taskNo" placeholder="请输入任务号" maxlength="20" show-word-limit clearable />
                     <el-input v-model="ruleForm.taskNo" placeholder="任务号自动生成" maxlength="20" show-word-limit clearable readonly/>
                     
                  </el-form-item>
                  
@@ -95,6 +95,12 @@
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="拆垛箱数" prop="qty">
                     <el-input-number v-model="ruleForm.qty" placeholder="请输入拆垛箱数" clearable />
                  </el-form-item>
						
               </el-col>
            </el-row>
         </el-form>
         <template #footer>
@@ -172,6 +178,20 @@
      ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
         if (isValid) {
            let values = ruleForm.value;
            //入库任务
            if(ruleForm.value.taskType==0){
               if(ruleForm.value.startLocate==undefined || ruleForm.value.startLocate.length!=3){
                  ElMessage.error("入库任务的起始位置字符长度应是3位");
                  return;
               }
            }
            //出库任务
            if(ruleForm.value.taskType==1){
               if(ruleForm.value.endLocate==undefined || ruleForm.value.endLocate.length!=3){
                  ElMessage.error("出库任务的结束位置字符长度应是3位");
                  return;
               }
            }
            if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
               await addWcsTask(values);
            } else {