From ee5c9a9a3da85dff584d382b9a5b65098f7b2571 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 28 Jul 2025 17:53:17 +0800
Subject: [PATCH 1/5] =?UTF-8?q?update=20qms=E8=B4=A8=E6=A3=80=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2=E5=85=B3=E8=81=94=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/QcInspectionMain/index.vue | 34 ++++++++++--------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index 8e3bad0..b18f5b7 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -21,11 +21,11 @@
                 <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="检验类别" prop="inspectionType" v-if='inspectionTypeVisible'>
-              <el-select v-model="queryParams.inspectionType" placeholder="请选择检验类别" >
-                <el-option v-for="dict in qc_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item label="检测类别" prop="inspectionType" v-if='inspectionTypeVisible'>-->
+<!--              <el-select v-model="queryParams.qcInspectionType" placeholder="请选择检测类别" >-->
+<!--                <el-option v-for="dict in qc_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item label="单据状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable >
                 <el-option v-for="dict in qc_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -103,11 +103,7 @@
           </template>
         </el-table-column>
         <el-table-column label="车间" align="center" prop="workshop" v-if="columns[12].visible"/>
-        <el-table-column label="检验类别" align="center" prop="inspectionType" v-if="columns[13].visible">
-          <template #default="scope">
-            <dict-tag :options="qc_inspection_type" :value="scope.row.inspectionType"/>
-          </template>
-        </el-table-column>
+        <el-table-column label="检测类别" align="center" prop="typeName" v-if="columns[13].visible" />
         <el-table-column label="单据状态" align="center" prop="status" v-if="columns[14].visible">
           <template #default="scope">
             <dict-tag :options="qc_status" :value="scope.row.status"/>
@@ -322,8 +318,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检验类别" prop="inspectionType">
-              <el-select v-model="form.inspectionType" placeholder="请选择检验类别">
+            <el-form-item label="检测类别" prop="inspectionType">
+              <el-select v-model="form.inspectionType" placeholder="请选择检测类别">
                 <el-option
                   v-for="dict in qc_inspection_type"
                   :key="dict.value"
@@ -638,20 +634,18 @@ const inspectionResultDialog = reactive<DialogOption>({
   title: ''
 });
 
-//0首检 1专检 2自检 3互检 4原材料检 5抽检 6成品检 7入库检
+
 //路由：inspectionType = 1产品检 2原材料检 3入库检
 const inspectionType = ref();
-const inspectionTypeVisible = ref(false);
 const getInspectionType = async () => {
   const router = useRouter();
   inspectionType.value = router.currentRoute._rawValue.query && router.currentRoute._rawValue.query.inspectionType;
   if (inspectionType.value == 2){
-    queryParams.value.inspectionType = '4';
+    queryParams.value.qcInspectionType = '2';
   } else if (inspectionType.value == 3){
-    queryParams.value.inspectionType = '7';
+    queryParams.value.qcInspectionType = '3';
   } else {
-    queryParams.value.inspectionType = '6';
-    inspectionTypeVisible.value = true;
+    queryParams.value.qcInspectionType = '1';
   }
 };
 
@@ -670,7 +664,7 @@ const columns = ref<FieldOption[]>([
   { key: 10, label: `不合格数`, visible: true },
   { key: 11, label: `质检结果`, visible: true },
   { key: 12, label: `车间`, visible: true },
-  { key: 13, label: `检验类别`, visible: true },
+  { key: 13, label: `检测类别`, visible: true },
   { key: 14, label: `单据状态`, visible: true },
   { key: 15, label: `检测人员`, visible: true },
   { key: 16, label: `班次`, visible: true },
@@ -754,7 +748,7 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     unqualifiedQty: undefined,
     result: undefined,
     workshop: undefined,
-    inspectionType: undefined,
+    qcInspectionType: undefined,
     status: undefined,
     inspector: undefined,
     shift: undefined,

From 399e6d051c0674340748adc0fa874949713b0134 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 28 Jul 2025 17:57:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?refactor(qms):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E6=8E=A5=E5=8F=A3=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AD=97=E5=85=B8=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将检测项的 specUpper 和 specLower 字段类型从 number改为 string
- 更新了相关 API 类型定义文件
- 调整了规格上下限，将 InputNumber 改为 Input
- 优化了数据初始化逻辑，将字典相关字段转换为 Number 类型
---
 src/api/qms/qcInspectionItem/types.ts    | 12 ++++++------
 src/api/qms/qcInspectionResult/types.ts  | 12 ++++++------
 src/api/qms/qcTemplateItem/types.ts      | 12 ++++++------
 src/api/qms/qcUnqualifiedRecord/types.ts | 12 ++++++------
 src/views/qms/qcInspectionItem/index.vue | 11 +++++++----
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/api/qms/qcInspectionItem/types.ts b/src/api/qms/qcInspectionItem/types.ts
index 2c37b4c..947813e 100644
--- a/src/api/qms/qcInspectionItem/types.ts
+++ b/src/api/qms/qcInspectionItem/types.ts
@@ -67,12 +67,12 @@ export interface QcInspectionItemVO {
   /**
    * 规格上限
    */
-  specUpper: number;
+  specUpper: string;
 
   /**
    * 规格下限
    */
-  specLower: number;
+  specLower: string;
 
   /**
    * 检测项说明
@@ -174,12 +174,12 @@ export interface QcInspectionItemForm extends BaseEntity {
   /**
    * 规格上限
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检测项说明
@@ -283,12 +283,12 @@ export interface QcInspectionItemQuery extends PageQuery {
   /**
    * 规格上限
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检测项说明
diff --git a/src/api/qms/qcInspectionResult/types.ts b/src/api/qms/qcInspectionResult/types.ts
index 3f67b2c..d57e05c 100644
--- a/src/api/qms/qcInspectionResult/types.ts
+++ b/src/api/qms/qcInspectionResult/types.ts
@@ -92,12 +92,12 @@ export interface QcInspectionResultVO {
   /**
    * 规格上限（快照）
    */
-  specUpper: number;
+  specUpper: string;
 
   /**
    * 规格下限（快照）
    */
-  specLower: number;
+  specLower: string;
 
   /**
    * 检测项说明（快照）
@@ -200,12 +200,12 @@ export interface QcInspectionResultForm extends BaseEntity {
   /**
    * 规格上限（快照）
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限（快照）
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检测项说明（快照）
@@ -309,12 +309,12 @@ export interface QcInspectionResultQuery extends PageQuery {
   /**
    * 规格上限（快照）
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限（快照）
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检测项说明（快照）
diff --git a/src/api/qms/qcTemplateItem/types.ts b/src/api/qms/qcTemplateItem/types.ts
index c824eb9..63563b2 100644
--- a/src/api/qms/qcTemplateItem/types.ts
+++ b/src/api/qms/qcTemplateItem/types.ts
@@ -72,12 +72,12 @@ export interface QcTemplateItemVO {
   /**
    * 规格上限
    */
-  specUpper: number;
+  specUpper: string;
 
   /**
    * 规格下限
    */
-  specLower: number;
+  specLower: string;
 
   /**
    * 检测项说明
@@ -160,12 +160,12 @@ export interface QcTemplateItemForm extends BaseEntity {
   /**
    * 规格上限
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检测项说明
@@ -249,12 +249,12 @@ export interface QcTemplateItemQuery extends PageQuery {
   /**
    * 规格上限
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检测项说明
diff --git a/src/api/qms/qcUnqualifiedRecord/types.ts b/src/api/qms/qcUnqualifiedRecord/types.ts
index 921fc97..efff4b2 100644
--- a/src/api/qms/qcUnqualifiedRecord/types.ts
+++ b/src/api/qms/qcUnqualifiedRecord/types.ts
@@ -72,12 +72,12 @@ export interface QcUnqualifiedRecordVO {
   /**
    * 规格上限
    */
-  specUpper: number;
+  specUpper: string;
 
   /**
    * 规格下限
    */
-  specLower: number;
+  specLower: string;
 
   /**
    * 检查项说明
@@ -160,12 +160,12 @@ export interface QcUnqualifiedRecordForm extends BaseEntity {
   /**
    * 规格上限
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检查项说明
@@ -249,12 +249,12 @@ export interface QcUnqualifiedRecordQuery extends PageQuery {
   /**
    * 规格上限
    */
-  specUpper?: number;
+  specUpper?: string;
 
   /**
    * 规格下限
    */
-  specLower?: number;
+  specLower?: string;
 
   /**
    * 检查项说明
diff --git a/src/views/qms/qcInspectionItem/index.vue b/src/views/qms/qcInspectionItem/index.vue
index 39131b8..32ea7d9 100644
--- a/src/views/qms/qcInspectionItem/index.vue
+++ b/src/views/qms/qcInspectionItem/index.vue
@@ -215,7 +215,7 @@
           </el-col>
         </el-row>
 
-        <el-row v-if="form.detectType === 1">
+        <el-row v-if="form.detectType == 1">
           <el-col :span="6">
             <el-form-item label="标准值" prop="standardValue">
               <el-input-number v-model="form.standardValue" placeholder="请输入标准值" />
@@ -233,15 +233,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格上限" prop="specUpper">
-              <el-input-number v-model="form.specUpper" placeholder="请输入规格上限" />
+              <el-input v-model="form.specUpper" placeholder="请输入规格上限" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row v-if="form.detectType === 1">
+        <el-row v-if="form.detectType == 1">
           <el-col :span="6">
             <el-form-item label="规格下限" prop="specLower">
-              <el-input-number v-model="form.specLower" placeholder="请输入规格下限" />
+              <el-input v-model="form.specLower" placeholder="请输入规格下限" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -465,6 +465,9 @@ const handleUpdate = async (row?: QcInspectionItemVO) => {
   const _itemId = row?.itemId || ids.value[0]
   const res = await getQcInspectionItem(_itemId);
   Object.assign(form.value, res.data);
+  form.value.method = Number(form.value.method);
+  form.value.detectType = Number(form.value.detectType);
+  form.value.controlType = Number(form.value.controlType);
   dialog.visible = true;
   dialog.title = "修改检测项定义";
 }

From 54c19a540e6523aa357646d56042852e1f1d0a06 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 29 Jul 2025 11:04:34 +0800
Subject: [PATCH 3/5] =?UTF-8?q?update=20qms=E4=B8=8D=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E9=A1=B5=E9=9D=A2=E5=85=B3=E8=81=94=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/qcUnqualifiedReview/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/qms/qcUnqualifiedReview/index.vue b/src/views/qms/qcUnqualifiedReview/index.vue
index ef1d8cd..846440e 100644
--- a/src/views/qms/qcUnqualifiedReview/index.vue
+++ b/src/views/qms/qcUnqualifiedReview/index.vue
@@ -134,7 +134,7 @@
           </template>
         </el-table-column>
         <el-table-column label="质检单号" align="center" prop="inspectionNo" v-if="columns[3].visible"/>
-        <el-table-column label="检测类型" align="center" prop="inspectionType" v-if="columns[4].visible"/>
+        <el-table-column label="检测类型" align="center" prop="typeName" v-if="columns[4].visible"/>
         <el-table-column label="生产日期" align="center" prop="productionDate" width="180" v-if="columns[5].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -483,17 +483,17 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `序号`, visible: true },
+        { key: 0, label: `序号`, visible: false },
         { key: 1, label: `不合格检测单号`, visible: true },
         { key: 2, label: `评审结果`, visible: true },
         { key: 3, label: `质检单号`, visible: true },
         { key: 4, label: `检测类型`, visible: true },
-        { key: 5, label: `生产日期`, visible: true },
+        { key: 5, label: `生产日期`, visible: false },
         { key: 6, label: `派工单号`, visible: true },
         { key: 7, label: `工序名称`, visible: true },
         { key: 8, label: `物料名称`, visible: true },
         { key: 9, label: `物料编码`, visible: true },
-        { key: 10, label: `物料规格`, visible: true },
+        { key: 10, label: `物料规格`, visible: false },
         { key: 11, label: `供应商名称`, visible: true },
         { key: 12, label: `供应商编码`, visible: true },
         { key: 13, label: `质检数量`, visible: true },

From 65767a1da54f95e1e1465a5aed2b50867067040a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 29 Jul 2025 14:47:58 +0800
Subject: [PATCH 4/5] =?UTF-8?q?update=20qms=E4=B8=8D=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E5=A4=84=E7=90=86-=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/qcUnqualifiedReview/index.ts    | 12 ++++++
 src/views/qms/qcUnqualifiedReview/index.vue | 47 ++++++++++++++++-----
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/api/qms/qcUnqualifiedReview/index.ts b/src/api/qms/qcUnqualifiedReview/index.ts
index 9f3e1ce..0966739 100644
--- a/src/api/qms/qcUnqualifiedReview/index.ts
+++ b/src/api/qms/qcUnqualifiedReview/index.ts
@@ -75,3 +75,15 @@ export function getQcUnqualifiedReviewList (query) {
         params: query
     });
 };
+
+/**
+ * 删除不合格品待评审
+ * @param dispositionType
+ * @param reviewId
+ */
+export const handleUnqualified = (dispositionType: string | number, reviewId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcMobile/handleUnqualified/' + dispositionType + '/' + reviewId,
+    method: 'get'
+  });
+};
diff --git a/src/views/qms/qcUnqualifiedReview/index.vue b/src/views/qms/qcUnqualifiedReview/index.vue
index 846440e..2484716 100644
--- a/src/views/qms/qcUnqualifiedReview/index.vue
+++ b/src/views/qms/qcUnqualifiedReview/index.vue
@@ -456,7 +456,14 @@
 </template>
 
 <script setup name="QcUnqualifiedReview" lang="ts">
-import { listQcUnqualifiedReview, getQcUnqualifiedReview, delQcUnqualifiedReview, addQcUnqualifiedReview, updateQcUnqualifiedReview } from '@/api/qms/qcUnqualifiedReview';
+import {
+  listQcUnqualifiedReview,
+  getQcUnqualifiedReview,
+  delQcUnqualifiedReview,
+  addQcUnqualifiedReview,
+  updateQcUnqualifiedReview,
+  handleUnqualified
+} from '@/api/qms/qcUnqualifiedReview';
 import { QcUnqualifiedReviewVO, QcUnqualifiedReviewQuery, QcUnqualifiedReviewForm } from '@/api/qms/qcUnqualifiedReview/types';
 import { listQcUnqualifiedRecord, getQcUnqualifiedRecord, delQcUnqualifiedRecord, addQcUnqualifiedRecord, updateQcUnqualifiedRecord } from '@/api/qms/qcUnqualifiedRecord';
 import { QcUnqualifiedRecordVO, QcUnqualifiedRecordQuery, QcUnqualifiedRecordForm } from '@/api/qms/qcUnqualifiedRecord/types';
@@ -469,6 +476,7 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
+const inspectionNos = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
@@ -618,6 +626,7 @@ const resetQuery = () => {
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: QcUnqualifiedReviewVO[]) => {
   ids.value = selection.map(item => item.reviewId);
+  inspectionNos.value = selection.map(item => item.inspectionNo);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -808,33 +817,49 @@ onMounted(() => {
   getList();
 });
 
+const getDispositionType = (reviewResult?: number) => {
+  switch(reviewResult) {
+    case 0: return '报废';
+    case 1: return '返工';
+    case 2: return '退货';
+    case 3: return '流转';
+    case 4: return '让步接收';
+    default: return '未知处置类型';
+  }
+}
+
+const handleReviewResult = async (reviewResult?: number) => {
+  const _reviewIds = ids.value;
+  const _inspectionNos = inspectionNos.value;
+  const dispositionType = getDispositionType(reviewResult);
+  await proxy?.$modal.confirm('是否确认' + dispositionType + '不合格品待评审编号为"' + _inspectionNos + '"的数据项？').finally(() => loading.value = false);
+  await handleUnqualified(reviewResult, _reviewIds);
+  proxy?.$modal.msgSuccess(dispositionType + '成功');
+  await getList();
+}
+
 /** 流转按钮操作 */
 const handleFlow = () => {
-  // TODO: 后续完善补充
-  console.log('点击了流转按钮');
+  handleReviewResult(3);
 }
 
 /** 报废按钮操作 */
 const handleScrap = () => {
-  // TODO: 后续完善补充
-  console.log('点击了报废按钮');
+  handleReviewResult(0);
 }
 
 /** 让步接收按钮操作 */
 const handleConcession = () => {
-  // TODO: 后续完善补充
-  console.log('点击了让步接收按钮');
+  handleReviewResult(4);
 }
 
 /** 返工按钮操作 */
 const handleRework = () => {
-  // TODO: 后续完善补充
-  console.log('点击了返工按钮');
+  handleReviewResult(1);
 }
 
 /** 退货按钮操作 */
 const handleReturn = () => {
-  // TODO: 后续完善补充
-  console.log('点击了退货按钮');
+  handleReviewResult(2);
 }
 </script>

From fb342f236df1d7d9dea47bf0c9ede4224df6c4b4 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 29 Jul 2025 15:32:32 +0800
Subject: [PATCH 5/5] =?UTF-8?q?refactor(qms):=20=E4=BC=98=E5=8C=96qms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 字典移除不必要的 parseInt 转换
- 添加筛选条件以根据 selectedTypeId过滤检测项列表
- 优化模板添加/修改对话框，支持根据模板类型过滤检测项
- 质检任务主表只有不合格时才能编辑不合格数量
---
 src/api/qms/qcUnqualifiedRecord/types.ts     |  3 ++
 src/views/qms/QcInspectionMain/index.vue     | 32 +++++++++++---------
 src/views/qms/qcInspectionItem/index.vue     |  6 ++--
 src/views/qms/qcInspectionResult/index.vue   |  8 ++---
 src/views/qms/qcInspectionTemplate/index.vue | 20 +++++++++---
 src/views/qms/qcInspectionType/index.vue     |  6 ++--
 src/views/qms/qcTemplateItem/index.vue       |  4 +--
 src/views/qms/qcUnqualifiedRecord/index.vue  |  6 ++--
 src/views/qms/qcUnqualifiedReview/index.vue  | 10 +++---
 9 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/api/qms/qcUnqualifiedRecord/types.ts b/src/api/qms/qcUnqualifiedRecord/types.ts
index efff4b2..2410901 100644
--- a/src/api/qms/qcUnqualifiedRecord/types.ts
+++ b/src/api/qms/qcUnqualifiedRecord/types.ts
@@ -28,6 +28,7 @@ export interface QcUnqualifiedRecordVO {
    * 检测项目类别
    */
   categoryName: number;
+  categoryId: string | number;
 
   /**
    * 关联检测类型表
@@ -116,6 +117,7 @@ export interface QcUnqualifiedRecordForm extends BaseEntity {
    * 检测项目类别
    */
   categoryName?: number;
+  categoryId?: string | number;
 
   /**
    * 关联检测类型表
@@ -205,6 +207,7 @@ export interface QcUnqualifiedRecordQuery extends PageQuery {
    * 检测项目类别
    */
   categoryName?: number;
+  categoryId?: string | number;
 
   /**
    * 关联检测类型表
diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index b18f5b7..fa83e7f 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -293,7 +293,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="不合格数" prop="unqualifiedQty">
+            <el-form-item label="不合格数" prop="unqualifiedQty" v-if="form.result == 1">
               <el-input v-model="form.unqualifiedQty" placeholder="请输入不合格数" />
             </el-form-item>
           </el-col>
@@ -304,7 +304,7 @@
                   v-for="dict in qc_result"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="parseInt(dict.value)"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -324,7 +324,7 @@
                   v-for="dict in qc_inspection_type"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="parseInt(dict.value)"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -335,7 +335,7 @@
                 <el-radio
                   v-for="dict in qc_status"
                   :key="dict.value"
-                  :value="parseInt(dict.value)"
+                  :value="dict.value"
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -462,7 +462,7 @@
             <el-form-item label="检测方式" prop="detectType">
               <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
                 <el-select v-model="inspectionResultForm.detectType" placeholder="检测方式" style="width: 100%;" :disabled="true">
-                  <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                  <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                 </el-select>
               </el-tooltip>
             </el-form-item>
@@ -471,7 +471,7 @@
             <el-form-item label="控制类型" prop="controlType">
               <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
                 <el-select v-model="inspectionResultForm.controlType" placeholder="控制类型" style="width: 100%;" :disabled="true">
-                  <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                  <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                 </el-select>
               </el-tooltip>
             </el-form-item>
@@ -525,7 +525,7 @@
           <el-col :span="6">
             <el-form-item label="检测结果" prop="detectResult">
               <el-select v-model="inspectionResultForm.detectResult" placeholder="请选择检测结果">
-                <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -567,7 +567,7 @@
 
     <!-- 添加物料信息对话框 -->
     <el-dialog title="选择物料信息" v-model="materialOpen" width="1200px" append-to-body>
-      <MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
+      <MaterialSelect ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
@@ -589,7 +589,7 @@ import { getProcessInfoList } from '@/api/qms/baseProcessInfo';
 import { getStationInfoList } from '@/api/qms/baseStationInfo';
 
 import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { qc_inspection_type, qc_result, qc_status, material_type, detect_type, control_type } = toRefs<any>(proxy?.useDict('qc_inspection_type', 'qc_result', 'qc_status', 'material_type', 'detect_type', 'control_type'));
@@ -638,14 +638,14 @@ const inspectionResultDialog = reactive<DialogOption>({
 //路由：inspectionType = 1产品检 2原材料检 3入库检
 const inspectionType = ref();
 const getInspectionType = async () => {
-  const router = useRouter();
-  inspectionType.value = router.currentRoute._rawValue.query && router.currentRoute._rawValue.query.inspectionType;
+  const route = useRoute();
+  inspectionType.value = route.query.inspectionType;
   if (inspectionType.value == 2){
-    queryParams.value.qcInspectionType = '2';
+    queryParams.value.inspectionType = '2';
   } else if (inspectionType.value == 3){
-    queryParams.value.qcInspectionType = '3';
+    queryParams.value.inspectionType = '3';
   } else {
-    queryParams.value.qcInspectionType = '1';
+    queryParams.value.inspectionType = '1';
   }
 };
 
@@ -748,7 +748,7 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     unqualifiedQty: undefined,
     result: undefined,
     workshop: undefined,
-    qcInspectionType: undefined,
+    inspectionType: undefined,
     status: undefined,
     inspector: undefined,
     shift: undefined,
@@ -985,6 +985,7 @@ const handleDeleteInspectionResult = async (row?: QcInspectionResultVO) => {
   await delQcInspectionResult(_resultIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getInspectionResultList();
+  await getList(); // 新增
 }
 
 /** 提交按钮 */
@@ -1017,6 +1018,7 @@ const submitInspectionResultForm = () => {
       proxy?.$modal.msgSuccess("操作成功");
       inspectionResultDialog.visible = false;
       await getInspectionResultList();
+      await getList(); // 新增
     }
   });
 }
diff --git a/src/views/qms/qcInspectionItem/index.vue b/src/views/qms/qcInspectionItem/index.vue
index 32ea7d9..f3ba2d4 100644
--- a/src/views/qms/qcInspectionItem/index.vue
+++ b/src/views/qms/qcInspectionItem/index.vue
@@ -173,14 +173,14 @@
           <el-col :span="6">
             <el-form-item label="检测方式" prop="detectType">
               <el-select v-model="form.detectType" placeholder="请选择检测方式" :disabled="!!form.itemId">
-                <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="控制类型" prop="controlType">
               <el-select v-model="form.controlType" placeholder="请选择控制类型">
-                <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -204,7 +204,7 @@
           <el-col :span="6">
             <el-form-item label="检测方法" prop="method">
               <el-select v-model="form.method" placeholder="请选择检测方法">
-                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/qms/qcInspectionResult/index.vue b/src/views/qms/qcInspectionResult/index.vue
index aea80c8..7ab9daf 100644
--- a/src/views/qms/qcInspectionResult/index.vue
+++ b/src/views/qms/qcInspectionResult/index.vue
@@ -152,7 +152,7 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    
+
     <!-- 添加或修改质检结果子表对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="qcInspectionResultFormRef" :model="form" :rules="rules" label-width="120px">
@@ -184,7 +184,7 @@
             <el-radio
               v-for="dict in qc_result"
               :key="dict.value"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -218,7 +218,7 @@
                 v-for="dict in detect_type"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -228,7 +228,7 @@
                 v-for="dict in control_type"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
diff --git a/src/views/qms/qcInspectionTemplate/index.vue b/src/views/qms/qcInspectionTemplate/index.vue
index fc91179..fc80cd9 100644
--- a/src/views/qms/qcInspectionTemplate/index.vue
+++ b/src/views/qms/qcInspectionTemplate/index.vue
@@ -153,7 +153,7 @@
       <pagination v-show="templateItemTotal > 0" :total="templateItemTotal" v-model:page="templateItemQueryParams.pageNum" v-model:limit="templateItemQueryParams.pageSize" @pagination="getTemplateItemList" />
     </el-card>
 
-    <!-- 添加或修改检测模板主对话框 -->
+    <!-- 添加或修改检测模板对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="qcInspectionTemplateFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="模板编码" prop="templateCode">
@@ -238,7 +238,7 @@
           <el-col :span="6">
             <el-form-item label="关联检测项定义" prop="itemId">
               <el-select v-model="templateItemForm.itemId" placeholder="请选择关联检测项定义" style="width: 100%;" @change="handleItemChange">
-                <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
+                <el-option v-for="item in filteredQcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -262,7 +262,7 @@
             <el-form-item label="检测方式" prop="detectType">
               <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
                 <el-select v-model="templateItemForm.detectType" placeholder="请选择检测方式" style="width: 100%;" :disabled="true">
-                  <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                  <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                 </el-select>
               </el-tooltip>
             </el-form-item>
@@ -271,7 +271,7 @@
             <el-form-item label="控制类型" prop="controlType">
               <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
                 <el-select v-model="templateItemForm.controlType" placeholder="请选择控制类型" style="width: 100%;" :disabled="true">
-                  <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                  <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                 </el-select>
               </el-tooltip>
             </el-form-item>
@@ -367,7 +367,7 @@
 
     <!-- 添加物料信息对话框 -->
     <el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
-      <MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
+      <MaterialSelect ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
       <div slot='footer' class='dialog-footer'>
         <el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
         <el-button @click='materialOpen = false'>取 消</el-button>
@@ -393,6 +393,7 @@ import { getBaseSupplierInfoList } from '@/api/qms/baseSupplierInfo';
 import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory';
 
 import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
+import { computed } from 'vue';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -423,6 +424,8 @@ const selectedMaterialId = ref(null);
 const selectedProcessId = ref(null);
 const selectedStaionId = ref(null);
 const selectedSupplierId = ref(null);
+// 修改 selectedTypeId 的类型
+const selectedTypeId = ref<string | number | null>(null);
 
 const queryFormRef = ref<ElFormInstance>();
 const qcInspectionTemplateFormRef = ref<ElFormInstance>();
@@ -669,6 +672,7 @@ const handleRowClick = (row: QcInspectionTemplateVO) => {
   selectedTemplateId.value = row.templateId;
   selectedTemplateName.value = row.templateName || '';
   selectedTemplateCode.value = row.templateCode || '';
+  selectedTypeId.value = row.typeId; // 新增
   // 刷新子表数据
   nextTick(() => {
     getTemplateItemList();
@@ -979,6 +983,12 @@ const submitMaterialForm = () => {
   materialOpen.value = false;
 };
 
+// 添加 computed
+const filteredQcInspectionItemList = computed(() => {
+  if (selectedTypeId.value === null) return [];
+  return qcInspectionItemList.value.filter(item => item.inspectionType === Number(selectedTypeId.value));
+});
+
 
 onMounted(() => {
   getList();
diff --git a/src/views/qms/qcInspectionType/index.vue b/src/views/qms/qcInspectionType/index.vue
index 253b6b5..73844e8 100644
--- a/src/views/qms/qcInspectionType/index.vue
+++ b/src/views/qms/qcInspectionType/index.vue
@@ -111,7 +111,7 @@
                 v-for="dict in qc_inspection_type"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -121,7 +121,7 @@
                 v-for="dict in create_method"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -310,7 +310,7 @@ const handleExport = () => {
 /** 导出模板按钮操作 */
 const handleExportTemplate = () => {
   proxy?.download('qms/qcInspectionType/exportTemplate', {
-    
+
   }, `qcInspectionType_template_${new Date().getTime()}.xlsx`)
 }
 
diff --git a/src/views/qms/qcTemplateItem/index.vue b/src/views/qms/qcTemplateItem/index.vue
index 04fe393..39518d1 100644
--- a/src/views/qms/qcTemplateItem/index.vue
+++ b/src/views/qms/qcTemplateItem/index.vue
@@ -162,7 +162,7 @@
                     v-for="dict in qc_methond"
                     :key="dict.value"
                     :label="dict.label"
-                    :value="parseInt(dict.value)"
+                    :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -174,7 +174,7 @@
                     v-for="dict in control_type"
                     :key="dict.value"
                     :label="dict.label"
-                    :value="parseInt(dict.value)"
+                    :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
diff --git a/src/views/qms/qcUnqualifiedRecord/index.vue b/src/views/qms/qcUnqualifiedRecord/index.vue
index 40d3da1..798ff7c 100644
--- a/src/views/qms/qcUnqualifiedRecord/index.vue
+++ b/src/views/qms/qcUnqualifiedRecord/index.vue
@@ -164,7 +164,7 @@
                 v-for="dict in qc_methond"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -174,7 +174,7 @@
                 v-for="dict in detect_type"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -184,7 +184,7 @@
                 v-for="dict in qc_result"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
diff --git a/src/views/qms/qcUnqualifiedReview/index.vue b/src/views/qms/qcUnqualifiedReview/index.vue
index 2484716..57902e2 100644
--- a/src/views/qms/qcUnqualifiedReview/index.vue
+++ b/src/views/qms/qcUnqualifiedReview/index.vue
@@ -251,7 +251,7 @@
                 v-for="dict in review_result"
                 :key="dict.value"
                 :label="dict.label"
-                :value="parseInt(dict.value)"
+                :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -382,14 +382,14 @@
           <el-col :span="12">
             <el-form-item label="检测方法" prop="inspectionMethod">
               <el-select v-model="qcUnqualifiedRecordForm.inspectionMethod" placeholder="请选择检测方法">
-                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="检测方式" prop="detectType">
               <el-select v-model="qcUnqualifiedRecordForm.detectType" placeholder="请选择检测方式">
-                <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -398,7 +398,7 @@
           <el-col :span="12">
             <el-form-item label="检测结果" prop="detectResult">
               <el-select v-model="qcUnqualifiedRecordForm.detectResult" placeholder="请选择检测结果">
-                <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+                <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -683,7 +683,7 @@ const handleExport = () => {
 
 /***** 子表 */
 const selectedReviewId = ref<string | number>('');
-const selectedUnqualifiedReviewNo = ref<string>('');
+const selectedUnqualifiedReviewNo = ref();
 const qcUnqualifiedRecordList = ref<QcUnqualifiedRecordVO[]>([]);
 const qcUnqualifiedRecordLoading = ref(false);
 const qcUnqualifiedRecordTotal = ref(0);