From 7457271638984423ac3b6c2fd136f8c0fe970d40 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:39 +0800
Subject: [PATCH] feat(mes):盘号字段支持 添加和报工时间功能
---
src/views/mes/pro/feedback/data.ts | 30 +++++-------------------------
1 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index c7ce9fe..e4b989d 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -17,7 +17,6 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
import { getSimpleUserList } from '#/api/system/user';
import { loadParamDetails } from './param-state';
@@ -138,11 +137,14 @@
{ field: 'workstationName', title: '宸ヤ綔绔�', width: 120 },
{ field: 'processName', title: '宸ュ簭', width: 100 },
{ field: 'workOrderCode', title: '鐢熶骇璁㈠崟缂栫爜', width: 160 },
+ { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
{ field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 120 },
{ field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', minWidth: 140 },
{ field: 'itemSpecification', title: '瑙勬牸鍨嬪彿', width: 120 },
{ field: 'unitMeasureName', title: '鍗曚綅', width: 80 },
{ field: 'feedbackQuantity', title: '鎶ュ伐鏁伴噺', width: 100 },
+ { field: 'qualifiedQuantity', title: '璐ㄦ鍚堟牸鏁伴噺', width: 120 },
+ { field: 'unqualifiedQuantity', title: '璐ㄦ涓嶅悎鏍兼暟閲�', width: 130 },
{ field: 'feedbackUserNickname', title: '鎶ュ伐浜�', width: 100 },
{
field: 'feedbackTime',
@@ -176,7 +178,7 @@
* - submit / approve / detail锛氫富浣撳瓧娈靛彧璇�
*
* 鎶ュ伐鍙~鍐�"鎶ュ伐鏁伴噺"锛涘悎鏍煎搧/涓嶈壇鍝佹暟閲忕敱璐ㄦ纭畾锛屾姤宸ョ幆鑺備笉閲囬泦銆�
- * 璐ㄦ宸ュ簭鎶ュ伐鍚庤繘鍏ュ緟妫�楠岋紙uncheckQuantity = 鎶ュ伐鏁伴噺锛夛紝闈炶川妫�宸ュ簭鐩存帴瀹岀粨銆�
+ * 鎶ュ伐瀹℃壒鍚庝骇鍑哄潎寰呮楠岋紝鍚堟牸鍝佺粡妫�楠屽悗鍏ュ簱銆�
*/
export function useFormSchema(
formType: FormType,
@@ -188,12 +190,6 @@
fieldName: 'id',
component: 'Input',
dependencies: { triggerFields: [''], show: () => false },
- },
- {
- fieldName: 'checkFlag',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
- defaultValue: true,
},
{
fieldName: 'routeId',
@@ -256,7 +252,6 @@
// 璁㈠崟鍙樻洿锛氭竻绌轰换鍔″強浠诲姟甯﹀嚭鐨勪骇鍝佷俊鎭�佹暟閲忓尯鍩熸帶鍒朵綅
onChange: async () => {
await formApi?.setValues({
- checkFlag: true,
itemCode: undefined,
itemId: undefined,
itemName: undefined,
@@ -286,7 +281,7 @@
workstationId: values.workstationId,
}),
},
- // 浠诲姟鍙樻洿锛氳嚜鍔ㄥ~鍏呭叧鑱斿瓧娈点�佷骇鍝佷俊鎭�乧heckFlag锛屽苟鍔犺浇浠诲姟缁戝畾鐨勫伐鑹哄弬鏁�
+ // 浠诲姟鍙樻洿锛氳嚜鍔ㄥ~鍏呭叧鑱斿瓧娈点�佷骇鍝佷俊鎭紝骞跺姞杞戒换鍔$粦瀹氱殑宸ヨ壓鍙傛暟
componentProps: {
onChange: async (task?: MesProTaskApi.Task) => {
await loadParamDetails(task?.id);
@@ -304,21 +299,6 @@
workstationId: task.workstationId,
reportableQuantity: task.reportableQuantity,
});
- // 宸ヨ壓璺嚎宸ュ簭鐨� checkFlag 鍐冲畾鏁伴噺鍖哄煙灞曠ず
- if (task.routeId && task.processId) {
- try {
- const routeProcess = await getRouteProcessByRouteAndProcess(
- task.routeId,
- task.processId,
- );
- await formApi?.setFieldValue(
- 'checkFlag',
- routeProcess?.checkFlag ?? false,
- );
- } catch {
- await formApi?.setFieldValue('checkFlag', true);
- }
- }
},
},
rules: 'selectRequired',
--
Gitblit v1.9.3