Просмотр исходного кода

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

hanchaobo 2 лет назад
Родитель
Сommit
96086cf6f9
3 измененных файлов: 4 добавлений и 4 удалений
  1. 1
    1
      src/views/caseManagement/caseList.vue
  2. 2
    2
      src/views/caseManagement/components/addCase.vue
  3. 1
    1
      vue.config.js

+ 1
- 1
src/views/caseManagement/caseList.vue Просмотреть файл

86
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
86
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
87
                             v-if="(item.id == scope.row.caseFlowId &&
87
                             v-if="(item.id == scope.row.caseFlowId &&
88
             checkPermi([item.buttonAuthFlag]) &&
88
             checkPermi([item.buttonAuthFlag]) &&
89
-            scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1)
89
+            scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1 || scope.row.agentFlag == 1 || scope.row.mediatorFlag == 1)
90
             ">{{ item.nodeName }}</el-button>
90
             ">{{ item.nodeName }}</el-button>
91
                     </div>
91
                     </div>
92
                 </template>
92
                 </template>

+ 2
- 2
src/views/caseManagement/components/addCase.vue Просмотреть файл

173
       },
173
       },
174
     ]">
174
     ]">
175
                 <el-select v-model="item.applicant.operatorFlag" placeholder="请选择" auto-complete="off"
175
                 <el-select v-model="item.applicant.operatorFlag" placeholder="请选择" auto-complete="off"
176
-                  style="width: 100%;">
176
+                  style="width: 100%;" disabled>
177
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
177
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
178
 
178
 
179
                   </el-option>
179
                   </el-option>
455
             </el-col>
455
             </el-col>
456
             <el-col :span="12" v-if="item.res.organizeFlag == 0">
456
             <el-col :span="12" v-if="item.res.organizeFlag == 0">
457
               <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'">
457
               <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'">
458
-                <el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;">
458
+                <el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;" disabled>
459
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
459
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
460
 
460
 
461
                   </el-option>
461
                   </el-option>

+ 1
- 1
vue.config.js Просмотреть файл

15
 const API = 'http://121.40.189.20:6001'  //测试
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.26:7001' //w
18
+// const API = 'http://172.16.1.26:6001' //w
19
 
19
 
20
 // vue.config.js 配置说明 
20
 // vue.config.js 配置说明 
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions