From 239e269368e4b83fdc84792856f5c20338b973fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Thu, 4 Dec 2025 17:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A0=B7=E5=BC=8F=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 25 +++++++-
.../Customer/components/bankListModal.vue | 5 +-
.../Customer/components/certificateModal.vue | 2 +-
.../sales/Customer/components/createForm.vue | 34 +++++++----
src/views/sales/Customer/index.vue | 60 ++++++++++---------
src/views/secondDev/createFlow.vue | 2 +-
6 files changed, 84 insertions(+), 44 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 1605650..a089008 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,7 +79,7 @@
line-height: 35px;
}
-
diff --git a/src/views/sales/Customer/components/bankListModal.vue b/src/views/sales/Customer/components/bankListModal.vue
index 26f3536..9ae9e54 100644
--- a/src/views/sales/Customer/components/bankListModal.vue
+++ b/src/views/sales/Customer/components/bankListModal.vue
@@ -1,6 +1,6 @@
-
@@ -175,4 +175,7 @@
z-index: 1001 !important;
}
+ .bankListModal .ant-modal-mask {
+ z-index: 1001 !important;
+ }
diff --git a/src/views/sales/Customer/components/certificateModal.vue b/src/views/sales/Customer/components/certificateModal.vue
index b9edf99..2172f68 100644
--- a/src/views/sales/Customer/components/certificateModal.vue
+++ b/src/views/sales/Customer/components/certificateModal.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue
index a77ad52..de901e7 100644
--- a/src/views/sales/Customer/components/createForm.vue
+++ b/src/views/sales/Customer/components/createForm.vue
@@ -1,6 +1,6 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -676,18 +676,21 @@
try {
const data = await request(obj);
- if (type) {
- data?.id && (formState.id = data.id)
- data?.cuCode && (formState.cuCode = data.cuCode)
- if (!type) {
- notification.success({
- message: 'Tip',
- description: data?.id ? t('新增成功！') : t('修改成功！')
- }); //提示消息
- }
+ // 新增保存
+ // data?.id && (formState.id = data.id)
+ // data?.cuCode && (Object.assign(formState, {cuCode: data?.cuCode}))
+ if (data?.id) {
+ getList(data?.id)
+ }
+ // 同意保存不提示
+ if (!type) {
+ notification.success({
+ message: 'Tip',
+ description: data?.id ? t('新增成功！') : t('修改成功！')
+ }); //提示消息
}
// formRef.value.resetFields();
- return data?.id ? data : formState
+ return data?.id ? data : obj
// setTimeout(() => {
// bus.emit(FORM_LIST_MODIFIED, { path: formPath });
// close();
@@ -700,7 +703,7 @@
} catch (errorInfo) {
spinning.value = false;
console.log(errorInfo, 'errorInfo')
- errorInfo?.value && notification.warning({
+ errorInfo?.errorFields?.length && notification.warning({
message: 'Tip',
description: '请完善信息'
});
@@ -734,4 +737,9 @@
font-size: 20px;
font-weight: bold;
}
+
+
+
+
+
diff --git a/src/views/sales/Customer/index.vue b/src/views/sales/Customer/index.vue
index 4cfb2d8..fabd341 100644
--- a/src/views/sales/Customer/index.vue
+++ b/src/views/sales/Customer/index.vue
@@ -79,7 +79,7 @@
//所有按钮
const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true}]);
//展示在列表内的按钮
- const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'enable', 'disable', 'startwork','flowRecord']);
+ const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'startwork','flowRecord']);
const buttonConfigs = computed(()=>{
return filterButtonAuth(buttons.value);
})
@@ -145,13 +145,19 @@
dataIndex: 'action',
slots: { customRender: 'action' },
},
+ rowSelection: {
+ type: 'checkbox',
+ onChange: onSelectChange
+ },
tableSetting: {
size: false,
setting: false,
},
});
-
+ function onSelectChange(rowKeys: string[]) {
+ selectedKeys.value = rowKeys;
+ }
function dbClickRow(record) {
if (!actionButtonConfig?.value.some(element => element.code == 'view')) {
return;
@@ -261,16 +267,16 @@
}
function handleEnable(record: Recordable) {
- // if (!selectedKeys.value.length) {
- // notification.warning({
- // message: 'Tip',
- // description: t('请选择需要启用的数据'),
- // });
- // return;
- // }
+ if (!selectedKeys.value.length) {
+ notification.warning({
+ message: 'Tip',
+ description: t('请选择需要启用的数据'),
+ });
+ return;
+ }
- // let ids = selectedKeys.value;
- let ids = [record.id]
+ let ids = selectedKeys.value;
+ // let ids = [record.id]
Modal.confirm({
title: '提示信息',
icon: createVNode(ExclamationCircleOutlined),
@@ -291,15 +297,15 @@
}
function handleDisable(record: Recordable) {
- let ids = [record.id]
- // if (!selectedKeys.value.length) {
- // notification.warning({
- // message: 'Tip',
- // description: t('请选择需要禁用的数据'),
- // });
- // return;
- // }
- // let ids = selectedKeys.value;
+ // let ids = [record.id]
+ if (!selectedKeys.value.length) {
+ notification.warning({
+ message: 'Tip',
+ description: t('请选择需要禁用的数据'),
+ });
+ return;
+ }
+ let ids = selectedKeys.value;
Modal.confirm({
title: '提示信息',
icon: createVNode(ExclamationCircleOutlined),
@@ -406,13 +412,13 @@
actionsList = actionsList.concat(editAndDelBtn);
}
}
- if (record.approCode === 'YSP') {
- let idx = actionsList.findIndex(v =>v.tooltip == '作废')
- idx>-1 && actionsList.splice(idx, 1)
- } else {
- let idx = actionsList.findIndex(v =>v.tooltip == '启用')
- idx>-1 && actionsList.splice(idx, 1)
- }
+ // if (record.approCode === 'YSP' && record.valid!='有效') {
+ // let idx = actionsList.findIndex(v =>v.tooltip == '作废')
+ // idx>-1 && actionsList.splice(idx, 1)
+ // } else {
+ // let idx = actionsList.findIndex(v =>v.tooltip == '启用')
+ // record.valid=='有效' && idx>-1 && actionsList.splice(idx, 1)
+ // }
return actionsList;
}
diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue
index f009f65..7c9f4e0 100644
--- a/src/views/secondDev/createFlow.vue
+++ b/src/views/secondDev/createFlow.vue
@@ -358,7 +358,7 @@
let obj = {}
system[key] = false
- let value = await formInformation.value.handleSubmit();
+ let value = await formInformation.value.handleSubmit(true);
obj[key] = value
mainFormModels.value = obj
console.log(mainFormModels.value, 6666)