From a55f2851b95a0e401aec5b28ea49b819e54d9f88 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 17 Jul 2025 15:44:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E4=BC=98=E5=8C=96=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重构了质检结果主表和子表的界面布局
- 新增了导出模板功能
- 优化了检测项定义的展示和选择
- 调整了模板子表的列显示
- 修复了一些小问题和用户体验改进
---
 src/views/qms/QcInspectionMain/index.vue     | 350 ++++++++++++-------
 src/views/qms/qcInspectionItem/index.vue     |  13 +-
 src/views/qms/qcInspectionTemplate/index.vue | 109 +++---
 3 files changed, 292 insertions(+), 180 deletions(-)

diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index c50f149..fe364c1 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -48,6 +48,9 @@
           <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>
           <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -165,92 +168,148 @@
     </el-card>
 
     <!-- 添加或修改质检主表对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
       <el-form ref="QcInspectionMainFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="检测单号/卡号" prop="inspectionNo">
-          <el-input v-model="form.inspectionNo" placeholder="请输入检测单号/卡号" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="materialCode">
-          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="物料类型" prop="materialType">
-          <el-input v-model="form.materialType" placeholder="请输入物料类型" />
-        </el-form-item>
-        <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
-        </el-form-item>
-        <el-form-item label="工序名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入工序名称" />
-        </el-form-item>
-        <el-form-item label="工位名称" prop="stationName">
-          <el-input v-model="form.stationName" placeholder="请输入工位名称" />
-        </el-form-item>
-        <el-form-item label="质检数量" prop="inspectionQty">
-          <el-input v-model="form.inspectionQty" placeholder="请输入质检数量" />
-        </el-form-item>
-        <el-form-item label="合格数" prop="qualifiedQty">
-          <el-input v-model="form.qualifiedQty" placeholder="请输入合格数" />
-        </el-form-item>
-        <el-form-item label="不合格数" prop="unqualifiedQty">
-          <el-input v-model="form.unqualifiedQty" placeholder="请输入不合格数" />
-        </el-form-item>
-        <el-form-item label="质检结果" prop="result">
-          <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-form-item label="车间" prop="workshop">
-          <el-input v-model="form.workshop" 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="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-group>
-        </el-form-item>
-        <el-form-item label="检测人员" prop="inspector">
-          <el-input v-model="form.inspector" placeholder="请输入检测人员" />
-        </el-form-item>
-        <el-form-item label="班次" prop="shift">
-          <el-input v-model="form.shift" placeholder="请输入班次" />
-        </el-form-item>
-        <el-form-item label="班组" prop="team">
-          <el-input v-model="form.team" placeholder="请输入班组" />
-        </el-form-item>
-        <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="请选择检验时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="生产订单号" prop="productionOrder">
-          <el-input v-model="form.productionOrder" placeholder="请输入生产订单号" />
-        </el-form-item>
-        <el-form-item label="批次号" prop="batchNo">
-          <el-input v-model="form.batchNo" placeholder="请输入批次号" />
-        </el-form-item>
-        <el-form-item label="条码号" prop="barcode">
-          <el-input v-model="form.barcode" placeholder="请输入条码号" />
-        </el-form-item>
-        <el-form-item label="供应商名称" prop="supplierName">
-          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检测单号/卡号" prop="inspectionNo">
+              <el-input v-model="form.inspectionNo" placeholder="请输入检测单号/卡号" />
+            </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>
+          </el-col>
+        </el-row>
+        <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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="工序名称" prop="processName">
+              <el-input v-model="form.processName" placeholder="请输入工序名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工位名称" prop="stationName">
+              <el-input v-model="form.stationName" placeholder="请输入工位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-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-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-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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="车间" prop="workshop">
+              <el-input v-model="form.workshop" placeholder="请输入车间" />
+            </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>
+          </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-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检测人员" prop="inspector">
+              <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="请输入班次" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="班组" prop="team">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产订单号" prop="productionOrder">
+              <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="请输入批次号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="条码号" prop="barcode">
+              <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-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -261,35 +320,48 @@
     </el-dialog>
 
     <!-- 添加或修改质检结果子表对话框 -->
-    <el-dialog :title="inspectionResultDialog.title" v-model="inspectionResultDialog.visible" width="500px" append-to-body>
+    <el-dialog :title="inspectionResultDialog.title" v-model="inspectionResultDialog.visible" width="800px" append-to-body>
       <el-form ref="inspectionResultFormRef" :model="inspectionResultForm" :rules="inspectionResultRules" label-width="120px">
-        <el-form-item label="关联质检主表ID" prop="inspectionId">
-          <el-input v-model="inspectionResultForm.inspectionId" placeholder="请输入关联质检主表ID" readonly />
-        </el-form-item>
-        <el-form-item label="关联检测项" prop="itemId">
-          <!-- <el-input v-model="inspectionResultForm.itemId" placeholder="请输入关联检测项ID" /> -->
-           <el-select v-model="inspectionResultForm.itemId" placeholder="请选择关联检测项">
-            <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
-           </el-select>
-        </el-form-item>
-        <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-form-item>
-        <el-form-item label="定量检测值" prop="detectValue">
-          <el-input v-model="inspectionResultForm.detectValue" placeholder="请输入定量检测值" />
-        </el-form-item>
-        <el-form-item label="规格质检值" prop="specInspection">
-          <el-input v-model="inspectionResultForm.specInspection" placeholder="请输入规格质检值" />
-        </el-form-item>
-        <el-form-item label="定性不合格明细" prop="problemDetail">
-          <el-input v-model="inspectionResultForm.problemDetail" placeholder="请输入定性不合格明细" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检测单号/卡号" prop="inspectionNo">
+              <el-input v-model="selectedInspectionNo" placeholder="检测单号/卡号" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联检测项" prop="itemId">
+              <el-select v-model="inspectionResultForm.itemId" placeholder="请选择关联检测项" style="width: 100%;">
+                <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <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-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-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <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>
+          </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>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -307,7 +379,7 @@ import { QcInspectionMainVO, QcInspectionMainQuery, QcInspectionMainForm } from
 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';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { qc_result, qc_status } = toRefs<any>(proxy?.useDict('qc_result', 'qc_status'));
@@ -440,8 +512,17 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     }
   },
   rules: {
-    inspectionId: [
-      { required: true, message: "质检主键不能为空", trigger: "blur" }
+    // inspectionId: [
+    //   { required: true, message: "质检主键不能为空", trigger: "blur" }
+    // ],
+    inspectionQty: [
+      { required: true, message: "质检数量不能为空", trigger: "blur" }
+    ],
+    qualifiedQty: [
+      { required: true, message: "合格数不能为空", trigger: "blur" }
+    ],
+    result: [
+      { required: true, message: "质检结果不能为空", trigger: "blur" }
     ],
   }
 });
@@ -462,9 +543,9 @@ const inspectionResultQueryParams = ref<QcInspectionResultQuery>({
 });
 
 const inspectionResultRules = ref({
-  inspectionId: [
-    { required: true, message: "关联质检主表ID不能为空", trigger: "blur" }
-  ],
+  // inspectionId: [
+  //   { required: true, message: "关联质检主表ID不能为空", trigger: "blur" }
+  // ],
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -572,7 +653,7 @@ const handleRowClick = (row: QcInspectionMainVO) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加质检主表";
+  dialog.title = "添加质检结果主表";
 }
 
 /** 修改按钮操作 */
@@ -582,7 +663,7 @@ const handleUpdate = async (row?: QcInspectionMainVO) => {
   const res = await getQcInspectionMain(_inspectionId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改质检主表";
+  dialog.title = "修改质检结果主表";
 }
 
 /** 新增检测结果 */
@@ -662,6 +743,13 @@ const handleExport = () => {
   }, `QcInspectionMain_${new Date().getTime()}.xlsx`)
 }
 
+/** 导出模板按钮操作 */
+const handleExportTemplate = () => {
+  proxy?.download('qms/QcInspectionMain/exportTemplate', {
+    
+  }, `QcInspectionMain_${new Date().getTime()}.xlsx`)
+}
+
 //获取检测项列表（不分页，获取全部）
 let qcInspectionItemList = ref([]);
 const getInspectionItemList = async () => {
@@ -669,8 +757,28 @@ 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;
+    }
+  } else {
+    form.value.unqualifiedQty = 0;
+  }
+}
+
 onMounted(() => {
   getInspectionItemList();
+  getInspectionTypeList();
   getList();
 });
 </script>
diff --git a/src/views/qms/qcInspectionItem/index.vue b/src/views/qms/qcInspectionItem/index.vue
index 27044f8..cf458f1 100644
--- a/src/views/qms/qcInspectionItem/index.vue
+++ b/src/views/qms/qcInspectionItem/index.vue
@@ -209,7 +209,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <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="请输入标准值" />
@@ -232,7 +232,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <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="请输入规格下限" />
@@ -244,6 +244,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-else>
+          <el-col :span="6">
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="检测项说明" prop="description">
@@ -283,7 +290,7 @@
 </template>
 
 <script setup name="QcInspectionItem" lang="ts">
-import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem } from '@/api/qms/qcInspectionItem';
+import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
 import { QcInspectionItemVO, QcInspectionItemQuery, QcInspectionItemForm } from '@/api/qms/qcInspectionItem/types';
 import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory';
 import { QcInspectionItemCategoryVO } from '@/api/qms/qcInspectionItemCategory/types';
diff --git a/src/views/qms/qcInspectionTemplate/index.vue b/src/views/qms/qcInspectionTemplate/index.vue
index 402ce31..b8e291c 100644
--- a/src/views/qms/qcInspectionTemplate/index.vue
+++ b/src/views/qms/qcInspectionTemplate/index.vue
@@ -38,20 +38,21 @@
         </el-row>
       </template>
 
-      <el-table 
-        v-loading="loading" 
-        :data="qcInspectionTemplateList" 
+      <el-table
+        v-loading="loading"
+        :data="qcInspectionTemplateList"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
         highlight-current-row
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="templateId" v-if="columns[0].visible"/>
+        <!-- 序号前端自动排序 -->
+        <el-table-column label="序号" type="index" width="50" align="center" v-if="columns[0].visible"/>
         <el-table-column label="模板编码" align="center" prop="templateCode" v-if="columns[1].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="materialName" v-if="columns[4].visible"/>
-        <el-table-column label="关联检测类型表ID" align="center" prop="typeId" v-if="columns[5].visible"/>
+        <el-table-column label="关联检测类型表" align="center" prop="typeName" v-if="columns[5].visible"/>
         <el-table-column label="工位编码" align="center" prop="stationCode" 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="processCode" v-if="columns[8].visible"/>
@@ -84,7 +85,7 @@
           </el-button>
         </div>
       </template>
-      
+
       <!-- 子表搜索区域 -->
       <div class="mb-4">
         <el-form :model="templateItemQueryParams" :inline="true" label-width="100px">
@@ -108,7 +109,7 @@
       <!-- 子表数据表格 -->
       <el-table v-loading="templateItemLoading" :data="templateItemList" @selection-change="handleTemplateItemSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="templateItemId" />
+        <el-table-column label="序号" type="index" width="50" align="center" />
         <el-table-column label="检测项编码" align="center" prop="itemCode" />
         <el-table-column label="检测项名称" align="center" prop="itemName" />
         <el-table-column label="检测位置" align="center" prop="inspectionPosition" />
@@ -162,7 +163,7 @@
           <el-input v-model="form.materialName" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="关联检测类型表" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择关联检测类型表ID">
+          <el-select v-model="form.typeId" placeholder="请选择关联检测类型表">
             <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
           </el-select>
         </el-form-item>
@@ -201,14 +202,18 @@
       <el-form ref="templateItemFormRef" :model="templateItemForm" :rules="templateItemRules" label-width="120px">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="关联模板主表ID" prop="templateId">
-              <el-input v-model="templateItemForm.templateId" placeholder="请输入关联模板主表ID" readonly />
+            <el-form-item label="模板编码" prop="templateCode">
+              <el-input v-model="selectedTemplateCode" placeholder="模板编码" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="关联检测项定义ID" prop="itemId">
-              <!-- <el-input v-model="templateItemForm.itemId" placeholder="请输入关联检测项定义ID" /> -->
-              <el-select v-model="templateItemForm.itemId" placeholder="请选择关联检测项定义ID">
+            <el-form-item label="模板名称" prop="templateName">
+              <el-input v-model="selectedTemplateName" placeholder="模板名称" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="关联检测项定义" prop="itemId">
+              <el-select v-model="templateItemForm.itemId" placeholder="请选择关联检测项定义" style="width: 100%;">
                 <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
               </el-select>
             </el-form-item>
@@ -218,34 +223,24 @@
               <el-input v-model="templateItemForm.itemCode" placeholder="请输入检测项编码" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="检测项名称" prop="itemName">
               <el-input v-model="templateItemForm.itemName" placeholder="请输入检测项名称" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="检测方式" prop="detectType">
-              <el-select v-model="templateItemForm.detectType" placeholder="请选择检测方式">
-                <el-option
-                    v-for="dict in qc_methond"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="parseInt(dict.value)"
-                ></el-option>
+              <el-select v-model="templateItemForm.detectType" placeholder="请选择检测方式" style="width: 100%;">
+                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="parseInt(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="templateItemForm.controlType" placeholder="请选择控制类型">
-                <el-option
-                    v-for="dict in control_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="parseInt(dict.value)"
-                ></el-option>
+              <el-select v-model="templateItemForm.controlType" placeholder="请选择控制类型" style="width: 100%;">
+                <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-col>
@@ -254,35 +249,35 @@
               <el-input v-model="templateItemForm.categoryName" placeholder="请输入检测项目类别" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="检测类型" prop="inspectionType">
               <el-input v-model="templateItemForm.inspectionType" placeholder="请输入检测类型" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-           <el-col :span="6">
-            <el-form-item label="标准值" prop="standardValue">
-              <el-input-number v-model="templateItemForm.standardValue" placeholder="请输入标准值" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
-            <el-form-item label="控制上限" prop="upperLimit">
-              <el-input-number v-model="templateItemForm.upperLimit" placeholder="请输入控制上限" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="控制下限" prop="lowerLimit">
-              <el-input-number v-model="templateItemForm.lowerLimit" placeholder="请输入控制下限" />
-            </el-form-item>
-          </el-col>
-           <el-col :span="6">
             <el-form-item label="检测位置" prop="inspectionPosition">
               <el-input v-model="templateItemForm.inspectionPosition" placeholder="请输入检测位置" />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准值" prop="standardValue" v-if="templateItemForm.detectType === 1">
+              <el-input-number v-model="templateItemForm.standardValue" placeholder="请输入标准值" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制上限" prop="upperLimit" v-if="templateItemForm.detectType === 1">
+              <el-input-number v-model="templateItemForm.upperLimit" placeholder="请输入控制上限" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="templateItemForm.detectType === 1">
+          <el-col :span="6">
+            <el-form-item label="控制下限" prop="lowerLimit">
+              <el-input-number v-model="templateItemForm.lowerLimit" placeholder="请输入控制下限" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="规格名称" prop="specName">
               <el-input v-model="templateItemForm.specName" placeholder="请输入规格名称" />
@@ -290,12 +285,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格上限" prop="specUpper">
-              <el-input-number v-model="templateItemForm.specUpper" placeholder="请输入规格上限" />
+              <el-input-number v-model="templateItemForm.specUpper" placeholder="请输入规格上限" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格下限" prop="specLower">
-              <el-input-number v-model="templateItemForm.specLower" placeholder="请输入规格下限" />
+              <el-input-number v-model="templateItemForm.specLower" placeholder="请输入规格下限" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -341,6 +336,7 @@ const total = ref(0);
 // 子表相关状态
 const selectedTemplateId = ref<string | number | null>(null);
 const selectedTemplateName = ref<string>('');
+const selectedTemplateCode = ref<string>('');
 const templateItemList = ref<QcTemplateItemVO[]>([]);
 const templateItemLoading = ref(false);
 const templateItemTotal = ref(0);
@@ -438,9 +434,9 @@ const data = reactive<PageData<QcInspectionTemplateForm, QcInspectionTemplateQue
     }
   },
   rules: {
-    templateId: [
-      { required: true, message: "模板主键不能为空", trigger: "blur" }
-    ],
+    // templateId: [
+    //   { required: true, message: "模板主键不能为空", trigger: "blur" }
+    // ],
     templateCode: [
       { required: true, message: "模板编码不能为空", trigger: "blur" }
     ],
@@ -476,9 +472,9 @@ const templateItemQueryParams = ref<QcTemplateItemQuery>({
 });
 
 const templateItemRules = ref({
-  templateId: [
-    { required: true, message: "关联模板主表ID不能为空", trigger: "blur" }
-  ],
+  // templateId: [
+  //   { required: true, message: "关联模板主表ID不能为空", trigger: "blur" }
+  // ],
   itemCode: [
     { required: true, message: "检测项编码不能为空", trigger: "blur" }
   ],
@@ -501,7 +497,7 @@ const getList = async () => {
 /** 查询检测模板子表列表 */
 const getTemplateItemList = async () => {
   if (!selectedTemplateId.value) return;
-  
+
   templateItemLoading.value = true;
   // 设置templateId过滤条件
   templateItemQueryParams.value.templateId = selectedTemplateId.value;
@@ -592,6 +588,7 @@ const handleTemplateItemSelectionChange = (selection: QcTemplateItemVO[]) => {
 const handleRowClick = (row: QcInspectionTemplateVO) => {
   selectedTemplateId.value = row.templateId;
   selectedTemplateName.value = row.templateName || '';
+  selectedTemplateCode.value = row.templateCode || '';
   // 刷新子表数据
   nextTick(() => {
     getTemplateItemList();