From db085179138394e517bf6eecab0d916c406ebec5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 15:00:50 +0800
Subject: [PATCH] 宁夏万通需求：商机状态组改为非必填；过程检验单生产订单、工位改为非必填
---
src/views/crm/business/data.ts | 3 +--
src/views/mes/qc/ipqc/data.ts | 33 ++++++++++++++++-----------------
src/views/crm/business/detail/data.ts | 18 ++++++++++++++----
3 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/views/crm/business/data.ts b/src/views/crm/business/data.ts
index d1c9a3e..b83c9c7 100644
--- a/src/views/crm/business/data.ts
+++ b/src/views/crm/business/data.ts
@@ -82,14 +82,13 @@
api: getBusinessStatusTypeSimpleList,
labelField: 'name',
valueField: 'id',
- placeholder: '璇烽�夋嫨鍟嗘満鐘舵�佺粍',
+ placeholder: '璇烽�夋嫨鍟嗘満鐘舵�佺粍锛堥�夊～锛�',
allowClear: true,
},
dependencies: {
triggerFields: ['id'],
disabled: (values) => values.id,
},
- rules: 'required',
},
{
fieldName: 'dealTime',
diff --git a/src/views/crm/business/detail/data.ts b/src/views/crm/business/detail/data.ts
index 78272d2..2adbc7c 100644
--- a/src/views/crm/business/detail/data.ts
+++ b/src/views/crm/business/detail/data.ts
@@ -99,19 +99,29 @@
dependencies: {
triggerFields: [''],
async componentProps() {
- const statusList = await getBusinessStatusSimpleList(
- formData.value?.statusTypeId ?? 0,
- );
+ const statusTypeId = formData.value?.statusTypeId;
+ // 鍟嗘満鐘舵�佺粍涓洪�夊～锛氭湭璁剧疆鐘舵�佺粍鏃舵病鏈夊彲閫夐樁娈碉紝绂佺敤骞惰鏄庡師鍥�
+ if (!statusTypeId) {
+ return {
+ disabled: true,
+ options: [],
+ placeholder: '璇ュ晢鏈烘湭璁剧疆銆屽晢鏈虹姸鎬佺粍銆嶏紝鏃犲彲閫夊晢鏈洪樁娈�',
+ };
+ }
+ const statusList = await getBusinessStatusSimpleList(statusTypeId);
const options = statusList.map((item) => ({
label: `${item.name}(璧㈠崟鐜囷細${item.percent}%)`,
value: item.id,
}));
return {
+ disabled: false,
options,
+ placeholder: '璇烽�夋嫨鍟嗘満闃舵',
};
},
+ // 鏈缃晢鏈虹姸鎬佺粍鏃朵笉鍋氬繀濉牎楠岋紙姝ゆ椂涔熸病鏈夐樁娈靛彲渚涢�夋嫨锛�
+ rules: () => (formData.value?.statusTypeId ? 'required' : null),
},
- rules: 'required',
},
];
}
diff --git a/src/views/mes/qc/ipqc/data.ts b/src/views/mes/qc/ipqc/data.ts
index 6f92628..4cf2854 100644
--- a/src/views/mes/qc/ipqc/data.ts
+++ b/src/views/mes/qc/ipqc/data.ts
@@ -156,17 +156,18 @@
label: '鐢熶骇璁㈠崟',
component: markRaw(ProWorkOrderSelect),
componentProps: {
- placeholder: '璇烽�夋嫨鐢熶骇璁㈠崟',
+ allowClear: true,
+ placeholder: '璇烽�夋嫨鐢熶骇璁㈠崟锛堥�夊～锛�',
status: MesProWorkOrderStatusEnum.CONFIRMED,
// 璁㈠崟鍙樻洿鏃舵竻绌虹敓浜т换鍔�
onChange: () => formApi?.setFieldValue('taskId', undefined),
},
- rules: 'selectRequired',
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
+ allowClear: true,
disabled: !!values.sourceDocId,
- placeholder: '璇烽�夋嫨鐢熶骇璁㈠崟',
+ placeholder: '璇烽�夋嫨鐢熶骇璁㈠崟锛堥�夊～锛�',
status: MesProWorkOrderStatusEnum.CONFIRMED,
onChange: () => formApi?.setFieldValue('taskId', undefined),
}),
@@ -177,14 +178,15 @@
label: '宸ヤ綅',
component: markRaw(MdWorkstationSelect),
componentProps: {
- placeholder: '璇烽�夋嫨宸ヤ綅',
+ allowClear: true,
+ placeholder: '璇烽�夋嫨宸ヤ綅锛堥�夊～锛�',
},
- rules: 'selectRequired',
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
+ allowClear: true,
disabled: !!values.sourceDocId,
- placeholder: '璇烽�夋嫨宸ヤ綅',
+ placeholder: '璇烽�夋嫨宸ヤ綅锛堥�夊～锛�',
}),
},
},
@@ -226,17 +228,14 @@
autoSelect: 'first',
labelField: 'templateName',
valueField: 'templateId',
- disabled: formType !== 'create' || !values.workOrderId,
- params: values.workOrderId
- ? {
- qcType: 2,
- workOrderId: values.workOrderId,
- taskId: values.taskId,
- }
- : {},
- placeholder: values.workOrderId
- ? '璇烽�夋嫨璐ㄦ鏂规'
- : '璇峰厛閫夋嫨鐢熶骇璁㈠崟',
+ disabled: formType !== 'create',
+ // 鏈�夌敓浜ц鍗�/鐢熶骇浠诲姟鏃讹紝鍚庣鎸夈�岃繃绋嬫楠屻�嶇绫昏繑鍥炲叏閮ㄥ惎鐢ㄦ柟妗堬紙涓嶅啀瑕佹眰鍏堥�夌敓浜ц鍗曪級
+ params: {
+ qcType: 2,
+ ...(values.workOrderId ? { workOrderId: values.workOrderId } : {}),
+ ...(values.taskId ? { taskId: values.taskId } : {}),
+ },
+ placeholder: '璇烽�夋嫨璐ㄦ鏂规',
}),
},
},
--
Gitblit v1.9.3