From 62eacaff7ea3489c265959d1ec29348a83fe79e8 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 24 Jul 2025 17:27:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor(qms):=20=E9=87=8D=E6=9E=84=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/QcInspectionMain/index.ts      |  29 +-
 src/api/qms/QcInspectionMain/types.ts      |  88 +--
 src/api/qms/qcInspectionResult/index.ts    |  17 -
 src/api/qms/qcInspectionResult/types.ts    | 210 +++++++
 src/views/qms/QcInspectionMain/index.vue   | 669 ++++++++++++++-------
 src/views/qms/qcInspectionResult/index.vue | 247 +++++++-
 6 files changed, 930 insertions(+), 330 deletions(-)

diff --git a/src/api/qms/QcInspectionMain/index.ts b/src/api/qms/QcInspectionMain/index.ts
index 17c46b8..d43871c 100644
--- a/src/api/qms/QcInspectionMain/index.ts
+++ b/src/api/qms/QcInspectionMain/index.ts
@@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
 import { QcInspectionMainVO, QcInspectionMainForm, QcInspectionMainQuery } from '@/api/qms/QcInspectionMain/types';
 
 /**
- * 查询质检主表列表
+ * 查询质检任务列表
  * @param query
  * @returns {*}
  */
@@ -17,7 +17,7 @@ export const listQcInspectionMain = (query?: QcInspectionMainQuery): AxiosPromis
 };
 
 /**
- * 查询质检主表详细
+ * 查询质检任务详细
  * @param inspectionId
  */
 export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise<QcInspectionMainVO> => {
@@ -28,7 +28,7 @@ export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise
 };
 
 /**
- * 新增质检主表
+ * 新增质检任务
  * @param data
  */
 export const addQcInspectionMain = (data: QcInspectionMainForm) => {
@@ -40,7 +40,7 @@ export const addQcInspectionMain = (data: QcInspectionMainForm) => {
 };
 
 /**
- * 修改质检主表
+ * 修改质检任务
  * @param data
  */
 export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
@@ -52,7 +52,7 @@ export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
 };
 
 /**
- * 删除质检主表
+ * 删除质检任务
  * @param inspectionId
  */
 export const delQcInspectionMain = (inspectionId: string | number | Array<string | number>) => {
@@ -64,7 +64,7 @@ export const delQcInspectionMain = (inspectionId: string | number | Array<string
 
 
 /**
- * 下拉框查询质检主表列表
+ * 下拉框查询质检任务列表
  * @param query
  * @returns {*}
  */
@@ -75,20 +75,3 @@ export function getQcInspectionMainList (query) {
         params: query
     });
 };
-
-/**
- * 导入数据
- *
- * @param file          导入文件
- * @param updateSupport 是否更新已存在数据
- */
-export const importData = (file: File, updateSupport: boolean) => {
-    const formData = new FormData();
-    formData.append('file', file);
-    formData.append('updateSupport', updateSupport.toString());
-    return request({
-        url: '/qms/QcInspectionMain/importData',
-        method: 'post',
-        data: formData
-    });
-};
\ No newline at end of file
diff --git a/src/api/qms/QcInspectionMain/types.ts b/src/api/qms/QcInspectionMain/types.ts
index 2165483..5c881b1 100644
--- a/src/api/qms/QcInspectionMain/types.ts
+++ b/src/api/qms/QcInspectionMain/types.ts
@@ -9,6 +9,11 @@ export interface QcInspectionMainVO {
    */
   inspectionNo: string;
 
+  /**
+   * 关联模板主表ID
+   */
+  templateId: string | number;
+
   /**
    * 物料编码
    */
@@ -60,9 +65,9 @@ export interface QcInspectionMainVO {
   workshop: string;
 
   /**
-   * 检测类型主键
+   * 检验类别（首检/过程检等等）
    */
-  typeId: string | number;
+  inspectionType: number;
 
   /**
    * 单据状态（0未处理/1完成）
@@ -114,22 +119,11 @@ export interface QcInspectionMainVO {
    */
   remark: string;
 
-
-    /**
-   * 关联检测类型表
+  /**
+   * 模板名称
    */
-    qcInspectionType: string;
+  templateName: string;//join
 
-    /**
-     * 关联检测类型表名称
-     */
-    typeName: string;
-  
-    /**
-     * 关联检测类型表编码
-     */
-    typeCode: string;
-  
 
 }
 
@@ -144,6 +138,11 @@ export interface QcInspectionMainForm extends BaseEntity {
    */
   inspectionNo?: string;
 
+  /**
+   * 关联模板主表ID
+   */
+  templateId?: string | number;
+
   /**
    * 物料编码
    */
@@ -195,9 +194,9 @@ export interface QcInspectionMainForm extends BaseEntity {
   workshop?: string;
 
   /**
-   * 检测类型主键
+   * 检验类别（首检/过程检等等）
    */
-  typeId?: string | number;
+  inspectionType?: number;
 
   /**
    * 单据状态（0未处理/1完成）
@@ -249,25 +248,10 @@ export interface QcInspectionMainForm extends BaseEntity {
    */
   remark?: string;
 
-
-
-
-  /**
-   * 关联检测类型表
+    /**
+   * 模板名称
    */
-  qcInspectionType?: string;
-
-  /**
-   * 关联检测类型表名称
-   */
-  typeName?: string;
-
-  /**
-   * 关联检测类型表编码
-   */
-  typeCode?: string;
-
-
+    templateName?: string;//join
 
 }
 
@@ -283,6 +267,11 @@ export interface QcInspectionMainQuery extends PageQuery {
    */
   inspectionNo?: string;
 
+  /**
+   * 关联模板主表ID
+   */
+  templateId?: string | number;
+
   /**
    * 物料编码
    */
@@ -334,9 +323,9 @@ export interface QcInspectionMainQuery extends PageQuery {
   workshop?: string;
 
   /**
-   * 检测类型主键
+   * 检验类别（首检/过程检等等）
    */
-  typeId?: string | number;
+  inspectionType?: number;
 
   /**
    * 单据状态（0未处理/1完成）
@@ -383,25 +372,12 @@ export interface QcInspectionMainQuery extends PageQuery {
    */
   supplierName?: string;
 
-
-
-
-  /**
-   * 关联检测类型表
-   */
-  qcInspectionType?: string;
-
-  /**
-   * 关联检测类型表名称
-   */
-  typeName?: string;
-
-  /**
-   * 关联检测类型表编码
-   */
-  typeCode?: string;
   
-
+    /**
+   * 模板名称
+   */
+    templateName?: string;//join
+    
 
     /**
      * 日期范围参数
diff --git a/src/api/qms/qcInspectionResult/index.ts b/src/api/qms/qcInspectionResult/index.ts
index 8a31f4c..8109a8f 100644
--- a/src/api/qms/qcInspectionResult/index.ts
+++ b/src/api/qms/qcInspectionResult/index.ts
@@ -75,20 +75,3 @@ export function getQcInspectionResultList (query) {
         params: query
     });
 };
-
-/**
- * 导入数据
- *
- * @param file          导入文件
- * @param updateSupport 是否更新已存在数据
- */
-export const importData = (file: File, updateSupport: boolean) => {
-    const formData = new FormData();
-    formData.append('file', file);
-    formData.append('updateSupport', updateSupport.toString());
-    return request({
-        url: '/qms/qcInspectionResult/importData',
-        method: 'post',
-        data: formData
-    });
-};
\ No newline at end of file
diff --git a/src/api/qms/qcInspectionResult/types.ts b/src/api/qms/qcInspectionResult/types.ts
index 3289b56..3f67b2c 100644
--- a/src/api/qms/qcInspectionResult/types.ts
+++ b/src/api/qms/qcInspectionResult/types.ts
@@ -34,6 +34,76 @@ export interface QcInspectionResultVO {
    */
   problemDetail: string;
 
+  /**
+   * 检测项编码（快照）
+   */
+  itemCode: string;
+
+  /**
+   * 检测项名称（快照）
+   */
+  itemName: string;
+
+  /**
+   * 检测位置（快照）
+   */
+  inspectionPosition: string;
+
+  /**
+   * 检测项目类别（快照）
+   */
+  categoryName: string;
+
+  /**
+   * 关联检测类型表（快照）
+   */
+  typeId: string | number;
+
+  /**
+   * 检测方式（0定性,1定量）（快照）
+   */
+  detectType: number;
+
+  /**
+   * 控制类型(0手动,1自动)（快照）
+   */
+  controlType: number;
+
+  /**
+   * 标准值（快照）
+   */
+  standardValue: number;
+
+  /**
+   * 控制上限（快照）
+   */
+  upperLimit: number;
+
+  /**
+   * 控制下限（快照）
+   */
+  lowerLimit: number;
+
+  /**
+   * 规格名称（快照）
+   */
+  specName: string;
+
+  /**
+   * 规格上限（快照）
+   */
+  specUpper: number;
+
+  /**
+   * 规格下限（快照）
+   */
+  specLower: number;
+
+  /**
+   * 检测项说明（快照）
+   */
+  description: string;
+
 }
 
 export interface QcInspectionResultForm extends BaseEntity {
@@ -72,6 +142,76 @@ export interface QcInspectionResultForm extends BaseEntity {
    */
   problemDetail?: string;
 
+  /**
+   * 检测项编码（快照）
+   */
+  itemCode?: string;
+
+  /**
+   * 检测项名称（快照）
+   */
+  itemName?: string;
+
+  /**
+   * 检测位置（快照）
+   */
+  inspectionPosition?: string;
+
+  /**
+   * 检测项目类别（快照）
+   */
+  categoryName?: string;
+
+  /**
+   * 关联检测类型表（快照）
+   */
+  typeId?: string | number;
+
+  /**
+   * 检测方式（0定性,1定量）（快照）
+   */
+  detectType?: number;
+
+  /**
+   * 控制类型(0手动,1自动)（快照）
+   */
+  controlType?: number;
+
+  /**
+   * 标准值（快照）
+   */
+  standardValue?: number;
+
+  /**
+   * 控制上限（快照）
+   */
+  upperLimit?: number;
+
+  /**
+   * 控制下限（快照）
+   */
+  lowerLimit?: number;
+
+  /**
+   * 规格名称（快照）
+   */
+  specName?: string;
+
+  /**
+   * 规格上限（快照）
+   */
+  specUpper?: number;
+
+  /**
+   * 规格下限（快照）
+   */
+  specLower?: number;
+
+  /**
+   * 检测项说明（快照）
+   */
+  description?: string;
+
 }
 
 export interface QcInspectionResultQuery extends PageQuery {
@@ -111,6 +251,76 @@ export interface QcInspectionResultQuery extends PageQuery {
    */
   problemDetail?: string;
 
+  /**
+   * 检测项编码（快照）
+   */
+  itemCode?: string;
+
+  /**
+   * 检测项名称（快照）
+   */
+  itemName?: string;
+
+  /**
+   * 检测位置（快照）
+   */
+  inspectionPosition?: string;
+
+  /**
+   * 检测项目类别（快照）
+   */
+  categoryName?: string;
+
+  /**
+   * 关联检测类型表（快照）
+   */
+  typeId?: string | number;
+
+  /**
+   * 检测方式（0定性,1定量）（快照）
+   */
+  detectType?: number;
+
+  /**
+   * 控制类型(0手动,1自动)（快照）
+   */
+  controlType?: number;
+
+  /**
+   * 标准值（快照）
+   */
+  standardValue?: number;
+
+  /**
+   * 控制上限（快照）
+   */
+  upperLimit?: number;
+
+  /**
+   * 控制下限（快照）
+   */
+  lowerLimit?: number;
+
+  /**
+   * 规格名称（快照）
+   */
+  specName?: string;
+
+  /**
+   * 规格上限（快照）
+   */
+  specUpper?: number;
+
+  /**
+   * 规格下限（快照）
+   */
+  specLower?: number;
+
+  /**
+   * 检测项说明（快照）
+   */
+  description?: string;
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index d7848b4..2db1bcd 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -3,27 +3,42 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='120px'>
-            <el-form-item label="检测单号/卡号" prop="inspectionNo">
-              <el-input v-model="queryParams.inspectionNo" placeholder="请输入检测单号/卡号" clearable @keyup.enter="handleQuery" />
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
+            <el-form-item label="物料编码" prop="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工序名称" prop="processName">
+              <el-input v-model="queryParams.processName" placeholder="请输入工序名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工位名称" prop="stationName">
+              <el-input v-model="queryParams.stationName" placeholder="请输入工位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="质检结果" prop="result">
+              <el-select v-model="queryParams.result" placeholder="请选择质检结果" clearable >
+                <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">
+              <el-select v-model="queryParams.inspectionType" placeholder="请选择检验类别" clearable >
+                <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"/>
+              </el-select>
             </el-form-item>
             <el-form-item label="检验时间" prop="inspectionTime">
               <el-date-picker clearable
-                v-model="queryParams.inspectionTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择检验时间"
+                              v-model="queryParams.inspectionTime"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择检验时间"
               />
             </el-form-item>
-            <el-form-item label="生产订单号" prop="productionOrder">
-              <el-input v-model="queryParams.productionOrder" placeholder="请输入生产订单号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="批次号" prop="batchNo">
-              <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="条码号" prop="barcode">
-              <el-input v-model="queryParams.barcode" placeholder="请输入条码号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -48,12 +63,6 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:QcInspectionMain:export']">导出</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExportTemplate" v-hasPermi="['qms:QcInspectionMain:export']">导出模板</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleImport" v-hasPermi="['qms:QcInspectionMain:import']">导入</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -66,41 +75,47 @@
         highlight-current-row
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="inspectionId" v-if="columns[0].visible"/>
+        <!-- 自动序号 -->
+        <el-table-column label="序号" align="center" type="index" width="55" v-if="columns[0].visible"/>
         <el-table-column label="检测单号/卡号" align="center" prop="inspectionNo" v-if="columns[1].visible"/>
-        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible"/>
-        <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[3].visible"/>
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
-        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[5].visible"/>
-        <el-table-column label="工位名称" align="center" prop="stationName" v-if="columns[6].visible"/>
-        <el-table-column label="质检数量" align="center" prop="inspectionQty" v-if="columns[7].visible"/>
-        <el-table-column label="合格数" align="center" prop="qualifiedQty" v-if="columns[8].visible"/>
-        <el-table-column label="不合格数" align="center" prop="unqualifiedQty" v-if="columns[9].visible"/>
+        <el-table-column label="模板主表名称" align="center" prop="templateName" v-if="columns[2].visible"/>
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[3].visible"/>
+        <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[4].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[5].visible"/>
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[6].visible"/>
+        <el-table-column label="工位名称" align="center" prop="stationName" v-if="columns[7].visible"/>
+        <el-table-column label="质检数量" align="center" prop="inspectionQty" v-if="columns[8].visible"/>
+        <el-table-column label="合格数" align="center" prop="qualifiedQty" v-if="columns[9].visible"/>
+        <el-table-column label="不合格数" align="center" prop="unqualifiedQty" v-if="columns[10].visible"/>
         <el-table-column label="质检结果" align="center" prop="result" v-if="columns[11].visible">
           <template #default="scope">
             <dict-tag :options="qc_result" :value="scope.row.result"/>
           </template>
         </el-table-column>
-        <el-table-column label="车间" align="center" prop="workshop" v-if="columns[11].visible"/>
-        <el-table-column label="关联检测类型表" align="center" prop="typeName" v-if="columns[12].visible"/>
-        <el-table-column label="单据状态" align="center" prop="status" v-if="columns[13].visible">
+        <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="status" v-if="columns[14].visible">
           <template #default="scope">
             <dict-tag :options="qc_status" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="检测人员" align="center" prop="inspector" v-if="columns[14].visible"/>
-        <el-table-column label="班次" align="center" prop="shift" v-if="columns[15].visible"/>
-        <el-table-column label="班组" align="center" prop="team" v-if="columns[16].visible"/>
-        <el-table-column label="检验时间" align="center" prop="inspectionTime" width="180" v-if="columns[17].visible">
+        <el-table-column label="检测人员" align="center" prop="inspector" v-if="columns[15].visible"/>
+        <el-table-column label="班次" align="center" prop="shift" v-if="columns[16].visible"/>
+        <el-table-column label="班组" align="center" prop="team" v-if="columns[17].visible"/>
+        <el-table-column label="检验时间" align="center" prop="inspectionTime" width="180" v-if="columns[18].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.inspectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="生产订单号" align="center" prop="productionOrder" v-if="columns[18].visible"/>
-        <el-table-column label="批次号" align="center" prop="batchNo" v-if="columns[19].visible"/>
-        <el-table-column label="条码号" align="center" prop="barcode" v-if="columns[20].visible"/>
-        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[21].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[22].visible"/>
+        <el-table-column label="生产订单号" align="center" prop="productionOrder" v-if="columns[19].visible"/>
+        <el-table-column label="批次号" align="center" prop="batchNo" v-if="columns[20].visible"/>
+        <el-table-column label="条码号" align="center" prop="barcode" v-if="columns[21].visible"/>
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[22].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[23].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -122,7 +137,7 @@
         <div class="flex justify-between items-center">
           <h3>质检结果子表 - {{ selectedInspectionNo }}</h3>
           <el-button type="primary" size="small" icon="Plus" @click="handleAddInspectionResult" v-hasPermi="['qms:qcInspectionResult:add']">
-            新增检测结果
+            新增质检结果
           </el-button>
         </div>
       </template>
@@ -135,6 +150,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="detectType">
+            <el-select v-model="inspectionResultQueryParams.detectType" placeholder="请选择检测方式" clearable>
+              <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="getInspectionResultList">搜索</el-button>
             <el-button icon="Refresh" @click="resetInspectionResultQuery">重置</el-button>
@@ -145,8 +165,8 @@
       <!-- 子表数据表格 -->
       <el-table v-loading="inspectionResultLoading" :data="inspectionResultList" @selection-change="handleInspectionResultSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="resultId" />
-        <el-table-column label="关联检测项ID" align="center" prop="itemId" />
+        <el-table-column label="序号" align="center" type="index" width="55" />
+        <el-table-column label="关联检测项" align="center" prop="itemName" />
         <el-table-column label="检测结果" align="center" prop="detectResult">
           <template #default="scope">
             <dict-tag :options="qc_result" :value="scope.row.detectResult"/>
@@ -155,6 +175,26 @@
         <el-table-column label="定量检测值" align="center" prop="detectValue" />
         <el-table-column label="规格质检值" align="center" prop="specInspection" />
         <el-table-column label="定性不合格明细" align="center" prop="problemDetail" />
+        <el-table-column label="检测项编码" align="center" prop="itemCode" />
+        <el-table-column label="检测位置" align="center" prop="inspectionPosition" />
+        <el-table-column label="检测项目类别" align="center" prop="categoryName" />
+        <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="controlType">
+          <template #default="scope">
+            <dict-tag :options="control_type" :value="scope.row.controlType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="标准值" align="center" prop="standardValue" />
+        <el-table-column label="控制上限" align="center" prop="upperLimit" />
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" />
+        <el-table-column label="规格名称" align="center" prop="specName" />
+        <el-table-column label="规格上限" align="center" prop="specUpper" />
+        <el-table-column label="规格下限" align="center" prop="specLower" />
+        <el-table-column label="检测项说明" align="center" prop="description" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -170,9 +210,10 @@
       <pagination v-show="inspectionResultTotal > 0" :total="inspectionResultTotal" v-model:page="inspectionResultQueryParams.pageNum" v-model:limit="inspectionResultQueryParams.pageSize" @pagination="getInspectionResultList" />
     </el-card>
 
-    <!-- 添加或修改质检主表对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+    <!-- 添加或修改质检任务对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body>
       <el-form ref="QcInspectionMainFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-divider content-position="left">基本信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="检测单号/卡号" prop="inspectionNo">
@@ -180,61 +221,85 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="物料编码" prop="materialCode">
-              <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+            <el-form-item label="关联模板主表" prop="templateId">
+              <el-select v-model="form.templateId" placeholder="请选择关联模板主表">
+                <el-option
+                  v-for="dict in QcInspectionTemplateList"
+                  :key="dict.templateId"
+                  :label="dict.templateName"
+                  :value="dict.templateId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-divider content-position="left">物料信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="物料类型" prop="materialType">
-              <el-input v-model="form.materialType" placeholder="请输入物料类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="物料名称" prop="materialName">
-              <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+            <el-form-item label="物料" prop="materialName">
+              <el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd" readonly>
+                <template #append>
+                  <el-button icon="Search"></el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="物料名称" prop="materialName">-->
+<!--              <el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
+        <el-divider content-position="left">位置信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="工序名称" prop="processName">
-              <el-input v-model="form.processName" placeholder="请输入工序名称" />
+              <el-select v-model="selectedProcessId" placeholder="请选择工序" filterable clearable @change="handleBaseProcessInfoChange" style="width: 100%;">
+                <el-option v-for="item in baseProcessInfoList" :key="item.processId" :label="item.processName" :value="item.processId" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工位名称" prop="stationName">
-              <el-input v-model="form.stationName" placeholder="请输入工位名称" />
+              <el-select v-model="selectedStaionId" placeholder="请选择工位" filterable clearable @change="handleBaseStationInfoChange" style="width: 100%;">
+                <el-option v-for="item in baseStationInfoList" :key="item.stationId" :label="item.stationName" :value="item.stationId" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-divider content-position="left">数量信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="质检数量" prop="inspectionQty">
-              <el-input-number v-model="form.inspectionQty" :precision="2" placeholder="请输入质检数量" style="width: 100%;" @change="calculateUnqualifiedQty" />
+              <el-input v-model="form.inspectionQty" placeholder="请输入质检数量" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="合格数" prop="qualifiedQty">
-              <el-input-number v-model="form.qualifiedQty" :precision="2" placeholder="请输入合格数" style="width: 100%;" @change="calculateUnqualifiedQty" />
+              <el-input v-model="form.qualifiedQty" placeholder="请输入合格数" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="不合格数" prop="unqualifiedQty">
-              <el-input-number v-model="form.unqualifiedQty" :precision="2" placeholder="不合格数" style="width: 100%;" disabled />
+              <el-input v-model="form.unqualifiedQty" placeholder="请输入不合格数" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="质检结果" prop="result">
-              <el-select v-model="form.result" placeholder="请选择质检结果" style="width: 100%;">
-                <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              <el-select v-model="form.result" placeholder="请选择质检结果">
+                <el-option
+                  v-for="dict in qc_result"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-divider content-position="left">其他信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="车间" prop="workshop">
@@ -242,19 +307,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检测类型" prop="typeId">
-              <!-- <el-input v-model="form.typeId" placeholder="请输入检测类型主键" /> -->
-               <el-select v-model="form.typeId" placeholder="请选择检测类型" style="width: 100%;">
-                <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
-               </el-select>
+            <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"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="单据状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in qc_status" :key="dict.value" :value="parseInt(dict.value)">{{dict.label}}</el-radio>
+                <el-radio
+                  v-for="dict in qc_status"
+                  :key="dict.value"
+                  :value="parseInt(dict.value)"
+                >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -263,8 +334,6 @@
               <el-input v-model="form.inspector" placeholder="请输入检测人员" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="班次" prop="shift">
               <el-input v-model="form.shift" placeholder="请输入班次" />
@@ -275,11 +344,14 @@
               <el-input v-model="form.team" placeholder="请输入班组" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="检验时间" prop="inspectionTime">
-              <el-date-picker clearable v-model="form.inspectionTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择检验时间" style="width: 100%;">
+              <el-date-picker clearable
+                              v-model="form.inspectionTime"
+                              type="datetime"
+                              value-format="YYYY-MM-DD HH:mm:ss"
+                              placeholder="请选择检验时间"
+                              style="width: 100%;">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -288,8 +360,6 @@
               <el-input v-model="form.productionOrder" placeholder="请输入生产订单号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="批次号" prop="batchNo">
               <el-input v-model="form.batchNo" placeholder="请输入批次号" />
@@ -300,16 +370,14 @@
               <el-input v-model="form.barcode" placeholder="请输入条码号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="供应商名称" prop="supplierName">
               <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -323,45 +391,146 @@
     </el-dialog>
 
     <!-- 添加或修改质检结果子表对话框 -->
-    <el-dialog :title="inspectionResultDialog.title" v-model="inspectionResultDialog.visible" width="800px" append-to-body>
+    <el-dialog :title="inspectionResultDialog.title" v-model="inspectionResultDialog.visible" width="1200px" append-to-body>
       <el-form ref="inspectionResultFormRef" :model="inspectionResultForm" :rules="inspectionResultRules" label-width="120px">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="检测单号/卡号" prop="inspectionNo">
-              <el-input v-model="selectedInspectionNo" placeholder="检测单号/卡号" readonly />
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测单号" prop="inspectionNo">
+              <el-input v-model="selectedInspectionNo" placeholder="检测单号" readonly />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="关联检测项" prop="itemId">
-              <el-select v-model="inspectionResultForm.itemId" placeholder="请选择关联检测项" style="width: 100%;">
+              <el-select v-model="inspectionResultForm.itemId" placeholder="请选择关联检测项" style="width: 100%;" @change="handleItemChange">
                 <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项编码" prop="itemCode">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input v-model="inspectionResultForm.itemCode" placeholder="检测项编码" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项名称" prop="itemName">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input v-model="inspectionResultForm.itemName" placeholder="检测项名称" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input v-model="inspectionResultForm.inspectionPosition" placeholder="检测位置" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项目类别" prop="categoryName">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input v-model="inspectionResultForm.categoryName" placeholder="检测项目类别" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <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-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <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-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="标准值" prop="standardValue">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input-number v-model="inspectionResultForm.standardValue" placeholder="标准值" style="width: 100%;" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制上限" prop="upperLimit">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input-number v-model="inspectionResultForm.upperLimit" placeholder="控制上限" style="width: 100%;" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制下限" prop="lowerLimit">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input-number v-model="inspectionResultForm.lowerLimit" placeholder="控制下限" style="width: 100%;" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格名称" prop="specName">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input v-model="inspectionResultForm.specName" placeholder="规格名称" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="规格上限" prop="specUpper">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input-number v-model="inspectionResultForm.specUpper" placeholder="规格上限" style="width: 100%;" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格下限" prop="specLower">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input-number v-model="inspectionResultForm.specLower" placeholder="规格下限" style="width: 100%;" :disabled="true" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="检测结果" prop="detectResult">
-              <el-radio-group v-model="inspectionResultForm.detectResult">
-                <el-radio v-for="dict in qc_result" :key="dict.value" :value="parseInt(dict.value)">{{dict.label}}</el-radio>
-              </el-radio-group>
+              <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-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="定量检测值" prop="detectValue" v-if="inspectionResultForm.detectResult === 1">
-              <el-input-number v-model="inspectionResultForm.detectValue" placeholder="请输入定量检测值" style="width: 100%;" />
+          <el-col :span="6">
+            <el-form-item label="定量检测值" prop="detectValue">
+              <el-input-number v-model="inspectionResultForm.detectValue" placeholder="定量检测值" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row>
           <el-col :span="12">
-            <el-form-item label="规格质检值" prop="specInspection" v-if="inspectionResultForm.detectResult === 1">
-              <el-input-number v-model="inspectionResultForm.specInspection" placeholder="请输入规格质检值" style="width: 100%;" />
+            <el-form-item label="规格质检值" prop="specInspection">
+              <el-input v-model="inspectionResultForm.specInspection" placeholder="规格质检值" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="定性不合格明细" prop="problemDetail" v-if="inspectionResultForm.detectResult === 0">
-              <el-input v-model="inspectionResultForm.problemDetail" placeholder="请输入定性不合格明细" />
+            <el-form-item label="定性不合格明细" prop="problemDetail">
+              <el-input v-model="inspectionResultForm.problemDetail" placeholder="定性不合格明细" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="检测项说明" prop="description">
+              <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
+                <el-input type="textarea" v-model="inspectionResultForm.description" placeholder="检测项说明" :disabled="true" />
+              </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
@@ -373,20 +542,34 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title="选择物料信息" v-model="materialOpen" width="1200px" append-to-body>
+      <MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
+          <el-button @click="materialOpen = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="QcInspectionMain" lang="ts">
 import { listQcInspectionMain, getQcInspectionMain, delQcInspectionMain, addQcInspectionMain, updateQcInspectionMain } from '@/api/qms/QcInspectionMain';
 import { QcInspectionMainVO, QcInspectionMainQuery, QcInspectionMainForm } from '@/api/qms/QcInspectionMain/types';
+import {getQcInspectionTemplateList} from "@/api/qms/qcInspectionTemplate";
 import { listQcInspectionResult, getQcInspectionResult, delQcInspectionResult, addQcInspectionResult, updateQcInspectionResult } from '@/api/qms/qcInspectionResult';
 import { QcInspectionResultVO, QcInspectionResultQuery, QcInspectionResultForm } from '@/api/qms/qcInspectionResult/types';
-import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
-import { getQcInspectionTypeList } from '@/api/qms/qcInspectionType';
-import {getBaseMaterialInfoList} from "@/api/qms/baseMaterialInfo";
+import { getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
+import { getProcessInfoList } from '@/api/qms/baseProcessInfo';
+import { getStationInfoList } from '@/api/qms/baseStationInfo';
+
+import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { qc_result, qc_status } = toRefs<any>(proxy?.useDict('qc_result', 'qc_status'));
+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'));
 
 const QcInspectionMainList = ref<QcInspectionMainVO[]>([]);
 const buttonLoading = ref(false);
@@ -408,6 +591,12 @@ const inspectionResultSingle = ref(true);
 const inspectionResultMultiple = ref(true);
 const inspectionResultButtonLoading = ref(false);
 
+// 物料、工序、工位相关
+const selectedProcessId = ref(null);
+const selectedStaionId = ref(null);
+const materialOpen = ref(false);
+const materialSelectRef = ref();
+
 const queryFormRef = ref<ElFormInstance>();
 const QcInspectionMainFormRef = ref<ElFormInstance>();
 const inspectionResultFormRef = ref<ElFormInstance>();
@@ -424,34 +613,36 @@ const inspectionResultDialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `序号`, visible: true },
-        { 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: 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: 11, label: `车间`, visible: true },
-        { key: 12, label: `检测类型主键`, visible: true },
-        { key: 13, label: `单据状态`, visible: true },
-        { key: 14, label: `检测人员`, visible: true },
-        { key: 15, label: `班次`, visible: true },
-        { key: 16, label: `班组`, visible: true },
-        { key: 17, label: `检验时间`, visible: true },
-        { key: 18, label: `生产订单号`, visible: true },
-        { key: 19, label: `批次号`, visible: true },
-        { key: 20, label: `条码号`, visible: true },
-        { key: 21, label: `供应商名称`, visible: true },
-        { key: 22, label: `备注`, visible: true },
+  { key: 0, label: `序号`, visible: true },
+  { 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: 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: 11, label: `质检结果`, visible: true },
+  { key: 12, label: `车间`, visible: true },
+  { key: 13, label: `检验类别`, visible: true },
+  { key: 14, label: `单据状态`, visible: true },
+  { key: 15, label: `检测人员`, visible: true },
+  { key: 16, label: `班次`, visible: true },
+  { key: 17, label: `班组`, visible: true },
+  { key: 18, label: `检验时间`, visible: true },
+  { key: 19, label: `生产订单号`, visible: true },
+  { key: 20, label: `批次号`, visible: true },
+  { key: 21, label: `条码号`, visible: true },
+  { key: 22, label: `供应商名称`, visible: true },
+  { key: 23, label: `备注`, visible: true },
 ]);
 
 const initFormData: QcInspectionMainForm = {
   inspectionId: undefined,
   inspectionNo: undefined,
+  templateId: undefined,
   materialCode: undefined,
   materialType: undefined,
   materialName: undefined,
@@ -462,7 +653,7 @@ const initFormData: QcInspectionMainForm = {
   unqualifiedQty: undefined,
   result: undefined,
   workshop: undefined,
-  typeId: undefined,
+  inspectionType: undefined,
   status: undefined,
   inspector: undefined,
   shift: undefined,
@@ -483,6 +674,20 @@ const initInspectionResultFormData: QcInspectionResultForm = {
   detectValue: undefined,
   specInspection: undefined,
   problemDetail: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryName: undefined,
+  typeId: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
 }
 
 const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
@@ -492,6 +697,7 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     pageSize: 10,
     inspectionId: undefined,
     inspectionNo: undefined,
+    templateId: undefined,
     materialCode: undefined,
     materialType: undefined,
     materialName: undefined,
@@ -502,7 +708,7 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     unqualifiedQty: undefined,
     result: undefined,
     workshop: undefined,
-    typeId: undefined,
+    inspectionType: undefined,
     status: undefined,
     inspector: undefined,
     shift: undefined,
@@ -516,18 +722,6 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     }
   },
   rules: {
-    // inspectionId: [
-    //   { required: true, message: "质检主键不能为空", trigger: "blur" }
-    // ],
-    inspectionQty: [
-      { required: true, message: "质检数量不能为空", trigger: "blur" }
-    ],
-    qualifiedQty: [
-      { required: true, message: "合格数不能为空", trigger: "blur" }
-    ],
-    result: [
-      { required: true, message: "质检结果不能为空", trigger: "blur" }
-    ],
   }
 });
 
@@ -543,18 +737,35 @@ const inspectionResultQueryParams = ref<QcInspectionResultQuery>({
   detectValue: undefined,
   specInspection: undefined,
   problemDetail: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryName: undefined,
+  typeId: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
   params: {}
 });
 
 const inspectionResultRules = ref({
-  // inspectionId: [
-  //   { required: true, message: "关联质检主表ID不能为空", trigger: "blur" }
-  // ],
+  itemId: [
+    { required: true, message: "关联检测项不能为空", trigger: "blur" }
+  ],
+  detectResult: [
+    { required: true, message: "检测结果不能为空", trigger: "blur" }
+  ],
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询质检主表列表 */
+/** 查询质检任务列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listQcInspectionMain(queryParams.value);
@@ -586,6 +797,8 @@ const cancel = () => {
 const reset = () => {
   form.value = {...initFormData};
   QcInspectionMainFormRef.value?.resetFields();
+  selectedProcessId.value = null;
+  selectedStaionId.value = null;
 }
 
 /** 子表取消按钮 */
@@ -624,6 +837,20 @@ const resetInspectionResultQuery = () => {
     detectValue: undefined,
     specInspection: undefined,
     problemDetail: undefined,
+    itemCode: undefined,
+    itemName: undefined,
+    inspectionPosition: undefined,
+    categoryName: undefined,
+    typeId: undefined,
+    detectType: undefined,
+    controlType: undefined,
+    standardValue: undefined,
+    upperLimit: undefined,
+    lowerLimit: undefined,
+    specName: undefined,
+    specUpper: undefined,
+    specLower: undefined,
+    description: undefined,
     params: {}
   };
   getInspectionResultList();
@@ -656,44 +883,49 @@ const handleRowClick = (row: QcInspectionMainVO) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
-  getMaterialList();
+  getBaseProcessList();
+  getBaseStationList();
   dialog.visible = true;
-  dialog.title = "添加质检结果主表";
+  dialog.title = "添加质检任务";
 }
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: QcInspectionMainVO) => {
   reset();
-  getMaterialList();
+  getBaseProcessList();
+  getBaseStationList();
   const _inspectionId = row?.inspectionId || ids.value[0]
   const res = await getQcInspectionMain(_inspectionId);
   Object.assign(form.value, res.data);
+
+
   dialog.visible = true;
-  dialog.title = "修改质检结果主表";
+  dialog.title = "修改质检任务";
 }
 
-/** 新增检测结果 */
+/** 新增质检结果 */
 const handleAddInspectionResult = () => {
   resetInspectionResult();
   inspectionResultForm.value.inspectionId = selectedInspectionId.value;
   inspectionResultDialog.visible = true;
-  inspectionResultDialog.title = "添加检测结果";
+  inspectionResultDialog.title = "添加质检结果";
 }
 
-/** 修改检测结果 */
+/** 修改质检结果 */
 const handleUpdateInspectionResult = async (row?: QcInspectionResultVO) => {
   resetInspectionResult();
   const _resultId = row?.resultId || inspectionResultIds.value[0];
   const res = await getQcInspectionResult(_resultId);
   Object.assign(inspectionResultForm.value, res.data);
+  handleItemChange(inspectionResultForm.value.itemId);
   inspectionResultDialog.visible = true;
-  inspectionResultDialog.title = "修改检测结果";
+  inspectionResultDialog.title = "修改质检结果";
 }
 
-/** 删除检测结果 */
+/** 删除质检结果 */
 const handleDeleteInspectionResult = async (row?: QcInspectionResultVO) => {
   const _resultIds = row?.resultId || inspectionResultIds.value;
-  await proxy?.$modal.confirm('是否确认删除检测结果编号为"' + _resultIds + '"的数据项？').finally(() => inspectionResultLoading.value = false);
+  await proxy?.$modal.confirm('是否确认删除质检结果编号为"' + _resultIds + '"的数据项？').finally(() => inspectionResultLoading.value = false);
   await delQcInspectionResult(_resultIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getInspectionResultList();
@@ -736,7 +968,7 @@ const submitInspectionResultForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: QcInspectionMainVO) => {
   const _inspectionIds = row?.inspectionId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除质检主表编号为"' + _inspectionIds + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除质检任务编号为"' + _inspectionIds + '"的数据项？').finally(() => loading.value = false);
   await delQcInspectionMain(_inspectionIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
@@ -749,12 +981,12 @@ const handleExport = () => {
   }, `QcInspectionMain_${new Date().getTime()}.xlsx`)
 }
 
-/** 导出模板按钮操作 */
-const handleExportTemplate = () => {
-  proxy?.download('qms/QcInspectionMain/exportTemplate', {
-
-  }, `QcInspectionMain_${new Date().getTime()}.xlsx`)
-}
+/** 获取检测模板列表*/
+let QcInspectionTemplateList = ref([]);
+const getInspectionTemplateList = async () => {
+  const res = await getQcInspectionTemplateList(null);
+  QcInspectionTemplateList.value = res.data;
+};
 
 //获取检测项列表（不分页，获取全部）
 let qcInspectionItemList = ref([]);
@@ -763,59 +995,82 @@ const getInspectionItemList = async () => {
   qcInspectionItemList.value = res.data;
 }
 
-// 获取检测类型列表
-let qcInspectionTypeList = ref([]);
-const getInspectionTypeList = async () => {
-  const res = await getQcInspectionTypeList(null);
-  qcInspectionTypeList.value = res.data;
-}
-
-// 计算不合格数
-const calculateUnqualifiedQty = () => {
-  if (form.value.inspectionQty !== undefined && form.value.qualifiedQty !== undefined) {
-    form.value.unqualifiedQty = parseFloat((form.value.inspectionQty - form.value.qualifiedQty).toFixed(2));
-    if (form.value.unqualifiedQty < 0) {
-      form.value.unqualifiedQty = 0;
-    }
+/** 关联检测项定义选择变化 */
+const handleItemChange = (value) => {
+  const selected = qcInspectionItemList.value.find(item => item.itemId === value);
+  if (selected) {
+    inspectionResultForm.value.itemCode = selected.itemCode;
+    inspectionResultForm.value.itemName = selected.itemName;
+    inspectionResultForm.value.detectType = selected.detectType;
+    inspectionResultForm.value.controlType = selected.controlType;
+    inspectionResultForm.value.categoryName = selected.categoryName || '';
+    // inspectionResultForm.value.inspectionType = selected.inspectionType;
+    inspectionResultForm.value.inspectionPosition = selected.inspectionPosition;
+    inspectionResultForm.value.standardValue = selected.standardValue;
+    inspectionResultForm.value.upperLimit = selected.upperLimit;
+    inspectionResultForm.value.lowerLimit = selected.lowerLimit;
+    inspectionResultForm.value.specName = selected.specName;
+    inspectionResultForm.value.specUpper = selected.specUpper;
+    inspectionResultForm.value.specLower = selected.specLower;
+    inspectionResultForm.value.description = selected.description;
   } else {
-    form.value.unqualifiedQty = 0;
+    // Optionally reset fields
   }
 }
 
-/** 导入按钮操作 */
-const fileInput = ref<HTMLInputElement>();
-const uploading = ref(false);
-const handleImport = () => {
-  fileInput.value?.click();
+// 获取工序列表（不分页，获取全部）
+let baseProcessInfoList = ref([]);
+const getBaseProcessList = async () => {
+  const res = await getProcessInfoList(null);
+  baseProcessInfoList.value = res.data;
 }
-const onFileChange = async (event: Event) => {
-  const input = event.target as HTMLInputElement;
-  if (input.files && input.files.length > 0) {
-    const file = input.files[0];
-    uploading.value = true;
-    try {
-      await importData(file, true);
-      proxy?.$modal.msgSuccess("导入成功");
-      await getList();
-    } catch (err) {
-      proxy?.$modal.msgError("导入失败");
-      console.error(err);
-    } finally {
-      uploading.value = false;
-      input.value = '';
-    }
+
+// 获取工位列表（不分页，获取全部）
+let baseStationInfoList = ref([]);
+const getBaseStationList = async () => {
+  const res = await getStationInfoList(null);
+  baseStationInfoList.value = res.data;
+}
+
+/*工序名称选择变化 */
+const handleBaseProcessInfoChange = (value) => {
+  const selected = baseProcessInfoList.value.find(item => item.processId === value);
+  if (selected) {
+    form.value.processName = selected.processName;
+  } else {
+    form.value.processName = '';
   }
 }
 
-let materialList = ref([]);
-const getMaterialList = async () => {
-  const res = await getBaseMaterialInfoList(null);
-  materialList.value = res.data;
+/* 工位名称选择变化 */
+const handleBaseStationInfoChange = (value) => {
+  const selected = baseStationInfoList.value.find(item => item.stationId === value);
+  if (selected) {
+    form.value.stationName = selected.stationName;
+  } else {
+    form.value.stationName = ''
+  }
 }
 
+/** 物料选择弹窗 */
+const handleMaterialAdd = () => {
+  materialOpen.value = true;
+};
+
+/** 确定按钮 */
+const submitMaterialForm = () => {
+  const selected = materialSelectRef.value.tableRef.store.states.currentRow.value;
+  if (selected) {
+    form.value.materialName = selected.materialName;
+    form.value.materialCode = selected.materialCode;
+    form.value.materialType = selected.matrialTypeName;
+  }
+  materialOpen.value = false;
+};
+
 onMounted(() => {
-  getInspectionItemList();
-  getInspectionTypeList();
   getList();
+  getInspectionTemplateList();
+  getInspectionItemList();
 });
 </script>
diff --git a/src/views/qms/qcInspectionResult/index.vue b/src/views/qms/qcInspectionResult/index.vue
index 430c848..aea80c8 100644
--- a/src/views/qms/qcInspectionResult/index.vue
+++ b/src/views/qms/qcInspectionResult/index.vue
@@ -3,7 +3,7 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
             <!-- <el-form-item label="结果主键" prop="resultId">
               <el-input v-model="queryParams.resultId" placeholder="请输入结果主键" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -12,13 +12,13 @@
             </el-form-item>
             <el-form-item label="关联检测项ID" prop="itemId">
               <el-input v-model="queryParams.itemId" placeholder="请输入关联检测项ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="检测结果" prop="detectResult">
               <el-select v-model="queryParams.detectResult" placeholder="请选择检测结果" clearable >
                 <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="detectValue">
+            <!-- <el-form-item label="定量检测值" prop="detectValue">
               <el-input v-model="queryParams.detectValue" placeholder="请输入定量检测值" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="规格质检值" prop="specInspection">
@@ -26,6 +26,52 @@
             </el-form-item>
             <el-form-item label="定性不合格明细" prop="problemDetail">
               <el-input v-model="queryParams.problemDetail" placeholder="请输入定性不合格明细" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测项编码" prop="itemCode">
+              <el-input v-model="queryParams.itemCode" placeholder="请输入检测项编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测项名称" prop="itemName">
+              <el-input v-model="queryParams.itemName" placeholder="请输入检测项名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-input v-model="queryParams.inspectionPosition" placeholder="请输入检测位置" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测项目类别" prop="categoryName">
+              <el-input v-model="queryParams.categoryName" placeholder="请输入检测项目类别" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="关联检测类型表" prop="typeId">
+              <el-input v-model="queryParams.typeId" placeholder="请输入关联检测类型表" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="检测方式" prop="detectType">
+              <el-select v-model="queryParams.detectType" placeholder="请选择检测方式" clearable >
+                <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="控制类型(0手动,1自动)" prop="controlType">
+              <el-select v-model="queryParams.controlType" placeholder="请选择控制类型(0手动,1自动)" clearable >
+                <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="标准值" prop="standardValue">
+              <el-input v-model="queryParams.standardValue" placeholder="请输入标准值" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="控制上限" prop="upperLimit">
+              <el-input v-model="queryParams.upperLimit" placeholder="请输入控制上限" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="控制下限" prop="lowerLimit">
+              <el-input v-model="queryParams.lowerLimit" placeholder="请输入控制下限" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="规格名称" prop="specName">
+              <el-input v-model="queryParams.specName" placeholder="请输入规格名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="规格上限" prop="specUpper">
+              <el-input v-model="queryParams.specUpper" placeholder="请输入规格上限" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="规格下限" prop="specLower">
+              <el-input v-model="queryParams.specLower" placeholder="请输入规格下限" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测项说明" prop="description">
+              <el-input v-model="queryParams.description" placeholder="请输入检测项说明" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -57,9 +103,11 @@
 
       <el-table v-loading="loading" :data="qcInspectionResultList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="resultId" v-if="columns[0].visible"/>
-        <el-table-column label="关联质检主表ID" align="center" prop="inspectionId" v-if="columns[1].visible"/>
-        <el-table-column label="关联检测项ID" align="center" prop="itemId" v-if="columns[2].visible"/>
+        <!-- <el-table-column label="结果主键" align="center" prop="resultId" v-if="columns[0].visible"/> -->
+         <!-- 自动序号 -->
+        <el-table-column label="序号" align="center" type="index" width="55" v-if="columns[0].visible"/>
+        <el-table-column label="关联质检主表" align="center" prop="inspectionId" v-if="columns[1].visible"/>
+        <el-table-column label="关联检测项" align="center" prop="itemName" v-if="columns[2].visible"/>
         <el-table-column label="检测结果" align="center" prop="detectResult" v-if="columns[3].visible">
           <template #default="scope">
             <dict-tag :options="qc_result" :value="scope.row.detectResult"/>
@@ -68,6 +116,28 @@
         <el-table-column label="定量检测值" align="center" prop="detectValue" v-if="columns[4].visible"/>
         <el-table-column label="规格质检值" align="center" prop="specInspection" v-if="columns[5].visible"/>
         <el-table-column label="定性不合格明细" align="center" prop="problemDetail" v-if="columns[6].visible"/>
+        <el-table-column label="检测项编码" align="center" prop="itemCode" v-if="columns[7].visible"/>
+        <el-table-column label="检测项名称" align="center" prop="itemName" v-if="columns[8].visible"/>
+        <el-table-column label="检测位置" align="center" prop="inspectionPosition" v-if="columns[9].visible"/>
+        <el-table-column label="检测项目类别" align="center" prop="categoryName" v-if="columns[10].visible"/>
+        <el-table-column label="关联检测类型表" align="center" prop="typeId" v-if="columns[11].visible"/>
+        <el-table-column label="检测方式" align="center" prop="detectType" v-if="columns[12].visible">
+          <template #default="scope">
+            <dict-tag :options="detect_type" :value="scope.row.detectType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="控制类型(0手动,1自动)" align="center" prop="controlType" v-if="columns[13].visible">
+          <template #default="scope">
+            <dict-tag :options="control_type" :value="scope.row.controlType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="标准值" align="center" prop="standardValue" v-if="columns[14].visible"/>
+        <el-table-column label="控制上限" align="center" prop="upperLimit" v-if="columns[15].visible"/>
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" v-if="columns[16].visible"/>
+        <el-table-column label="规格名称" align="center" prop="specName" v-if="columns[17].visible"/>
+        <el-table-column label="规格上限" align="center" prop="specUpper" v-if="columns[18].visible"/>
+        <el-table-column label="规格下限" align="center" prop="specLower" v-if="columns[19].visible"/>
+        <el-table-column label="检测项说明" align="center" prop="description" v-if="columns[20].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -82,17 +152,32 @@
 
       <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">
         <!-- <el-form-item label="结果主键" prop="resultId">
           <el-input v-model="form.resultId" placeholder="请输入结果主键" />
         </el-form-item> -->
-        <el-form-item label="关联质检主表ID" prop="inspectionId">
-          <el-input v-model="form.inspectionId" placeholder="请输入关联质检主表ID" />
+        <el-form-item label="关联质检主表" prop="inspectionId">
+          <el-select v-model="form.inspectionId" placeholder="请选择关联质检主表">
+            <el-option
+                v-for="item in inspectionMainList"
+                :key="item.inspectionId"
+                :label="item.inspectionNo"
+                :value="item.inspectionId"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="关联检测项ID" prop="itemId">
-          <el-input v-model="form.itemId" placeholder="请输入关联检测项ID" />
+        <el-form-item label="关联检测项" prop="itemId">
+          <el-select v-model="form.itemId" placeholder="请选择关联检测项">
+            <el-option
+                v-for="item in inspectionItemList"
+                :key="item.itemId"
+                :label="item.itemName"
+                :value="item.itemId"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="检测结果" prop="detectResult">
           <el-radio-group v-model="form.detectResult">
@@ -112,6 +197,62 @@
         <el-form-item label="定性不合格明细" prop="problemDetail">
           <el-input v-model="form.problemDetail" placeholder="请输入定性不合格明细" />
         </el-form-item>
+        <el-form-item label="检测项编码" prop="itemCode">
+          <el-input v-model="form.itemCode" placeholder="请输入检测项编码" />
+        </el-form-item>
+        <el-form-item label="检测项名称" prop="itemName">
+          <el-input v-model="form.itemName" placeholder="请输入检测项名称" />
+        </el-form-item>
+        <el-form-item label="检测位置" prop="inspectionPosition">
+          <el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
+        </el-form-item>
+        <el-form-item label="检测项目类别" prop="categoryName">
+          <el-input v-model="form.categoryName" placeholder="请输入检测项目类别" />
+        </el-form-item>
+        <el-form-item label="关联检测类型表" prop="typeId">
+          <el-input v-model="form.typeId" placeholder="请输入关联检测类型表" />
+        </el-form-item>
+        <el-form-item label="检测方式" prop="detectType">
+          <el-select v-model="form.detectType" placeholder="请选择检测方式">
+            <el-option
+                v-for="dict in detect_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="控制类型(0手动,1自动)" prop="controlType">
+          <el-select v-model="form.controlType" placeholder="请选择控制类型(0手动,1自动)">
+            <el-option
+                v-for="dict in control_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标准值" prop="standardValue">
+          <el-input v-model="form.standardValue" placeholder="请输入标准值" />
+        </el-form-item>
+        <el-form-item label="控制上限" prop="upperLimit">
+          <el-input v-model="form.upperLimit" placeholder="请输入控制上限" />
+        </el-form-item>
+        <el-form-item label="控制下限" prop="lowerLimit">
+          <el-input v-model="form.lowerLimit" placeholder="请输入控制下限" />
+        </el-form-item>
+        <el-form-item label="规格名称" prop="specName">
+          <el-input v-model="form.specName" placeholder="请输入规格名称" />
+        </el-form-item>
+        <el-form-item label="规格上限" prop="specUpper">
+          <el-input v-model="form.specUpper" placeholder="请输入规格上限" />
+        </el-form-item>
+        <el-form-item label="规格下限" prop="specLower">
+          <el-input v-model="form.specLower" placeholder="请输入规格下限" />
+        </el-form-item>
+        <el-form-item label="检测项说明" prop="description">
+          <el-input v-model="form.description" placeholder="请输入检测项说明" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -126,9 +267,11 @@
 <script setup name="QcInspectionResult" lang="ts">
 import { listQcInspectionResult, getQcInspectionResult, delQcInspectionResult, addQcInspectionResult, updateQcInspectionResult } from '@/api/qms/qcInspectionResult';
 import { QcInspectionResultVO, QcInspectionResultQuery, QcInspectionResultForm } from '@/api/qms/qcInspectionResult/types';
+import { getQcInspectionMainList } from '@/api/qms/qcInspectionMain';
+import { getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { qc_result } = toRefs<any>(proxy?.useDict('qc_result'));
+const { detect_type, qc_result, control_type } = toRefs<any>(proxy?.useDict('detect_type', 'qc_result', 'control_type'));
 
 const qcInspectionResultList = ref<QcInspectionResultVO[]>([]);
 const buttonLoading = ref(false);
@@ -150,19 +293,26 @@ const dialog = reactive<DialogOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
         { key: 0, label: `序号`, visible: true },
-        { key: 1, label: `检测单号/卡号`, visible: true },
-        { key: 2, label: `关联质检主表ID`, visible: true },
-        { key: 3, label: `关联检测项ID`, visible: true },
-        { key: 4, label: `检测结果`, visible: true },
-        { key: 5, label: `定量检测值`, visible: true },
-        { 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: 11, label: `修改人`, visible: true },
-        // { key: 12, label: `修改时间`, visible: true },
-        // { key: 13, label: `是否删除`, visible: true },
+        { 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: 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: 11, label: `关联检测类型表`, visible: true },
+        { key: 12, label: `检测方式`, visible: true },
+        { key: 13, label: `控制类型(0手动,1自动)`, visible: true },
+        { key: 14, label: `标准值`, visible: true },
+        { key: 15, label: `控制上限`, visible: true },
+        { key: 16, label: `控制下限`, visible: true },
+        { key: 17, label: `规格名称`, visible: true },
+        { key: 18, label: `规格上限`, visible: true },
+        { key: 19, label: `规格下限`, visible: true },
+        { key: 20, label: `检测项说明`, visible: true },
 ]);
 
 const initFormData: QcInspectionResultForm = {
@@ -173,6 +323,20 @@ const initFormData: QcInspectionResultForm = {
   detectValue: undefined,
   specInspection: undefined,
   problemDetail: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryName: undefined,
+  typeId: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
 }
 const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>({
   form: {...initFormData},
@@ -186,13 +350,24 @@ const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>
     detectValue: undefined,
     specInspection: undefined,
     problemDetail: undefined,
+    itemCode: undefined,
+    itemName: undefined,
+    inspectionPosition: undefined,
+    categoryName: undefined,
+    typeId: undefined,
+    detectType: undefined,
+    controlType: undefined,
+    standardValue: undefined,
+    upperLimit: undefined,
+    lowerLimit: undefined,
+    specName: undefined,
+    specUpper: undefined,
+    specLower: undefined,
+    description: undefined,
     params: {
     }
   },
   rules: {
-    resultId: [
-      { required: true, message: "结果主键不能为空", trigger: "blur" }
-    ],
   }
 });
 
@@ -288,7 +463,25 @@ const handleExport = () => {
   }, `qcInspectionResult_${new Date().getTime()}.xlsx`)
 }
 
+// 获取关联质检主表
+let inspectionMainList = ref([]);
+const getInspectionMain = async () => {
+  const res = await getQcInspectionMainList(null);
+  inspectionMainList.value = res.data;
+}
+
+// 获取关联检测项
+let inspectionItemList = ref([]);
+const getInspectionItem = async () => {
+  const res = await getQcInspectionItemList(null);
+  inspectionItemList.value = res.data;
+}
+
+
+
 onMounted(() => {
   getList();
+  getInspectionMain();
+  getInspectionItem();
 });
 </script>