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>

src/views/caseManagement/components/caseentryDialog.vue

@@ -36,7 +36,7 @@
           <el-col :span="12">
             <el-form-item label="借款开始日期：" prop="loanStartDate">
               <el-date-picker v-model="formData.loanStartDate" type="datetime" placeholder="借款开始日期"
-                @change="setStartTime">
+                >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -961,16 +961,16 @@ export default {
       this.$emit("cancel");
     },
     // 校验借款开始日期与结束日期
-    setStartTime() {
-      if (
-        this.setTime(this.formData.loanStartDate) >=
-        this.setTime(this.formData.loanEndDate)
-      ) {
-        this.$message.error("借款开始日期应早于借款结束日期");
-        this.formData.loanStartDate = "";
-        this.formData.loanEndDate = "";
-      }
-    },
+    // setStartTime() {
+    //   if (
+    //     this.setTime(this.formData.loanStartDate) >=
+    //     this.setTime(this.formData.loanEndDate)
+    //   ) {
+    //     this.$message.error("借款开始日期应早于借款结束日期");
+    //     this.formData.loanStartDate = "";
+    //     this.formData.loanEndDate = "";
+    //   }
+    // },
     setEndTime() {
       if (
         this.setTime(this.formData.loanEndDate) <=

src/views/caseManagement/components/filingreviewDialog.vue

@@ -1,27 +1,22 @@
 <template>
   <div>
     <!-- 立案审查 -->
-    <el-dialog
-      title="立案审查"
-      :visible="showfilingreview"
-      width="500px"
-      @close="cancel"
-      :destroy-on-close="true"
-    >
+    <el-dialog title="立案审查" :visible="showfilingreview" width="500px" @close="cancel" :destroy-on-close="true">
       <div class="radiobox">
-        <el-radio-group v-model="radio">
+        <el-radio-group v-model="radio" style="margin-bottom: 20px;">
           <el-radio :label="1">同意</el-radio>
           <el-radio :label="2">拒绝</el-radio>
         </el-radio-group>
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
+          <!-- TODO -->
+          <el-form-item label="拒绝原因" prop="caseCheckReject" v-if="radio == 2">
+            <el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="ruleForm.caseCheckReject"></el-input>
+          </el-form-item>
+        </el-form>
       </div>
-
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" class="endbutton"
-          ><span>提 交</span></el-button
-        >
-        <el-button @click="cancel" class="endbutton1"
-          ><span> 取 消</span></el-button
-        >
+        <el-button type="primary" @click="submitForm" class="endbutton"><span>提 交</span></el-button>
+        <el-button @click="cancel" class="endbutton1"><span> 取 消</span></el-button>
       </div>
     </el-dialog>
   </div>
@@ -37,21 +32,36 @@ export default {
   data() {
     return {
       radio: 1,
+      ruleForm: {},
+      rules: {
+        caseCheckReject: [
+          {
+            required: true,
+            message: "拒绝原因不能为空",
+            trigger: "blur",
+          },
+        ],
+      }
     };
   },
   methods: {
     submitForm() {
-      let paramsdata = {
-        agreeOrNotCheck: this.radio,
-        ids: [this.filingreviewdata.id],
-      };
-      submitCaseApplicationCheck(paramsdata)
-        .then((res) => {
-          this.$modal.msgSuccess("提交成功");
-          this.cancel();
-          this.$emit("getcaseApply", this.queryParams);
-        })
-        .catch((err) => {});
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          let paramsdata = {
+            agreeOrNotCheck: this.radio,
+            ids: [this.filingreviewdata.id],
+            caseCheckReject:this.ruleForm.caseCheckReject
+          };
+          submitCaseApplicationCheck(paramsdata)
+            .then((res) => {
+              this.$modal.msgSuccess("提交成功");
+              this.cancel();
+              this.$emit("getcaseApply", this.queryParams);
+            })
+            .catch((err) => { });
+        }
+      });
     },
     cancel() {
       this.$emit("cancelFilingreview");
@@ -64,16 +74,19 @@ export default {
 .radiobox {
   margin-left: 5%;
 }
+
 ::v-deep .el-dialog {
   width: 800px;
   background: #ffffff;
   border-radius: 20px;
 }
+
 .endbutton {
   width: 124px;
   height: 37px;
   background: #0072ff;
   border-radius: 19px;
+
   span {
     width: 32px;
     height: 15px;
@@ -84,12 +97,14 @@ export default {
     // line-height: 48px;
   }
 }
+
 .endbutton1 {
   width: 124px;
   height: 37px;
   background: #ffffff;
   border: 1px solid #d0d0d0;
   border-radius: 19px;
+
   span {
     width: 31px;
     height: 13px;

vue.config.js

@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-const API = 'http://121.40.189.20:9001'  //生产
-// const API = 'http://121.40.189.20:8001'  //测试
+// const API = 'http://121.40.189.20:9001'  //生产
+const API = 'http://121.40.189.20:8001'  //测试
 // const API = 'http://192.168.3.18:9001'  //B
 // const API = 'http://192.168.3.77:9001' //Q