From 5a90852489e1bf91d386746d75cfa0066c271228 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 26 八月 2026 17:15:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/task/data.ts | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index 0098d65..7dae255 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -1,6 +1,8 @@
import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import { z } from '#/adapter/form';
+import { getSimpleUserListByRoleCode } from '#/api/system/user';
+import { getTemplatePage } from '#/api/mes/pro/processdesign/template';
import { getUserListByWorkstationId } from '#/api/mes/md/workstation/worker';
import type { MesProTaskApi } from '#/api/mes/pro/task';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
@@ -163,6 +165,12 @@
field: 'quantityProduced',
title: '宸茬敓浜ф暟閲�',
width: 100,
+ },
+ {
+ field: 'progressPercent',
+ title: '瀹屾垚杩涘害',
+ width: 150,
+ slots: { default: 'progressPercent' },
},
{
field: 'clientCode',
@@ -347,6 +355,12 @@
width: 120,
},
{
+ field: 'paramTemplateId',
+ title: '宸ヨ壓鍙傛暟妯℃澘',
+ minWidth: 140,
+ formatter: ({ cellValue }) => cellValue ? `妯℃澘 #${cellValue}` : '鏈厤缃�',
+ },
+ {
field: 'quantity',
title: '鎺掍骇鏁伴噺',
width: 100,
@@ -395,6 +409,19 @@
/** 鐢熶骇浠诲姟鏂板/淇敼鐨勮〃鍗� */
export function useTaskFormSchema(formApi?: VbenFormApi, workOrderQuantity?: Ref<number | undefined>): VbenFormSchema[] {
return [
+ {
+ fieldName: 'paramTemplateId',
+ label: '宸ヨ壓鍙傛暟妯℃澘',
+ component: 'ApiSelect',
+ componentProps: {
+ api: () => getTemplatePage({ pageNo: 1, pageSize: 100 }),
+ labelField: 'templateName',
+ valueField: 'id',
+ resultField: 'list',
+ allowClear: true,
+ placeholder: '璇烽�夋嫨宸ヨ壓鍙傛暟妯℃澘',
+ },
+ },
{
fieldName: 'workstationId',
label: '宸ヤ綔绔�',
@@ -507,7 +534,7 @@
async function recalcDuration(formApi?: VbenFormApi) {
if (!formApi) return;
const values = await formApi.getValues();
-
+
if (values.workstationId) {
try {
const users = await getUserListByWorkstationId({ workstationId: values.workstationId });
--
Gitblit v1.9.3