kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-03-02 09:01:47 +08:00
parent a0f8e79c85 e86d35858c
commit 27445b1bba
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
View File

@@ -190,7 +190,7 @@ export default {
this.dialog = true this.dialog = true
this.dialogForm = JSON.parse(JSON.stringify({ this.dialogForm = JSON.parse(JSON.stringify({
...row, ...row,
sysUserIds: [row.sysUserId], sysUserIds: [row.id],
areaId: row.areaId || this.user.info.areaId areaId: row.areaId || this.user.info.areaId
})); }));
}, },
@@ -214,7 +214,7 @@ export default {
if (v) { if (v) {
if (this.lock) return this.$message.error("请勿多次提交!") if (this.lock) return this.$message.error("请勿多次提交!")
this.lock = true this.lock = true
this.instance.post("/user/edit", this.dialogForm).then(res => { this.instance.post("/user/empower", this.dialogForm).then(res => {
this.lock = false this.lock = false
if (res?.code == 0) { if (res?.code == 0) {
this.dialog = false; this.dialog = false;

4
project/xiushan/apps/finance/AppFinanceProduct/productList.vue
View File

@@ -13,7 +13,7 @@
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
</template> </template>
<template #right> <template #right>
<el-input size="small" placeholder="搜索产品名称" v-model="search.name" clearable <el-input size="small" placeholder="搜索产品名称" v-model="search.productName" clearable
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
</template> </template>
</ai-search-bar> </ai-search-bar>
@@ -68,7 +68,7 @@ export default {
}, },
data() { data() {
return { return {
search: {name: ""}, search: {productName: ""},
page: {current: 1, size: 10, total: 0}, page: {current: 1, size: 10, total: 0},
tableData: [], tableData: [],
colConfigs: [ colConfigs: [