From b921e333300a26393291ffac44e9d9a2ed2d92ed Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 13 七月 2023 18:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 18 +++++++++++-------
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 12 ++++++------
2 files changed, 17 insertions(+), 13 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 1ad84bd..87bf1ca 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -238,7 +238,7 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"codeRuleOidName",
labelWidth:128,
disabled: true,
},
@@ -308,7 +308,7 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"codeRuleOidName",
labelWidth:128,
focus:this.CodeFoucus,
readonly: true,
@@ -394,8 +394,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)
}
},
@@ -449,8 +449,8 @@
'conditionMap[name]':this.SelectFInd
}
this.KeydefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue="";
+ this.SelectFInd="";
}
},
//鍏抽敭灞炴�ф帴鍙�
--
Gitblit v1.9.3