From b35039bcd6b21e26bc01d2ad8de328456b272d16 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 十月 2026 10:56:41 +0800
Subject: [PATCH] Merge branch 'dev_海西州_北京同仁堂' into dev_海西州_惠牧
---
src/views/mes/qc/oqc/data.ts | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/qc/oqc/data.ts b/src/views/mes/qc/oqc/data.ts
index f27a382..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,6 +167,7 @@
label: '瀹㈡埛',
component: markRaw(CrmCustomerSelect),
componentProps: {
+ allCustomers: true,
allowClear: true,
placeholder: '璇烽�夋嫨瀹㈡埛锛堝彲涓嶅～锛�',
},
@@ -340,6 +342,7 @@
label: '瀹㈡埛',
component: markRaw(CrmCustomerSelect),
componentProps: {
+ allCustomers: true,
placeholder: '璇烽�夋嫨瀹㈡埛',
},
},
@@ -371,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