From e5a9545c55d14ad6ac0b2bebc59b4dd21b95c76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Mon, 15 Dec 2025 14:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=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
---
.../Form/src/components/SelectAreaCascader.vue | 3 ++-
src/components/Table/src/props.ts | 2 +-
src/views/mdm/Bank/index.vue | 5 +++--
src/views/mdm/Category/index.vue | 3 ++-
src/views/mdm/CountryRegion/index.vue | 6 +++---
src/views/mdm/Currency/index.vue | 9 +++++----
src/views/mdm/DocCp/index.vue | 3 ++-
src/views/mdm/Fee/index.vue | 4 ++--
src/views/mdm/LNGStation/index.vue | 3 ++-
src/views/mdm/PipeGasDownloadPoint/index.vue | 5 +++--
src/views/mdm/PipelineGgasLine/index.vue | 5 +++--
src/views/mdm/PlaceLngUnload/index.vue | 5 +++--
src/views/mdm/Port/index.vue | 3 ++-
src/views/mdm/PriceTerms/index.vue | 9 +++++----
src/views/mdm/TaxRate/index.vue | 3 ++-
src/views/sales/Customer/index.vue | 8 +++++---
src/views/sales/GradeSystem/index.vue | 3 ++-
src/views/secondDev/approveFlowPage.vue | 5 ++++-
18 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/components/Form/src/components/SelectAreaCascader.vue b/src/components/Form/src/components/SelectAreaCascader.vue
index fddf61e..489e428 100644
--- a/src/components/Form/src/components/SelectAreaCascader.vue
+++ b/src/components/Form/src/components/SelectAreaCascader.vue
@@ -1,5 +1,5 @@
-
+
@@ -189,6 +189,7 @@
isChange.value = true;
if (!keys) {
emit('change', keys);
+ emit('update:value', '');
return;
}
emit('change', keys[keys.length -1]);
diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts
index 20e0209..6b2203b 100644
--- a/src/components/Table/src/props.ts
+++ b/src/components/Table/src/props.ts
@@ -15,7 +15,7 @@ import { DEFAULT_FILTER_FN, DEFAULT_SORT_FN, FETCH_SETTING, DEFAULT_SIZE } from
import { propTypes } from '/@/utils/propTypes';
export const basicProps = {
- clickToRowSelect: { type: Boolean, default: true },
+ clickToRowSelect: { type: Boolean, default: false },
isTreeTable: Boolean,
tableSetting: propTypes.shape({}),
inset: Boolean,
diff --git a/src/views/mdm/Bank/index.vue b/src/views/mdm/Bank/index.vue
index 53364e6..d0e3251 100644
--- a/src/views/mdm/Bank/index.vue
+++ b/src/views/mdm/Bank/index.vue
@@ -70,7 +70,7 @@ const logPath = ref('/mdm/bank/datalog');
//所有按钮
const buttons = ref([
- {"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},
+ {"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true, type: 'primary' },
{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":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"},
@@ -103,7 +103,7 @@ const logPath = ref('/mdm/bank/datalog');
const [registerModal, { openModal }] = useModal();
const formName='银行';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngBBankPage,
rowKey: 'id',
@@ -121,6 +121,7 @@ const logPath = ref('/mdm/bank/datalog');
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
diff --git a/src/views/mdm/Category/index.vue b/src/views/mdm/Category/index.vue
index 13c8f63..4dbcb67 100644
--- a/src/views/mdm/Category/index.vue
+++ b/src/views/mdm/Category/index.vue
@@ -98,7 +98,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId;
const [registerModal, { openModal }] = useModal();
const formName = '品种';
- const [registerTable, { reload }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || formName + '列表',
api: getLngBCategoryPage,
rowKey: 'id',
@@ -115,6 +115,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
diff --git a/src/views/mdm/CountryRegion/index.vue b/src/views/mdm/CountryRegion/index.vue
index d551be4..8969f02 100644
--- a/src/views/mdm/CountryRegion/index.vue
+++ b/src/views/mdm/CountryRegion/index.vue
@@ -88,7 +88,7 @@
const selectedKeysTree = ref(['0']);
const tableRef = ref();
//所有按钮
- const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":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"},{"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
+ const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,"type":"primary"},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":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"},{"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
//展示在列表内的按钮
const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']);
const buttonConfigs = computed(()=>{
@@ -116,7 +116,7 @@
const treeData = ref([]);
const [registerModal, { openModal }] = useModal();
const formName='国家地区';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngBRegionPage,
rowKey: 'id',
@@ -133,12 +133,12 @@
return { ...params, pid:selectId.value||'0', FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
showTableSetting: true,
-
striped: false,
actionColumn: {
width: 160,
diff --git a/src/views/mdm/Currency/index.vue b/src/views/mdm/Currency/index.vue
index 61bbafa..6358eb3 100644
--- a/src/views/mdm/Currency/index.vue
+++ b/src/views/mdm/Currency/index.vue
@@ -64,10 +64,10 @@
//所有按钮
const buttons = ref([
- { name: '新增', code: 'add', icon: 'ant-design:plus-outlined', isDefault: true, isUse: true },
+ { name: '新增', code: 'add', icon: 'ant-design:plus-outlined', isDefault: true, isUse: true, type: 'primary' },
{ name: '编辑', code: 'edit', icon: 'ant-design:form-outlined', isDefault: true, isUse: true },
- { name: '启用', code: 'enable', icon: 'ant-design:form-outlined', isDefault: true, isUse: true },
- { name: '作废', code: 'disable', icon: 'ant-design:stop-outlined', isDefault: true, isUse: true },
+ { name: '启用', code: 'enable', icon: 'ant-design:form-outlined', isDefault: true, isUse: true, type: 'primary' },
+ { name: '作废', code: 'disable', icon: 'ant-design:stop-outlined', isDefault: true, isUse: true,type: 'dashed'},
{ 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: 'datalog', icon: 'ant-design:profile-outlined', isDefault: true, isUse: true },
@@ -97,7 +97,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId;
const [registerModal, { openModal }] = useModal();
const formName = '币种管理';
- const [registerTable, { reload }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || formName + '列表',
api: getLngBCurrencyPage,
rowKey: 'id',
@@ -114,6 +114,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
diff --git a/src/views/mdm/DocCp/index.vue b/src/views/mdm/DocCp/index.vue
index d63fb82..de036b7 100644
--- a/src/views/mdm/DocCp/index.vue
+++ b/src/views/mdm/DocCp/index.vue
@@ -97,7 +97,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId;
const [registerModal, { openModal }] = useModal();
const formName = '公司资质证书';
- const [registerTable, { reload }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || formName + '列表',
api: getLngBDocCpPage,
rowKey: 'id',
@@ -114,6 +114,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
diff --git a/src/views/mdm/Fee/index.vue b/src/views/mdm/Fee/index.vue
index 956bdf1..29e31a1 100644
--- a/src/views/mdm/Fee/index.vue
+++ b/src/views/mdm/Fee/index.vue
@@ -91,7 +91,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='费用名称';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys}] = useTable({
title: '' || (formName + '列表'),
api: getLngBFeePage,
rowKey: 'id',
@@ -109,12 +109,12 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
showTableSetting: true,
-
striped: false,
actionColumn: {
width: 160,
diff --git a/src/views/mdm/LNGStation/index.vue b/src/views/mdm/LNGStation/index.vue
index 8e08c47..71ed0e3 100644
--- a/src/views/mdm/LNGStation/index.vue
+++ b/src/views/mdm/LNGStation/index.vue
@@ -98,7 +98,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId;
const [registerModal, { openModal }] = useModal();
const formName = 'LNG气源地';
- const [registerTable, { reload }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || formName + '列表',
api: getLngBStationLngPage,
rowKey: 'id',
@@ -115,6 +115,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
diff --git a/src/views/mdm/PipeGasDownloadPoint/index.vue b/src/views/mdm/PipeGasDownloadPoint/index.vue
index ec1c073..38cc362 100644
--- a/src/views/mdm/PipeGasDownloadPoint/index.vue
+++ b/src/views/mdm/PipeGasDownloadPoint/index.vue
@@ -66,7 +66,7 @@
const selectedKeys = ref([]);
const tableRef = ref();
//所有按钮
- const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
+ const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true, type: 'primary'},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"isUse":true, type: 'primary'},{"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"isUse":true, type: 'dashed'},{"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
//展示在列表内的按钮
const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']);
const buttonConfigs = computed(()=>{
@@ -91,7 +91,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='管道气上下载点';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngBStationPngPage,
rowKey: 'id',
@@ -108,6 +108,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
diff --git a/src/views/mdm/PipelineGgasLine/index.vue b/src/views/mdm/PipelineGgasLine/index.vue
index db25b31..09b9397 100644
--- a/src/views/mdm/PipelineGgasLine/index.vue
+++ b/src/views/mdm/PipelineGgasLine/index.vue
@@ -66,7 +66,7 @@
const selectedKeys = ref([]);
const tableRef = ref();
//所有按钮
- const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
+ const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true, type: 'primary'},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"isUse":true, type: 'primary'},{"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"isUse":true, type: 'dashed'},{"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
//展示在列表内的按钮
const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']);
const buttonConfigs = computed(()=>{
@@ -91,7 +91,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='管道气管线';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys}] = useTable({
title: '' || (formName + '列表'),
api: getLngBPngLinePage,
rowKey: 'id',
@@ -108,6 +108,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
diff --git a/src/views/mdm/PlaceLngUnload/index.vue b/src/views/mdm/PlaceLngUnload/index.vue
index 9344f57..010b78c 100644
--- a/src/views/mdm/PlaceLngUnload/index.vue
+++ b/src/views/mdm/PlaceLngUnload/index.vue
@@ -66,7 +66,7 @@
const selectedKeys = ref([]);
const tableRef = ref();
//所有按钮
- const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
+ const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,type: 'primary'},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"isUse":true, type: 'primary'},{"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"isUse":true, type: 'dashed'},{"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":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
//展示在列表内的按钮
const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']);
const buttonConfigs = computed(()=>{
@@ -91,7 +91,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='卸货地';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys}] = useTable({
title: '' || (formName + '列表'),
api: getLngBPlaceLngUnloadPage,
rowKey: 'id',
@@ -108,6 +108,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
diff --git a/src/views/mdm/Port/index.vue b/src/views/mdm/Port/index.vue
index da09b21..0db9ad6 100644
--- a/src/views/mdm/Port/index.vue
+++ b/src/views/mdm/Port/index.vue
@@ -97,7 +97,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId;
const [registerModal, { openModal }] = useModal();
const formName = '港口';
- const [registerTable, { reload }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys}] = useTable({
title: '' || formName + '列表',
api: getLngBPortPage,
rowKey: 'id',
@@ -114,6 +114,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
diff --git a/src/views/mdm/PriceTerms/index.vue b/src/views/mdm/PriceTerms/index.vue
index 06f2ae4..811517b 100644
--- a/src/views/mdm/PriceTerms/index.vue
+++ b/src/views/mdm/PriceTerms/index.vue
@@ -63,10 +63,10 @@
const tableRef = ref();
//所有按钮
const buttons = ref([
- { name: '新增', code: 'add', icon: 'ant-design:plus-outlined', isDefault: true, isUse: true },
+ { name: '新增', code: 'add', icon: 'ant-design:plus-outlined', isDefault: true, isUse: true,type: 'primary' },
{ name: '编辑', code: 'edit', icon: 'ant-design:form-outlined', isDefault: true, isUse: true },
- { name: '启用', code: 'enable', icon: 'ant-design:form-outlined', isDefault: true, isUse: true },
- { name: '作废', code: 'disable', icon: 'ant-design:stop-outlined', isDefault: true, isUse: true },
+ { name: '启用', code: 'enable', icon: 'ant-design:form-outlined', isDefault: true, isUse: true,type: 'primary' },
+ { name: '作废', code: 'disable', icon: 'ant-design:stop-outlined', isDefault: true, isUse: true,type: 'dashed' },
{ 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: 'datalog', icon: 'ant-design:profile-outlined', isDefault: true, isUse: true },
@@ -96,7 +96,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId;
const [registerModal, { openModal }] = useModal();
const formName = '价格条款管理';
- const [registerTable, { reload }] = useTable({
+ const [registerTable, { reload,clearSelectedRowKeys}] = useTable({
title: '' || formName + '列表',
api: getLngBPriceTermPage,
rowKey: 'id',
@@ -113,6 +113,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
useSearchForm: true,
diff --git a/src/views/mdm/TaxRate/index.vue b/src/views/mdm/TaxRate/index.vue
index ced243a..d4c7b69 100644
--- a/src/views/mdm/TaxRate/index.vue
+++ b/src/views/mdm/TaxRate/index.vue
@@ -91,7 +91,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='税率';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys}] = useTable({
title: '' || (formName + '列表'),
api: getLngBTaxPage,
rowKey: 'id',
@@ -108,6 +108,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
diff --git a/src/views/sales/Customer/index.vue b/src/views/sales/Customer/index.vue
index 71cee86..0773d7c 100644
--- a/src/views/sales/Customer/index.vue
+++ b/src/views/sales/Customer/index.vue
@@ -115,7 +115,7 @@
const visibleFlowRecordModal = ref(false);
const [registerModal, { openModal }] = useModal();
const formName='客户';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngCustomerPage,
rowKey: 'id',
@@ -132,6 +132,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
@@ -162,7 +163,7 @@
if (!actionButtonConfig?.value.some(element => element.code == 'view')) {
return;
}
- const { processId, taskIds, schemaId } = record.workflowData || {};
+ const { processId, taskIds, schemaId, status } = record.workflowData || {};
if (taskIds && taskIds.length) {
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@@ -181,7 +182,8 @@
taskId: '',
formName: formName,
formId:currentRoute.value.meta.formId,
- id: record.id
+ id: record.id,
+ status
}
});
} else {
diff --git a/src/views/sales/GradeSystem/index.vue b/src/views/sales/GradeSystem/index.vue
index bdc51b8..c056b0a 100644
--- a/src/views/sales/GradeSystem/index.vue
+++ b/src/views/sales/GradeSystem/index.vue
@@ -91,7 +91,7 @@
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='评价体系';
- const [registerTable, { reload, }] = useTable({
+ const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngGradeSystemPage,
rowKey: 'id',
@@ -108,6 +108,7 @@
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
afterFetch: (res) => {
+ clearSelectedRowKeys()
tableRef.value.setToolBarWidth();
},
diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue
index dac87e7..c3efa6f 100644
--- a/src/views/secondDev/approveFlowPage.vue
+++ b/src/views/secondDev/approveFlowPage.vue
@@ -38,7 +38,7 @@
-
+