From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/qc/oqc/data.ts | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/mes/qc/oqc/data.ts b/src/views/mes/qc/oqc/data.ts
index 4aeca09..bc0eb75 100644
--- a/src/views/mes/qc/oqc/data.ts
+++ b/src/views/mes/qc/oqc/data.ts
@@ -13,7 +13,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
import { getSimpleUserList } from '#/api/system/user';
-import { getRangePickerDefaultProps } from '#/utils';
+import { getDateRangePickerDefaultProps } from '#/utils';
import CrmCustomerSelect from '#/components/crm-customer-select.vue';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
@@ -129,6 +129,7 @@
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
+ allCustomers: true,
disabled: !!values.sourceDocId,
placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
}),
@@ -166,14 +167,16 @@
label: '瀹㈡埛',
component: markRaw(CrmCustomerSelect),
componentProps: {
- placeholder: '璇烽�夋嫨瀹㈡埛',
+ allCustomers: true,
+ allowClear: true,
+ placeholder: '璇烽�夋嫨瀹㈡埛锛堝彲涓嶅~锛�',
},
- rules: 'selectRequired',
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
disabled: !!values.sourceDocId,
- placeholder: '璇烽�夋嫨瀹㈡埛',
+ allowClear: true,
+ placeholder: '璇烽�夋嫨瀹㈡埛锛堝彲涓嶅~锛�',
}),
},
},
@@ -339,6 +342,7 @@
label: '瀹㈡埛',
component: markRaw(CrmCustomerSelect),
componentProps: {
+ allCustomers: true,
placeholder: '璇烽�夋嫨瀹㈡埛',
},
},
@@ -370,11 +374,25 @@
},
},
{
+ fieldName: 'inspectorUserId',
+ label: '妫�娴嬩汉鍛�',
+ component: 'ApiSelect',
+ componentProps: {
+ allowClear: true,
+ api: getSimpleUserList,
+ labelField: 'nickname',
+ placeholder: '璇烽�夋嫨妫�娴嬩汉鍛�',
+ showSearch: true,
+ optionFilterProp: 'label',
+ valueField: 'id',
+ },
+ },
+ {
fieldName: 'inspectDate',
label: '妫�娴嬫棩鏈�',
component: 'RangePicker',
componentProps: {
- ...getRangePickerDefaultProps(),
+ ...getDateRangePickerDefaultProps(),
},
},
];
--
Gitblit v1.9.3