From 5fdea06fbfc49a8ae8f20054db6b27fcf4ade75f Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期四, 04 七月 2024 00:34:19 +0800 Subject: [PATCH] 一些更新 --- src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts | 105 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 74 insertions(+), 31 deletions(-) diff --git a/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts b/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts index 8341abf..12b9e0f 100644 --- a/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts +++ b/src/views/tigerprojects/mes/prod/biz_mes_wo/biz_mes_wo.data.ts @@ -4,7 +4,7 @@ import { Tag, Tooltip } from 'ant-design-vue'; import { useLocale } from '/@/locales/useLocale'; import { useI18n } from '/@/hooks/web/useI18n'; -import { GetEnum } from '/@/api/tigerapi/system'; +import { GetEnum, getEntity } from '/@/api/tigerapi/system'; const { getLocale } = useLocale(); const { t } = useI18n(); @@ -55,7 +55,7 @@ sorter: true, resizable: true, customRender: ({ record }) => { - const status = record.STATUS; + const status = record.ROUTE_STATUS; let text = ''; let color = ''; switch (status) { @@ -120,6 +120,12 @@ } return h(Tooltip, { title: text }, () => h(Tag, { color: color }, () => text)); }, + }, + { + title: '璁″垝鏁伴噺', + dataIndex: 'PLAN_QTY', + sorter: true, + resizable: true, }, { title: '宸ヨ壓璺嚎缂栫爜', @@ -305,7 +311,7 @@ label: '宸ュ崟鍙�', required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 24 }, }, { field: 'ID', @@ -318,13 +324,13 @@ label: '宸ュ崟鎻忚堪', component: 'Input', show: false, - colProps: { span: 12 }, + colProps: { span: 24 }, }, { field: 'ORDER_TYPE', label: '宸ュ崟绫诲瀷', component: 'Select', - colProps: { span: 12 }, + colProps: { span: 24 }, defaultValue: 'Normal', componentProps: { options: [ @@ -340,6 +346,12 @@ }, }, { + field: 'PLAN_QTY', + label: '璁″垝鏁伴噺', + component: 'Input', + show: true, + }, + { field: 'STATUS', label: '鐘舵��', component: 'Input', @@ -350,75 +362,106 @@ label: '鐖跺伐鍗�', //required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 24 }, }, { field: 'ITEM_CODE', label: '鐗╂枡缂栫爜', required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 20 }, + }, + { + field: '0', + component: 'Input', + label: '1', + colSlot: 'addItem', + colProps: { + span: 4, + }, }, { field: 'ITEM_TYPE', label: '鐗╂枡绫诲瀷', //required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 24 }, }, { field: 'ITEM_MODEL', label: '鏈哄瀷', //required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 24 }, }, { field: 'PRIORITY', label: '浼樺厛绾�', //required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 24 }, }, { field: 'CUST_CODE', label: '瀹㈡埛缂栫爜', required: true, component: 'Input', - colProps: { span: 12 }, + colProps: { span: 24 }, }, - { - field: 'FACTORY', - label: '宸ュ巶', - required: true, - component: 'ApiSelect', - colProps: { span: 12 }, - componentProps: { - api: optionsListApiType, - resultField: 'Data', - labelField: 'Name', - valueField: 'Value', - }, - }, + // { + // field: 'FACTORY', + // label: '宸ュ巶', + // required: true, + // component: 'ApiSelect', + // colProps: { span: 12 }, + // componentProps: { + // api: getEntity, + // params: { entityName: 'MES_FACTORY', sqlcmd: ' 1=1 ' }, + // resultField: 'Data.Items', + // labelField: 'FTY_NAME', + // valueField: 'FTY_CODE', + // }, + // }, { field: 'PLAN_LINE', label: '璁″垝绾夸綋', required: true, - component: 'Input', - colProps: { span: 12 }, + component: 'ApiSelect', + colProps: { span: 24 }, + componentProps: { + api: getEntity, + params: { entityName: 'MES_LINE', sqlcmd: ' 1=1 ' }, + resultField: 'Data.Items', + labelField: 'LINE_NAME', + valueField: 'LINE_CODE', + }, }, { field: 'ACT_LINE', label: '瀹為檯绾夸綋', // required: true, - component: 'Input', - colProps: { span: 12 }, + component: 'ApiSelect', + colProps: { span: 24 }, + componentProps: { + api: getEntity, + params: { entityName: 'MES_LINE', sqlcmd: ' 1=1 ' }, + resultField: 'Data.Items', + labelField: 'LINE_NAME', + valueField: 'LINE_CODE', + }, + }, + { + field: 'PLAN_START_TIME', + label: '璁″垝寮�濮嬫椂闂�', + required: true, + component: 'DatePicker', + colProps: { span: 24 }, }, { field: 'PLAN_END_TIME', - label: '璁″垝寮�濮嬫椂闂�', + label: '璁″垝缁撴潫鏃堕棿', required: true, - component: 'Input', - colProps: { span: 12 }, + component: 'DatePicker', + colProps: { span: 24 }, }, ]; -- Gitblit v1.9.3