Quellcode durchsuchen

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

hhl123456789 vor 2 Jahren
Ursprung
Commit
ecd8979c8b
2 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
  1. 7
    7
      src/views/caseManagement/components/mediation.vue
  2. 1
    1
      vue.config.js

+ 7
- 7
src/views/caseManagement/components/mediation.vue Datei anzeigen

46
         </el-col>
46
         </el-col>
47
         <el-col :span="24" v-if="mediationType">
47
         <el-col :span="24" v-if="mediationType">
48
           <el-form-item label="调解结果:">
48
           <el-form-item label="调解结果:">
49
-            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole" @change="resultsMediation">
49
+            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole && !selectRoido" @change="resultsMediation">
50
               <el-radio :label="1">达成调解</el-radio>
50
               <el-radio :label="1">达成调解</el-radio>
51
               <el-radio :label="2">未达成调解</el-radio>
51
               <el-radio :label="2">未达成调解</el-radio>
52
               <el-radio :label="3">未达成调解但不在争议</el-radio>
52
               <el-radio :label="3">未达成调解但不在争议</el-radio>
119
           <span>取 消</span>
119
           <span>取 消</span>
120
         </el-button>
120
         </el-button>
121
         <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
121
         <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
122
-          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1'" class="endbutton1"
122
+          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole" class="endbutton1"
123
           type="primary" round>
123
           type="primary" round>
124
           提 交
124
           提 交
125
         </el-button>
125
         </el-button>
170
       fileList: [],
170
       fileList: [],
171
       attachList: [],
171
       attachList: [],
172
       isSecretaryRole: true,
172
       isSecretaryRole: true,
173
-      loadingSubmit: false
173
+      loadingSubmit: false,
174
+      selectRoido:true
174
     };
175
     };
175
   },
176
   },
176
   watch: {
177
   watch: {
200
         userId: this.userId
201
         userId: this.userId
201
       }).then(res => {
202
       }).then(res => {
202
          this.isSecretaryRole = res.data.isSecretaryRole;
203
          this.isSecretaryRole = res.data.isSecretaryRole;
203
-        //  if(this.recordArrMediate){
204
-        //   this.isSecretaryRole = false
205
-        // }
204
+         if(this.recordArrMediate.length > 0){
205
+          this.selectRoido = false
206
+        }
206
       })
207
       })
207
     },
208
     },
208
     /**上传地址*/
209
     /**上传地址*/
257
       caseApplicationSelectById({
258
       caseApplicationSelectById({
258
         id: this.mediationData.id
259
         id: this.mediationData.id
259
       }).then(res => {
260
       }).then(res => {
260
-        console.log(res)
261
         res.data.caseAttachList.forEach(item => {
261
         res.data.caseAttachList.forEach(item => {
262
           if (item.annexType == 6) {
262
           if (item.annexType == 6) {
263
             this.recordArr.push(item);
263
             this.recordArr.push(item);

+ 1
- 1
vue.config.js Datei anzeigen

12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13
 
13
 
14
 // const API = 'http://121.40.189.20:9001'  //生产
14
 // const API = 'http://121.40.189.20:9001'  //生产
15
-const API = 'http://121.40.189.20:7001'  //测试
15
+const API = 'http://121.40.189.20:6001'  //测试
16
 // const API = 'http://192.168.3.18:6001'  //B
16
 // const API = 'http://192.168.3.18:6001'  //B
17
 // const API = 'http://172.16.0.237:6001' //Q
17
 // const API = 'http://172.16.0.237:6001' //Q
18
 // const API = 'http://172.16.1.43:6001' //w
18
 // const API = 'http://172.16.1.43:6001' //w