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

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

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