SH-Arbitrate/Mediation-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
gyj
2024-05-17 17:14:45 +08:00
parent 3b809685e3 96086cf6f9
commit 604d76e1fd
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/caseList.vue
+1 -1
View File
@@ -86,7 +86,7 @@
<el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)" <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
v-if="(item.id == scope.row.caseFlowId && v-if="(item.id == scope.row.caseFlowId &&
checkPermi([item.buttonAuthFlag]) && checkPermi([item.buttonAuthFlag]) &&
scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1) scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1 || scope.row.agentFlag == 1 || scope.row.mediatorFlag == 1)
">{{ item.nodeName }}</el-button> ">{{ item.nodeName }}</el-button>
</div> </div>
</template> </template>
src/views/caseManagement/components/addCase.vue
+6 -2
View File
@@ -173,7 +173,7 @@
}, },
]"> ]">
<el-select v-model="item.applicant.operatorFlag" placeholder="请选择" auto-complete="off" <el-select v-model="item.applicant.operatorFlag" placeholder="请选择" auto-complete="off"
style="width: 100%;"> style="width: 100%;" disabled>
<el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id"> <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
</el-option> </el-option>
@@ -455,7 +455,7 @@
</el-col> </el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0"> <el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'"> <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'">
<el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;"> <el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;" disabled>
<el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id"> <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
</el-option> </el-option>
@@ -1020,6 +1020,8 @@ export default {
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex); this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth); this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
this.$set(this.formData.affiliate.applicant[0].applicant, "home", this.getUserInfoList.home);
this.$set(this.formData.affiliate.applicant[0].applicant, "address", this.getUserInfoList.address);
} }
this.activeName = "first"; this.activeName = "first";
this.showmediate = false; this.showmediate = false;
@@ -1063,6 +1065,8 @@ export default {
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex); this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth); this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
this.$set(this.formData.affiliate.applicant[0].applicant, "home", this.getUserInfoList.home);
this.$set(this.formData.affiliate.applicant[0].applicant, "address", this.getUserInfoList.address);
}) })
}, },
/** 根据案件id获取对应信息 */ /** 根据案件id获取对应信息 */
src/views/onlyoffice/onlyoffice.vue
+1 -1
View File
@@ -35,7 +35,7 @@ export default {
} }
axios axios
.get( .get(
`http://121.40.189.20:9090/onlyOfficeConfig/${edit}/${id}/${this.userId}/desktop/true` `http://121.40.189.20:9090/onlyOfficeConfig/${edit}/${id}/${this.userId}/desktop/true/tiaojieprod`
) )
.then((res) => { .then((res) => {
this.config = res.data; this.config = res.data;
vue.config.js
+1 -1
View File
@@ -15,7 +15,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
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://192.168.3.18:6001' //B
// const API = 'http://172.16.0.237:6001' //Q // const API = 'http://172.16.0.237:6001' //Q
// const API = 'http://172.16.1.26:7001' //w // const API = 'http://172.16.1.26:6001' //w
// vue.config.js 配置说明 // vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions