From d57625584c60a29d0ccfe54ca07df130965b64eb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 21:06:01 +0800
Subject: [PATCH] fix(mes): 修复生产领退料及产品入库表单
---
src/views/wls/productissue/data.ts | 22 ++++++++++++++++++++++
src/views/wls/productreceipt/data.ts | 2 +-
src/views/wls/returnissue/data.ts | 21 +++++++++++++++++++++
3 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/src/views/wls/productissue/data.ts b/src/views/wls/productissue/data.ts
index d76c1db..b9d15b9 100644
--- a/src/views/wls/productissue/data.ts
+++ b/src/views/wls/productissue/data.ts
@@ -20,6 +20,7 @@
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
import {
@@ -124,6 +125,9 @@
component: markRaw(ProWorkOrderSelect),
componentProps: {
status: MesProWorkOrderStatusEnum.CONFIRMED,
+ onChange: async () => {
+ await formApi?.setFieldValue('taskId', undefined);
+ },
},
rules: 'selectRequired',
},
@@ -132,10 +136,28 @@
label: '宸ヤ綔绔�',
component: markRaw(MdWorkstationSelect),
componentProps: {
+ onChange: async () => {
+ await formApi?.setFieldValue('taskId', undefined);
+ },
placeholder: '璇烽�夋嫨宸ヤ綔绔�',
},
},
{
+ fieldName: 'taskId',
+ label: '鐢熶骇浠诲姟',
+ component: markRaw(ProTaskSelect),
+ dependencies: {
+ triggerFields: ['workOrderId', 'workstationId'],
+ componentProps: (values) => ({
+ disabled: !values.workOrderId,
+ placeholder: values.workOrderId ? '璇烽�夋嫨鐢熶骇浠诲姟' : '璇峰厛閫夋嫨鐢熶骇璁㈠崟',
+ workOrderId: values.workOrderId,
+ workstationId: values.workstationId,
+ }),
+ },
+ rules: 'selectRequired',
+ },
+ {
fieldName: 'remark',
label: '澶囨敞',
component: 'Textarea',
diff --git a/src/views/wls/productreceipt/data.ts b/src/views/wls/productreceipt/data.ts
index 07cc1bf..778bc92 100644
--- a/src/views/wls/productreceipt/data.ts
+++ b/src/views/wls/productreceipt/data.ts
@@ -98,7 +98,7 @@
class: '!w-full',
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鍏ュ簱鏃ユ湡',
- valueFormat: 'YYYY-MM-DD',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
},
diff --git a/src/views/wls/returnissue/data.ts b/src/views/wls/returnissue/data.ts
index 4ca6336..5f7fa15 100644
--- a/src/views/wls/returnissue/data.ts
+++ b/src/views/wls/returnissue/data.ts
@@ -19,6 +19,7 @@
import { z } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
import {
@@ -108,6 +109,9 @@
component: markRaw(ProWorkOrderSelect),
componentProps: {
status: MesProWorkOrderStatusEnum.CONFIRMED,
+ onChange: async () => {
+ await formApi?.setFieldValue('taskId', undefined);
+ },
},
rules: 'selectRequired',
},
@@ -116,10 +120,27 @@
label: '宸ヤ綔绔�',
component: markRaw(MdWorkstationSelect),
componentProps: {
+ onChange: async () => {
+ await formApi?.setFieldValue('taskId', undefined);
+ },
placeholder: '璇烽�夋嫨宸ヤ綔绔�',
},
},
{
+ fieldName: 'taskId',
+ label: '鐢熶骇浠诲姟',
+ component: markRaw(ProTaskSelect),
+ dependencies: {
+ triggerFields: ['workOrderId', 'workstationId'],
+ componentProps: (values) => ({
+ disabled: !values.workOrderId,
+ placeholder: values.workOrderId ? '璇烽�夋嫨鐢熶骇浠诲姟' : '璇峰厛閫夋嫨鐢熶骇璁㈠崟',
+ workOrderId: values.workOrderId,
+ workstationId: values.workstationId,
+ }),
+ },
+ },
+ {
fieldName: 'returnDate',
label: '閫�鏂欐棩鏈�',
component: 'DatePicker',
--
Gitblit v1.9.3