Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -304,6 +304,7 @@ export default {
       })
     },
     submitForm(parms) {
+      let that = this;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (parms == 0) {
@@ -318,17 +319,18 @@ export default {
               arbitrateRecord: this.arbitrateRecord,
             });
           } else if (parms == 2) {
-            if (this.arbitrateRecord.arbitrateReject == "") {
+            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,
+              });
             }
-            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,
@@ -345,15 +347,17 @@ export default {
               arbitrateRecord: this.arbitrateRecord,
             });
           } else if (parms == 6) {
-            if (this.arbitrateRecord.arbitrateReject == "") {
+            debugger
+            if (!that.arbitrateRecord.arbitrateReject) {
               this.$message.error('请输入拒绝原因');
               return
+            } else {
+              this.arbitratorCheckArbitrateRecordFn({
+                id: this.form.id,
+                agreeOrNotCheck: 2,
+                arbitrateRecord: this.arbitrateRecord,
+              });
             }
-            this.arbitratorCheckArbitrateRecordFn({
-              id: this.form.id,
-              agreeOrNotCheck: 2,
-              arbitrateRecord: this.arbitrateRecord,
-            });
           }
         }
       });

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>
@@ -945,16 +945,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) <=

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