Merge branch 'dev' into gyj

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -81,14 +81,16 @@
         <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2 || flag == 4">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
         </el-form-item>
+        <el-form-item label="驳回原因" prop="arbitrateReject" v-if="flag == 2 || flag == 4">
+          <el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="arbitrateRecord.arbitrateReject"></el-input>
+        </el-form-item>
       </el-form>
       <!-- 画布 -->
-      <h4 v-if="flag == 3">签名区域</h4>
+      <!-- <h4 v-if="flag == 3">签名区域</h4>
       <div class="esign" v-if="flag == 3">
         <vue-esign ref="esign" :width="900" :height="300" bgColor="#ffffff" />
-      </div>
+      </div> -->
       <!-- 清除画布 -->
-      <el-button v-if="flag == 3" type="info" @click="handleReset">清除画布</el-button>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="danger" @click="submitForm(4)" v-if="flag == 1">重新生成裁决书</el-button> -->
         <el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
@@ -173,6 +175,13 @@ export default {
             trigger: "blur",
           },
         ],
+        // arbitrateReject: [
+        //   {
+        //     required: true,
+        //     message: "拒绝原因不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       applicantFileArr: [], //申请人
       applicantPathArr: [], //申请人
@@ -200,7 +209,10 @@ export default {
           // this.form.arbitrateRecord.checkOpinion = '同意';
           this.arbitrateRecord.checkOpinion = '';
           // }
-          // this.arbitrateRecord = this.form.arbitrateRecord;
+          this.arbitrateRecord = {};
+          if (this.form.arbitrateRecord) {
+            this.arbitrateRecord.id = this.form.arbitrateRecord.id;
+          }
           this.evidenceFile(this.form);
           // }, 1000);
         }
@@ -292,6 +304,7 @@ export default {
       })
     },
     submitForm(parms) {
+      let that = this;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (parms == 0) {
@@ -306,11 +319,18 @@ export default {
               arbitrateRecord: this.arbitrateRecord,
             });
           } else if (parms == 2) {
-            this.checkArbitrateRecordFn({
-              id: this.form.id,
-              agreeOrNotCheck: 2,
-              arbitrateRecord: this.arbitrateRecord,
-            });
+            if (!that.arbitrateRecord.arbitrateReject == "") {
+              this.$message.error('请输入拒绝原因');
+              return
+            } else {
+              this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject;
+              delete this.arbitrateRecord.arbitrateReject;
+              this.checkArbitrateRecordFn({
+                id: this.form.id,
+                agreeOrNotCheck: 2,
+                arbitrateRecord: this.arbitrateRecord,
+              });
+            }
           } else if (parms == 3) {
             this.adjudicationSignatureFn({
               id: this.form.id,
@@ -326,12 +346,18 @@ export default {
               agreeOrNotCheck: 1,
               arbitrateRecord: this.arbitrateRecord,
             });
-          }else if (parms == 6) {
-            this.arbitratorCheckArbitrateRecordFn({
-              id: this.form.id,
-              agreeOrNotCheck: 2,
-              arbitrateRecord: this.arbitrateRecord,
-            });
+          } else if (parms == 6) {
+            debugger
+            if (!that.arbitrateRecord.arbitrateReject) {
+              this.$message.error('请输入拒绝原因');
+              return
+            } else {
+              this.arbitratorCheckArbitrateRecordFn({
+                id: this.form.id,
+                agreeOrNotCheck: 2,
+                arbitrateRecord: this.arbitrateRecord,
+              });
+            }
           }
         }
       });
@@ -339,10 +365,6 @@ export default {
     cancel() {
       this.$emit("cancelpaymentdetails");
     },
-    // 清除画布
-    handleReset() {
-      this.$refs["esign"].reset(); //清空画布
-    },
   },
 };
 </script>