1.修复启用多个第三方系统时,第三方系统字段回显和查询错误问题

master
x_z 3 years ago
parent f865f85b11
commit ed6471bb48

@ -18,14 +18,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange"> <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" @change="thirdSysFkChange(query.thirdSysFk)">
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.value" :key="item.thirdId"
:label="item.thirdName" :label="item.thirdName"
:value="item.thirdId"> :value="item.thirdName">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -74,11 +72,7 @@
<!-- <span>{{ enableMap[scope.row.isDefault] }}</span>--> <!-- <span>{{ enableMap[scope.row.isDefault] }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="thirdSysFk" label="第三方系统名称"> <el-table-column prop="thirdName" label="第三方系统名称"></el-table-column>
<template slot-scope="scope">
<span v-for="item in thirdSys" :key="item.thirdId">{{item.thirdName}}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@ -217,7 +211,7 @@
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.thirdId" :key="item.thirdId"
:lable="item.thirdId" :lable="item.thirdName"
:value="item.thirdName" :value="item.thirdName"
> >
</el-option> </el-option>
@ -372,7 +366,7 @@ export default {
this.query = { this.query = {
name: "", name: "",
status: "", status: "",
thirdSysFk: "" thirdSysFk: null
}; };
this.getList(); this.getList();
}, },
@ -381,11 +375,15 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
if (this.query.thirdSysFk != null) {
this.getQueryThirdSysFk(this.query.thirdSysFk);
}
filterThrList(this.query) filterThrList(this.query)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.mergeList = response.data.list || []; this.mergeList = response.data.list || [];
this.treeList = response.data.tree_list || []; this.treeList = response.data.tree_list || [];
this.getQueryThirdSysFkName(this.query.thirdSysFk);
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -393,6 +391,20 @@ export default {
this.treeList = []; this.treeList = [];
}); });
}, },
getQueryThirdSysFk(){
this.thirdSys.forEach((item) => {
if (item.thirdName == this.query.thirdSysFk) {
this.query.thirdSysFk = item.thirdId;
}
})
},
getQueryThirdSysFkName(){
this.thirdSys.forEach((item) => {
if (item.thirdId == this.query.thirdSysFk) {
this.query.thirdSysFk = item.thirdName;
}
})
},
// //
resetForm() { resetForm() {
if (this.$refs["dataForm"]) { if (this.$refs["dataForm"]) {
@ -419,6 +431,13 @@ export default {
this.formData = JSON.parse(JSON.stringify(formJson)); this.formData = JSON.parse(JSON.stringify(formJson));
if (formName === "edit") { if (formName === "edit") {
this.formData = Object.assign({}, data); this.formData = Object.assign({}, data);
if (this.formData.thirdSysFk != null) {
this.thirdSys.forEach((item) => {
if (item.thirdId == this.formData.thirdSysFk) {
this.formData.thirdSysFk = item.thirdName;
}
})
}
this.node = node; this.node = node;
} else { } else {
this.formData.code = no; this.formData.code = no;
@ -562,7 +581,6 @@ export default {
getBasicThirdSys(query) getBasicThirdSys(query)
.then((response) => { .then((response) => {
this.thirdSys = response.data.list || []; this.thirdSys = response.data.list || [];
this.query.thirdSysFk = this.thirdSys[0].thirdId;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -574,9 +592,11 @@ export default {
this.$message.warning("请选择需要下载的第三方系统"); this.$message.warning("请选择需要下载的第三方系统");
return; return;
} }
this.getQueryThirdSysFk();
let params = { let params = {
thirdSysFk: this.query.thirdSysFk thirdSysFk: this.query.thirdSysFk
} }
this.getQueryThirdSysFkName();
download(params).then((res) => { download(params).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success("下载完成"); this.$message.success("下载完成");
@ -587,6 +607,9 @@ export default {
}).catch((error) => { }).catch((error) => {
this.$message.error("下载失败"); this.$message.error("下载失败");
}) })
},
thirdSysFkChange(thirdSysFk) {
console.log(thirdSysFk);
} }
}, },
filters: { filters: {

Loading…
Cancel
Save