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

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" @change="resultsMediation">
+            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole && !selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
               <el-radio :label="2">未达成调解</el-radio>
               <el-radio :label="3">未达成调解但不在争议</el-radio>
@@ -119,7 +119,7 @@
           <span>取 消</span>
         </el-button>
         <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
-          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1'" class="endbutton1"
+          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole" class="endbutton1"
           type="primary" round>
           提 交
         </el-button>
@@ -170,7 +170,8 @@ export default {
       fileList: [],
       attachList: [],
       isSecretaryRole: true,
-      loadingSubmit: false
+      loadingSubmit: false,
+      selectRoido:true
     };
   },
   watch: {
@@ -200,9 +201,9 @@ export default {
         userId: this.userId
       }).then(res => {
          this.isSecretaryRole = res.data.isSecretaryRole;
-        //  if(this.recordArrMediate){
-        //   this.isSecretaryRole = false
-        // }
+         if(this.recordArrMediate.length > 0){
+          this.selectRoido = false
+        }
       })
     },
     /**上传地址*/
@@ -257,7 +258,6 @@ export default {
       caseApplicationSelectById({
         id: this.mediationData.id
       }).then(res => {
-        console.log(res)
         res.data.caseAttachList.forEach(item => {
           if (item.annexType == 6) {
             this.recordArr.push(item);

vue.config.js

@@ -12,7 +12,7 @@ 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.43:6001' //w