修改申请单锁拒绝、驳回添加备注验证

ui/src/views/approve/approveDetail/offlinevalve-detail.vue

@@ -1,10 +1,10 @@
 <template>
-  <el-dialog  :close-on-click-modal="false"
-    :title="!this.taskForm.taskId == '' ? $t('处理') : $t('详情')"
+  <el-dialog :close-on-click-modal="false"
+             :title="!this.taskForm.taskId == '' ? $t('处理') : $t('详情')"
 
-    :visible.sync="visible"
-    :append-to-body="true"
-    width="60%">
+             :visible.sync="visible"
+             :append-to-body="true"
+             width="60%">
     <el-descriptions :column="2" border size="small" v-if="!desFlag">
       <el-descriptions-item label="安全阀位号" :label-style="labelStyle">{{ this.dataForm.devNo }}
       </el-descriptions-item>
@@ -87,7 +87,7 @@
       <div v-if="flag">
         <div v-if="taskName=='临时措施制定人'">
           <el-form-item label="安全评估以及临时措施执行" prop="safa">
-<!--            <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估以及临时措施执行"/>-->
+            <!--            <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估以及临时措施执行"/>-->
             <el-autocomplete
               type="textarea"
               class="inline-input"
@@ -401,8 +401,8 @@ export default {
       this.getDicts("UNIT").then(response => {
         this.unitOptions = response.data;
       });
-      listSAFA({}).then(res=>{
-        this.safaList=res.data
+      listSAFA({}).then(res => {
+        this.safaList = res.data
       })
     },
     getSAFA(val, cb) {
@@ -415,16 +415,22 @@ export default {
     },
     getLocks(devNo) {
       listAllLock({position: devNo, status: 0}).then(res => {
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           let riskLevel = '风险等级: ';
           if (item.riskLevel)
-            riskLevel='风险等级:'+item.riskLevel.substring(item.riskLevel.indexOf('=')+1,item.riskLevel.length)
-          item.lockCode=item.lockCode+'('+riskLevel+'；'+'初始状态:'+item.valveStatus+')'
+            riskLevel = '风险等级:' + item.riskLevel.substring(item.riskLevel.indexOf('=') + 1, item.riskLevel.length)
+          item.lockCode = item.lockCode + '(' + riskLevel + '；' + '初始状态:' + item.valveStatus + ')'
         })
         this.lockList = res.data;
       })
     },
     dataFormSubmit(val) {
+      if (val == 2||val==0) {
+        if (this.form.remarks == "" || this.form.remarks == null || this.form.remarks == undefined) {
+          this.$alert("驳回/拒绝申请必须填写备注！", "注意！", {dangerouslyUseHTMLString: true});
+          return;
+        }
+      }
       this.$refs["form"].validate(valid => {
         if (valid || val != 1) {
           this.submitDisabled = true;

ui/src/views/approve/approveDetail/safetychange-detail.vue

@@ -417,6 +417,12 @@ export default {
       return <el-tag type={type}>{s}</el-tag>;
     },
     dataFormSubmit(val) {
+      if (val==2||val==0){
+        if (this.form.remarks==""||this.form.remarks==null||this.form.remarks==undefined){
+          this.$alert("驳回/拒绝申请必须填写备注！", "注意！", { dangerouslyUseHTMLString: true });
+          return;
+        }
+      }
       this.$refs["form"].validate(valid => {
         if (valid || val != 1) {
           this.submitDisabled = true;