提示

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

@@ -118,7 +118,7 @@
           <el-form-item :prop="'detailList.' + $index + '.ifPackageOk'" :rules="{
             required: true,
             trigger: 'change',
-            message: '请选择'
+            message: '请选择包装完好与否'
           }">
             <el-select v-if="isTrue" v-model="row.ifPackageOk" placeholder="请选择" clearable style="width: 100%"
               @change="listChange('ifPackageOk', row.ifPackageOk)">
@@ -135,7 +135,7 @@
           <el-form-item :prop="'detailList.' + $index + '.unpackUserName'" :rules="{
             required: true,
             trigger: 'change',
-            message: '请选择'
+            message: '请选择拆包装责任人'
           }">
             <el-input v-if="isTrue" @click.native="handHead(row, $index)" v-model="row.unpackUserName"
               placeholder="请选择"></el-input>
@@ -151,7 +151,7 @@
           <el-form-item :prop="'detailList.' + $index + '.ifReasonMatch'" :rules="{
             required: true,
             trigger: 'change',
-            message: '请选择'
+            message: '请选择退货原因是否与退货信息一致'
           }">
             <el-select v-if="isTrue" v-model="row.ifReasonMatch" placeholder="请选择" clearable style="width: 100%"
               @change="listChange('ifReasonMatch', row.ifReasonMatch)">
@@ -168,7 +168,7 @@
         <!--  ///  技术员审核展示字段 -->
         <template v-slot:unqualifiedReasonAnalysis="{ row, $index }">
           <el-form-item :prop="'detailList.' + $index + '.unqualifiedReasonAnalysis'"
-            :rules="{ required: true, trigger: 'blur', message: '请输入' }">
+            :rules="{ required: true, trigger: 'blur', message: '请输入不合格原因分析' }">
             <el-input v-if="isTrue" v-model="row.unqualifiedReasonAnalysis"></el-input>
             <div v-else>{{ row.unqualifiedReasonAnalysis }}</div>
           </el-form-item>
@@ -183,7 +183,7 @@
         </template>
         <template v-slot:unqualifiedType="{ row, $index }">
           <el-form-item :prop="'detailList.' + $index + '.unqualifiedType'"
-            :rules="{ required: true, trigger: 'blur', message: '请输入' }">
+            :rules="{ required: true, trigger: 'blur', message: '请选择不合格类型' }">
             <DictSelection dict-name="产品不合格类型" multiple collapse-tags clearable v-if="isTrue"
               v-model="row.unqualifiedTypeList" @change="
                 (val) =>
@@ -225,7 +225,7 @@
         </template>
         <template v-slot:handleOpinion="{ row, $index }">
           <el-form-item :prop="'detailList.' + $index + '.handleOpinion'"
-            :rules="{ required: true, trigger: 'blur', message: '请输入' }">
+            :rules="{ required: true, trigger: 'blur', message: '请输入处理意见' }">
             <el-input v-if="isTrue" v-model="row.handleOpinion"></el-input>
             <div v-else>{{ row.handleOpinion }}</div>
           </el-form-item>
@@ -238,16 +238,14 @@
             <div>{{ row.handleOpinion }}</div>
           </el-form-item>
         </template>
-        <template v-slot:headerHandleOpinion="{ column }">
-          <span class="is-required">{{ column.label }}</span>
-        </template>
+
         <!--////-->
         <!--  ///  生产员审核 -->
         <template v-slot:inOrOut="{ row, $index }">
           <el-form-item :prop="'detailList.' + $index + '.inOrOut'" :rules="{
             required: true,
             trigger: 'change',
-            message: '请选择'
+            message: '请选择处理方式'
           }">
             <el-select v-if="isTrue" v-model="row.inOrOut" @change="listChange('inOrOut', row.inOrOut, 'inOrOut')">
               <el-option label="内部" :value="1" />
@@ -876,8 +874,14 @@ export default {
     },
     getTableValue() {
       return new Promise((resolve) => {
-        this.$refs.formRef.validate(async (validate) => {
+        this.$refs.formRef.validate(async (validate,obj) => {
           if (!validate) {
+            if (obj) {
+            let messages = Object.keys(obj).map((key) => obj[key][0]);
+            if (messages.length > 0) {
+              this.$message.warning(messages[0].message);
+            }
+          }
             resolve(false);
           } else {
             let params = {

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

@@ -452,8 +452,8 @@
         let data = await this.getTableValue();
         let updateCode = '1'; //判断saleReturnUpdateAPI方法是否执行成功
         this.$refs.formRef.validate(async (validate) => {
-          if ((!validate || !data) && !!pass)
-            return this.$message.warning('有必填项未填，请检查');
+          if ((!validate || !data) && !!pass)return
+            // return this.$message.warning('有必填项未填，请检查');
             // alert(1)
             // return
           if (this.taskDefinitionKey === 'storeman' && !!pass) {