From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/qc/iqc/data.ts | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/qc/iqc/data.ts b/src/views/mes/qc/iqc/data.ts
index 0a77b97..a59f777 100644
--- a/src/views/mes/qc/iqc/data.ts
+++ b/src/views/mes/qc/iqc/data.ts
@@ -11,10 +11,12 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
+import { getSupplierSimpleList } from '#/api/srm/supplier';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'update';
@@ -134,18 +136,52 @@
},
},
{
- fieldName: 'vendorId',
- label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ fieldName: 'templateId',
+ label: '璐ㄦ鏂规',
+ component: 'ApiSelect',
componentProps: {
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ 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: 1 }
+ : {},
+ placeholder: values.itemId ? '璇烽�夋嫨璐ㄦ鏂规' : '璇峰厛閫夋嫨浜у搧鐗╂枡',
+ }),
+ },
+ },
+ {
+ fieldName: 'vendorId',
+ label: '渚涘簲鍟�',
+ component: 'ApiSelect',
+ componentProps: {
+ allowClear: true,
+ api: getSupplierSimpleList,
+ labelField: 'name',
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ valueField: 'id',
+ },
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
disabled: !!values.sourceDocId,
+ allowClear: true,
+ api: getSupplierSimpleList,
+ labelField: 'name',
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ valueField: 'id',
}),
},
},
@@ -200,6 +236,7 @@
placeholder: '璇疯緭鍏ヤ笉鍚堟牸鍝佹暟閲�',
},
rules: 'required',
+ help: '涓嶅悎鏍煎搧鏁伴噺澶т簬0鏃讹紝淇濆瓨鍚庡皢鑷姩鐢熸垚涓嶅悎鏍煎鐞嗗崟',
},
{
fieldName: 'receiveDate',
@@ -208,7 +245,7 @@
componentProps: {
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鏉ユ枡鏃ユ湡',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
@@ -232,7 +269,7 @@
componentProps: {
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨妫�娴嬫棩鏈�',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
@@ -274,9 +311,13 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: 'ApiSelect',
componentProps: {
+ allowClear: true,
+ api: getSupplierSimpleList,
+ labelField: 'name',
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ valueField: 'id',
},
},
{
--
Gitblit v1.9.3