From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/task/data.ts | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index 3d575ad..605cd9c 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -5,11 +5,11 @@
import { markRaw } from 'vue';
-import { DICT_TYPE } from '../../../../packages/constants/src';
-import { getDictOptions } from '../../../../packages/effects/hooks/src';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
import { getRangePickerDefaultProps } from '#/utils';
-import { MdClientSelect } from '#/views/mes/md/client/components';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
import { ProProcessSelect } from '#/views/mes/process-design/process/components';
@@ -57,7 +57,7 @@
{
fieldName: 'clientId',
label: '瀹㈡埛',
- component: markRaw(MdClientSelect),
+ component: markRaw(CrmCustomerSelect),
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
},
@@ -258,7 +258,7 @@
{
fieldName: 'clientId',
label: '瀹㈡埛',
- component: markRaw(MdClientSelect),
+ component: markRaw(CrmCustomerSelect),
componentProps: {
disabled: true,
},
@@ -347,8 +347,8 @@
},
{
field: 'duration',
- title: '鐢熶骇鏃堕暱',
- width: 80,
+ title: '鐢熶骇鏃堕暱(h)',
+ width: 120,
},
{
field: 'endTime',
@@ -420,7 +420,7 @@
},
{
fieldName: 'duration',
- label: '鐢熶骇鏃堕暱',
+ label: '鐢熶骇鏃堕暱(h)',
component: 'InputNumber',
componentProps: {
class: '!w-full',
@@ -456,7 +456,7 @@
];
}
-/** 璁＄畻缁撴潫鏃堕棿锛氬紑濮嬫椂闂� + 鐢熶骇鏃堕暱 脳 8 灏忔椂 */
+/** 璁＄畻缁撴潫鏃堕棿锛氬紑濮嬫椂闂� + 鐢熶骇鏃堕暱锛堝皬鏃讹級 */
async function recalcEndTime(formApi?: VbenFormApi) {
if (!formApi) {
return;
@@ -466,7 +466,7 @@
const start = Number(values.startTime);
await formApi.setFieldValue(
'endTime',
- start + values.duration * 8 * 3600 * 1000,
+ start + values.duration * 3600 * 1000,
);
}
}
@@ -553,7 +553,7 @@
width: 170,
formatter: 'formatDateTime',
},
- { field: 'duration', title: '鐢熶骇鏃堕暱', width: 100 },
+ { field: 'duration', title: '鐢熶骇鏃堕暱(h)', width: 120 },
{
field: 'endTime',
title: '棰勮瀹屾垚鏃堕棿',
--
Gitblit v1.9.3