From 173855b299e89930b5ea2ff9a9295fde9d0f55b5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:51:43 +0800
Subject: [PATCH] feat: 同步质检、生产、销售、财务与人事前端功能

---
 src/views/mes/qc/ncr/index.vue |  142 ++++++++++++++++++++++++----------------------
 1 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/src/views/mes/qc/ncr/index.vue b/src/views/mes/qc/ncr/index.vue
index 6204415..875251a 100644
--- a/src/views/mes/qc/ncr/index.vue
+++ b/src/views/mes/qc/ncr/index.vue
@@ -2,6 +2,8 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcNcrApi } from '#/api/mes/qc/ncr';
 
+import { useRouter } from 'vue-router';
+
 import { Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
@@ -15,66 +17,30 @@
   disposeNcr,
   exportNcr,
   getNcrPage,
-  reviewNcr,
+  submitNcrApproval,
 } from '#/api/mes/qc/ncr';
 import { $t } from '#/locales';
 
 import {
+  getNcrDispositionLabel,
+  getNcrStatusColor,
+  getNcrStatusLabel,
   NCR_STATUS,
   QC_TYPE_OPTIONS,
   useCloseFormSchema,
   useDisposeFormSchema,
   useGridColumns,
   useGridFormSchema,
-  useReviewFormSchema,
 } from './data';
 import Form from './modules/form.vue';
 
 defineOptions({ name: 'NcrIndex' });
 
+const router = useRouter();
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
-});
-
-/** 璇勫寮圭獥 */
-const [ReviewForm, reviewFormApi] = useVbenForm({
-  commonConfig: {
-    componentProps: { class: 'w-full' },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: useReviewFormSchema(),
-  showDefaultActions: false,
-});
-const [ReviewModal, reviewModalApi] = useVbenModal({
-  async onConfirm() {
-    const { valid } = await reviewFormApi.validate();
-    if (!valid) return;
-    reviewModalApi.lock();
-    try {
-      await reviewNcr(
-        (await reviewFormApi.getValues()) as {
-          defectLevel?: number;
-          disposition: number;
-          id: number;
-          responsibleDeptId?: number;
-          reviewOpinion?: string;
-        },
-      );
-      await reviewModalApi.close();
-      message.success('璇勫鎴愬姛');
-      handleRefresh();
-    } finally {
-      reviewModalApi.unlock();
-    }
-  },
-  onOpenChange(isOpen: boolean) {
-    if (!isOpen) return;
-    const data = reviewModalApi.getData<MesQcNcrApi.Ncr>();
-    reviewFormApi.setValues({ id: data?.id });
-  },
 });
 
 /** 澶勭疆寮圭獥 */
@@ -96,6 +62,7 @@
     try {
       await disposeNcr(
         (await disposeFormApi.getValues()) as {
+          disposition: number;
           handleResult?: string;
           handlerUserId?: number;
           id: number;
@@ -108,8 +75,10 @@
       disposeModalApi.unlock();
     }
   },
-  onOpenChange(isOpen: boolean) {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) return;
+    // 姣忔鎵撳紑閲嶇疆锛屼繚璇佸缃柟寮忛粯璁や笉閫変腑锛堝繀椤荤敱璐ㄩ噺閮ㄩ噸鏂伴�夋嫨锛�
+    await disposeFormApi.resetForm();
     const data = disposeModalApi.getData<MesQcNcrApi.Ncr>();
     disposeFormApi.setValues({ id: data?.id });
   },
@@ -186,9 +155,35 @@
   }
 }
 
-/** 璇勫 */
-function handleReview(row: MesQcNcrApi.Ncr) {
-  reviewModalApi.setData(row).open();
+/** 鎻愪氦瀹℃壒 */
+async function handleSubmitApproval(row: MesQcNcrApi.Ncr) {
+  const hideLoading = message.loading({
+    content: `姝e湪鎻愪氦 ${row.code} 瀹℃壒...`,
+    duration: 0,
+  });
+  try {
+    await submitNcrApproval(row.id!);
+    message.success(
+      `涓嶅悎鏍煎搧澶勭悊鍗� ${row.code} 宸叉彁浜ゅ鎵癸紝鍙湪銆屾煡鐪嬪鎵广�嶄腑璺熻釜杩涘害`,
+    );
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 鏌ョ湅瀹℃壒璁板綍锛堝鐢� BPM 娴佺▼瀹炰緥璇︽儏椤电殑鏃堕棿绾匡級 */
+function handleViewApproval(row: MesQcNcrApi.Ncr) {
+  if (!row.processInstanceId) {
+    message.warning(
+      `涓嶅悎鏍煎搧澶勭悊鍗� ${row.code} 娌℃湁娴佺▼瀹炰緥锛氬彲鑳藉紑鍚簡鍏ㄥ眬鍏嶅鎵癸紝鎴栧皻鏈彁浜ゅ鎵筦,
+    );
+    return;
+  }
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: { id: row.processInstanceId, viewOnly: '1' },
+  });
 }
 
 /** 澶勭疆 */
@@ -241,9 +236,6 @@
 <template>
   <Page auto-content-height>
     <FormModal @success="handleRefresh" />
-    <ReviewModal title="璇勫涓嶅悎鏍煎搧澶勭悊鍗�" class="w-2/5">
-      <ReviewForm class="mx-4" />
-    </ReviewModal>
     <DisposeModal title="澶勭疆涓嶅悎鏍煎搧澶勭悊鍗�" class="w-2/5">
       <DisposeForm class="mx-4" />
     </DisposeModal>
@@ -277,16 +269,38 @@
           {{ getQcTypeLabel(row.qcType) }}
         </Tag>
       </template>
+      <template #disposition="{ row }">
+        <span v-if="row.disposition !== undefined && row.disposition !== null">
+          {{ getNcrDispositionLabel(row.disposition) }}
+        </span>
+        <span v-else class="text-gray-400">--</span>
+      </template>
+      <template #status="{ row }">
+        <Tag :color="getNcrStatusColor(row.status)">
+          {{ getNcrStatusLabel(row.status) }}
+        </Tag>
+      </template>
       <template #actions="{ row }">
         <TableAction
-          v-if="row.status === NCR_STATUS.PENDING_REVIEW"
           :actions="[
             {
               label: $t('common.edit'),
               type: 'link',
               icon: ACTION_ICON.EDIT,
               auth: ['mes:qc-ncr:update'],
+              ifShow: row.status === NCR_STATUS.PENDING_REVIEW,
               onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: '鎻愪氦瀹℃壒',
+              type: 'link',
+              icon: 'lucide:send',
+              auth: ['mes:qc-ncr:update'],
+              ifShow: row.status === NCR_STATUS.PENDING_REVIEW,
+              popConfirm: {
+                title: `纭鎻愪氦涓嶅悎鏍煎搧澶勭悊鍗� ${row.code} 瀹℃壒锛焋,
+                confirm: handleSubmitApproval.bind(null, row),
+              },
             },
             {
               label: $t('common.delete'),
@@ -294,45 +308,37 @@
               danger: true,
               icon: ACTION_ICON.DELETE,
               auth: ['mes:qc-ncr:delete'],
+              ifShow: row.status === NCR_STATUS.PENDING_REVIEW,
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.name]),
                 confirm: handleDelete.bind(null, row),
               },
             },
             {
-              label: '璇勫',
-              type: 'link',
-              icon: 'lucide:clipboard-check',
-              auth: ['mes:qc-ncr:review'],
-              onClick: handleReview.bind(null, row),
-            },
-          ]"
-        />
-        <TableAction
-          v-else-if="row.status === NCR_STATUS.REVIEWED"
-          :actions="[
-            {
               label: '澶勭疆',
               type: 'link',
               icon: 'lucide:play',
               auth: ['mes:qc-ncr:dispose'],
+              ifShow: row.status === NCR_STATUS.REVIEWED,
               onClick: handleDispose.bind(null, row),
             },
-          ]"
-        />
-        <TableAction
-          v-else-if="row.status === NCR_STATUS.DISPOSED"
-          :actions="[
             {
               label: '鍏抽棴',
               type: 'link',
               icon: 'lucide:check-circle',
               auth: ['mes:qc-ncr:close'],
+              ifShow: row.status === NCR_STATUS.DISPOSED,
               onClick: handleClose.bind(null, row),
+            },
+            {
+              label: '鏌ョ湅瀹℃壒',
+              type: 'link',
+              icon: 'lucide:history',
+              ifShow: !!row.processInstanceId,
+              onClick: handleViewApproval.bind(null, row),
             },
           ]"
         />
-        <span v-else class="text-gray-400">--</span>
       </template>
     </Grid>
   </Page>

--
Gitblit v1.9.3