From c8a6236013ec15d00ddcab1587bbd4f090611cdf Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 26 八月 2026 13:56:49 +0800
Subject: [PATCH] fix: 修复员工业绩图表 null 数据展示与甘特图日期格式解析错误
---
src/views/erp/sale/order/index.vue | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index c6bd0cd..6124ec7 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -2,8 +2,8 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
-import { ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
@@ -19,18 +19,27 @@
getSaleOrderPage,
updateSaleOrderStatus,
} from '#/api/erp/sale/order';
+import { generateFromSaleOrder } from '#/api/mes/wm/salesnotice';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
+import SaleOrderPrint from './modules/print.vue';
+import SalesNoticeForm from '#/views/wls/salesnotice/modules/form.vue';
/** ERP 閿�鍞鍗曞垪琛� */
defineOptions({ name: 'ErpSaleOrder' });
const router = useRouter();
+const route = useRoute();
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
+ destroyOnClose: true,
+});
+
+const [SalesNoticeFormModal, salesNoticeFormModalApi] = useVbenModal({
+ connectedComponent: SalesNoticeForm,
destroyOnClose: true,
});
@@ -132,13 +141,33 @@
formModalApi.setData({ formType: 'detail', id: row.id }).open();
}
+/** 鎵撳嵃/瀵煎嚭閿�鍞鍗曡鎯咃紝渚涗紒涓氱洊绔犵暀瀛� */
+const printRef = ref<InstanceType<typeof SaleOrderPrint>>();
+function handlePrint(row: ErpSaleOrderApi.SaleOrder) {
+ printRef.value?.print(row.id!);
+}
+
/** 鏌ョ湅鍏宠仈鍚堝悓 */
function handleViewContract(row: ErpSaleOrderApi.SaleOrder) {
if (row.contractId) {
router.push({
- path: '/crm/contract/detail',
- query: { id: row.contractId },
+ path: `/crm/contract/detail/${row.contractId}`,
});
+ }
+}
+
+/** 鐢熸垚鍙戣揣閫氱煡鍗� */
+async function handleGenerateNotice(row: ErpSaleOrderApi.SaleOrder) {
+ try {
+ const noticeId = await generateFromSaleOrder(row.id!);
+ message.success('鐢熸垚鍙戣揣閫氱煡鍗曟垚鍔�');
+ handleRefresh();
+ // 鐩存帴鎵撳紑鍙戣揣閫氱煡鍗曡鎯呭脊妗�
+ salesNoticeFormModalApi
+ .setData({ formType: 'detail', id: noticeId })
+ .open();
+ } catch (e) {
+ console.error(e);
}
}
@@ -153,10 +182,19 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
+ // 鐢熶骇鐘舵�佹悳绱㈠弬鏁拌浆鎹細-1(鏃犻渶鐢熶骇) 鈫� needProduction=0
+ const { productionStatus, ...rest } = formValues;
+ const params: Record<string, any> = { ...rest };
+ if (productionStatus === -1) {
+ params.needProduction = 0;
+ } else if (productionStatus != null) {
+ params.productionStatus = productionStatus;
+ params.needProduction = 1;
+ }
return await getSaleOrderPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
- ...formValues,
+ ...params,
});
},
},
@@ -175,10 +213,21 @@
checkboxChange: handleRowCheckboxChange,
},
});
+
+/** 澶勭悊浠庡悎鍚岃烦杞繃鏉ョ殑鏌ヨ鍙傛暟 */
+onMounted(() => {
+ const orderId = route.query.id;
+ if (orderId) {
+ formModalApi.setData({ formType: 'detail', id: Number(orderId) }).open();
+ }
+});
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
+ <SalesNoticeFormModal />
+ <SaleOrderPrint ref="printRef" />
<Grid table-title="閿�鍞鍗曞垪琛�">
<template #toolbar-tools>
<TableAction
@@ -233,6 +282,25 @@
<Tag v-if="row.status === 20" color="success">宸插鏍�</Tag>
<Tag v-if="row.status === 30" color="error">宸蹭綔搴�</Tag>
</template>
+ <template #needProduction="{ row }">
+ <Tag v-if="row.needProduction === 1" color="success">鏄�</Tag>
+ <Tag v-else color="default">鍚�</Tag>
+ </template>
+ <template #outStatus="{ row }">
+ <Tag v-if="row.outStatus === 0" color="default">鏈嚭搴�</Tag>
+ <Tag v-else-if="row.outStatus === 1" color="processing">宸查鐣�</Tag>
+ <Tag v-else-if="row.outStatus === 2" color="warning">閮ㄥ垎鍑哄簱</Tag>
+ <Tag v-else-if="row.outStatus === 3" color="success">鍏ㄩ儴鍑哄簱</Tag>
+ </template>
+ <template #productionStatus="{ row }">
+ <template v-if="row.needProduction !== 1">
+ <Tag color="default">鏃犻渶鐢熶骇</Tag>
+ </template>
+ <template v-else>
+ <Tag v-if="row.productionStatus === 0" color="warning">鏈畬鎴�</Tag>
+ <Tag v-else-if="row.productionStatus === 1" color="success">宸插畬鎴�</Tag>
+ </template>
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
@@ -242,6 +310,13 @@
icon: ACTION_ICON.VIEW,
auth: ['erp:sale-order:query'],
onClick: handleDetail.bind(null, row),
+ },
+ {
+ label: '鎵撳嵃',
+ type: 'link',
+ icon: 'lucide:printer',
+ auth: ['erp:sale-order:query'],
+ onClick: handlePrint.bind(null, row),
},
{
label: $t('common.edit'),
@@ -296,6 +371,14 @@
},
},
{
+ label: '鐢熸垚鍙戣揣閫氱煡鍗�',
+ type: 'link',
+ icon: 'ant-design:file-protect-outlined',
+ auth: ['mes:wm-sales-notice:create'],
+ ifShow: () => row.status === 20 && !!row.canCreateSalesNotice,
+ onClick: handleGenerateNotice.bind(null, row),
+ },
+ {
label: $t('common.delete'),
type: 'link',
danger: true,
--
Gitblit v1.9.3