Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into gyj

src/views/caseManagement/caseList.vue

@@ -1047,6 +1047,7 @@ export default {
     },
      // model框显示
         showModel(row, type) {
+
             switch (type) {
                 case 0:
                     selectSignSealUrl({ id: row.id }).then(res => {

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -34,7 +34,7 @@
               <el-input v-model="adjudicatename.respondentName" />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="借款开始日期：" prop="loanStartDate">
               <el-date-picker
                 v-model="formData.loanStartDate"
@@ -53,7 +53,7 @@
               >
               </el-date-picker>
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :span="12">
             <el-form-item label="案件标的：" prop="caseSubjectAmount">
               <el-input
@@ -78,14 +78,14 @@
               />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="申请人主张欠本金：" prop="claimPrinciOwed">
               <el-input
                 v-model="formData.claimPrinciOwed"
                 placeholder="请输入"
               />
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <!-- <el-col :span="12">
           <el-form-item label="案件顾问：" prop="claimPrinciOwed">
             <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
@@ -108,7 +108,7 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="开庭日期：" prop="hearDate">
               <el-date-picker
                 v-model="adjudicatename.hearDate"
@@ -117,14 +117,14 @@
               >
               </el-date-picker>
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
         <!-- <el-col :span="24">
           <el-form-item label="案件资料：" prop="claimPrinciOwed">
             <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
           </el-form-item>
         </el-col> -->
-        <!-- <el-col :span="24">
+        <el-col :span="24">
             <el-form-item
               label="申请人案件证据："
             >
@@ -147,7 +147,7 @@
                 </a>
             </div>
             </el-form-item>
-        </el-col> -->
+        </el-col>
       </el-form>
       <el-form ref="form2" :model="form2" label-width="150px">
         <el-form-item label="笔录内容：" prop="responCrossOpin">

src/views/caseManagement/components/caseentryDialog.vue

@@ -820,7 +820,7 @@ export default {
     "initpaymentArr",
     "initpaymentArr1",
     "queryParams",
-    "caseAttachList",
+    // "caseAttachList",
     "columnValues",
     "detailsAwardForm"
   ],
@@ -1090,10 +1090,6 @@ export default {
       this.activeName = "first"
       this.formGrab.list = this.columnValues
       this.caseAttachListArr = []
-      this.getTemplateFn({
-          pageNum: 1,
-          pageSize: 10000000,
-        })
       if (val) {
         this.applicateArr = [];
         this.quiltArr = [];
@@ -1197,14 +1193,20 @@ export default {
         }
       }
       if (val && (this.flag == "0" || this.flag == "1")) {
-        
+        setTimeout(() => {
+          this.detailsAwardNum = this.detailsAwardForm;
+        }, 2000)
+        this.getTemplateFn({
+          pageNum: 1,
+          pageSize: 10000000,
+        })
         let params = {
           id: this.form.id,
           version: this.form.version
         }
         selectCaseApply(params).then(res => {
+
           let data = res.data;
-          this.detailsAwardNum = data;
           data.affiliate.applicant.forEach(item => {
             if (!item.applicant) {
               item.applicant = {}
@@ -1251,6 +1253,8 @@ export default {
           this.formData = data;
           this.form2 = data.affiliate;
         })
+        // this.detailsAwardNum = this.detailsAwardForm;
+        // console.log(this.detailsAwardNum.caseAttachList,"PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP");
       }
     }
   },
@@ -1453,10 +1457,10 @@ export default {
           "YYYY-MM-DD HH:mm:ss"
         );
         if (valid) {
+          this.loadingSubmit = true;
           this.$refs["form2"].validate((valid) => {
             if (valid) {
               this.$refs["form3"].validate((vail) => {
-                this.loadingSubmit = true;
                 if (vail) {
                   this.$set(this.formData, "affiliate", { applicant: [], res: [] });
                   this.$set(this.formData.affiliate, "applicant", this.form2.applicant);
@@ -1468,13 +1472,7 @@ export default {
                   //   "YYYY-MM-DD HH:mm:ss"
                   // );
                   if (this.formData.id) {
-                    this.formData['columnValues'] = this.formGrab.list;
+                    this.formData['columnValues'] = this.formGrab.list
-                    this.formData.affiliate.applicant.forEach(item => {
-                      item.applicantAgent.roleType = 2
-                    })
-                    this.formData.affiliate.res.forEach(item => {
-                      item.resAgent.roleType = 4
-                    })
                     addCaseApply({
                       ...this.formData,
                       affiliate: this.formData.affiliate,

src/views/caseManagement/components/judgmentInformation.vue

@@ -139,12 +139,12 @@
       <!-- 清除画布 -->
       <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" :loading="buttonFlag">提 交</el-button>
+        <el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
-        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2" :loading="buttonFlag">提交</el-button>
+        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">提交</el-button>
         <!-- <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button> -->
         <!-- <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button> -->
         <!-- <el-button type="primary" @click="submitForm(5)" v-if="flag == 4">同 意</el-button> -->
-        <el-button type="primary" @click="submitForm(6)" v-if="flag == 4" :loading="buttonFlag">提交</el-button>
+        <el-button type="primary" @click="submitForm(6)" v-if="flag == 4">提交</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -164,7 +164,6 @@ export default {
   props: ["openDialogInfor", "title", "flag", "awardDetailform","queryParams"],
   data() {
     return {
-      buttonFlag:false,
       // key: value
       arbitrateRecordt: {},
       agreeOrNotCheck:1,
@@ -328,10 +327,8 @@ export default {
     },
     // 校验裁决书
     verificationArbitrateRecordFn(parms) {
-      this.buttonFlag = true;
       verificationArbitrateRecord(parms).then((res) => {
         this.cancel();
-        this.buttonFlag = false;
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
         // this.$message("成功");
@@ -340,10 +337,8 @@ export default {
     },
     //审核裁决书
     checkArbitrateRecordFn(parms) {
-      this.buttonFlag = true;
       checkArbitrateRecord(parms).then((res) => {
         this.cancel();
-        this.buttonFlag = false;
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
         // this.$message("成功");
@@ -352,11 +347,9 @@ export default {
     },
     // 仲裁员审核裁决书
     arbitratorCheckArbitrateRecordFn(parms) {
-      this.buttonFlag = true;
       console.log(parms)
       arbitratorCheckArbitrateRecord(parms).then((res) => {
         this.cancel();
-        this.buttonFlag = false;
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
         // this.$message("成功");
@@ -365,10 +358,8 @@ export default {
     },
     // 签名
     adjudicationSignatureFn(parms) {
-      this.buttonFlag = true;
       adjudicationSignature(parms).then((res) => {
         this.cancel();
-        this.buttonFlag = false;
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
         this.$message("成功");
@@ -417,7 +408,18 @@ export default {
               });
             } 
           } else if (parms == 2) {
-           
+            // 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,
@@ -438,6 +440,16 @@ export default {
                 arbitrateRecord: this.arbitrateRecord,
               });
               }
+            // if (!that.arbitrateRecord.arbitrateReject) {
+            //   this.$message.error('请输入拒绝原因');
+            //   return
+            // } else {
+            //   this.arbitratorCheckArbitrateRecordFn({
+            //     id: this.form.id,
+            //     agreeOrNotCheck: 2,
+            //     arbitrateRecord: this.arbitrateRecord,
+            //   });
+            // }
           }
         }
       });

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:9001'  //生产
-  // const API = 'http://121.40.189.20:8001'  //测试
+  const API = 'http://121.40.189.20:8001'  //测试
 // const API = 'http://172.16.1.26:8001'  //Bs
 // const API = 'http://192.168.3.77:9001' //Q
 // const API = 'http://172.16.0.241:8001' //W