From 82a7e17552cd7e68c195c5c2ca7b0b38582b9e6f Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 8 Nov 2024 16:24:20 +0800 Subject: [PATCH] =?UTF-8?q?YT-270=E7=89=A9=E6=96=99=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itembasic/itembasic.data.ts | 577 ++++++++++-------- .../itempackage/itempackage.data.ts | 12 + .../packageunit/packageunit.data.ts | 20 +- 3 files changed, 342 insertions(+), 267 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 4163cdccd..ecc2cce07 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -9,7 +9,7 @@ import {validateYS} from '@/utils/validator' */ export const Itembasic = useCrudSchemas(reactive([ { - label: '代码', + label: '品番', field: 'code', sort: 'custom', isSearch: true, @@ -18,6 +18,15 @@ export const Itembasic = useCrudSchemas(reactive([ fixed: 'left' }, }, + { + label: '品名', + field: 'name', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, { label: '品号', field: 'articleNumber', @@ -46,25 +55,93 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '名称', - field: 'name', + label: '描述1', + field: 'desc1', + sort: 'custom', + table: { + width: 150 + } , + // isTableForm:false + }, + { + label: '描述2', + field: 'desc2', sort: 'custom', - isSearch: true, table: { width: 150 + } , + }, + { + label: '物料类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isTable: true, + table: { + width: 100 + } , + }, + { + label: '物料状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 120 + } + }, + { + label: '可采购', + field: 'enableBuy', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + table: { + width: 100 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } }, }, { - label: '是否可用', - field: 'available', + label: '可制造', + field: 'enableMake', sort: 'custom', - isSearch:true, - isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - search: { + dictClass: 'string', + isTable: true, + table: { + width: 100 + } , + form: { + component: 'Switch', value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } }, + }, + { + label: '虚零件', + field: 'isPhantom', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + table: { + width: 100 + } , form: { component: 'Switch', value: 'TRUE', @@ -73,27 +150,46 @@ export const Itembasic = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + }, + { + label: 'ABC类', + field: 'abcClass', + sort: 'custom', + dictType: DICT_TYPE.ABC_CLASS, + dictClass: 'string', + isTable: true, table: { - width: 110 - } + width: 100 + } , }, { - label: '描述1', - field: 'desc1', + label: '默认包装规格', + field: 'defaultPackUnit', sort: 'custom', table: { width: 150 } , - // isTableForm:false }, { - label: '描述2', - field: 'desc2', + label: '默认包装数量', + field: 'defaultPackQty', sort: 'custom', table: { width: 150 } , }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 120 + } + }, { label: '受入号', field: 'receivedNumber', @@ -103,15 +199,6 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: '受入地', - // field: 'receivedLocation', - // sort: 'custom', - // isSearch: true, - // table: { - // width: 150 - // }, - // }, { label: '前工程', field: 'preEngineering', @@ -131,7 +218,7 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '再订货点', + label: '再订货点数量', field: 'reorderPoint', sort: 'custom', isSearch: false, @@ -148,15 +235,6 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '生产线分区', - field: 'productionLineZoning', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - }, { label: '采购员', field: 'purchaser', @@ -167,73 +245,42 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '状态', - field: 'status', - sort: 'custom', - dictType: DICT_TYPE.ITEM_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 120 - } - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 120 - } - }, - { - label: '替代计量单位', - field: 'altUom', + label: '项目', + field: 'project', sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, table: { - width: 150 + width: 100 } , }, { - label: '是否标包', - field: 'isStdPack', + label: '是否脱离ERP管理', + field: 'isOutErp', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - // colorType: 'danger', isTable: true, table: { - width: 120 + width: 100 }, form: { component: 'Switch', - value: 'TRUE', + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' } }, - // tableForm:{ - // width: 180, - // type:'Radio', - // } }, { - label: '可采购', - field: 'enableBuy', + label: '是否可用', + field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - table: { - width: 100 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -243,129 +290,245 @@ export const Itembasic = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { - label: '可制造', - field: 'enableMake', + label: '生效时间', + field: 'activeTime', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 100 + width: 180 } , form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, + // tableForm:{ + // width: 200, + // type:'FormDateTime', + // } }, { - label: '可委外加工', - field: 'enableOutsourcing', + label: '失效时间', + field: 'expireTime', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 120 + width: 180 } , form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', + value:'activeTime', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, }, { - label: '回收件', - field: 'isRecycled', + label: '备注', + field: 'remark', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', + isTable: false + }, + { + label: '创建者', + field: 'creator', + isForm: false, isTable: true, table: { - width: 100 + width: 180 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + isTable: true, + formatter: dateFormatter, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 180 }, }, { - label: '虚零件', - field: 'isPhantom', + label: '最后更新时间', + field: 'updateTime', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, + isDetail: true, + formatter: dateFormatter, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 100 - } , + width: 180 + }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } + } + }, + + // { + // label: '受入地', + // field: 'receivedLocation', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // }, + + { + label: '生产线分区', + field: 'productionLineZoning', + sort: 'custom', + isSearch: false, + isTable: false, + isDetail:false, + table: { + width: 150 }, }, + + + { - label: '是否脱离ERP管理', - field: 'isOutErp', + label: '替代计量单位', + field: 'altUom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: false, + isDetail:false, + table: { + width: 150 + } , + }, + { + label: '是否标包', + field: 'isStdPack', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + // colorType: 'danger', + isTable: false, + isDetail:false, table: { - width: 100 + width: 120 }, form: { component: 'Switch', - value: 'FALSE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' } }, + // tableForm:{ + // width: 180, + // type:'Radio', + // } }, + { - label: 'ABC类', - field: 'abcClass', + label: '可委外加工', + field: 'enableOutsourcing', sort: 'custom', - dictType: DICT_TYPE.ABC_CLASS, + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { - width: 100 + width: 120 } , + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, }, { - label: '类型', - field: 'type', + label: '回收件', + field: 'isRecycled', sort: 'custom', - dictType: DICT_TYPE.ITEM_TYPE, + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 - } , + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, }, + + + + { label: '产品类', field: 'prodCla', sort: 'custom', isForm:false, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -376,7 +539,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_CATEGORY, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -387,7 +551,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_GROUP, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -398,7 +563,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_COLOR, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -409,7 +575,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_CONFIGURATION, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -420,26 +587,21 @@ export const Itembasic = useCrudSchemas(reactive([ dictType: DICT_TYPE.SETTLEMENT_TYPE, dictClass: 'string', sort: 'custom', - isTable: true, + isTable: false, + isDetail:false, table: { width: 120 } , }, - { - label: '项目', - field: 'project', - sort: 'custom', - table: { - width: 100 - } , - }, + { label: '质量等级', field: 'eqLevel', sort: 'custom', dictType: DICT_TYPE.EQ_LEVEL, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 120 } , @@ -448,6 +610,8 @@ export const Itembasic = useCrudSchemas(reactive([ label: '有效天数', field: 'validityDays', sort: 'custom', + isTable: false, + isDetail:false, table: { width: 120 }, @@ -459,122 +623,9 @@ export const Itembasic = useCrudSchemas(reactive([ } }, }, - { - label: '生效时间', - field: 'activeTime', - sort: 'custom', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - } , - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - // tableForm:{ - // width: 200, - // type:'FormDateTime', - // } - }, - { - label: '失效时间', - field: 'expireTime', - sort: 'custom', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - } , - form: { - component: 'DatePicker', - value:'activeTime', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - isTable: true, - formatter: dateFormatter, - isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - } - }, - { - label: '创建者', - field: 'creator', - isForm: false, - isTable: true, - table: { - width: 180 - }, - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isTable: true, - isDetail: true, - formatter: dateFormatter, - isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - } - }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: true, - table: { - width: 180 - }, - }, - { label: '备注', field: 'remark', sort: 'custom', isTable: false}, + + + // { // label: '操作', // field: 'action', diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index bca65a1c6..2fed930a9 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -144,6 +144,9 @@ export const Itempackaging = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', + isTable: false, + isDetail:false, + isForm:false, table: { width: 120 }, @@ -223,6 +226,15 @@ export const Itempackaging = useCrudSchemas(reactive([ } } }, + { + label: '数据来源', + field: 'dataSource', + sort: 'custom', + isForm:false, + table: { + width: 180 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 0035745bc..6f3f9764a 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -122,6 +122,8 @@ export const Packageunit1 = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, form: { component: 'Switch', value: 'TRUE', @@ -141,6 +143,8 @@ export const Packageunit1 = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, form: { component: 'Switch', value: 'FALSE', @@ -335,7 +339,9 @@ export const Packageunit = useCrudSchemas(reactive([ label: '父包装代码', field: 'parentCode', sort: 'custom', - isTable:false, + isTable: false, + isDetail:false, + isForm:false, table: { width: 150 }, @@ -479,6 +485,9 @@ export const Packageunit = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, + isForm:false, form: { component: 'Switch', value: 'TRUE', @@ -498,6 +507,9 @@ export const Packageunit = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, + isForm:false, form: { component: 'Switch', value: 'FALSE', @@ -713,9 +725,9 @@ export const PackageunitRules = reactive({ type: [ { required: true, message: '请选择包装类型', trigger: 'change' } ], - reuse: [ - { required: true, message: '请选择是否重复使用', trigger: 'change' } - ], + // reuse: [ + // { required: true, message: '请选择是否重复使用', trigger: 'change' } + // ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ],