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

src/views/caseManagement/components/addCase.vue

@@ -17,8 +17,8 @@
           <el-divider></el-divider>
           <el-col :span="24">
             <el-form-item label="压缩包导入">
-              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip' :limit="1"
-                :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
+              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip'
+                :limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
                 <el-button size="small" type="primary">点击上传</el-button>
                 <div slot="tip" class="el-upload__tip">只能上传zip压缩包</div>
               </el-upload>
@@ -522,7 +522,7 @@ export default {
       modelFlag: false,
       fileURL: window.location.origin + "/API",
       fileList: [],
-      fileListZip:[],
+      fileListZip: [],
       filedata: {
         annexType: 2,
       },
@@ -534,7 +534,8 @@ export default {
       buttonFlag: true,
       getUserInfoList: {},
       applicationFlag: null,
-      showmediate: false
+      showmediate: false,
+      formZipData: {}
     };
   },
   watch: {
@@ -676,10 +677,30 @@ export default {
     beforeRemoveZip(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
-    successZip(res){
-      this.formData = res.data;
-      this.$set(this.formData.affiliate,'organizeFlag',0);
-      this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
+    successZip(res) {
+      this.formZipData = res.data;
+      // this.formData = res.data;
+      this.$set(this.formData.affiliate, 'organizeFlag', 0);
+      this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+      this.$set(this.formData, 'facts', this.formZipData.facts);
+      // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+      // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+      // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+      // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+      this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+      this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+      this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+      this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+      this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+      this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+      this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+      this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+      this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+      this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+      this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+      this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+      this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate.compLegalPerson);
+      // this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
     },
     handlePreview(file) {
       window.open(
@@ -705,17 +726,59 @@ export default {
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
-        this.formData.affiliate.nameAgent = null;
-        this.formData.affiliate.agentEmail = null;
-        this.formData.affiliate.contactTelphoneAgent = null;
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate, 'organizeFlag', 0);
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+          this.$set(this.formData, 'facts', this.formZipData.facts);
+          // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+          // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+          // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+          // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+          this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+          this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+          this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+          this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+          this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+        }
+        // this.formData.affiliate.nameAgent = null;
+        // this.formData.affiliate.agentEmail = null;
+        // this.formData.affiliate.contactTelphoneAgent = null;
       } else if (val == 1) {
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "contactTelphoneAgent", this.getUserInfoList.phonenumber);
-        this.formData.affiliate.applicationName = null;
-        this.formData.affiliate.code = null;
-        this.formData.affiliate.applicationEmail = null;
-        this.formData.affiliate.applicationPhone = null;
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate, 'organizeFlag', 1);
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+          this.$set(this.formData, 'facts', this.formZipData.facts);
+          this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+          this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+          this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+          this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+          // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+          // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+          // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+          this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+          this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+        }
+        // this.formData.affiliate.applicationName = null;
+        // this.formData.affiliate.code = null;
+        // this.formData.affiliate.applicationEmail = null;
+        // this.formData.affiliate.applicationPhone = null;
       }
       this.$refs["ruleForm"].clearValidate()
     },

src/views/caseManagement/components/mediation.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="24" v-if="mediationType">
           <el-form-item label="调解结果:">
-            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole && !selectRoido" @change="resultsMediation">
+            <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
               <el-radio :label="2">未达成调解</el-radio>
               <el-radio :label="3">未达成调解但不在争议</el-radio>
@@ -191,6 +191,12 @@ export default {
         });
         this.getUser(); 
       }
+    },
+    recordArrMediate(val){
+      if(val.length >= 1){
+        console.log('监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听');
+        this.selectRoido = false;
+      }
     }
   },
   created() { },
@@ -201,9 +207,6 @@ export default {
         userId: this.userId
       }).then(res => {
          this.isSecretaryRole = res.data.isSecretaryRole;
-         if(this.recordArrMediate.length > 0){
-          this.selectRoido = false
-        }
       })
     },
     /**上传地址*/
@@ -280,7 +283,7 @@ export default {
           });
         });
       })
-      this.isSecretaryRole = false
+      // this.selectRoido = true;
     },
     /** 庭审笔录附件 */
     toFile2(annexPath) {

vue.config.js

@@ -11,11 +11,11 @@ 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:7001'  //生产
 // const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
 // const API = 'http://172.16.0.237:6001' //Q
-const API = 'http://172.16.1.26:6001' //w
+// const API = 'http://172.16.1.26:6001' //w
 
 // vue.config.js 配置说明 
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions