From 2e8c5d342a60ae707f42350371c718c212f703f1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:52:12 +0800
Subject: [PATCH] refactor(mes,wls): 生产计划审核改在协同办公,精简报工/工单归档入口

---
 src/views/mes/pro/feedback/index.vue                        |   22 ----
 src/views/mes/pro/mps/index.vue                             |  101 +------------------
 src/views/wls/salesnotice/components/line-select-dialog.vue |   11 --
 src/views/wls/salesnotice/data.ts                           |   16 ---
 src/views/mes/pro/workorder/index.vue                       |   15 ---
 src/views/mes/pro/mps/detail/approve/index.vue              |  112 ++++++++++++++++++++++
 src/views/mes/pro/workorder/data.ts                         |    4 
 src/api/mes/pro/mps/index.ts                                |   11 --
 src/views/wls/productissue/modules/generate.vue             |    4 
 9 files changed, 125 insertions(+), 171 deletions(-)

diff --git a/src/api/mes/pro/mps/index.ts b/src/api/mes/pro/mps/index.ts
index ceb99ff..7777738 100644
--- a/src/api/mes/pro/mps/index.ts
+++ b/src/api/mes/pro/mps/index.ts
@@ -76,12 +76,6 @@
     remark?: string;
   }
 
-  /** 瀹℃牳璇锋眰 */
-  export interface AuditReq {
-    id: number;
-    approved: boolean;
-    auditRemark?: string;
-  }
 }
 
 /** 鏌ヨ MPS 鍒嗛〉 */
@@ -136,11 +130,6 @@
 /** 鎻愪氦瀹℃牳 */
 export function submitMps(id: number) {
   return requestClient.post(`/mes/pro-mps/submit?id=${id}`);
-}
-
-/** 瀹℃牳锛堥�氳繃/椹冲洖锛� */
-export function auditMps(data: MesProMpsApi.AuditReq) {
-  return requestClient.post('/mes/pro-mps/audit', data);
 }
 
 /** 鏌ヨ璁″垝鐨勮緟鏂欓渶姹傛槑缁� */
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index c56983a..f9aa21e 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -15,15 +15,12 @@
   exportFeedback,
   getFeedbackPage,
 } from '#/api/mes/pro/feedback';
-import { getWorkOrder } from '#/api/mes/pro/workorder';
 import { $t } from '#/locales';
 
-import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
-import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
 
 const userStore = useUserStore();
 const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鎵逛汉鏉冮檺鍒ゆ柇
@@ -33,8 +30,6 @@
   connectedComponent: Form,
   destroyOnClose: true,
 });
-
-const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
 
 /** 鍒锋柊琛ㄦ牸 */
 function handleRefresh() {
@@ -94,17 +89,6 @@
 async function handleExport() {
   const data = await exportFeedback(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '鐢熶骇鎶ュ伐.xls', source: data });
-}
-
-/** 鏌ョ湅褰掓。 */
-async function handleArchive(row: MesProFeedbackApi.Feedback) {
-  if (!row.workOrderId) return;
-  try {
-    const workOrder = await getWorkOrder(row.workOrderId);
-    archiveDetailRef.value?.open(workOrder.productCode);
-  } catch {
-    message.error('鑾峰彇宸ュ崟淇℃伅澶辫触');
-  }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -203,15 +187,9 @@
                 confirm: handleDelete.bind(null, row),
               },
             },
-            {
-              label: '褰掓。',
-              type: 'link',
-              onClick: handleArchive.bind(null, row),
-            },
           ]"
         />
       </template>
     </Grid>
-    <ArchiveDetail ref="archiveDetailRef" />
   </Page>
 </template>
diff --git a/src/views/mes/pro/mps/detail/approve/index.vue b/src/views/mes/pro/mps/detail/approve/index.vue
new file mode 100644
index 0000000..0f18521
--- /dev/null
+++ b/src/views/mes/pro/mps/detail/approve/index.vue
@@ -0,0 +1,112 @@
+<script lang="ts" setup>
+import type { MesProMpsApi } from '#/api/mes/pro/mps';
+import type { DescriptionItemSchema } from '#/components/description';
+
+import { h, onMounted, ref } from 'vue';
+
+import { ContentWrap } from '@vben/common-ui';
+import { formatDate } from '@vben/utils';
+
+import { Spin, Tag } from 'ant-design-vue';
+
+import { getMps } from '#/api/mes/pro/mps';
+import { useDescription } from '#/components/description';
+
+defineOptions({ name: 'MesProMpsApproveDetail' });
+
+const props = defineProps<{ id: string }>();
+
+const loading = ref(false);
+const formData = ref<MesProMpsApi.Mps>();
+
+/** 鏂囨湰瀛楁绌哄�煎崰浣� */
+function textRender(val: unknown) {
+  return val === 0 || val ? String(val) : '-';
+}
+
+/** 鐘舵�佹覆鏌� */
+function renderStatus(val?: number) {
+  const map: Record<number, { text: string; color: string }> = {
+    0: { text: '鏈紑濮�', color: 'blue' },
+    1: { text: '宸蹭笅鍙�', color: 'success' },
+    2: { text: '宸插畬鎴�', color: 'purple' },
+    3: { text: '宸插彇娑�', color: 'red' },
+    4: { text: '瀹℃牳涓�', color: 'warning' },
+    5: { text: '宸插鏍�', color: 'cyan' },
+  };
+  const item = map[val ?? 0]!;
+  return h(Tag, { color: item.color }, () => item.text);
+}
+
+/** 鏁伴噺娓叉煋锛氬幓鎺夊浣欏皬鏁颁綅 */
+function quantityRender(val?: number) {
+  if (val === null || val === undefined) {
+    return '-';
+  }
+  return Number(val).toString();
+}
+
+const [Descriptions] = useDescription({
+  bordered: true,
+  column: 2,
+  schema: [
+    { label: '璁″垝缂栧彿', field: 'code', render: textRender },
+    { label: '鐘舵��', field: 'status', render: (val) => renderStatus(val as number) },
+    { label: '閿�鍞鍗曞彿', field: 'saleOrderNo', render: textRender },
+    { label: '瀹㈡埛鍚嶇О', field: 'clientName', render: textRender },
+    { label: '浜у搧缂栫爜', field: 'productCode', render: textRender },
+    { label: '浜у搧鍚嶇О', field: 'productName', render: textRender },
+    { label: '瑙勬牸鍨嬪彿', field: 'productSpecification', render: textRender },
+    { label: '鍗曚綅', field: 'unitMeasureName', render: textRender },
+    {
+      label: '璁″垝鐢熶骇鏁伴噺',
+      field: 'quantity',
+      render: (val) => quantityRender(val as number),
+    },
+    {
+      label: '宸茬敓浜ф暟閲�',
+      field: 'quantityProduced',
+      render: (val) => quantityRender(val as number),
+    },
+    {
+      label: '璁″垝寮�濮嬫棩鏈�',
+      field: 'planStartDate',
+      render: (val) => (val ? (formatDate(val) as string) : '-'),
+    },
+    {
+      label: '闇�姹傛棩鏈�',
+      field: 'requestDate',
+      render: (val) => (val ? (formatDate(val) as string) : '-'),
+    },
+    {
+      label: '鍒涘缓鏃堕棿',
+      field: 'createTime',
+      render: (val) => (val ? (formatDate(val) as string) : '-'),
+    },
+    { label: '澶囨敞', field: 'remark', render: textRender },
+  ] as DescriptionItemSchema[],
+});
+
+onMounted(async () => {
+  try {
+    loading.value = true;
+    formData.value = await getMps(Number(props.id));
+  } finally {
+    loading.value = false;
+  }
+});
+</script>
+
+<template>
+  <ContentWrap class="m-2">
+    <Spin :spinning="loading" tip="鍔犺浇涓�...">
+      <div class="rounded-lg border border-border bg-background p-4">
+        <div class="mb-4 flex items-center gap-2">
+          <span class="inline-block h-4 w-1 rounded bg-primary" />
+          <span class="text-base font-semibold">鐢熶骇璁″垝淇℃伅</span>
+        </div>
+        <Descriptions :data="formData" />
+      </div>
+    </Spin>
+  </ContentWrap>
+</template>
diff --git a/src/views/mes/pro/mps/index.vue b/src/views/mes/pro/mps/index.vue
index 5b6b8f8..8ad1b4b 100644
--- a/src/views/mes/pro/mps/index.vue
+++ b/src/views/mes/pro/mps/index.vue
@@ -8,19 +8,10 @@
 import { Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
-import {
-  Button,
-  message,
-  Modal,
-  Radio,
-  RadioGroup,
-  Tag,
-  Textarea,
-} from 'ant-design-vue';
+import { Button, message, Modal, Tag } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
-  auditMps,
   cancelMps,
   deleteMps,
   exportMps,
@@ -53,15 +44,6 @@
 const itemListOpen = ref(false);
 const currentMpsId = ref<number>();
 
-/** 瀹℃牳寮圭獥 */
-const auditOpen = ref(false);
-const auditSubmitting = ref(false);
-const auditForm = ref<{ approved: boolean; remark: string }>({
-  approved: true,
-  remark: '',
-});
-const currentAuditRow = ref<MesProMpsApi.Mps>();
-
 /** 鎵撳紑杈呮枡鏄庣粏 */
 function handleShowItems(row: MesProMpsApi.Mps) {
   currentMpsId.value = row.id;
@@ -77,37 +59,6 @@
     handleRefresh();
   } finally {
     hideLoading();
-  }
-}
-
-/** 鎵撳紑瀹℃牳寮圭獥 */
-function handleAudit(row: MesProMpsApi.Mps) {
-  currentAuditRow.value = row;
-  auditForm.value = { approved: true, remark: '' };
-  auditOpen.value = true;
-}
-
-/** 纭瀹℃牳 */
-async function handleAuditSubmit() {
-  if (!currentAuditRow.value?.id) {
-    return;
-  }
-  if (!auditForm.value.approved && !auditForm.value.remark.trim()) {
-    message.warning('椹冲洖鏃跺繀椤诲~鍐欓┏鍥炲師鍥�');
-    return;
-  }
-  auditSubmitting.value = true;
-  try {
-    await auditMps({
-      id: currentAuditRow.value.id,
-      approved: auditForm.value.approved,
-      auditRemark: auditForm.value.remark.trim() || undefined,
-    });
-    message.success(auditForm.value.approved ? '瀹℃牳閫氳繃' : '宸查┏鍥�');
-    auditOpen.value = false;
-    handleRefresh();
-  } finally {
-    auditSubmitting.value = false;
   }
 }
 
@@ -383,9 +334,8 @@
               type: 'link',
               icon: ACTION_ICON.EDIT,
               auth: ['mes:pro-mps:update'],
-              ifShow: () =>
-                row.status === MpsStatusEnum.DRAFT ||
-                row.status === MpsStatusEnum.AUDITING,
+              // 浠呰崏绋垮彲缂栬緫锛涘鏍镐腑鐨勮鍒掗渶鍦ㄥ崗鍚屽姙鍏畬鎴愬鎵�
+              ifShow: () => row.status === MpsStatusEnum.DRAFT,
               onClick: handleEdit.bind(null, row),
             },
             {
@@ -393,21 +343,12 @@
               type: 'link',
               icon: ACTION_ICON.AUDIT,
               auth: ['mes:pro-mps:submit'],
-              ifShow: () =>
-                row.status === MpsStatusEnum.DRAFT ||
-                row.status === MpsStatusEnum.AUDITING,
+              // 鎻愪氦鍚庤繘鍏ュ崗鍚屽姙鍏鎵癸紝瀹℃牳涓笉鍐嶉噸澶嶆彁浜�
+              ifShow: () => row.status === MpsStatusEnum.DRAFT,
               popConfirm: {
-                title: `纭鎻愪氦${row.code}瀹℃牳鍚楋紵`,
+                title: `纭鎻愪氦${row.code}瀹℃牳鍚楋紵鎻愪氦鍚庤鍒般�屽崗鍚屽姙鍏�嶅畬鎴愬鎵筦,
                 confirm: handleSubmit.bind(null, row),
               },
-            },
-            {
-              label: '瀹℃牳',
-              type: 'link',
-              icon: ACTION_ICON.AUDIT,
-              auth: ['mes:pro-mps:audit'],
-              ifShow: () => row.status === MpsStatusEnum.AUDITING,
-              onClick: handleAudit.bind(null, row),
             },
             {
               label: '鐢熸垚閲囪喘鍗�',
@@ -446,9 +387,7 @@
               danger: true,
               icon: ACTION_ICON.DELETE,
               auth: ['mes:pro-mps:delete'],
-              ifShow: () =>
-                row.status === MpsStatusEnum.DRAFT ||
-                row.status === MpsStatusEnum.AUDITING,
+              ifShow: () => row.status === MpsStatusEnum.DRAFT,
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.code]),
                 confirm: handleDelete.bind(null, row),
@@ -467,32 +406,6 @@
       destroy-on-close
     >
       <ItemList v-if="itemListOpen && currentMpsId" :mps-id="currentMpsId" />
-    </Modal>
-
-    <Modal
-      v-model:open="auditOpen"
-      title="瀹℃牳鐢熶骇璁″垝"
-      :confirm-loading="auditSubmitting"
-      ok-text="鎻愪氦"
-      cancel-text="鍙栨秷"
-      width="520px"
-      @ok="handleAuditSubmit"
-    >
-      <div class="mb-3">{{ currentAuditRow?.code }} 路 {{ currentAuditRow?.productName }}</div>
-      <div class="mb-2 flex items-center gap-4">
-        <span>瀹℃牳缁撴灉锛�</span>
-        <RadioGroup v-model:value="auditForm.approved">
-          <Radio :value="true">閫氳繃</Radio>
-          <Radio :value="false">椹冲洖</Radio>
-        </RadioGroup>
-      </div>
-      <Textarea
-        v-model:value="auditForm.remark"
-        :rows="3"
-        :maxlength="500"
-        :placeholder="auditForm.approved ? '瀹℃牳鎰忚锛堝彲閫夛級' : '璇峰~鍐欓┏鍥炲師鍥狅紙蹇呭~锛�'"
-        show-count
-      />
     </Modal>
   </Page>
 </template>
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index 8e4bf12..8ad0a86 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -575,7 +575,9 @@
     },
     {
       title: '鎿嶄綔',
-      width: 240,
+      // 宸茬‘璁よ鏈�澶氬悓鏃跺嚭鐜� 7 涓摼鎺ユ寜閽紙鏂板瀛愯鍗�/鎵规绠$悊/鎵ц鎯呭喌/鎵撳嵃棰嗘枡鍗�/鍚姩鐢熶骇/瀹屾垚/鍙栨秷锛夛紝
+      // 鎸� 14px 瀛楀彿瀹炴祴鎬诲绾� 420锛屽姞鍗曞厓鏍煎乏鍙� 6px 鍐呰竟璺濈暀鍒� 440锛岄伩鍏嶈瑁佸垏
+      width: 440,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index cadfc26..e6a051d 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -22,7 +22,6 @@
     startWorkOrder,
   } from "#/api/mes/pro/workorder";
   import { $t } from "#/locales";
-  import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
 // import { BarcodeDetail } from '#/views/wls/barcode/components';
 
   import { useGridColumns, useGridFormSchema } from "./data";
@@ -46,8 +45,6 @@
     destroyOnClose: true,
   });
 
-  const archiveVisible = ref(false);
-  const archiveProductCode = ref('');
 // const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉$爜璇︽儏寮圭獥
 
   /** 鍒锋柊琛ㄦ牸 */
@@ -151,12 +148,6 @@
     await cancelWorkOrder(row.id!);
     message.success("璁㈠崟宸插彇娑�");
     handleRefresh();
-  }
-
-  /** 鎵撳紑褰掓。璇︽儏 */
-  function handleArchive(row: MesProWorkOrderApi.WorkOrder) {
-    archiveProductCode.value = row.productCode || '';
-    archiveVisible.value = true;
   }
 
   /** 鏌ョ湅璁㈠崟鏉$爜 */
@@ -371,16 +362,10 @@
             //   auth: ['mes:pro-work-order:query'],
             //   onClick: handleBarcode.bind(null, row),
             // },
-            {
-              label: '褰掓。',
-              type: 'link',
-              onClick: handleArchive.bind(null, row),
-            },
           ]" />
       </template>
     </Grid>
     <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
-    <ArchiveDetail :visible="archiveVisible" :product-code="archiveProductCode" @update:visible="archiveVisible = $event" />
   </Page>
 </template>
 
diff --git a/src/views/wls/productissue/modules/generate.vue b/src/views/wls/productissue/modules/generate.vue
index a0baded..042d85e 100644
--- a/src/views/wls/productissue/modules/generate.vue
+++ b/src/views/wls/productissue/modules/generate.vue
@@ -116,6 +116,9 @@
 }
 
 const [Modal, modalApi] = useVbenModal({
+  // 寮圭獥搴曢儴銆岀敓鎴愰鏂欏崟銆嶆寜閽偣鍑诲洖璋冿細Vben Modal 鐨勭‘瀹氭寜閽彧浼氳皟鐢� modalApi.onConfirm锛�
+  // 妯℃澘涓婂啓 @confirm 涓嶄細瑙﹀彂锛堢粍浠舵病鏈夋毚闇� confirm 浜嬩欢锛夛紝蹇呴』鍦ㄨ繖閲屾敞鍐�
+  onConfirm: handleGenerate,
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       workOrderId.value = undefined;
@@ -141,7 +144,6 @@
     :confirm-text="'鐢熸垚棰嗘枡鍗�'"
     :confirm-disabled="!workOrderId || !hasGap || loading"
     :confirm-loading="submitting"
-    @confirm="handleGenerate"
   >
     <div class="mx-4 flex flex-col gap-3">
       <div class="flex items-center gap-2">
diff --git a/src/views/wls/salesnotice/components/line-select-dialog.vue b/src/views/wls/salesnotice/components/line-select-dialog.vue
index fdd4c69..ed8ca02 100644
--- a/src/views/wls/salesnotice/components/line-select-dialog.vue
+++ b/src/views/wls/salesnotice/components/line-select-dialog.vue
@@ -4,8 +4,6 @@
 
 import { nextTick, ref } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
-
 import { message, Modal } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
@@ -57,15 +55,6 @@
       field: 'batchCode',
       title: '鎵规鍙�',
       minWidth: 120,
-    },
-    {
-      field: 'oqcCheckFlag',
-      title: '鏄惁妫�楠�',
-      width: 90,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
-      },
     },
   ];
 }
diff --git a/src/views/wls/salesnotice/data.ts b/src/views/wls/salesnotice/data.ts
index 6818446..e14d886 100644
--- a/src/views/wls/salesnotice/data.ts
+++ b/src/views/wls/salesnotice/data.ts
@@ -12,7 +12,6 @@
 
 import { Button } from 'ant-design-vue';
 
-import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import CrmCustomerSelect from '#/components/crm-customer-select.vue';
 import { ErpSaleOrderSelect } from '#/views/erp/sale/order/components';
@@ -323,15 +322,6 @@
       minWidth: 120,
     },
     {
-      field: 'oqcCheckFlag',
-      title: '鏄惁妫�楠�',
-      width: 90,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
-      },
-    },
-    {
       field: 'remark',
       title: '澶囨敞',
       minWidth: 120,
@@ -380,12 +370,6 @@
       componentProps: {
         placeholder: '璇疯緭鍏ユ壒娆″彿',
       },
-    },
-    {
-      fieldName: 'oqcCheckFlag',
-      label: '鏄惁妫�楠�',
-      component: 'Switch',
-      rules: z.boolean().default(true),
     },
     {
       fieldName: 'remark',

--
Gitblit v1.9.3