From 95b219ec596a10c2a98b485c0977f0c58257a8f4 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 13 七月 2023 18:17:50 +0800
Subject: [PATCH] 主数据联调
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 18 +++++++++++-------
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 12 ++++++------
Source/UBCS-WEB/vue.config.js | 4 ++--
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index dda1009..9e419a2 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -442,10 +442,10 @@
await TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
- page: val.currentPage,
- limit: val.pageSize,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
}).then((res) => {
- this.data = res.data.data;
+ this.tableData = res.data.data;
});
},
//澶氶��
@@ -519,15 +519,19 @@
console.log(val)
addSaveCode(val).then(res=>{
console.log(res)
- this.onLoad()
+ this.$nextTick(() => {
+ this.onLoad()
+ })
})
},
EditSumbit(val) {
this.editvisible = false;
console.log(val)
- editSaveCode(val).then(res=>{
- console.log(res)
- this.onLoad()
+ editSaveCode(val).then(res=>{
+ console.log(res)
+ this.$nextTick(() => {
+ this.onLoad()
+ })
})
},
openBatchImport(type) {
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 9b1469a..2d6fc7b 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -237,7 +237,7 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"codeRuleOidName",
labelWidth:128,
disabled: true,
},
@@ -307,7 +307,7 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"codeRuleOidName",
labelWidth:128,
focus:this.CodeFoucus,
readonly: true,
@@ -393,8 +393,8 @@
}else {
this.MasterdialogVisible=false;
this.masterSelectList=[]
- this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
- this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
+ this.$set(this.loneTreeNewForm,'codeRuleOidName',this.masterName)
+ this.$set(this.loneTreeNewForm,'codeRuleOid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
@@ -448,8 +448,8 @@
'conditionMap[name]':this.SelectFInd
}
this.KeydefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue="";
+ this.SelectFInd="";
}
},
//鍏抽敭灞炴�ф帴鍙�
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..63a88c9 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,9 +26,9 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- // target: 'http://192.168.1.46:37000',
+ target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
--
Gitblit v1.9.3