From 1deae1d89a7039ef0b943be291f6c1b9aaa5ad2c Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 10:30:33 +0800
Subject: [PATCH] feat(mes): 生产报工新增「可报工数量」展示 - `src/api/mes/pro/task/index.ts`: `MesProTaskApi.Task` 接口新增 `reportableQuantity` (可报工数量) 字段定义 - `src/views/mes/pro/feedback/data.ts`: - 生产报工弹框表单中新增「可报工数量」字段展示,设置为不可编辑,且仅在新建/编辑模式下显示 - 在生产任务选择弹框 (`ProTaskSelect`) 的 `onChange` 事件中,自动从选中的任务对象中提取并带入 `reportableQuantity` - 完善了表单联动的重置逻辑,确保更换工单等操作时正确清空此字段
---
src/views/crm/contract/data.ts | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/views/crm/contract/data.ts b/src/views/crm/contract/data.ts
index de4629d..7dabc09 100644
--- a/src/views/crm/contract/data.ts
+++ b/src/views/crm/contract/data.ts
@@ -66,6 +66,10 @@
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
},
+ dependencies: {
+ triggerFields: ['customerId'],
+ disabled: (values) => !!values.customerId,
+ },
},
{
fieldName: 'orderDate',
@@ -75,7 +79,7 @@
componentProps: {
showTime: false,
format: 'YYYY-MM-DD',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨涓嬪崟鏃ユ湡',
},
},
@@ -88,9 +92,15 @@
placeholder: '璇烽�夋嫨鍟嗘満',
},
dependencies: {
- triggerFields: ['customerId'],
- disabled: (values) => !values.customerId,
+ triggerFields: ['customerId', 'businessId'],
+ disabled: (values) => !!values.businessId || !values.customerId,
async componentProps(values) {
+ if (values.businessId && values.businessName) {
+ return {
+ options: [{ label: values.businessName, value: values.businessId }],
+ placeholder: '璇烽�夋嫨鍟嗘満',
+ };
+ }
if (!values.customerId) {
return {
options: [],
@@ -118,7 +128,7 @@
componentProps: {
showTime: false,
format: 'YYYY-MM-DD',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鍚堝悓寮�濮嬫椂闂�',
},
},
@@ -129,7 +139,7 @@
componentProps: {
showTime: false,
format: 'YYYY-MM-DD',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鍚堝悓缁撴潫鏃堕棿',
},
},
@@ -405,6 +415,18 @@
},
},
{
+ title: '宸插紑绁ㄩ噾棰濓紙鍏冿級',
+ field: 'totalInvoicePrice',
+ minWidth: 150,
+ formatter: 'formatAmount2',
+ },
+ {
+ title: '鏈紑绁ㄩ噾棰濓紙鍏冿級',
+ field: 'unInvoicePrice',
+ minWidth: 140,
+ formatter: 'formatAmount2',
+ },
+ {
title: '鏈�鍚庤窡杩涙椂闂�',
field: 'contactLastTime',
minWidth: 180,
--
Gitblit v1.9.3