xinyouhe/art-design
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整优化 审批和备货单 退税

Browse Source
This commit is contained in:
浅念
2026-01-28 11:53:41 +08:00
parent a11d090273
commit 7c5d0127cc
4 changed files with 122 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/admin/approval/approval_add.vue
+14
View File
@@ -176,7 +176,13 @@
</el-select>
</el-form-item>
<el-form-item label="选项" size="small">
<el-input
v-if="group.type == 'field_user'"
placeholder="请输入"
v-model="group.users"
></el-input>
<el-select
v-else
v-model="group.users"
multiple
placeholder="请选择"
@@ -251,7 +257,13 @@
</el-select>
</el-form-item>
<el-form-item label="选项" size="small">
<el-input
v-if="group.type == 'field_user'"
placeholder="请输入"
v-model="group.users"
></el-input>
<el-select
v-else
v-model="group.users"
multiple
placeholder="请选择"
@@ -660,6 +672,8 @@
node.approverGroups.forEach((group) => {
if (group && group.type === 'initiator_leader') {
approvers.push({ type: 'initiator_leader' })
} else if (group && group.type === 'field_user') {
approvers.push({ type: group.type, value: group.users })
} else if (group && group.type && Array.isArray(group.users) && group.users.length > 0) {
approvers.push({ type: group.type, value: group.users.join(',') })
}
src/views/admin/approval/approval_edit.vue
+19 -1
View File
@@ -176,7 +176,13 @@
</el-select>
</el-form-item>
<el-form-item label="选项" size="small">
<el-input
v-if="group.type == 'field_user'"
placeholder="请输入"
v-model="group.users"
></el-input>
<el-select
v-else
v-model="group.users"
multiple
placeholder="请选择"
@@ -251,7 +257,13 @@
</el-select>
</el-form-item>
<el-form-item label="选项" size="small">
<el-input
v-if="group.type == 'field_user'"
placeholder="请输入"
v-model="group.users"
></el-input>
<el-select
v-else
v-model="group.users"
multiple
placeholder="请选择"
@@ -604,6 +616,8 @@
await ensureOptionsLoaded(group)
if (ap.type === 'initiator_leader') {
group.users = []
} else if (ap.type === 'field_user') {
group.users = ap.value.split(',').map((v) => v.trim())
} else if (ap.value) {
const values = String(ap.value)
.split(',')
@@ -637,6 +651,8 @@
await ensureOptionsLoaded(group)
if (c.type === 'initiator_leader') {
group.users = []
} else if (c.type === 'field_user') {
group.users = c.value.split(',').map((v) => v.trim())
} else if (c.value) {
// group.users = String(c.value)
// .split(',')
@@ -773,6 +789,8 @@
node.approverGroups.forEach((group) => {
if (group && group.type === 'initiator_leader') {
approvers.push({ type: 'initiator_leader' })
} else if (group && group.type === 'field_user') {
approvers.push({ type: group.type, value: group.users })
} else if (group && group.type && Array.isArray(group.users) && group.users.length > 0) {
approvers.push({ type: group.type, value: group.users.join(',') })
}
@@ -789,7 +807,7 @@
if (group && group.type === 'initiator_leader') {
cc.push({ type: 'initiator_leader' })
} else if (group && group.type && Array.isArray(group.users) && group.users.length > 0) {
cc.push({ type: group.type, value: group.users.join(',') })
cc.push({ type: group.type, value: group.users })
}
})
}
src/views/admin/system/notice/index.vue
+7 -3
View File
@@ -183,11 +183,15 @@
loading.value = true
try {
const { currentPage, pageSize } = pagination
const { records, current, size, total } = await systemService.getNoticeList({
const params: any = {
current: currentPage,
size: pageSize
})
}
if (keyword.value) {
params.keyword = keyword.value
}
const { records, current, size, total } = await systemService.getNoticeList(params)
tableData.value = records.map((item: any) => ({
...item
}))