diff --git a/cds-fontend-2025.V1/src/views/business/category/index.vue b/cds-fontend-2025.V1/src/views/business/category/index.vue
index 3d53866..5272572 100644
--- a/cds-fontend-2025.V1/src/views/business/category/index.vue
+++ b/cds-fontend-2025.V1/src/views/business/category/index.vue
@@ -131,9 +131,16 @@ const {
resizable: true,
render: (row) => {
if (!row.pricingRule) return '';
+ const suffixMap = {
+ 'gjjjnzh': ' * 交易金额',
+ 'xzzhsdshlcltsdj': ' 元/条',
+ 'default': ' 元/条'
+ };
+
+ const suffix = suffixMap[row.typeId] || suffixMap.default;
return (
- {row.pricingRule}
+ {`${row.pricingRule}${suffix}`}
);
}
diff --git a/cds-fontend-2025.V1/src/views/business/category/modules/subcategory-operate-drawer.vue b/cds-fontend-2025.V1/src/views/business/category/modules/subcategory-operate-drawer.vue
index 6d9ac8f..f84a724 100644
--- a/cds-fontend-2025.V1/src/views/business/category/modules/subcategory-operate-drawer.vue
+++ b/cds-fontend-2025.V1/src/views/business/category/modules/subcategory-operate-drawer.vue
@@ -141,9 +141,12 @@ watch(visible, () => {
+ >
+
+ 元/条
+
+
diff --git a/cds-fontend-2025.V1/src/views/mps/detail-entry/index.vue b/cds-fontend-2025.V1/src/views/mps/detail-entry/index.vue
index f21c963..a0988d6 100644
--- a/cds-fontend-2025.V1/src/views/mps/detail-entry/index.vue
+++ b/cds-fontend-2025.V1/src/views/mps/detail-entry/index.vue
@@ -10,8 +10,10 @@ import ButtonIcon from '@/components/custom/button-icon.vue';
import DetailEntryOperateDrawer from './modules/detail-entry-operate-drawer.vue';
import DetailEntrySearch from './modules/detail-entry-search.vue';
import {computed, ref, watch} from "vue";
+import DictTag from '@/components/custom/dict-tag.vue';
import {useBoolean} from "~/packages/hooks";
import DetailEntryImportModal from './modules/detail-entry-import-modal.vue';
+import {useDict} from "@/hooks/business/dict";
defineOptions({
name: 'DetailEntryList'
});
@@ -20,6 +22,8 @@ const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();
const { bool: importVisible, setTrue: openImportModal } = useBoolean();
+// const { options: mps_cust_type } = useDict('mps_cust_type');
+const { options: mps_check_status } = useDict('mps_check_status');
// 添加用于显示trafficList的模态框相关状态
const trafficListModalVisible = ref(false);
@@ -160,14 +164,14 @@ const {
ellipsis: true,
resizable: true
},
- {
- key: 'deptId',
- title: '部门id',
- align: 'center',
- minWidth: 120,
- ellipsis: true,
- resizable: true
- },
+ // {
+ // key: 'deptId',
+ // title: '部门id',
+ // align: 'center',
+ // minWidth: 120,
+ // ellipsis: true,
+ // resizable: true
+ // },
{
key: 'custType',
title: '客户类型',
@@ -307,16 +311,26 @@ const {
ellipsis: true,
resizable: true
},
+ {
+ key: 'checkMsg',
+ title: '核对结果',
+ align: 'center',
+ minWidth: 120,
+ ellipsis: true,
+ resizable: true,
+ fixed: 'right'
+ },
{
key: 'checkFlag',
title: '核对标志',
align: 'center',
minWidth: 120,
ellipsis: true,
+ fixed: 'right',
resizable: true,
render(row) {
return ;
- }
+ },
},
// {
// key: 'checkTime',
@@ -342,14 +356,15 @@ const {
// ellipsis: true,
// resizable: true
// },
- {
- key: 'checkMsg',
- title: '核对结果',
- align: 'center',
- minWidth: 120,
- ellipsis: true,
- resizable: true
- },
+ // {
+ // key: 'checkMsg',
+ // title: '核对结果',
+ // align: 'center',
+ // minWidth: 120,
+ // ellipsis: true,
+ // resizable: true,
+ // fixed: 'right'
+ // }
// {
// key: 'operate',
// title: $t('common.operate'),
diff --git a/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue b/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
index ddd6dbe..8596a4d 100644
--- a/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
+++ b/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
@@ -1,8 +1,9 @@