From e9a3ddbff371ec45fc2d1c3ba522a91d8463549b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 10:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/salesnotice/index.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/views/wls/salesnotice/index.vue b/src/views/wls/salesnotice/index.vue
index db5f8a5..a4c4590 100644
--- a/src/views/wls/salesnotice/index.vue
+++ b/src/views/wls/salesnotice/index.vue
@@ -3,10 +3,10 @@
import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
import { Page, useVbenModal } from '@vben/common-ui';
-import { MesWmSalesNoticeStatusEnum } from '@vben/constants';
+import { MesWmSalesNoticeOutStatusEnum, MesWmSalesNoticeStatusEnum } from '@vben/constants';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message } from 'ant-design-vue';
+import { Button, message, Tag } from 'ant-design-vue';
import { useRouter } from 'vue-router';
@@ -29,6 +29,17 @@
const router = useRouter();
+const outStatusLabelMap: Record<number, string> = {
+ [MesWmSalesNoticeOutStatusEnum.NONE]: '鏈嚭搴�',
+ [MesWmSalesNoticeOutStatusEnum.PARTIAL]: '閮ㄥ垎鍑哄簱',
+ [MesWmSalesNoticeOutStatusEnum.ALL]: '鍏ㄩ儴鍑哄簱',
+};
+const outStatusColorMap: Record<number, string> = {
+ [MesWmSalesNoticeOutStatusEnum.NONE]: 'default',
+ [MesWmSalesNoticeOutStatusEnum.PARTIAL]: 'warning',
+ [MesWmSalesNoticeOutStatusEnum.ALL]: 'success',
+};
+
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
gridApi.query();
@@ -49,20 +60,14 @@
formModalApi.setData({ formType: 'update', id: row.id }).open();
}
-/** 鎵ц鍑哄簱 */
-function handleFinish(row: MesWmSalesNoticeApi.SalesNotice) {
- formModalApi.setData({ formType: 'finish', id: row.id }).open();
-}
-
/** 鐢熸垚閿�鍞嚭搴撳崟 */
async function handleGenerateProductSales(row: MesWmSalesNoticeApi.SalesNotice) {
try {
const productSalesId = await generateProductSales(row.id!);
message.success('鐢熸垚閿�鍞嚭搴撳崟鎴愬姛');
- // 璺宠浆鍒伴攢鍞嚭搴撳崟椤甸潰
router.push({
- path: '/wls/product-sales',
- query: { id: productSalesId },
+ name: 'MesWmProductSales',
+ query: { id: String(productSalesId) },
});
} catch (e) {
console.error(e);
@@ -150,6 +155,9 @@
{{ row.code }}
</Button>
</template>
+ <template #outStatus="{ row }">
+ <Tag :color="outStatusColorMap[row.outStatus ?? 0]">{{ outStatusLabelMap[row.outStatus ?? 0] }}</Tag>
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
@@ -180,13 +188,6 @@
auth: ['mes:wm-product-sales:create'],
ifShow: row.status === MesWmSalesNoticeStatusEnum.APPROVED,
onClick: handleGenerateProductSales.bind(null, row),
- },
- {
- label: '鎵ц鍑哄簱',
- type: 'link',
- auth: ['mes:wm-sales-notice:update'],
- ifShow: row.status === MesWmSalesNoticeStatusEnum.APPROVED,
- onClick: handleFinish.bind(null, row),
},
]"
/>
--
Gitblit v1.9.3