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

src/views/caseManagement/components/addCase.vue

@@ -15,7 +15,7 @@
             <div class="caseInfo">案件信息：</div>
           </div>
           <el-divider></el-divider>
-          <el-col :span="24">
+          <el-col :span="24"  v-if="buttonFlag">
             <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">
@@ -1172,8 +1172,8 @@ export default {
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
-        this.$set(this.formData.affiliate.applicant[0].applicant, 'sex', this.formZipData.affiliate.applicant[0].applicant.sex);
-        this.$set(this.formData.affiliate.applicant[0].applicant, 'birth', this.formZipData.affiliate.applicant[0].applicant.birth);
+        this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
+        this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
       } else if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 1) {
         this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
         this.$set(this.formData, 'facts', this.formZipData.facts);

src/views/caseManagement/components/confirmMediator.vue

@@ -92,7 +92,7 @@ export default {
             if (val) {
                 this.mediatorArr = [];
                 this.selectReservationFn({ id: this.confirmData.id })
-                listMediator().then(res => {
+                listMediator({caseAppliId:this.confirmData.id}).then(res => {
                     this.tableData = res.data;
                 })
             }

src/views/caseManagement/components/departmentMediator.vue

@@ -92,7 +92,7 @@ export default {
             if (val) {
                 this.mediatorArr = [];
                 this.selectReservationFn({ id: this.departmentData.id })
-                listMediator().then(res => {
+                listMediator({caseAppliId:this.departmentData.id}).then(res => {
                     this.tableData = res.data;
                 })
             }

src/views/login.vue

@@ -81,10 +81,9 @@
             <span v-else>登 录 中...</span>
           </el-button>
           <div style="float: right" v-if="register">
-            <!-- <router-link class="link-type" :to="'/register'">立即注册</router-link> -->
-            <el-button type="text" @click="registrationLink('/register')"
-              >立即注册</el-button
-            >
+            <router-link class="link-type" :to="'/register'">立即注册</router-link>
+            <!-- <el-button type="text" @click="registrationLink('/register')"
+              >立即注册</el-button> -->
           </div>
           <div class="registerImg" v-if="closeImgs">
             <div class="closeImg" @click="closeImg">

vue.config.js

@@ -12,10 +12,10 @@ 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:7001'  //生产
-// const API = 'http://121.40.189.20:6001'  //测试
+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