diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 8a5cedb..475c55f 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -18,14 +18,12 @@
-
+
- {{ item.thirdName }}
- {{ item.thirdId }}
+ :value="item.thirdName">
@@ -74,11 +72,7 @@
-
-
- {{item.thirdName}}
-
-
+
@@ -217,7 +211,7 @@
@@ -372,7 +366,7 @@ export default {
this.query = {
name: "",
status: "",
- thirdSysFk: ""
+ thirdSysFk: null
};
this.getList();
},
@@ -381,11 +375,15 @@ export default {
},
getList() {
this.loading = true;
+ if (this.query.thirdSysFk != null) {
+ this.getQueryThirdSysFk(this.query.thirdSysFk);
+ }
filterThrList(this.query)
.then((response) => {
this.loading = false;
this.mergeList = response.data.list || [];
this.treeList = response.data.tree_list || [];
+ this.getQueryThirdSysFkName(this.query.thirdSysFk);
})
.catch(() => {
this.loading = false;
@@ -393,6 +391,20 @@ export default {
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() {
if (this.$refs["dataForm"]) {
@@ -419,6 +431,13 @@ export default {
this.formData = JSON.parse(JSON.stringify(formJson));
if (formName === "edit") {
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;
} else {
this.formData.code = no;
@@ -562,7 +581,6 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
- this.query.thirdSysFk = this.thirdSys[0].thirdId;
})
.catch(() => {
this.loading = false;
@@ -574,9 +592,11 @@ export default {
this.$message.warning("请选择需要下载的第三方系统");
return;
}
+ this.getQueryThirdSysFk();
let params = {
thirdSysFk: this.query.thirdSysFk
}
+ this.getQueryThirdSysFkName();
download(params).then((res) => {
if (res.code == 20000) {
this.$message.success("下载完成");
@@ -587,6 +607,9 @@ export default {
}).catch((error) => {
this.$message.error("下载失败");
})
+ },
+ thirdSysFkChange(thirdSysFk) {
+ console.log(thirdSysFk);
}
},
filters: {