diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 77a7a04e0..ecbcb2c0e 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -352,6 +352,15 @@ export const Itembasic = useCrudSchemas(reactive([ width: 180 }, }, + { + label: 'ERP默认收货库位', + field: 'defaultErpLocationCode', + sort: 'custom', + isTable: true, + table: { + width: 100 + } , + }, { label: '创建者', field: 'creator', @@ -522,9 +531,6 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, - - - { label: '产品类', field: 'prodCla', diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 290ca2697..41a420590 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -446,7 +446,7 @@ export const PurchasePackaging = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '替代计量单位', + label: '采购计量单位', field: 'purchaseUom', sort: 'custom', dictType: DICT_TYPE.UOM, @@ -458,15 +458,15 @@ export const PurchasePackaging = useCrudSchemas(reactive([ }, }, { - label: '替代数量', + label: '采购数量', field: 'purchaseQty', sort: 'custom', }, - // { - // label: '采购标包数量', - // field: 'purchaseStdQty', - // sort: 'custom', - // }, + { + label: '采购标包数量', + field: 'purchaseStdQty', + sort: 'custom', + }, { label: '转换率', field: 'convertRate', diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts index 54145b1d0..533068257 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -61,55 +61,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 170, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 170, + // } + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index dd51b272c..63073c4ab 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -75,55 +75,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 180, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 180, + // } + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index e6641c733..44190d067 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -98,55 +98,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 180, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: { width: '100%' }, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 180, + // } + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index 94b32ddc0..b2368b840 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -76,55 +76,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 180, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 180, + // } + // }, { label: '是否可用', field: 'available',