From 7f38cd37975da9900842e3fe035a980ea9c9f7bd Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 7 Feb 2024 16:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itemarea/itemarea.data.ts | 146 +++++++++--------- .../itemwarehouse/itemwarehouse.data.ts | 33 ++-- 2 files changed, 98 insertions(+), 81 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index 86e778b7c..96e5e76c7 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -14,7 +14,7 @@ export const Itemarea = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 120, + width: 150, fixed: 'left' }, form: { @@ -42,8 +42,7 @@ export const Itemarea = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 120, - fixed: 'left' + width: 150 }, form: { // labelMessage: '信息提示说明！！！', @@ -70,7 +69,7 @@ export const Itemarea = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 140 + width: 150 }, form: { // labelMessage: '信息提示说明！！！', @@ -97,7 +96,7 @@ export const Itemarea = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 140 + width: 150 }, form: { // labelMessage: '信息提示说明！！！', @@ -123,7 +122,7 @@ export const Itemarea = useCrudSchemas(reactive([ field: 'maxQty', sort: 'custom', table: { - width: 140 + width: 150 }, form: { component: 'InputNumber', @@ -138,7 +137,7 @@ export const Itemarea = useCrudSchemas(reactive([ field: 'minQty', sort: 'custom', table: { - width: 140 + width: 150 }, form: { component: 'InputNumber', @@ -189,7 +188,7 @@ export const Itemarea = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 140 + width: 150 }, form: { // labelMessage: '信息提示说明！！！', @@ -215,7 +214,7 @@ export const Itemarea = useCrudSchemas(reactive([ field: 'repleinshQty', sort: 'custom', table: { - width: 120 + width: 150 }, form: { component: 'InputNumber', @@ -225,6 +224,59 @@ export const Itemarea = useCrudSchemas(reactive([ } }, }, + { + label: '管理精度', + field: 'manageMode', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.MANAGEMENT_MODE, + dictClass: 'string', + // colorType: 'danger', + isTable: true, + table: { + width: 150 + }, + }, + { + label: '入库自动转为出库包装规格', + field: 'newlyToOutpackunit', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + // colorType: 'danger', + isTable: true, + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '出库自动转为出库包装规格', + field: 'surplusToOutpackunit', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + // colorType: 'danger', + isTable: true, + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, { label: '需要接收确认', field: 'needReceive', @@ -234,7 +286,7 @@ export const Itemarea = useCrudSchemas(reactive([ // colorType: 'danger', isTable: true, table: { - width: 140 + width: 150 }, form: { component: 'Switch', @@ -255,7 +307,7 @@ export const Itemarea = useCrudSchemas(reactive([ // colorType: 'danger', isTable: true, table: { - width: 120 + width: 150 }, form: { component: 'Switch', @@ -275,7 +327,7 @@ export const Itemarea = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, table: { - width: 180 + width: 150 } , form: { component: 'DatePicker', @@ -294,7 +346,7 @@ export const Itemarea = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, table: { - width: 180 + width: 150 } , form: { component: 'DatePicker', @@ -304,14 +356,6 @@ export const Itemarea = useCrudSchemas(reactive([ } }, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 120 - } , - }, { label: '创建时间', field: 'createTime', @@ -330,8 +374,9 @@ export const Itemarea = useCrudSchemas(reactive([ field: 'creator', sort: 'custom', isForm: false, + isTable: false, table: { - width: 120 + width: 150 }, }, { @@ -340,11 +385,12 @@ export const Itemarea = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isForm: false, + isTable: false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, table: { - width: 180 + width: 150 }, }, { @@ -352,62 +398,18 @@ export const Itemarea = useCrudSchemas(reactive([ field: 'updater', sort: 'custom', isForm: false, + isTable: false, table: { - width: 120 - }, - }, - { - label: '管理精度', - field: 'manageMode', - sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.MANAGEMENT_MODE, - dictClass: 'string', - // colorType: 'danger', - isTable: true, - table: { - width: 120 - }, - }, - { - label: '入库自动转为出库包装规格', - field: 'newlyToOutpackunit', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - // colorType: 'danger', - isTable: true, - table: { - width: 120 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } + width: 150 }, }, { - label: '出库自动转为出库包装规格', - field: 'surplusToOutpackunit', + label: '备注', + field: 'remark', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - // colorType: 'danger', - isTable: true, table: { width: 120 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + } , }, { label: '操作', diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts index 6fdb207a7..d9a08a586 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts @@ -7,15 +7,6 @@ import { Area } from '../../factoryModeling/areabasic/areabasic.data' import * as PackageunitApi from '@/api/wms/packageunit' import { Packageunit } from '../packageunit/packageunit.data' -// 表单校验 -export const ItemwarehouseRules = reactive({ - itemCode: [required], - warehouseCode: [required], - manageMode: [required], - packUnit: [required], - available: [required], -}) - export const Itemwarehouse = useCrudSchemas(reactive([ { label: '物品代码', @@ -113,6 +104,21 @@ export const Itemwarehouse = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + // colorType: 'danger', + isTable: true, + table: { + width: 120 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '生效时间', @@ -198,3 +204,12 @@ export const Itemwarehouse = useCrudSchemas(reactive([ } } ])) + +// 表单校验 +export const ItemwarehouseRules = reactive({ + itemCode: [required], + warehouseCode: [required], + manageMode: [required], + packUnit: [required], + available: [required], +})