From ca803cd6508b005fd04c89dd92415a5c5eb3f782 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 1 Aug 2025 15:55:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E5=93=81=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增不合格品主管审批页面和相关功能
- 实现不合格品主表信息和子表明细的展示
- 添加审批通过和查看流程记录的功能
---
 src/api/qms/qcUnqualifiedReview/types.ts      |  20 ++
 src/router/index.ts                           |  16 +-
 .../qms/qcUnqualifiedApproval/approval.vue    | 299 ++++++++++++++++++
 3 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 src/views/qms/qcUnqualifiedApproval/approval.vue

diff --git a/src/api/qms/qcUnqualifiedReview/types.ts b/src/api/qms/qcUnqualifiedReview/types.ts
index 6ee51b9..2cfef69 100644
--- a/src/api/qms/qcUnqualifiedReview/types.ts
+++ b/src/api/qms/qcUnqualifiedReview/types.ts
@@ -334,6 +334,26 @@ export interface QcUnqualifiedReviewQuery extends PageQuery {
      * 日期范围参数
      */
     params?: any;
+
+  /**
+   * 处置类型
+   */
+  dispositionType?: string | number;
+
+  /**
+   * 流程状态
+   */
+  processStatus?: string;
+}
+
+/**
+ * 完成审批任务请求接口
+ */
+export interface CompleteTaskRequest {
+  reviewId: string | number;
+  taskId: string | number;
+  approved: boolean;
+  comment: string;
 }
 
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 93c962b..fdd0a5b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -213,6 +213,19 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
+  },
+  {
+    path: '/qms/qcUnqualifiedApproval',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'approval',
+        component: () => import('@/views/qms/qcUnqualifiedApproval/approval.vue'),
+        name: 'qcUnqualifiedApproval',
+        meta: { title: '不合格品主管审批', activeMenu: '/qms/qcUnqualifiedApproval', noCache: true }
+      }
+    ]
   }
 ];
 
@@ -489,8 +502,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         meta: { title: '保养工单申请', activeMenu: '/dms/maint/maintEdit', noCache: true }
       }
     ]
-  },
-
+  }
 
 ];
 
diff --git a/src/views/qms/qcUnqualifiedApproval/approval.vue b/src/views/qms/qcUnqualifiedApproval/approval.vue
new file mode 100644
index 0000000..4c498b0
--- /dev/null
+++ b/src/views/qms/qcUnqualifiedApproval/approval.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never" class="mb-[10px]">
+      <div style="display: flex; justify-content: space-between">
+        <div>
+          <el-button type="primary" @click="handleApprovalRecord">流程进度</el-button>
+        </div>
+        <div>
+          <el-button @click="goBack()">返回</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card shadow="never" class="mb-[10px]">
+      <h4>不合格品主表信息</h4>
+      <el-form :model="approvalForm" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="不合格检测单号">
+              <el-input v-model="approvalForm.unqualifiedReviewNo" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检单号">
+              <el-input v-model="approvalForm.inspectionNo" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="检测类型">
+              <el-input v-model="approvalForm.typeName" readonly />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="生产日期">
+              <el-input :value="parseTime(approvalForm.productionDate, '{y}-{m}-{d}')" readonly />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="派工单号">
+              <el-input v-model="approvalForm.workOrderNo" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工序名称">
+              <el-input v-model="approvalForm.processName" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物料名称">
+              <el-input v-model="approvalForm.materialName" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料编码">
+              <el-input v-model="approvalForm.materialCode" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item label="物料规格">
+              <el-input v-model="approvalForm.materialSpec" readonly />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="供应商名称">
+              <el-input v-model="approvalForm.supplierName" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="供应商编码">
+              <el-input v-model="approvalForm.supplierCode" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检数量">
+              <el-input v-model="approvalForm.inspectionQty" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="批次号">
+              <el-input v-model="approvalForm.batchNo" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检人">
+              <el-input v-model="approvalForm.inspector" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item label="评审人">
+              <el-input v-model="approvalForm.reviewer" readonly />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="评审开始时间">
+              <el-input :value="parseTime(approvalForm.reviewStartTime, '{y}-{m}-{d} {h}:{i}:{s}')" readonly />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="评审结束时间">
+              <el-input :value="parseTime(approvalForm.reviewEndTime, '{y}-{m}-{d} {h}:{i}:{s}')" readonly />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-form-item label="处置类型">
+          <el-tag :type="getDispositionTypeTag(approvalForm.reviewResult)">
+            {{ getDispositionTypeName(approvalForm.reviewResult) }}
+          </el-tag>
+        </el-form-item>
+        <!-- <el-form-item label="备注">
+          <el-input v-model="approvalForm.remark" type="textarea" :rows="3" readonly />
+        </el-form-item> -->
+        <!-- <el-form-item label="审批意见" prop="comment">
+          <el-input
+            v-model="approvalForm.comment"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入审批意见"
+            :maxlength="500"
+            show-word-limit
+          />
+        </el-form-item> -->
+      </el-form>
+    </el-card>
+
+    <el-card shadow="never" class="mt-4">
+      <h4>不合格品子表明细</h4>
+      <el-table v-loading="detailLoading" :data="detailRecordList" border>
+        <el-table-column type="index" label="序号" width="55" align="center"/>
+        <el-table-column label="检测项编码" align="center" prop="itemCode" />
+        <el-table-column label="检测名称" align="center" prop="itemName" />
+        <el-table-column label="检测位置" align="center" prop="inspectionPosition" />
+        <el-table-column label="检测方法" align="center" prop="inspectionMethod">
+          <template #default="scope">
+            <dict-tag :options="qc_methond" :value="scope.row.inspectionMethod" />
+          </template>
+        </el-table-column>
+        <el-table-column label="检测方式" align="center" prop="detectType">
+          <template #default="scope">
+            <dict-tag :options="detect_type" :value="scope.row.detectType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="检测结果" align="center" prop="detectResult">
+          <template #default="scope">
+            <dict-tag :options="qc_result" :value="scope.row.detectResult"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="检测值" align="center" prop="detectValue" />
+        <el-table-column label="控制上限" align="center" prop="upperLimit" />
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" />
+        <el-table-column label="规格检测值" align="center" prop="specInspectionValue" />
+        <el-table-column label="规格上限" align="center" prop="specUpper" />
+        <el-table-column label="规格下限" align="center" prop="specLower" />
+        <el-table-column label="检查项说明" align="center" prop="description" :show-overflow-tooltip="true"/>
+      </el-table>
+      <pagination v-show="detailTotal > 0" :total="detailTotal" v-model:page="detailQueryParams.pageNum" v-model:limit="detailQueryParams.pageSize" @pagination="getDetailList" />
+    </el-card>
+
+    <el-card shadow="never" class="mt-4">
+      <div class="dialog-footer text-center">
+        <el-button type="primary" :loading="approvalButtonLoading" @click="handleApprove">审批通过</el-button>
+      </div>
+    </el-card>
+
+    <!-- 审批记录组件 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup name="QcUnqualifiedApproval" lang="ts">
+import { ref, reactive, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { getQcUnqualifiedReview, completeTask } from '@/api/qms/qcUnqualifiedReview';
+import { listQcUnqualifiedRecord } from '@/api/qms/qcUnqualifiedRecord';
+import { QcUnqualifiedReviewVO } from '@/api/qms/qcUnqualifiedReview/types';
+import { QcUnqualifiedRecordVO, QcUnqualifiedRecordQuery } from '@/api/qms/qcUnqualifiedRecord/types';
+import { parseTime } from '@/utils/ruoyi';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import { getCurrentInstance, toRefs } from 'vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { review_result, qc_methond, detect_type, qc_result } = toRefs<any>(proxy?.useDict('review_result', 'qc_methond', 'detect_type', 'qc_result'));
+
+const router = useRouter();
+const route = useRoute();
+const approvalForm = ref<QcUnqualifiedReviewVO>({} as QcUnqualifiedReviewVO);
+const detailRecordList = ref<QcUnqualifiedRecordVO[]>([]);
+const detailLoading = ref(false);
+const detailTotal = ref(0);
+const approvalButtonLoading = ref(false);
+
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+const detailQueryParams = ref<QcUnqualifiedRecordQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  reviewId: undefined
+});
+
+// 加载数据
+const loadData = async () => {
+  const businessId = route.query.id as string;
+  const taskId = route.query.taskId as string;
+  if (!businessId || !taskId) {
+    proxy?.$modal.msgError('缺少参数');
+    return;
+  }
+
+  try {
+    const res = await getQcUnqualifiedReview(businessId);
+    approvalForm.value = { ...res.data, taskId, comment: '' };
+
+    detailQueryParams.value.reviewId = businessId;
+    await getDetailList();
+  } catch (error) {
+    proxy?.$modal.msgError('加载数据失败');
+  }
+};
+
+const getDetailList = async () => {
+  detailLoading.value = true;
+  try {
+    const res = await listQcUnqualifiedRecord(detailQueryParams.value);
+    detailRecordList.value = res.rows;
+    detailTotal.value = res.total;
+  } catch (error) {
+    proxy?.$modal.msgError('加载子表明细失败');
+  } finally {
+    detailLoading.value = false;
+  }
+};
+
+/** 审批通过 */
+const handleApprove = async () => {
+  // if (!approvalForm.value.comment || approvalForm.value.comment.length < 5) {
+  //   proxy?.$modal.msgError('审批意见至少5个字符');
+  //   return;
+  // }
+
+  approvalButtonLoading.value = true;
+  try {
+    console.log(approvalForm.value);
+    const reviewIdValue = approvalForm.value.reviewId; 
+    await completeTask({
+     reviewId: reviewIdValue
+    });
+    proxy?.$modal.msgSuccess('审批通过');
+    goBack();
+  } catch (error) {
+    proxy?.$modal.msgError('审批失败');
+  } finally {
+    approvalButtonLoading.value = false;
+  }
+};
+
+/** 查看流程记录 */
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(approvalForm.value.reviewId);
+};
+
+const getDispositionTypeName = (value: string | undefined) => {
+  return review_result.value.find(item => item.value === value)?.label || '未知';
+};
+
+const getDispositionTypeTag = (value: string | undefined) => {
+  // 自定义tag样式
+  const tagMap = {
+    '0': 'danger',
+    '1': 'warning',
+    '2': 'info',
+    '3': 'success',
+    '4': 'primary'
+  };
+  return tagMap[value || ''] || '';
+};
+
+const goBack = () => {
+  router.go(-1);
+};
+
+onMounted(() => {
+  loadData();
+});
+</script>