From 858df78951d5c29e8d4217cffcf81d2cc4fabcd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 03 八月 2026 14:58:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/erp/sale/order/index.vue |   80 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index c6bd0cd..7071c8e 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,26 @@
   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 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,
 });
 
@@ -136,9 +144,23 @@
 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 +175,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 +206,20 @@
     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 />
     <Grid table-title="閿�鍞鍗曞垪琛�">
       <template #toolbar-tools>
         <TableAction
@@ -232,6 +273,25 @@
         <Tag v-if="row.status === 10" color="warning">鏈鏍�</Tag>
         <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
@@ -296,6 +356,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