From aa0bc81d06736cc1a1bd210dde61f57736585d43 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期五, 07 六月 2024 10:37:05 +0800 Subject: [PATCH] 很多更新 --- src/views/tigerprojects/bas/mesline/mesline.data.ts | 87 ++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 30 deletions(-) diff --git a/src/views/tigerprojects/bas/mesline/mesline.data.ts b/src/views/tigerprojects/bas/mesline/mesline.data.ts index 67775d3..582b578 100644 --- a/src/views/tigerprojects/bas/mesline/mesline.data.ts +++ b/src/views/tigerprojects/bas/mesline/mesline.data.ts @@ -2,11 +2,12 @@ import { FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Tag } from 'ant-design-vue'; +import { getEntity } from '/@/api/tigerapi/system'; //鍒楄〃鏄剧ず export const columns: BasicColumn[] = [ { title: '宸ュ巶缂栫爜', - dataIndex: 'FACTORY_CODE', + dataIndex: 'AUTH_PROD', width: 180, }, { @@ -19,15 +20,15 @@ }, { title: '杞﹂棿', - dataIndex: 'WORKSHOP_CODE', + dataIndex: 'WS_CODE', }, - { - title: '缁勭粐ID', - dataIndex: 'ORG_ID', - }, + // { + // title: '缁勭粐ID', + // dataIndex: 'ORG_ID', + // }, { title: '鐝埗浠g爜', - dataIndex: 'SHIFTTYPE_CODE', + dataIndex: 'SFTS_CODE', }, { title: '鏄惁鍚敤', @@ -52,6 +53,11 @@ title: '鏇存柊浜�', dataIndex: 'UPDATE_USER', }, + { + title: 'ID', + dataIndex: 'ID', + ifShow: false, + }, ]; //妯$硦鏌ヨ export const searchFormSchema: FormSchema[] = [ @@ -72,10 +78,17 @@ export const formSchema: FormSchema[] = [ { field: 'LINE_CODE', - label: '浜х嚎浠g爜', + label: '浜х嚎缂栫爜', required: true, component: 'Input', - colProps: { span: 8 }, + colProps: { span: 24 }, + }, + { + field: 'LINE_NAME', + label: '浜х嚎鍚嶇О', + required: true, + component: 'Input', + colProps: { span: 24 }, }, { field: 'ID', @@ -88,42 +101,56 @@ label: '浜х嚎鍚嶇О', component: 'Input', show: false, - colProps: { span: 8 }, + colProps: { span: 24 }, }, + // { + // field: 'FACTORY_CODE', + // label: '宸ュ巶缂栫爜', + // required: true, + // component: 'ApiSelect', + // colProps: { span: 24 }, + // componentProps: { + // api: getEntity, + // params: { entityName: 'MES_FACTORY', sqlcmd: ' 1=1 ' }, + // resultField: 'Data.Items', + // labelField: 'FTY_NAME', + // valueField: 'FTY_CODE', + // }, + // }, { - field: 'FACTORY_CODE', - label: '宸ュ巶缂栫爜', - required: true, - component: 'Input', - colProps: { span: 8 }, - }, - { - field: 'WORKSHOP_CODE', + field: 'WS_CODE', label: '杞﹂棿', required: true, - component: 'Input', - colProps: { span: 8 }, + component: 'ApiSelect', + colProps: { span: 24 }, + componentProps: { + api: getEntity, + params: { entityName: 'MES_WORKSHOP', sqlcmd: ' 1=1 ' }, + resultField: 'Data.Items', + labelField: 'WS_NAME', + valueField: 'WS_CODE', + }, }, + // { + // field: 'ORG_ID', + // label: '缁勭粐ID', + // required: true, + // component: 'Input', + // colProps: { span: 24 }, + // }, { - field: 'ORG_ID', - label: '缁勭粐ID', - required: true, - component: 'Input', - colProps: { span: 8 }, - }, - { - field: 'SHIFTTYPE_CODE', + field: 'SFTS_CODE', label: '鐝埗浠g爜', required: true, component: 'Input', - colProps: { span: 8 }, + colProps: { span: 24 }, }, { field: 'IS_ACTIVE', label: '鏄惁鍚敤', required: true, component: 'Select', - colProps: { span: 8 }, + colProps: { span: 24 }, componentProps: { options: [ { -- Gitblit v1.9.3