From f063fdb79367d4c51a6da1541ff55833d2c49a38 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 17:37:49 +0800
Subject: [PATCH] feat(mes): 更新IPQC过程检验功能

---
 src/views/mes/qc/oqc/data.ts |   84 +++++++++++++++++++++++-------------------
 1 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/views/mes/qc/oqc/data.ts b/src/views/mes/qc/oqc/data.ts
index f0a8f81..b457b34 100644
--- a/src/views/mes/qc/oqc/data.ts
+++ b/src/views/mes/qc/oqc/data.ts
@@ -11,9 +11,11 @@
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
 import { getSimpleUserList } from '#/api/system/user';
-import { MdClientSelect } from '#/views/mes/md/client/components';
-import { MdItemSelect } from '#/views/mes/md/item/components';
+import { getRangePickerDefaultProps } from '#/utils';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
 
 /** 琛ㄥ崟绫诲瀷 */
 export type FormType = 'create' | 'detail' | 'update';
@@ -119,7 +121,7 @@
     {
       fieldName: 'itemId',
       label: '浜у搧鐗╂枡',
-      component: markRaw(MdItemSelect),
+      component: markRaw(MdmItemSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
       },
@@ -133,13 +135,39 @@
       },
     },
     {
+      fieldName: 'templateId',
+      label: '璐ㄦ鏂规',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getTemplateItemOptionList,
+        autoSelect: 'first',
+        labelField: 'templateName',
+        valueField: 'templateId',
+        placeholder: '璇烽�夋嫨璐ㄦ鏂规',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          api: getTemplateItemOptionList,
+          autoSelect: 'first',
+          labelField: 'templateName',
+          valueField: 'templateId',
+          disabled: formType !== 'create' || !values.itemId,
+          params: values.itemId
+            ? { itemId: values.itemId, qcType: 3 }
+            : {},
+          placeholder: values.itemId ? '璇烽�夋嫨璐ㄦ鏂规' : '璇峰厛閫夋嫨浜у搧鐗╂枡',
+        }),
+      },
+    },
+    {
       fieldName: 'clientId',
       label: '瀹㈡埛',
-      component: markRaw(MdClientSelect),
+      component: markRaw(CrmCustomerSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨瀹㈡埛',
       },
-      rules: 'selectRequired',
       dependencies: {
         triggerFields: ['sourceDocId'],
         componentProps: (values) => ({
@@ -174,7 +202,6 @@
           }
         },
       },
-      rules: 'required',
       dependencies: {
         triggerFields: ['sourceDocId'],
         componentProps: (values) => ({
@@ -210,7 +237,6 @@
           }
         },
       },
-      rules: 'required',
     },
     {
       fieldName: 'qualifiedQuantity',
@@ -233,6 +259,7 @@
         placeholder: '璇疯緭鍏ヤ笉鍚堟牸鍝佹暟閲�',
       },
       rules: 'required',
+      help: '涓嶅悎鏍煎搧鏁伴噺澶т簬0鏃讹紝淇濆瓨鍚庡皢鑷姩鐢熸垚涓嶅悎鏍煎鐞嗗崟',
     },
     {
       fieldName: 'inspectorUserId',
@@ -254,9 +281,8 @@
       componentProps: {
         format: 'YYYY-MM-DD',
         placeholder: '璇烽�夋嫨鍑鸿揣鏃ユ湡',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD',
       },
-      rules: 'required',
     },
     {
       fieldName: 'inspectDate',
@@ -265,7 +291,7 @@
       componentProps: {
         format: 'YYYY-MM-DD',
         placeholder: '璇烽�夋嫨妫�娴嬫棩鏈�',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD',
       },
       rules: 'required',
     },
@@ -307,7 +333,7 @@
     {
       fieldName: 'clientId',
       label: '瀹㈡埛',
-      component: markRaw(MdClientSelect),
+      component: markRaw(CrmCustomerSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨瀹㈡埛',
       },
@@ -324,7 +350,7 @@
     {
       fieldName: 'itemId',
       label: '浜у搧鐗╂枡',
-      component: markRaw(MdItemSelect),
+      component: markRaw(MdmItemSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
       },
@@ -337,6 +363,14 @@
         allowClear: true,
         options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
         placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
+      },
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '妫�娴嬫棩鏈�',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
       },
     },
   ];
@@ -355,16 +389,6 @@
       field: 'name',
       title: '妫�楠屽崟鍚嶇О',
       minWidth: 180,
-    },
-    {
-      field: 'clientNickname',
-      title: '瀹㈡埛鍚嶇О',
-      width: 120,
-    },
-    {
-      field: 'batchCode',
-      title: '鎵规鍙�',
-      width: 130,
     },
     {
       field: 'itemCode',
@@ -387,16 +411,6 @@
       width: 80,
     },
     {
-      field: 'outQuantity',
-      title: '鍙戣揣鏁伴噺',
-      width: 100,
-    },
-    {
-      field: 'checkQuantity',
-      title: '妫�娴嬫暟閲�',
-      width: 100,
-    },
-    {
       field: 'unqualifiedQuantity',
       title: '涓嶅悎鏍兼暟',
       width: 100,
@@ -409,12 +423,6 @@
         name: 'CellDict',
         props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
       },
-    },
-    {
-      field: 'outDate',
-      title: '鍑鸿揣鏃ユ湡',
-      width: 120,
-      formatter: 'formatDate',
     },
     {
       field: 'inspectDate',

--
Gitblit v1.9.3