From d29f76a034d71c82046d59f8f0ccf78fcaa004c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 4 Jun 2024 17:30:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90n-pc=E3=80=91=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90+?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8EFromFE=E5=AD=97=E6=AE=B5=E5=9B=9E?= =?UTF-8?q?=E6=98=BEbug+=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E8=81=94=E5=8A=A8bug=E5=A4=84=E7=90=86+=E5=A4=87?= =?UTF-8?q?=E5=93=81=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/commonTabel-drawer/index.vue | 23 +- fe/PC/src/components/currenForm/index.vue | 14 +- fe/PC/src/lang/zh.js | 4 + fe/PC/src/mixins/TableMixins.js | 1 + fe/PC/src/mixins/newAndEdiDialogMixins.js | 2 + fe/PC/src/utils/detailsTableColumns/index.js | 611 +++------ fe/PC/src/utils/tableColumns/index.js | 852 ++++++------- fe/PC/src/utils/tabsDesTions/index.js | 1114 +++++------------ .../views/basicData/ItemsManage/ItemBasic.vue | 41 +- .../basicData/SupplierManage/SupplierItem.vue | 9 +- .../views/basicData/WarehouseManage/Area.vue | 8 +- .../WarehouseManage/ItemSafetyStock.vue | 18 +- .../WarehouseManage/ItemStoreRelation.vue | 13 +- .../basicData/WarehouseManage/Location.vue | 3 +- .../WarehouseManage/LocationGroup.vue | 34 +- .../itemGuideBookManage/itemGuideBook.vue | 6 +- .../views/materialIssueBP/IssueRequestBP.vue | 4 +- .../quality/InspectRequest.vue | 15 +- 18 files changed, 997 insertions(+), 1775 deletions(-) diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue index 72133f709..d8288bd70 100644 --- a/fe/PC/src/components/commonTabel-drawer/index.vue +++ b/fe/PC/src/components/commonTabel-drawer/index.vue @@ -434,7 +434,7 @@ export default { this.zdyTableColumns = zdyTableColumnsJSON this.otherData = res // 父子双物料相关信息 - this.getBaseDataInfo(this.otherData,parent) + this.getBaseDataInfo(this.otherData,parent,item,['product','component']) }).catch(err => { console.log(err) parent.tableLoading = false @@ -446,7 +446,7 @@ export default { this.zdyTableColumns = zdyTableColumnsJSON this.otherData = res // 父子双物料相关信息 - this.getBaseDataInfo(this.otherData,parent) + this.getBaseDataInfo(this.otherData,parent,item,['product','component']) }).catch(err => { console.log(err) parent.tableLoading = false @@ -510,7 +510,7 @@ export default { delete zdyTableColumnsJSON[0].type this.zdyTableColumns = zdyTableColumnsJSON this.otherData = res - parent.tableLoading = false + this.getBaseDataInfo(this.otherData,parent,item) }).catch(err => { console.log(err) parent.tableLoading = false @@ -549,7 +549,7 @@ export default { }) }, // 获取其他基础信息前端转义 - getBaseDataInfo(ortherData,parent,itemProps = ['product','component']){ + getBaseDataInfo(ortherData,parent,configItem,itemProps = ['itemCode']){ let _allItemCode = [] ortherData.forEach(item => { for(let i in item){ @@ -575,10 +575,17 @@ export default { let _itemsConfig = {} res.items.forEach(item=>{ _itemsConfig[item.code] = item }) ortherData.forEach(item=>{ - this.$set(item,'productName',_itemsConfig[item.product].name) - this.$set(item,'productDesc1',_itemsConfig[item.product].desc1) - this.$set(item,'componentName',_itemsConfig[item.component].name) - this.$set(item,'componentDesc1',_itemsConfig[item.component].desc1) + if(configItem.functionName == 'byComponent' || configItem.functionName == 'byProduct'){ + this.$set(item,'productName',_itemsConfig[item.product].name) + this.$set(item,'productDesc1',_itemsConfig[item.product].desc1) + this.$set(item,'componentName',_itemsConfig[item.component].name) + this.$set(item,'componentDesc1',_itemsConfig[item.component].desc1) + }else{ + this.$set(item,'item_nameFromFE',_itemsConfig[item.itemCode].name) + this.$set(item,'item_desc1FromFE',_itemsConfig[item.itemCode].desc1) + this.$set(item,'item_desc2FromFE',_itemsConfig[item.itemCode].desc2) + this.$set(item,'item_configurationFromFE',_itemsConfig[item.itemCode].configuration) + } }) parent.tableLoading = false }).catch(err => { diff --git a/fe/PC/src/components/currenForm/index.vue b/fe/PC/src/components/currenForm/index.vue index bfc004c3c..f86001503 100644 --- a/fe/PC/src/components/currenForm/index.vue +++ b/fe/PC/src/components/currenForm/index.vue @@ -190,7 +190,7 @@ :allow-create="item.allowCreate" style="width: 100%" :placeholder="item.placeholder || '请输入' + item.label" - @change="changeSelect(item.prop,$event)" + @change="changeSelect(item.prop,$event,item)" > { + this.searchData[c] = null + }) + } + this.$emit("changeSelect", prop, val,item) }, resetCurrenForm() { this.$refs.form.resetFields(); diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js index 4ae49ece7..4aef2acb5 100644 --- a/fe/PC/src/lang/zh.js +++ b/fe/PC/src/lang/zh.js @@ -8,6 +8,7 @@ export default { description:'描述', status:'状态', type:'类型', + activeDate:'生效日期', creationTime:'创建时间', creatorId:'创建者ID', lastModificationTime:'上次修改时间', @@ -15,6 +16,8 @@ export default { beginTime:'开始时间', endTime:'结束时间', operation:'操作', + worker:'操作员', + status:'状态', }, // 所有字段（除了接口监控看板） @@ -45,6 +48,7 @@ export default { manageType:'管理类型', supplierCode:'供应商代码', supplierName:'供应商名称', + supplierAddress:'供应商地址', inspectType:'检验类型', categoryCode:'分类代码', categoryValue:'分类值', diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 1ce4cfe0d..8c712069b 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -227,6 +227,7 @@ export const tableMixins = { if(type != 'props'){ let _mainData = type == 'table' ? this.tableData : this.propsData.details let _valueArr = [] + if(!_mainData)return _mainData.forEach((item)=>{ for(let i in item){ if(i.indexOf('itemCode') >= 0){ diff --git a/fe/PC/src/mixins/newAndEdiDialogMixins.js b/fe/PC/src/mixins/newAndEdiDialogMixins.js index 50adb28f3..1624fe83f 100644 --- a/fe/PC/src/mixins/newAndEdiDialogMixins.js +++ b/fe/PC/src/mixins/newAndEdiDialogMixins.js @@ -22,11 +22,13 @@ export const newAndEdiDialogMixins = { if (this.active) { this.oldSkipCount = 1; this.paging(); + this.getItemInfoByItemCodeHandle('props') } } else { this.displayDialog.editDialog = false if (this.active) { this.paging(); + this.getItemInfoByItemCodeHandle('props') } } this.active = 0 diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 24a9cd1a4..2981d3ae6 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -13,56 +13,19 @@ export const Dict = [ { label: "字典项值", prop: "value" }, { label: "字典项描述", prop: "description" }, { label: "是否生效", prop: "enabled", type: "filter", filters: "whetherOrNot" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 原料管理 -// 供应商发货通知 -export const SupplierAsn = [ - { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "发货数量", prop: "qty" }, - { label: "物品单位", prop: "uom" }, - { label: "生产批次", prop: "lot" }, - { label: "箱码", prop: "packingCode" }, - { label: _Names.locationErpCode, prop: "recommendErpCode" }, - { label: "项目编号", prop: "projectCode" }, - { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" }, - { label: "生产时间", prop: "produceDate", type: "dateTime" }, - { label: "过期时间", prop: "expireDate", type: "dateTime" }, - { label: "到货时间", prop: "arriveDate", type: "dateTime" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "发货单号", prop: 'number', width: orderWidth }, - { label: "订单号", prop: 'poNumber', width: orderWidth }, - { label: "订单行", prop: 'poLine', width: orderWidth }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商包装数量", prop: 'supplierPackQty' }, - { label: "供应商包装计量单位", prop: 'supplierPackUom' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "转换率", prop: 'convertRate' }, - { label: "筹措员代码", prop: 'planUserCode' }, - { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "事务ID", prop: "tenantId" }, -] - // 采购订单信息 export const PurchaseOrder = [ { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: "发货数量", prop: "qty" }, { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, @@ -75,66 +38,80 @@ export const PurchaseOrder = [ { label: "已退货数量", prop: "returnedQty" }, { label: "已上架数量", prop: "putAwayQty" }, { label: "筹措员代码", prop: 'planUserCode' }, - { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" }, - { label: "过期时间", prop: "expireDate", type: "dateTime" }, { label: "发货单号", prop: 'number' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "订单行", prop: 'poLine' }, - { label: "供应商包装计量单位", prop: 'supplierPackUom' }, + // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, { label: "供应商包装数量", prop: 'supplierPackQty' }, - { label: "转换率", prop: 'convertRate' }, - { label: "是否寄存订单", prop: 'isConsignment' }, - { label: "备注", prop: 'remark' }, - { label: "订单备注", prop: 'orderRemark' }, - { label: "事务ID", prop: "tenantId" }, + { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" }, + { label: "过期时间", prop: "expireDate", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, + // { label: "转换率", prop: 'convertRate' }, + // { label: "是否寄存订单", prop: 'isConsignment' }, ] // 采购订单信息 （有关闭订单行） export const PurchaseOrderHigher = [ { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: "发货数量", prop: "qty" }, { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "项目编号", prop: "projectCode" }, { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" }, + { label: "状态", prop: "lineStatus", type: "filter", filters: "openToClose" }, { label: "已发货数量", prop: "shippedQty" }, { label: "已收货数量", prop: "receivedQty" }, { label: "已退货数量", prop: "returnedQty" }, { label: "已上架数量", prop: "putAwayQty" }, - { label: "订单行状态", prop: "lineStatus",type:'filter',filters:"openToClose" }, { label: "筹措员代码", prop: 'planUserCode' }, - { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" }, - { label: "过期时间", prop: "expireDate", type: "dateTime" }, { label: "发货单号", prop: 'number' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "订单行", prop: 'poLine' }, - { label: "供应商包装计量单位", prop: 'supplierPackUom' }, { label: "供应商包装数量", prop: 'supplierPackQty' }, - { label: "转换率", prop: 'convertRate' }, - { label: "是否寄存订单", prop: 'isConsignment' }, - { label: "备注", prop: 'remark' }, - { label: "订单备注", prop: 'orderRemark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, + { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" }, + { label: "过期时间", prop: "expireDate", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 供应商发货通知 +export const SupplierAsn = [ + { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, + { label: "发货数量", prop: "qty" }, + { label: "物品单位", prop: "uom" }, + { label: "生产批次", prop: "lot" }, + { label: "箱码", prop: "packingCode" }, + { label: _Names.locationErpCode, prop: "recommendErpCode" }, + { label: "项目编号", prop: "projectCode" }, + { label: "生产时间", prop: "produceDate", type: "dateTime" }, + { label: "过期时间", prop: "expireDate", type: "dateTime" }, + { label: "到货时间", prop: "arriveDate", type: "dateTime" }, + { label: "发货单号", prop: 'number', width: orderWidth }, + { label: "订单号", prop: 'poNumber', width: orderWidth }, + { label: "订单行", prop: 'poLine', width: orderWidth }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "供应商包装数量", prop: 'supplierPackQty' }, + { label: "供应商批次", prop: 'supplierBatch' }, + { label: "筹措员代码", prop: 'planUserCode' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 到货请求 export const PurchaseReceiptRequest = [ { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: "发货数量", prop: "qty" }, { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, @@ -143,20 +120,14 @@ export const PurchaseReceiptRequest = [ { label: "生产时间", prop: "produceDate", type: "dateTime" }, { label: "过期时间", prop: "expireDate", type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, { label: "订单号", prop:'poNumber', width: orderWidth }, { label: "单据号", prop:'number', width: orderWidth }, - { label: "备注", prop:'remark'}, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "订单行", prop: 'poLine' }, - { label: "供应商包装计量单位", prop:'supplierPackUom' }, { label: "供应商包装数量", prop:'supplierPackQty' }, - { label: "转换率", prop: 'convertRate' }, - { label: "事务ID", prop: "tenantId" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购收货任务 @@ -174,37 +145,35 @@ export const PurchaseReceiptJob = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "实际数量", prop: 'handledQty' }, { label: "推荐批次", prop: 'recommendLot' }, { label: "实际批次", prop: 'handledLot' }, { label: "推荐库位", prop: 'recommendToLocationCode' }, - { label: "推荐区域", prop: 'recommendToLocationArea' }, - { label: "推荐分组", prop: 'recommendToLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' }, { label: "计量单位", prop: 'uom' }, { label: "实际库位", prop: 'handledToLocationCode' }, - { label: "实际区域", prop: 'handledToLocationArea' }, - { label: "实际分组", prop: 'handledToLocationGroup' }, - { label: _Names.handledErpCode, prop: 'handledToLocationErpCode' }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, { label: "目检照片Json", prop: 'inspectPhotoJson' }, { label: "到货时间", prop: 'arriveDate',type: "dateTime" }, - { label: "供应商包装计量单位", prop: 'supplierPackUom' }, { label: "供应商包装数量", prop: 'supplierPackQty' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + // { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + // { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + // { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + // { label: "推荐区域", prop: 'recommendToLocationArea' }, + // { label: "推荐分组", prop: 'recommendToLocationGroup' }, + // { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' }, + // { label: "实际区域", prop: 'handledToLocationArea' }, + // { label: "实际分组", prop: 'handledToLocationGroup' }, + // { label: _Names.handledErpCode, prop: 'handledToLocationErpCode' }, + // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, ] // 报检单 @@ -219,39 +188,36 @@ export const InspectRequest = [ { label: "箱码", prop: "packingCode" }, { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, { label: "库位", prop: 'locationCode' }, - { label: _Names.locationErpCode, prop: 'locationErpCode' }, + // { label: _Names.locationErpCode, prop: 'locationErpCode' }, { label: "任务单号", prop: "number" }, { label: "计量单位", prop: 'uom' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者Id", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者Id", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "库区", prop: 'locationArea' }, { label: "订单号", prop: 'poNumber', width: orderWidth }, { label: "订单行", prop: 'poLine' }, - { label: "样品率", prop: 'samplePercent' }, + // { label: "样品率", prop: 'samplePercent' }, { label: "检验数量", prop: 'inspectQty' }, - { label: "AbcClass类别", prop: 'abcClass' }, - { label: "事务ID", prop: "tenantId" }, + // { label: "AbcClass类别", prop: 'abcClass' }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "不合格原因代码", prop: 'failedReason' }, { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, - { label: "破坏数量", prop: 'crackQty' }, - { label: "最终不合格数量", prop: 'notPassedQty' }, - { label: "检验人", prop: 'inspectUser' }, + // { label: "破坏数量", prop: 'crackQty' }, + // { label: "最终不合格数量", prop: 'notPassedQty' }, + // { label: "检验人", prop: 'inspectUser' }, { label: "合格数量", prop: 'goodQty' }, { label: "不合格数量", prop: 'failedQty' }, { label: "外观", prop: 'appearance' }, { label: "其他属性", prop: 'otherPropertyJson', width:300}, { label: "尺寸", prop: 'volume' }, { label: "重量", prop: 'weight' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 检验记录 @@ -265,34 +231,31 @@ export const InspectNote = [ { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "库位", prop: 'locationCode' }, - { label: _Names.locationErpCode, prop: 'locationErpCode' }, + // { label: _Names.locationErpCode, prop: 'locationErpCode' }, { label: "合格数量", prop: 'goodQty' }, { label: "不合格数量", prop: 'failedQty' }, - { label: "检验人", prop: 'inspectUser' }, - { label: "盘点标签", prop: "containerCode" }, - { label: "破坏数量", prop: 'crackQty' }, + // { label: "检验人", prop: 'inspectUser' }, + // { label: "盘点标签", prop: "containerCode" }, + // { label: "破坏数量", prop: 'crackQty' }, { label: "异常照片", prop: 'photos' }, { label: "最终不合格数量", prop: 'notPassedQty' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "单据号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "备注", prop: 'remark' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "库区", prop: 'locationArea' }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, { label: "计量单位", prop: 'uom' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "样品率", prop: 'samplePercent' }, + // { label: "样品率", prop: 'samplePercent' }, { label: "检验数量", prop: 'inspectQty' }, - { label: "AbcClass类别", prop: 'abcClass' }, - { label: "事务ID", prop: "tenantId" }, + // { label: "AbcClass类别", prop: 'abcClass' }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "其他属性", prop: 'otherPropertyJson' }, ] @@ -315,21 +278,18 @@ export const unqualifiedToQualifiedNote = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "来源批次", prop: 'fromLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "完成时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: "事务ID", prop: "tenantId" }, - { label: "备注", prop: 'remark' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, ] // 采购上架记录 @@ -339,57 +299,54 @@ export const PutawayNote = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, - { label: "数量", prop: "qty" }, - { label: "单位", prop: "uom" }, { label: "来源库位", prop: "fromLocationCode" }, - { label: "目标库位", prop: "toLocationCode" }, - { label: "供应商批次", prop: 'supplierBatch' }, + { label: "实际库位", prop: "handledToLocationCode" }, + { label: "实际数量", prop: "handledQty" }, { label: "单据号", prop: 'number' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "完成时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "订单行", prop: 'poLine' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "任务编号", prop: 'jobNumber' }, - { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, - { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, - { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, - { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, - { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, - { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, - { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, - { label: "推荐批次", prop: "recommendLot" }, { label: "实际批次", prop: "handledLot" }, - { label: "推荐库位", prop: "recommendToLocationCode" }, - { label: "实际库位", prop: "handledToLocationCode" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, - { label: "推荐库位组", prop: "recommendToLocationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, - { label: "推荐数量", prop: "recommendQty" }, - { label: "实际数量", prop: "handledQty" }, - { label: "事务ID", prop: "tenantId" }, - { label: "备注", prop: 'remark' }, + { label: "订单行", prop: 'poLine' }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, + // { label: "数量", prop: "qty" }, + // { label: "单位", prop: "uom" }, + // { label: "目标库位", prop: "toLocationCode" }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "创建时间", prop: "creationTime", type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "完成时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "任务编号", prop: 'jobNumber' }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, + // { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, + // { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, + // { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, + // { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "推荐库位", prop: "recommendToLocationCode" }, + // { label: "推荐库区", prop: "recommendToLocationArea" }, + // { label: "实际库区", prop: "handledToLocationArea" }, + // { label: "推荐库位组", prop: "recommendToLocationGroup" }, + // { label: "实际库位组", prop: "handledToLocationGroup" }, + // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, + // { label: "推荐数量", prop: "recommendQty" }, + // { label: "备注", prop: 'remark' }, ] // 人工叫料申请 @@ -403,7 +360,6 @@ export const IssueRequest = [ { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "目标库位", prop: "toLocationCode" }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, { label: "生成任务数量", prop: 'issuedQty' }, @@ -415,9 +371,7 @@ export const IssueRequest = [ { label: "工作中心", prop: 'workStation' }, { label: "过期时间", prop: 'expiredTime' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, { label: "请求未发", prop: 'toBeIssuedQty' }, { label: "已发未收", prop: 'toBeReceivedQty' }, { label: "请求未收", prop: 'notFinishQty' }, @@ -438,11 +392,9 @@ export const IssueJob = [ { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "标包数量", prop: "stdPackQty" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, @@ -474,7 +426,6 @@ export const IssueJob = [ { label: "取整后数量", prop: 'roundedQty' }, { label: "计划开始时间", prop: 'planBeginTime' }, { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 人工发料记录 @@ -487,7 +438,6 @@ export const IssueNote = [ { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "来源库位", prop: "fromLocationCode" }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: "目标库位", prop: "toLocationCode" }, @@ -495,7 +445,6 @@ export const IssueNote = [ { label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "生效日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -514,7 +463,6 @@ export const IssueNote = [ { label: "发料时间", prop: 'issueTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, { label: "实际库位", prop: 'handledFromLocationCode' }, @@ -549,7 +497,6 @@ export const automaticCallApply = [ { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "目标库位", prop: "toLocationCode" }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, { label: "生成任务数量", prop: 'issuedQty' }, @@ -561,9 +508,7 @@ export const automaticCallApply = [ { label: "工作中心", prop: 'workStation' }, { label: "过期时间", prop: 'expiredTime' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, { label: "请求未发", prop: 'toBeIssuedQty' }, { label: "已发未收", prop: 'toBeReceivedQty' }, { label: "请求未收", prop: 'notFinishQty' }, @@ -584,11 +529,9 @@ export const automaticCallJob = [ { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "标包数量", prop: "stdPackQty" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, @@ -620,7 +563,6 @@ export const automaticCallJob = [ { label: "取整后数量", prop: 'roundedQty' }, { label: "计划开始时间", prop: 'planBeginTime' }, { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 自动发料记录 @@ -633,7 +575,6 @@ export const automaticCallNote = [ { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "来源库位", prop: "fromLocationCode" }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: "目标库位", prop: "toLocationCode" }, @@ -641,7 +582,6 @@ export const automaticCallNote = [ { label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "生效日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -660,7 +600,6 @@ export const automaticCallNote = [ { label: "发料时间", prop: 'issueTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, { label: "实际库位", prop: 'handledFromLocationCode' }, @@ -704,9 +643,7 @@ export const beforeGroundingReturnNote = [ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, { label: "单据号", prop: 'number' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, @@ -716,7 +653,6 @@ export const beforeGroundingReturnNote = [ { label: "库位组", prop: 'locationGroup' }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, { label: "实际库位", prop: 'handledFromLocationCode' }, @@ -754,20 +690,13 @@ export const PurchaseReturnRequest = [ { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "单据号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate' }, { label: "生产时间", prop: 'produceDate' }, { label: "过期时间", prop: 'expireDate' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, { label: "订单行", prop: 'poLine' }, - { label: "事务ID", prop: "tenantId" }, ] // 上架后退货审批 @@ -784,21 +713,14 @@ export const PurchaseReturnApprove = [ { label: "退货库位", prop: "locationCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "单据号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate' }, { label: "生产时间", prop: 'produceDate' }, { label: "过期时间", prop: 'expireDate' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, { label: "订单行", prop: 'poLine' }, - { label: "事务ID", prop: "tenantId" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 上架后退货任务 @@ -812,21 +734,10 @@ export const PurchaseReturnJob = [ { label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, { label: "计量单位", prop: "uom" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "推荐批次", prop: 'recommendLot' }, @@ -834,15 +745,9 @@ export const PurchaseReturnJob = [ { label: "推荐数量", prop: 'recommendQty' }, { label: "实际数量", prop: 'handledQty' }, { label: "订单行", prop: 'poLine' }, - { label: "事务ID", prop: "tenantId" }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, { label: "实际库位", prop: 'handledFromLocationCode' }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, ] // 上架后退货记录 @@ -853,51 +758,48 @@ export const PurchaseReturnNote = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "批次", prop: "lot" }, - { label: "箱码", prop: "packingCode" }, - { label: "库位", prop: 'locationCode' }, - { label: "库区", prop: 'locationArea' }, - { label: _Names.locationErpCode, prop: "locationErpCode" }, + { label: "实际批次", prop: "handledLot" }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, { label: "退货原因代码", prop: 'reason' }, { label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, { label: "单据号", prop: 'number' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "库位组", prop: 'locationGroup' }, { label: "订单号", prop: 'poNumber' }, - { label: "订单行", prop: 'poLine' }, - { label: "事务ID", prop: "tenantId" }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际批次", prop: "handledLot" }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, - { label: "实际数量", prop: 'handledQty' }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, + // { label: "单位", prop: "uom" }, + // { label: "批次", prop: "lot" }, + // { label: "箱码", prop: "packingCode" }, + // { label: "库位", prop: 'locationCode' }, + // { label: "库区", prop: 'locationArea' }, + // { label: _Names.locationErpCode, prop: "locationErpCode" }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "订单行", prop: 'poLine' }, + // { label: "推荐数量", prop: 'recommendQty' }, + // { label: "实际区域", prop: 'handledFromLocationArea' }, + // { label: "实际分组", prop: 'handledFromLocationGroup' }, + // { label: "推荐库位", prop: 'recommendFromLocationCode' }, + // { label: "推荐区域", prop: 'recommendFromLocationArea' }, + // { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + // { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: "实际数量", prop: 'handledQty' }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + // { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + // { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + // { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + // { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, + // { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, ] // 原料报废记录 @@ -913,12 +815,7 @@ export const ScrapNote = [ { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" }, { label: "报废库位", prop: "fromLocationCode" }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, - { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -932,7 +829,7 @@ export const ScrapNote = [ { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: "事务ID", prop: "tenantId" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 原料直发客户记录 @@ -945,16 +842,12 @@ export const materialDirectSendNote = [ { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "来源库位", prop: "fromLocationCode" }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: "目标库位", prop: "toLocationCode" }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "生效日期", prop: "arriveDate", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, - { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -967,16 +860,9 @@ export const materialDirectSendNote = [ { label: "目标库位组", prop: 'toLocationGroup' }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "推荐批次", prop: 'recommendLot' }, { label: "实际批次", prop: 'handledLot' }, @@ -992,7 +878,7 @@ export const materialDirectSendNote = [ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, ] -// 直接发料记录 +// 非生产调拨记录 export const directIssueNote = [ { label: _Names.itemCode, prop: "itemCode",fixed: "left" }, { label: "物品名称", prop: "itemName" }, @@ -1002,7 +888,6 @@ export const directIssueNote = [ { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "来源库位", prop: "fromLocationCode" }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: "目标库位", prop: "toLocationCode" }, @@ -1010,7 +895,6 @@ export const directIssueNote = [ { label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "生效日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1029,7 +913,6 @@ export const directIssueNote = [ { label: "发料时间", prop: 'issueTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, { label: "实际库位", prop: 'handledFromLocationCode' }, @@ -1071,19 +954,16 @@ export const ProductReceiptRequest = [ { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "库区", prop: "locationArea" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "生产时间", prop: "produceDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate" ,type:"dateTime" }, { label: "库位组", prop: "locationGroup" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "申请编号", prop: 'number' }, { label: "批次", prop: 'lot' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "Bom版本", prop: 'bomVersion' }, - { label: "事务ID", prop: "tenantId" }, ] // 完工收货缴库记录 @@ -1135,11 +1015,8 @@ export const ProductReceiptNote = [ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 完工收货报废申请 @@ -1158,13 +1035,10 @@ export const ProductReceiptScrapRequest = [ { label: "报废原因代码", prop:"reasonCode" }, { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "记录编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 完工收货报废记录 @@ -1181,9 +1055,7 @@ export const ProductReceiptScrapNote = [ { label: "报废库位", prop: "fromLocationCode" }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1201,7 +1073,6 @@ export const ProductReceiptScrapNote = [ { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: "事务ID", prop: "tenantId" }, ] // 半成品上架记录 @@ -1218,9 +1089,7 @@ export const partiallyPreparedProductsNote = [ { label: "供应商批次", prop: 'supplierBatch' }, { label: "单据号", prop: 'number' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -1260,7 +1129,6 @@ export const partiallyPreparedProductsNote = [ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "推荐数量", prop: "recommendQty" }, { label: "实际数量", prop: "handledQty" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -1275,13 +1143,10 @@ export const DeliverRequest = [ { label: "单位", prop: "uom" }, { label: "发货库区", prop: "areaCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 成品发货任务 @@ -1299,9 +1164,7 @@ export const DeliverJob = [ { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1313,7 +1176,6 @@ export const DeliverJob = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "推荐区域", prop: 'recommendFromLocationArea' }, { label: "推荐分组", prop: 'recommendFromLocationGroup' }, @@ -1345,7 +1207,6 @@ export const DeliverNote = [ { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1366,7 +1227,6 @@ export const DeliverNote = [ { label: "实际数量", prop: 'handledQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, @@ -1375,7 +1235,6 @@ export const DeliverNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "推荐区域", prop: 'recommendFromLocationArea' }, { label: "推荐分组", prop: 'recommendFromLocationGroup' }, @@ -1402,13 +1261,10 @@ export const FISDeliverRequest = [ { label: "起始盘底号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' }, { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 成品发运任务 @@ -1424,13 +1280,10 @@ export const FISDeliverJob = [ { label: "起始盘底号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' }, { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // FIS发货记录 @@ -1452,7 +1305,6 @@ export const FISDeliverNote = [ { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1473,7 +1325,6 @@ export const FISDeliverNote = [ { label: "实际数量", prop: 'handledQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, @@ -1482,7 +1333,6 @@ export const FISDeliverNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "推荐区域", prop: 'recommendFromLocationArea' }, { label: "推荐分组", prop: 'recommendFromLocationGroup' }, @@ -1508,9 +1358,7 @@ export const customerDismantle = [ { label: "缴库库位", prop: 'rawLocationCode' }, { label: "原料"+_Names.locationErpCode, prop: 'rawLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "Bom版本", prop: 'bomVersion' }, @@ -1518,7 +1366,6 @@ export const customerDismantle = [ { label: "库区", prop: 'locationArea' }, { label: "原料库位组", prop: 'rawLocationGroup' }, { label: "原料库区", prop: 'rawLocationArea' }, - { label: "事务ID", prop: "tenantId" }, ] // 客户退拆任务 @@ -1579,9 +1426,7 @@ export const productionReturnRequest = [ { label: "批次", prop: 'lot' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -1600,7 +1445,6 @@ export const productionReturnRequest = [ { label: "来源库位组", prop: 'fromLocationGroup' }, { label: "目标库位", prop: 'toLocationCode' }, { label: "来源库区", prop: 'fromLocationArea' }, - { label: "事务ID", prop: "tenantId" }, ] // 生产退库任务 @@ -1641,10 +1485,7 @@ export const productionReturnJob = [ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "事务ID", prop: "tenantId" }, ] // 生产退库记录 @@ -1659,9 +1500,7 @@ export const productionReturnNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1701,7 +1540,6 @@ export const productionReturnNote = [ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "推荐数量", prop: "recommendQty" }, { label: "实际数量", prop: "handledQty" }, - { label: "事务ID", prop: "tenantId" }, ] // 库存管理 @@ -1724,9 +1562,7 @@ export const pickingRequest = [ { label: "项目分类", prop: 'projCapacityCode' }, { label: "次交易码", prop: 'onceBusiCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -1735,7 +1571,6 @@ export const pickingRequest = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产领料审批 @@ -1756,9 +1591,7 @@ export const pickingApproval = [ { label: "项目分类", prop: 'projCapacityCode' }, { label: "次交易码", prop: 'onceBusiCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -1767,7 +1600,6 @@ export const pickingApproval = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产领料任务 @@ -1807,10 +1639,8 @@ export const pickingJob = [ { label: "项目分类", prop: 'projCapacityCode' }, { label: "次交易码", prop: 'onceBusiCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, ] @@ -1841,9 +1671,7 @@ export const pickingNote = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "原因代码", prop: 'reasonCode' },//无 { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, @@ -1866,7 +1694,6 @@ export const pickingNote = [ { label: "实际区域", prop: 'handledFromLocationArea' }, { label: "实际分组", prop: 'handledFromLocationGroup' }, { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产退料申请 @@ -1887,9 +1714,7 @@ export const pickingNote = [ { label: "项目分类", prop: 'projCapacityCode' }, { label: "次交易码", prop: 'onceBusiCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -1898,7 +1723,6 @@ export const pickingNote = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产退料审批 @@ -1919,9 +1743,7 @@ export const materialReturnApproval = [ { label: "项目分类", prop: 'projCapacityCode' }, { label: "次交易码", prop: 'onceBusiCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -1930,7 +1752,6 @@ export const materialReturnApproval = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产领料任务 @@ -1970,10 +1791,8 @@ export const materialReturnJob = [ { label: "项目分类", prop: 'projCapacityCode' }, { label: "次交易码", prop: 'onceBusiCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, ] @@ -2004,9 +1823,7 @@ export const materialReturnNote = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "原因代码", prop: 'reasonCode' },//无 { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, @@ -2030,7 +1847,6 @@ export const materialReturnNote = [ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 回收料收货记录 @@ -2047,9 +1863,7 @@ export const recycledMaterialsReceipt = [ { label: "库位", prop: 'locationCode' }, { label: _Names.locationErpCode, prop: 'locationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "单据号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "供应商批次", prop: 'supplierBatch' }, @@ -2060,7 +1874,6 @@ export const recycledMaterialsReceipt = [ { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "原因代码", prop: 'reasonCode' }, - { label: "事务ID", prop: "tenantId" }, ] // 回收料调整申请 @@ -2103,10 +1916,7 @@ export const recycledMaterialsAdjustmentApply = [ { label: "从过期时间", prop: "fromExpireDate" ,type: "dateTime" }, { label: "到过期时间", prop: "toExpireDate" ,type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "事务ID", prop: "tenantId" }, ] // 回收料调整记录 @@ -2147,12 +1957,9 @@ export const materialsAdjustment = [ { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "任务编号", prop: 'number' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓调拨申请 @@ -2169,9 +1976,7 @@ export const lineSideWarehouseAllocationRequest = [ { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -2188,7 +1993,6 @@ export const lineSideWarehouseAllocationRequest = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓调拨确认 @@ -2204,8 +2008,6 @@ export const lineSideWarehouseAllocationConfirm = [ { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, @@ -2225,7 +2027,6 @@ export const lineSideWarehouseAllocationConfirm = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓调拨记录 @@ -2241,8 +2042,6 @@ export const lineSideWarehouseAllocationNote = [ { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, @@ -2262,7 +2061,6 @@ export const lineSideWarehouseAllocationNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 储位调拨记录 @@ -2278,8 +2076,6 @@ export const interStorageAllocationNote = [ { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, @@ -2299,7 +2095,6 @@ export const interStorageAllocationNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 客户储位调拨申请 @@ -2316,9 +2111,7 @@ export const customerStorageAllocationRequest = [ { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -2335,7 +2128,6 @@ export const customerStorageAllocationRequest = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 客户储位调拨确认 @@ -2351,8 +2143,6 @@ export const customerStorageAllocationConfirm = [ { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, @@ -2372,7 +2162,6 @@ export const customerStorageAllocationConfirm = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 客户储位调拨记录 @@ -2388,8 +2177,6 @@ export const customerStorageAllocationNote = [ { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, @@ -2409,7 +2196,6 @@ export const customerStorageAllocationNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 储位内移库记录 @@ -2425,8 +2211,6 @@ export const intraStorageTransferNote = [ { label: "调入库位", prop: "toLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, @@ -2446,7 +2230,6 @@ export const intraStorageTransferNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓缴库申请 @@ -2465,19 +2248,16 @@ export const lineSideWarehousePaymentRequest = [ { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "库区", prop: "locationArea" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "生产时间", prop: "produceDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate" ,type:"dateTime" }, { label: "库位组", prop: "locationGroup" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "申请编号", prop: 'number' }, { label: "批次", prop: 'lot' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "Bom版本", prop: 'bomVersion' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓缴库记录 @@ -2529,11 +2309,8 @@ export const lineSideWarehousePaymentNote = [ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓报废申请 @@ -2552,13 +2329,10 @@ export const lineSideWarehouseScrappingRequest = [ { label: "报废原因代码", prop:"reasonCode" }, { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "记录编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓报废记录 @@ -2575,9 +2349,7 @@ export const lineSideWarehouseScrappingNote = [ { label: "报废库位", prop: "fromLocationCode" }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -2595,7 +2367,6 @@ export const lineSideWarehouseScrappingNote = [ { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓调整申请 @@ -2613,9 +2384,7 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "来源库位", prop: 'fromLocationCode' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -2632,7 +2401,6 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "目标库区", prop: 'toLocationArea' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓调整记录 @@ -2653,9 +2421,7 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "来源库位", prop: 'fromLocationCode' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -2669,7 +2435,6 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, ] // 库存初始化记录 @@ -2692,10 +2457,7 @@ export const InventoryInitialNote = [ { label: "包装单位", prop: "stdPackUom" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -2742,10 +2504,7 @@ export const CountPlan = [ { label: "备注", prop: 'remark' }, { label: "单据号", prop: 'number', width:orderWidth }, { label: "包装数量", prop: "stdPackQty" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, ] @@ -2777,10 +2536,7 @@ export const CountJob = [ { label: "备注", prop: 'remark' }, { label: "包装数量", prop: "stdPackQty" }, { label: "供应商批次", prop: "supplierBatch" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -2826,10 +2582,7 @@ export const CountNote = [ { label: "备注", prop: 'remark' }, { label: "盘点计划单号", prop: "countPlanNumber" }, { label: "单据号", prop: 'number', width:orderWidth }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, ] @@ -2859,10 +2612,7 @@ export const CountPlanAdjust = [ { label: "备注", prop: 'remark' }, { label: "单据号", prop: 'number' }, { label: "包装数量", prop: "stdPackQty" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, @@ -2895,10 +2645,7 @@ export const CountPlanAdjust = [ { label: "备注", prop: 'remark' }, { label: "单据号", prop: 'number', width:orderWidth }, { label: "包装数量", prop: "stdPackQty" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "盘点标签", prop: "countLabel" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 985eeae00..3101853ee 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -65,7 +65,7 @@ export const ItemQuality = [ { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: _Names.supplierCode, prop: 'supplierCode' }, - { label: _Names.supplierName, prop: 'supplierName' }, + { label: _Names.supplierName, prop: 'supplierName',showProp:true }, { label: _Public.status, prop: 'status', type: "filter", filters: "openToClose" }, { label: _Names.inspectType, prop: 'inspectType', type: "filter", filters: "inspectType" }, { label: _Public.remark, prop: "remark" }, @@ -102,7 +102,7 @@ export const ItemPack = [ { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: _Names.supplierCode, prop: 'supplierCode' }, - { label: _Names.supplierName, prop: 'supplierName' }, + { label: _Names.supplierName, prop: 'supplierName',showProp:true }, { label: _Names.packCode, prop: "packCode", }, { label: _Names.packName, prop: "packName" }, { label: _Names.packType, prop: "packType" }, @@ -126,7 +126,7 @@ export const AQL = [ { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: _Names.supplierCode, prop: 'supplierCode' }, - { label: _Names.supplierName, prop: 'supplierName' }, + { label: _Names.supplierName, prop: 'supplierName',showProp:true }, { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" }, { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true }, { label: _Names.floorQty, prop: "floorQty",isNumber:true}, @@ -313,12 +313,12 @@ export const Project = [ // 供应商信息 export const Supplier = [ { - label: "供应商代码", + label: _Names.supplierCode, prop: "code", fixed: "left", type: "name" }, - { label: "供应商名称", prop: "name" }, + { label: _Names.supplierName, prop: "name" }, { label: "简称", prop: "shortName" }, { label: "税率", prop: "taxRate" }, { label: "状态", prop: "isActive", type: "filter", filters: "openToCloseBit" }, @@ -327,49 +327,54 @@ export const Supplier = [ { label: "电话", prop: "phone" }, { label: "传真", prop: 'fax' }, { label: "邮编", prop: 'postID' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "地址", prop: 'address' }, { label: "国家", prop: 'country' }, { label: "城市", prop: 'city' }, { label: "银行", prop: 'bank' }, { label: "货币", prop: 'currency' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, ] // 供应商物品信息 export const SupplierItem = [ { - label: "供应商代码", + label: _Names.supplierCode, prop: 'supplierCode', fixed: "left", type: "name" }, { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: "供应商物品代码", prop: "supplierItemCode" }, { label: "供应商物品名称", prop: "itemName" }, + { label: _Names.supplierName, prop: 'supplierName',showProp:true }, { label: "供应商简称", prop: "supplierSimpleName" }, - { label: "版本", prop: "version" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, - { label: "供应商包装计量单位", prop: "supplierPackUom" }, + // { label: "版本", prop: "version" }, + // { label: "供应商包装计量单位", prop: "supplierPackUom" }, { label: "供应商包装数量", prop: "supplierPackQty",isNumber:true }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 供应商时间窗口 export const SupplierTimeWindow = [ { - label: "供应商代码", + label: _Names.supplierCode, prop: 'supplierCode', fixed: "left", type: "name" }, - { label: "供应商名称", prop: "supplierName" }, + { label: _Names.supplierName, prop: "supplierName" }, { label: "当前星期", prop: "week", type: "filter", filters: "week" }, { label: "时间窗口", prop: "timeSlot" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 收货口信息 @@ -382,10 +387,10 @@ export const Dock = [ }, { label: "收货口名称", prop: 'name' }, { label: "默认库位代码", prop: "defaultLocationCode" }, - { label: "描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, + { label: _Public.description, prop: "description" },, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 区域信息 @@ -398,11 +403,10 @@ export const Area = [ }, { label: "区域名称", prop: "name" }, { label: "是否功能区", prop: "isFunctional", type: "filter", filters: "whetherOrNot" }, - { label: "类型", prop: "areaType", type: "filter", filters: "areaType" }, - { label: "描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, + // { label: "类型", prop: "areaType", type: "filter", filters: "areaType" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位组信息 @@ -413,13 +417,12 @@ export const LocationGroup = [ type: "name", prop: "code" }, - { label: "区域代码", prop: "areaCode" }, { label: "库位组名称", prop: 'name' }, + { label: "区域代码", prop: "areaCode" }, { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" }, { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, - { label: "拣料优先级", prop: "pickPriority" }, - { label: "描述", prop: "description" }, - { label: "溢流库位组", prop: "overflowLocationGroup" }, + // { label: "拣料优先级", prop: "pickPriority" }, + // { label: "溢流库位组", prop: "overflowLocationGroup" }, { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, @@ -436,9 +439,9 @@ export const LocationGroup = [ { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 工作组信息 @@ -450,26 +453,26 @@ export const WorkGroup = [ prop: "code" }, { label: "工作组名称", prop: 'name' }, - { label: "描述", prop: "description" }, - { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位信息 export const Location = [ { - label: "库位代码", + label: _Names.locationCode, fixed: "left", type: "name", prop: "code" }, - { label: "库位名称", prop: "name" }, + { label: _Names.locationName, prop: "name" }, { label: "区域代码", prop: "areaCode" }, { label: "库位组代码", prop: "locationGroupCode" }, { label: "工作组代码", prop: "workGroupCode" }, { label: "库位类型", prop: "type", type: "filter", filters: "locationType" }, - { label: "ERP系统库位代码", prop: "erpLocationCode" }, + { label: _Names.locationErpCode, prop: "erpLocationCode" }, { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' }, { label: "货架号", prop: "shelfCode" }, { label: "行号", prop: "rowCode" }, @@ -491,10 +494,10 @@ export const Location = [ { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, - { label: "备注", prop: "remark" }, - { label: "描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位零件关系 @@ -505,38 +508,42 @@ export const ItemStoreRelation = [ fixed: "left", type: "name" }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, - { label: "值", prop: "storeValue" }, + { label: "库位", prop: "storeValue" }, { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" }, { label: "主存储容量", prop: "umQty",isNumber:true }, { label: "主存储单位", prop: "storeUM" }, { label: "次要存储容量", prop: "altUmQty" ,isNumber:true}, { label: "次要存储单位", prop: "altUm" }, { label: "存储单位", prop: "pramaryUM", type: "filter", filters: "pramaryUm" }, - { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" }, - { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" }, - { label: "库位代码", prop: "locationCode" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" }, + // { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位可用容量信息 export const InventoryLocationCapacity = [ { - label: "库位代码", + label: _Names.locationCode, prop: "locationCode", fixed: "left", type: "name" }, { label: "可用容量(%)", prop: "availableCapacity" }, { label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "备注", prop: "remark" }, { label: "已用容量", prop: "usedCapacity" }, { label: "可承受过载容量", prop: "bearableOverloadCapacity" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] + // 物品安全库存信息 export const ItemSafetyStock = [ { @@ -545,20 +552,21 @@ export const ItemSafetyStock = [ fixed: "left", type: "name" }, - { label: "物品描述1", prop: "item_desc1FromFE",showProp:true }, - { label: "物品描述2", prop: "item_desc2FromFE",showProp:true }, - { label: "配置", prop: "item_configurationFromFE",showProp:true }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, { label: "存储关系代码", prop: "storeValue" }, { label: "最大库存", prop: "maxStock" }, { label: "最小库存", prop: "minStock" }, { label: "安全库存", prop: "safetyStock" }, - { label: "补料点", prop: "feedLine" }, - { label: "补料数量", prop: "feedQty",isNumber:true }, - { label: "补料单位", prop: "feedUM" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "补料点", prop: "feedLine" }, + // { label: "补料数量", prop: "feedQty",isNumber:true }, + // { label: "补料单位", prop: "feedUM" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 事务类型信息 @@ -583,23 +591,23 @@ export const TransactionType = [ // { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" }, { label: "入库库区列表", prop: 'inLocationAreas' }, { label: "出库库区列表", prop: 'outLocationAreas' }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, - { label: "描述", prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库存开账 export const InventoryBilling = [ { label: _Names.itemCode, prop: "itemCode", type: "name" }, - { label: "物品名称", prop: "item_nameFromFE",showProp:true }, - { label: "物品描述1", prop: "item_desc1FromFE",showProp:true }, - { label: "物品描述2", prop: "item_desc2FromFE",showProp:true }, - { label: "配置", prop: "item_configurationFromFE",showProp:true }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: "TYRP储位代码", prop: "erpLocationCode",width:"180px" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 车间信息 @@ -611,10 +619,10 @@ export const Workshop = [ prop: "code" }, { label: "车间名称", prop: "name" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 生产线信息 @@ -623,24 +631,24 @@ export const ProductionLine = [ { label: "生产线名称", prop: 'name' }, { label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" }, { label: "生产库位代码", prop: "locationCode" }, - { label: "描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 生产线零件关系 export const ProductionLineItem = [ { label: _Names.itemCode, prop: "itemCode", type: "name" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "生产线代码", prop: "prodLineCode" }, - { label: "成品/半成品库位列表", prop: "productLocationCodeListJson", type:"showDetail", isJson:true,showProp:true}, - { label: "原材料库位列表", prop: "rawLocationCodeListJson", type:"showDetail", isJson:true,showProp:true }, - { label: "线边库位列表", prop: "wipLocationCodeListJson", type:"showDetail", isJson:true,showProp:true }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "[来源]成品/半成品库位", prop: "productLocationCodeListJson", type:"showDetail", isJson:true,showProp:true,width:'180px'}, + { label: "[来源]原材料库位", prop: "rawLocationCodeListJson", type:"showDetail", isJson:true,showProp:true }, + { label: "[完工]线边库位", prop: "wipLocationCodeListJson", type:"showDetail", isJson:true,showProp:true }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 工作中心信息 @@ -657,9 +665,9 @@ export const WorkCenter = [ { label: "工作中心描述", prop: "description" }, { label: "原料库位", prop: "rawLocationCode" }, { label: "成品库位", prop: "productLocationCode" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: "remark" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 班组信息 @@ -671,11 +679,11 @@ export const Team = [ prop: "code" }, { label: "名称", prop: "name" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "成员", prop: "members" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 班次信息 @@ -690,10 +698,10 @@ export const Shift = [ { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" }, { label: "开始时间", prop: "beginTime", type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 作业指导书信息 @@ -704,14 +712,14 @@ export const ItemGuideBook = [ fixed: "left", type: "name" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "步骤", prop: "step" }, { label: "图片存储名称", prop: "pictureBlobName" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 账期信息 @@ -726,12 +734,12 @@ export const accountPeriodNote = [ { label: "迄日期", prop: "endTime", type:'dateTime' }, { label: "最后异动时间", prop: "convertToTime", type:'dateTime' }, { label: "名称", prop: "name" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, { label: "年", prop: "year" }, { label: "月", prop: "month" }, { label: "转换生效时间", prop: "convertToTime", type:'dateTime' }, - { label: "描述", prop: "description" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, ] // 字典信息 @@ -743,10 +751,71 @@ export const Dict = [ type: "name" }, { label: "字典名称", prop: "name" }, - { label: "描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 标准成本价格单 +export const StdCostPriceSheet = [ + { + label: _Names.itemCode, + fixed: "left", + type: "name", + prop: "itemCode", + width:"200px" + }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: "标准成本价格", prop: "stdCostPrice",type:"price" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 采购价格单 +export const PurchasePriceSheet = [ + { + label: _Names.itemCode, + fixed: "left", + type: "name", + prop: "itemCode", + width:"200px" + }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: "供应商编号", prop: "supplierCode" }, + { label: "采购价格", prop: "purchasePrice",type:"price" }, + { label: "价格单描述", prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 销售价格单 +export const SalePriceSheet = [ + { + label: _Names.itemCode, + fixed: "left", + type: "name", + prop: "itemCode", + width:"200px" + }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: "客户代码", prop: "customerCode" }, + { label: "销售价格", prop: "salePrice",type:"price" }, + { label: "价格单描述", prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 分类信息 @@ -758,10 +827,10 @@ export const Category = [ type: "name" }, { label: "分类名称", prop: "name" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 计量单位信息 @@ -774,10 +843,10 @@ export const Uom = [ }, { label: "计量单位名称", prop: "name" }, { label: "类型", prop: "type", type: "filter", filters: "uomType" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 日历信息 @@ -787,144 +856,53 @@ export const Calendar = [ prop: "module", type: "name", fixed: "left" - }, - { label: "状态", prop: "status", type: "filter", filters: "calendarStatus" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "开始时间", prop: "beginTime",type: "dateTime" }, - { label: "结束时间", prop: "endTime", type: "dateTime" }, -] - -// 配置信息 -export const Configuration = [ - { - label: "键", - fixed: "left", - type: "name", - prop: "key" - }, - { label: "值", prop: "value" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, -] - -// 文档信息 -export const documentBasic = [ - { - label: "编码", - fixed: "left", - type: "name", - prop: "code", - width:"200px" - }, - { label: "名称", prop: "name" }, - { label: "描述", prop: "description" }, - { label: "事务类型", type: "filter", prop: "transactionType", filters: "TransTypeBaseForStr" }, - { label: "单号前缀", prop: "numberPrefix" }, - { label: "单号格式", prop: "numberFormat" }, - { label: "单号流水长度", prop: "numberSerialLength" }, - { label: "单号分隔符", prop: "numberSeparator" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, -] - -// 标准成本价格单 -export const StdCostPriceSheet = [ - { - label: _Names.itemCode, - fixed: "left", - type: "name", - prop: "itemCode", - width:"200px" - }, - { label: "物品名称", prop: "item_nameFromFE",showProp:true }, - { label: "物品描述1", prop: "item_desc1FromFE",showProp:true }, - { label: "物品描述2", prop: "item_desc2FromFE",showProp:true }, - { label: "配置", prop: "item_configurationFromFE",showProp:true }, - { label: "标准成本价格", prop: "stdCostPrice",type:"price" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, -] - -// 采购价格单 -export const PurchasePriceSheet = [ - { - label: _Names.itemCode, - fixed: "left", - type: "name", - prop: "itemCode", - width:"200px" - }, - { label: "物品名称", prop: "item_nameFromFE",showProp:true }, - { label: "物品描述1", prop: "item_desc1FromFE",showProp:true }, - { label: "物品描述2", prop: "item_desc2FromFE",showProp:true }, - { label: "配置", prop: "item_configurationFromFE",showProp:true }, - { label: "供应商编号", prop: "supplierCode" }, - { label: "采购价格", prop: "purchasePrice",type:"price" }, - { label: "价格单描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, + }, + { label: "状态", prop: "status", type: "filter", filters: "calendarStatus" }, + { label: "开始时间", prop: "beginTime",type: "dateTime" }, + { label: "结束时间", prop: "endTime", type: "dateTime" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] -// 销售价格单 -export const SalePriceSheet = [ +// 配置信息 +export const Configuration = [ { - label: _Names.itemCode, + label: "键", fixed: "left", type: "name", - prop: "itemCode", - width:"200px" + prop: "key" }, - { label: "物品名称", prop: "item_nameFromFE",showProp:true }, - { label: "物品描述1", prop: "item_desc1FromFE",showProp:true }, - { label: "物品描述2", prop: "item_desc2FromFE",showProp:true }, - { label: "配置", prop: "item_configurationFromFE",showProp:true }, - { label: "客户代码", prop: "customerCode" }, - { label: "销售价格", prop: "salePrice",type:"price" }, - { label: "价格单描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, + { label: "值", prop: "value" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] - -// 原料管理 -/**/ -// 供应商发货通知 -export const SupplierAsn = [ +// 文档信息 +export const documentBasic = [ { - label: "发货单号", - prop: "number", + label: "编码", fixed: "left", type: "name", - width: orderWidth + prop: "code", + width:"200px" }, - { label: "订单号", prop: "poNumber",width: orderWidth }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, - { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" }, - { label: "发货日期", prop: "shipDate",type: "dateTime" }, - { label: "订单备注", prop: 'remark' }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "车牌号", prop: 'truckNumber' }, - { label: "收货口", prop: 'dockCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "联系人姓名", prop: 'contactName' }, - { label: "联系人电话", prop: 'contactPhone' }, - { label: "联系人邮件", prop: 'contactEmail' }, - { label: "到期日期", prop: 'dueDate', type: "dateTime" }, - { label: "时间窗口", prop: 'timeWindow' }, - { label: "筹措员代码", prop: 'planUserCode' }, + { label: "名称", prop: "name" }, + { label: _Public.description, prop: "description" }, + { label: "事务类型", type: "filter", prop: "transactionType", filters: "TransTypeBaseForStr" }, + { label: "单号前缀", prop: "numberPrefix" }, + { label: "单号格式", prop: "numberFormat" }, + { label: "单号流水长度", prop: "numberSerialLength" }, + { label: "单号分隔符", prop: "numberSeparator" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] +// 原料管理 +/**/ // 采购订单信息 export const PurchaseOrder = [ { @@ -934,24 +912,17 @@ export const PurchaseOrder = [ type: "name", width: orderWidth }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress",showProp: true }, - { label: "状态", prop: 'orderStatus', type: "filter", filters: "openToClose" }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "操作员", prop: 'worker' }, - { label: "联系人姓名", prop: 'contactName' }, - { label: "联系人电话", prop: 'contactPhone' }, - { label: "联系人邮件", prop: 'contactEmail' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: _Public.status, prop: 'orderStatus', type: "filter", filters: "openToClose" }, + { label: _Public.worker, prop: 'worker' }, { label: "订单类型", prop: 'poType' }, - { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" }, { label: "订单日期", prop: 'orderDate',type: "dateTime" }, { label: "截止日期", prop: 'dueDate',type: "dateTime" }, - { label: "版本", prop: 'version' }, - { label: "税率", prop: 'taxRate' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购订单信息 （有关闭订单行） @@ -963,23 +934,41 @@ export const PurchaseOrderHigher = [ type: "name", width: orderWidth }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress",showProp: true }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "操作员", prop: 'worker' }, - { label: "联系人姓名", prop: 'contactName' }, - { label: "联系人电话", prop: 'contactPhone' }, - { label: "联系人邮件", prop: 'contactEmail' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: _Public.status, prop: 'orderStatus', type: "filter", filters: "openToClose" }, + { label: _Public.worker, prop: 'worker' }, { label: "订单类型", prop: 'poType' }, - { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" }, { label: "订单日期", prop: 'orderDate',type: "dateTime" }, { label: "截止日期", prop: 'dueDate',type: "dateTime" }, - { label: "版本", prop: 'version' }, - { label: "税率", prop: 'taxRate' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 供应商发货通知 +export const SupplierAsn = [ + { + label: "发货单号", + prop: "number", + fixed: "left", + type: "name", + width: orderWidth + }, + { label: "订单号", prop: "poNumber",width: orderWidth }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" }, + { label: "发货日期", prop: "shipDate",type: "dateTime" }, + { label: _Public.worker, prop: 'worker' }, + { label: "到期日期", prop: 'dueDate', type: "dateTime" }, + { label: "时间窗口", prop: 'timeWindow' }, + { label: "筹措员代码", prop: 'planUserCode' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 到货请求 @@ -994,19 +983,15 @@ export const PurchaseReceiptRequest = [ { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "发货单号", prop: 'asnNumber',width: orderWidth }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "操作员", prop: 'worker' }, - { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "车牌号", prop: 'truckNumber' }, - { label: "收货口", prop: 'dockCode' }, + { label: _Public.worker, prop: 'worker' }, { label: "时间窗口", prop: 'timeWindow' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购收货任务 @@ -1018,30 +1003,22 @@ export const PurchaseReceiptJob = [ type: "name", width: orderWidth }, - { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: _Public.status, prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth }, { label: "采购订单号", prop: "poNumber", width: orderWidth }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, { label: "要求到货日期", prop: "planArriveDate" ,type: "dateTime" }, { label: "完成时间", prop: "completeTime",type: "dateTime" }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, + { label: _Public.worker, prop: 'worker' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, - { label: "任务描述", prop: 'jobDescription' }, { label: "时间窗口", prop: 'timeWindow' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购收货记录 @@ -1053,7 +1030,6 @@ export const PurchaseReceiptNote = [ type: "name", width: orderWidth, }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "发货单号", prop: "asnNumber", width:orderWidth }, { label: "到货单号", prop: "purchaseReceiptRequestNumber", width:orderWidth }, { label: "采购订单号", prop: "poNumber", width:orderWidth }, @@ -1062,11 +1038,11 @@ export const PurchaseReceiptNote = [ { label: "供应商地址", prop: "supplierAddress" }, { label: "备注", prop: 'remark' }, { label: "收货时间", prop: 'receiveTime',type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: "activeDate",type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "要货计划单号", prop: 'rpNumber' }, { label: "任务代码", prop: 'jobNumber' }, + { label: _Public.worker, prop: 'worker' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购收货记录-详情【合格品收货明细】 @@ -1096,31 +1072,31 @@ export const qualifiedInfo = [ { label: "订单行", prop: "poLine" }, { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, - { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, + // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, + // { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "推荐数量", prop: "recommendQty",isNumber:true }, { label: "实际数量", prop: "handledQty",isNumber:true }, - { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, - { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, + // { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, + // { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, - { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" }, - { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" }, + // { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" }, + // { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" }, { label: "库位代码", prop: "locationCode" }, { label: "推荐库位", prop: "recommendToLocationCode" }, { label: "实际库位", prop: "handledToLocationCode" }, - { label: "库区", prop: "locationArea" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, + // { label: "库区", prop: "locationArea" }, + // { label: "推荐库区", prop: "recommendToLocationArea" }, + // { label: "实际库区", prop: "handledToLocationArea" }, { label: "库位组", prop: "locationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, + // { label: "实际库位组", prop: "handledToLocationGroup" }, { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "推荐批次排序", prop: "recommendLot" }, - { label: "实际批次排序", prop: "handledLot" }, + // { label: "推荐批次排序", prop: "recommendLot" }, + // { label: "实际批次排序", prop: "handledLot" }, { label: "供应商批次", prop: "supplierBatch" }, - { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, { label: "备注", prop: 'remark' }, { label: "目检照片Json", prop: 'inspectPhotoJson' }, { label: "不合格原因代码", prop: 'failedReason' }, @@ -1161,32 +1137,32 @@ export const unqualifiedInfo = [ { label: "订单行", prop: "poLine" }, { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, - { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, - { label: "推荐数量", prop: "recommendQty",isNumber:true }, + // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, + // { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, + // { label: "推荐数量", prop: "recommendQty",isNumber:true }, { label: "实际数量", prop: "handledQty" ,isNumber:true}, - { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, + // { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, - { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, - { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, - { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" }, + // { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, + // { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, + // { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" }, { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" }, { label: "库位代码", prop: "locationCode" }, { label: "推荐库位", prop: "recommendToLocationCode" }, { label: "实际库位", prop: "handledToLocationCode" }, { label: "库区", prop: "locationArea" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, + // { label: "推荐库区", prop: "recommendToLocationArea" }, + // { label: "实际库区", prop: "handledToLocationArea" }, { label: "库位组", prop: "locationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, + // { label: "实际库位组", prop: "handledToLocationGroup" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "批次排序", prop: "lot" }, - { label: "推荐批次排序", prop: "recommendLot" }, - { label: "实际批次排序", prop: "handledLot" }, + // { label: "推荐批次排序", prop: "recommendLot" }, + // { label: "实际批次排序", prop: "handledLot" }, { label: "供应商批次", prop: "supplierBatch" }, - { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, { label: "备注", prop: 'remark' }, { label: "目检照片Json", prop: 'inspectPhotoJson' }, { label: "供应商包装计量单位", prop: "supplierPackUom" }, @@ -1210,35 +1186,35 @@ export const lackMaterialsInfo = [ { label: "箱码", prop: "packingCode" }, { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, - { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, + // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, + // { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, { label: "物品单位", prop: "uom" }, { label: "数量", prop: "qty",isNumber:true }, - { label: "推荐数量", prop: "recommendQty",isNumber:true }, - { label: "实际数量", prop: "handledQty",isNumber:true }, + // { label: "推荐数量", prop: "recommendQty",isNumber:true }, + // { label: "实际数量", prop: "handledQty",isNumber:true }, { label: "到货日期", prop: "arriveDate",type: "dateTime" }, - { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, - { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, + // { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, + // { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, - { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, - { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, + // { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, + // { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, - { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" }, - { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" }, + // { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" }, + // { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" }, { label: "库位代码", prop: "locationCode" }, { label: "推荐库位", prop: "recommendToLocationCode" }, { label: "实际库位", prop: "handledToLocationCode" }, - { label: "库区", prop: "locationArea" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, + // { label: "库区", prop: "locationArea" }, + // { label: "推荐库区", prop: "recommendToLocationArea" }, + // { label: "实际库区", prop: "handledToLocationArea" }, { label: "库位组", prop: "locationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, + // { label: "实际库位组", prop: "handledToLocationGroup" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, - { label: "推荐批次排序", prop: "recommendLot" }, - { label: "实际批次排序", prop: "handledLot" }, + // { label: "推荐批次排序", prop: "recommendLot" }, + // { label: "实际批次排序", prop: "handledLot" }, { label: "供应商批次", prop: "supplierBatch" }, - { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, { label: "备注", prop: 'remark' }, { label: "目检照片Json", prop: 'inspectPhotoJson' }, { label: "不合格原因代码", prop: 'failedReason' }, @@ -1256,28 +1232,19 @@ export const InspectRequest = [ fixed: "left", type: "name", }, - { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: _Public.status, prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, { label: "单据号", prop: 'number', width: orderWidth }, - { label: "操作员", prop: "worker" }, + { label: _Public.worker, prop: 'worker' }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, { label: "发货单号", prop: "asnNumber",width: orderWidth }, { label: "收货单号", prop: "receiptNumber",width: orderWidth }, { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "供应商代码", prop: "supplierCode" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "承接者用户名", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "备注", prop: 'remark' }, + { label: _Public.remark, prop: 'remark' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 检验记录 @@ -1295,13 +1262,13 @@ export const InspectNote = [ { label: "发货单号", prop: "asnNumber",width: orderWidth }, { label: "收货单号", prop: "receiptNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, - { label: "筹措员代码", prop: "worker" }, + // { label: "筹措员代码", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "备注", prop: 'remark' }, + // { label: "备注", prop: 'remark' }, { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" }, + // { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" }, ] // 不合格库存（不合格转合格） @@ -1325,18 +1292,18 @@ export const unqualifiedToQualified = [ { label: "到货日期", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "序号", prop: 'serialNumber' }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, - { label: "最后盘点时间", prop: 'lastCountTime' }, - { label: "最后盘点计划", prop: 'lastCountPlanNumber' }, - { label: "最后盘点标签", prop: 'lastCountLabel' }, + // { label: "序号", prop: 'serialNumber' }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "库区", prop: 'locationArea' }, + // { label: "最后盘点时间", prop: 'lastCountTime' }, + // { label: "最后盘点计划", prop: 'lastCountPlanNumber' }, + // { label: "最后盘点标签", prop: 'lastCountLabel' }, { label: "是否可用", prop: 'isActive' }, - { label: "最后事务号", prop: 'lastTransNumber' }, + // { label: "最后事务号", prop: 'lastTransNumber' }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, ] -// 不合格转合格记录 已调整 +// 不合格转合格记录 export const unqualifiedToQualifiedNote = [ { label: "转合格单号", @@ -1345,11 +1312,11 @@ export const unqualifiedToQualifiedNote = [ type: "name", width: orderWidth }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "操作员", prop: "worker" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, + { label: "操作员", prop: "worker" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 采购上架记录 @@ -1362,20 +1329,20 @@ export const PutawayNote = [ fixed: "left", width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, // { label: "备注", prop: 'remark' },//目前用来区分是否打印进行颜色区分，所以隐藏字段 - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "任务单号", prop: 'jobNumber',width: orderWidth }, + // { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "供应商名称", prop: 'supplierName',showProp:true }, - { label: "检验单号", prop: 'inspectNumber' }, - { label: "收货单号", prop: 'receiptNumber' }, - { label: "发货单号", prop: 'asnNumber' }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "完工收货单号", prop: 'productReceiptNumber' }, + { label: "操作员", prop: 'worker' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + // { label: "检验单号", prop: 'inspectNumber' }, + // { label: "收货单号", prop: 'receiptNumber' }, + // { label: "发货单号", prop: 'asnNumber' }, + // { label: "要货计划单号", prop: 'rpNumber' }, + // { label: "完工收货单号", prop: 'productReceiptNumber' }, ] // 人工叫料申请 @@ -1537,18 +1504,18 @@ export const beforeGroundingReturnNote = [ type: "name", width: orderWidth }, - { label: "发货单号", prop: "asnNumber",width: orderWidth }, - { label: "收货单号", prop: "rpNumber", width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, - { label: "退货时间", prop: "returnTime",type: "dateTime" }, + { label: "发货单号", prop: "asnNumber",width: orderWidth }, + // { label: "收货单号", prop: "rpNumber", width: orderWidth }, + { label: "订单号", prop: 'poNumber' }, { label: "操作员", prop: 'worker' }, + { label: "退货时间", prop: "returnTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "订单号", prop: 'poNumber' }, - { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "任务单号", prop: 'jobNumber' }, + // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + // { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' }, ] // 上架后退货申请 @@ -1566,10 +1533,10 @@ export const PurchaseReturnRequest = [ { label: "供应商代码", prop: "supplierCode" }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, + // { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "收货单号", prop: 'rpNumber' }, + // { label: "收货单号", prop: 'rpNumber' }, ] // 上架后退货审批 @@ -1581,16 +1548,14 @@ export const PurchaseReturnApprove = [ width: orderWidth }, { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "收货单号", prop: 'rpNumber' }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, // ************** 确认隐藏 ************************ // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, @@ -1616,22 +1581,12 @@ export const PurchaseReturnJob = [ { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "退货原因代码", prop: 'returnReason' }, { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, - { label: "操作员", prop: "worker" }, - { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "供应商代码", prop: "supplierCode" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "承接者用户名", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "操作员", prop: "worker" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "收货单号", prop: 'rpNumber' }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 上架后退货记录 @@ -1649,11 +1604,8 @@ export const PurchaseReturnNote = [ { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "收货单号", prop: 'rpNumber',width: orderWidth }, { label: "退货请求单号", prop: 'purchaseReturnRequestNumber',width: orderWidth }, ] @@ -1667,12 +1619,9 @@ export const ScrapNote = [ width: orderWidth }, { label: "报废日期", prop: "activeDate",type: "dateTime" }, + { label: "报废类型", prop: 'type' }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "报废类型", prop: 'type' }, - { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth }, ] // 原料直发客户记录 @@ -1687,18 +1636,13 @@ export const materialDirectSendNote = [ { label: "发货日期", prop: "deliverTime",type: "dateTime" }, { label: "客户代码", prop: 'customerCode' }, { label: "客户地址", prop: 'customerAddressCode' }, - { label: "操作员", prop: "worker" }, { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "发货计划单号", prop: 'deliverPlanNumber',width: orderWidth }, - { label: "发货申请单号", prop: 'deliverRequestNumber',width: orderWidth }, { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, - { label: "备注", prop: 'remark' }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] -// 直接发料记录 +// 非生产调拨记录 export const directIssueNote = [ { label: "发料记录单号", @@ -1707,18 +1651,9 @@ export const directIssueNote = [ type: "name", width: orderWidth }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, - { label: "车间", prop: 'workshop' }, - { label: "叫料请求类型", prop: 'requestType' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, ] // 成品管理 @@ -2282,12 +2217,12 @@ export const InventoryBalance = [ { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth }, - { label: "最后盘点标签", prop: "lastCountLabel" }, + // { label: "最后盘点标签", prop: "lastCountLabel" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "库位组", prop: "locationGroup" }, { label: "库区", prop: "locationArea" }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, - { label: "序号", prop: "serialNumber" }, + // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: "remark" }, { label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "供应商批次", prop: "supplierBatch" }, @@ -2451,7 +2386,7 @@ export const expectOut = [ }, { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, + // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: _Names.itemCode, prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, @@ -2468,7 +2403,7 @@ export const expectOut = [ { label: "到货日期", prop: "arriveDate",type:"dateTime" }, { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, - { label: "序号", prop: "serialNumber" }, + // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, ] @@ -2499,8 +2434,8 @@ export const expectIn = [ { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "序号", prop: 'serialNumber' }, + // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, + // { label: "序号", prop: 'serialNumber' }, { label: "备注", prop: 'remark' }, ] @@ -3547,6 +3482,7 @@ export const IssueRequestZS = [ // 注塑任务 export const IssueJobZS = [ { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: "injectionRequestNumber" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, @@ -3568,12 +3504,12 @@ export const IssueJobZS = [ export const IssueNoteZS = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, + { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, - { label: "任务代码", prop: 'jobNumber' }, { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -3598,6 +3534,7 @@ export const IssueRequestPT = [ // 喷涂任务 export const IssueJobPT = [ { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: "injectionRequestNumber" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, @@ -3619,12 +3556,12 @@ export const IssueJobPT = [ export const IssueNotePT = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, + { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, - { label: "任务代码", prop: 'jobNumber' }, { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -3649,6 +3586,7 @@ export const IssueRequestZP = [ // 装配任务 export const IssueJobZP = [ { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: "injectionRequestNumber" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, @@ -3670,12 +3608,12 @@ export const IssueJobZP = [ export const IssueNoteZP = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, + { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, - { label: "任务代码", prop: 'jobNumber' }, { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -3700,6 +3638,7 @@ export const IssueRequestBP = [ // 备品任务 export const IssueJobBP = [ { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: "injectionRequestNumber" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, @@ -3721,12 +3660,12 @@ export const IssueJobBP = [ export const IssueNoteBP = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, + { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, - { label: "任务代码", prop: 'jobNumber' }, { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -3932,6 +3871,7 @@ export const KittingIssueRequest = [ // kitting任务 export const KittingIssueJob = [ { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: "injectionRequestNumber" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, @@ -3953,12 +3893,12 @@ export const KittingIssueJob = [ export const KittingIssueNote = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber',width: orderWidth }, + { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, - { label: "任务代码", prop: 'jobNumber' }, { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 0b90ebbce..7260bda8b 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -33,10 +33,10 @@ export const ItemBasic = [ // 物品质量信息 export const ItemQuality = [ { label: _Names.itemCode, prop: "itemCode" }, - { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, - { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, - { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, - { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: _Names.supplierCode, prop: 'supplierCode' }, { label: _Names.supplierName, prop: 'supplierName' }, { label: _Public.status, prop: 'status', type: "filter", filters: "openToClose" }, @@ -60,12 +60,7 @@ export const ItemCategory = [ // 物品包装信息 export const ItemPack = [ - { - label: _Names.itemCode, - prop: "itemCode", - fixed: "left", - type: "name" - }, + { label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemName, prop: "item_nameFromFE" }, { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, @@ -213,107 +208,84 @@ export const Project = [ // 供应商信息 export const Supplier = [ - { label: "供应商代码", prop: "code" }, - { label: "供应商名称", prop: "name" }, + { label: _Names.supplierCode, prop: "code" }, + { label: _Names.supplierName, prop: "name" }, { label: "简称", prop: "shortName" }, { label: "税率", prop: "taxRate" }, { label: "状态", prop: "isActive", type: "filter", filters: "openToCloseBit" }, { label: "类型", prop: "type", type: "filter", filters: "supplierType" }, - { label: "国家", prop: "country" }, - { label: "城市", prop: "city" }, - { label: "地址", prop: "address" }, - { label: "联系人", prop: 'contacts' }, - { label: "电话", prop: 'phone' }, + { label: "联系人", prop: "contacts" }, + { label: "电话", prop: "phone" }, { label: "传真", prop: 'fax' }, { label: "邮编", prop: 'postID' }, + { label: "备注", prop: 'remark' }, + { label: "地址", prop: 'address' }, + { label: "国家", prop: 'country' }, + { label: "城市", prop: 'city' }, { label: "银行", prop: 'bank' }, { label: "货币", prop: 'currency' }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, ] // 供应商物品信息 export const SupplierItem = [ + { label: _Names.supplierCode, prop: 'supplierCode' }, { label: _Names.itemCode, prop: "itemCode" }, - { label: "物品名称", prop: "itemName" }, - { label: "供应商代码", prop: 'supplierCode' }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: "供应商物品代码", prop: "supplierItemCode" }, - { label: "供应商简称", prop: "SupplierSimpleName" }, - { label: "版本", prop: "version" }, - { label: "备注", prop: 'remark' }, - { label: "供应商包装数量", prop: "supplierPackQty" }, - { label: "供应商包装单位", prop: "supplierPackUom" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "供应商物品名称", prop: "itemName" }, + { label: _Names.supplierName, prop: 'supplierName' }, + { label: "供应商简称", prop: "supplierSimpleName" }, + { label: "供应商包装数量", prop: "supplierPackQty",isNumber:true }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 供应商时间窗口 export const SupplierTimeWindow = [ - { label: "供应商代码", prop: 'supplierCode' }, - { label: "供应商名称", prop: 'supplierName' }, + { label: _Names.supplierCode, prop: 'supplierCode' }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: "当前星期", prop: "week", type: "filter", filters: "week" }, { label: "时间窗口", prop: "timeSlot" }, - { label: "当前星期", prop: "week" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 收货口信息 export const Dock = [ - { label: "默认库位代码", prop: "defaultLocationCode" }, { label: "收货口代码", prop: "code" }, { label: "收货口名称", prop: 'name' }, + { label: "默认库位代码", prop: "defaultLocationCode" }, { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 区域信息 export const Area = [ { label: "区域代码", prop: "code" }, - { label: "区域名称", prop: 'name' }, + { label: "区域名称", prop: "name" }, { label: "是否功能区", prop: "isFunctional", type: "filter", filters: "whetherOrNot" }, - { label: "类型", prop: "areaType", type: "filter", filters: "areaType" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "类型", prop: "areaType", type: "filter", filters: "areaType" }, + // { label: "描述", prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位组信息 export const LocationGroup = [ + { label: "库位组代码", prop: "code" }, + { label: "库位组名称", prop: 'name' }, { label: "区域代码", prop: "areaCode" }, { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" }, { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, - { label: "拣料优先级", prop: "pickPriority" }, - { label: "编号", prop: "code" }, - { label: "名称", prop: 'name' }, - { label: "描述", prop: "description" }, - { label: "溢流库位组", prop: "overflowLocationGroup" }, - { label: "备注", prop: 'remark' }, - { label: "是否拆箱", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableSplitBox" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, @@ -330,6 +302,9 @@ export const LocationGroup = [ { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 工作组信息 @@ -337,29 +312,26 @@ export const WorkGroup = [ { label: "工作组代码", prop: "code" }, { label: "工作组名称", prop: 'name' }, { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位信息 export const Location = [ - { label: "库位代码", prop: "code" }, - { label: "库位名称", prop: "name" }, + { label: _Names.locationCode, prop: "code" }, + { label: _Names.locationName, prop: "name" }, { label: "区域代码", prop: "areaCode" }, { label: "库位组代码", prop: "locationGroupCode" }, { label: "工作组代码", prop: "workGroupCode" }, { label: "库位类型", prop: "type", type: "filter", filters: "locationType" }, + { label: _Names.locationErpCode, prop: "erpLocationCode" }, + { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' }, + { label: "货架号", prop: "shelfCode" }, { label: "行号", prop: "rowCode" }, { label: "列号", prop: "columnCode" }, - { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, { label: "拣料优先级", prop: "pickPriority" }, { label: "拣料顺序", prop: "pickOrder" }, - { label: "货架号", prop: "shelfCode" }, - { label: "ERP系统库位代码", prop: "erpLocationCode" }, { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, @@ -375,180 +347,153 @@ export const Location = [ { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, - { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位零件关系 export const ItemStoreRelation = [ { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, + { label: "库位", prop: "storeValue" }, { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" }, - { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" }, - { label: "主存储容量", prop: "umQty" }, + { label: "主存储容量", prop: "umQty",isNumber:true }, { label: "主存储单位", prop: "storeUM" }, - { label: "次要存储容量", prop: "altUmQty" }, + { label: "次要存储容量", prop: "altUmQty" ,isNumber:true}, { label: "次要存储单位", prop: "altUm" }, { label: "存储单位", prop: "pramaryUM", type: "filter", filters: "pramaryUm" }, - { label: "值", prop: "storeValue" }, - { label: "备注", prop: 'remark' }, - { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" }, - { label: "库位代码", prop: "locationCode" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库位可用容量信息 export const InventoryLocationCapacity = [ + { label: _Names.locationCode, prop: "locationCode" }, { label: "可用容量(%)", prop: "availableCapacity" }, { label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "备注", prop: 'remark' }, { label: "已用容量", prop: "usedCapacity" }, { label: "可承受过载容量", prop: "bearableOverloadCapacity" }, - { label: "库位", prop: "locationCode" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 物品安全库存信息 export const ItemSafetyStock = [ { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, { label: "存储关系代码", prop: "storeValue" }, { label: "最大库存", prop: "maxStock" }, { label: "最小库存", prop: "minStock" }, { label: "安全库存", prop: "safetyStock" }, - { label: "补料点", prop: "feedLine" }, - { label: "补料数量", prop: "feedQty" }, - { label: "补料单位", prop: "feedUM" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 事务类型信息 export const TransactionType = [ + { label: "事务ID", prop: 'id' }, { label: "事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" }, { label: "事务子类型", prop: "transSubType", type: "filter", filters: "transSubType" }, - { label: "入库库位类型", prop: 'inLocationTypes', type: "filterList", filters: "locationType" }, - { label: "出库库位类型", prop: 'outLocationTypes', type: "filterList", filters: "locationType" }, + { label: "入库库位类型", prop: 'inLocationTypes', type: "filterList", filters: "locationType", width: "300px" }, + { label: "出库库位类型", prop: 'outLocationTypes', type: "filterList", filters: "locationType", width: "300px" }, { label: "物品状态", prop: 'itemStatuses', type: "filterList", filters: "ItemStatus" }, { label: "物品类型", prop: 'itemTypes', type: "filterList", filters: "ItemType" }, { label: "来源库存状态", prop: 'outInventoryStatuses', type: "filterList", filters: "inventoryStage" }, { label: "目标库存状态", prop: 'inInventoryStatuses', type: "filterList", filters: "inventoryStage" }, - { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "是否可用", prop: 'enabled', type: "filter", filters: "whetherOrNot" }, - { label: "描述", prop: 'description' }, { label: "入库库区列表", prop: 'inLocationAreas' }, { label: "出库库区列表", prop: 'outLocationAreas' }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 库存开账 export const InventoryBilling = [ - { label: _Names.itemCode, prop: "itemCode", type: "name" }, - { label: "物品名称", prop: "item_nameFromFE" }, - { label: "物品描述1", prop: "item_desc1FromFE" }, - { label: "物品描述2", prop: "item_desc2FromFE" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "TYRP储位代码", prop: "erpLocationCode" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, + { label: "TYRP储位代码", prop: "erpLocationCode",width:"180px" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 车间信息 export const Workshop = [ { label: "车间代码", prop: "code" }, - { label: "车间名称", prop: 'name' }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "车间名称", prop: "name" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 生产线信息 export const ProductionLine = [ - { label: "生产线代码", prop: "code", fixed: "left", type: "name" }, + { label: "生产线代码", prop: "code" }, { label: "生产线名称", prop: 'name' }, { label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" }, { label: "生产库位代码", prop: "locationCode" }, - { label: "描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 生产线零件关系 export const ProductionLineItem = [ { label: _Names.itemCode, prop: "itemCode" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "生产线代码", prop: "prodLineCode" }, - { label: "成品/半成品库位列表", prop: "productLocationCodeListJson", type:"json" }, - { label: "原材料库位列表", prop: "rawLocationCodeListJson", type:"json" }, - { label: "线边库位列表", prop: "wipLocationCodeListJson", type:"json" }, - { label: "备注", prop: "remark" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "[来源]成品/半成品库位", prop: "productLocationCodeListJson", type:"json" }, + { label: "[来源]原材料库位", prop: "rawLocationCodeListJson", type:"json" }, + { label: "[完工]线边库位", prop: "wipLocationCodeListJson", type:"json" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 工作中心信息 export const WorkCenter = [ - { label: "生产线代码", prop: "productionLineCode" }, - { label: "原料库位", prop: "rawLocation" }, - { label: "成品库位", prop: "productLocation" }, - { label: "工作中心代码", prop: "code" }, - { label: "工作中心名称", prop: 'name' }, + { label: "编号", prop: "code" }, + { label: "生产线", prop: "productionLineCode" }, { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" }, + { label: "名称", prop: "name" }, { label: "工作中心描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "原料库位", prop: "rawLocationCode" }, + { label: "成品库位", prop: "productLocationCode" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 班组信息 export const Team = [ - { label: "班组代码", prop: "code" }, - { label: "班组名称", prop: 'name' }, + { label: "编号", prop: "code" }, + { label: "名称", prop: "name" }, { label: "成员", prop: "members" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 班次信息 @@ -556,448 +501,312 @@ export const Shift = [ { label: "班次代码", prop: "code" }, { label: "班次名称", prop: "name" }, { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" }, - { label: "描述", prop: "description" }, { label: "开始时间", prop: "beginTime", type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 作业指导书信息 export const ItemGuideBook = [ { label: _Names.itemCode, prop: "itemCode" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg" }, - { label: "步骤", prop: "step", type:'textarea', rows: 5 ,readonly:true }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: "步骤", prop: "step" }, + { label: "图片存储名称", prop: "pictureBlobName" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 账期信息 export const accountPeriodNote = [ - { label: "名称", prop: "name" }, - { label: "启日", prop: "beginTime",type:'dateTime' }, + { label: "代码", prop: "code" }, + { label: "启日", prop: "beginTime", type:'dateTime' }, { label: "迄日期", prop: "endTime", type:'dateTime' }, { label: "最后异动时间", prop: "convertToTime", type:'dateTime' }, + { label: "名称", prop: "name" }, { label: "年", prop: "year" }, { label: "月", prop: "month" }, - { label: "代码", prop: "code" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "转换生效时间", prop: "convertToTime", type:'dateTime' }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, ] // 字典信息 export const Dict = [ { label: "字典编号", prop: "code" }, { label: "字典名称", prop: "name" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 标准成本价格单 +export const StdCostPriceSheet = [ + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, + { label: "标准成本价格", prop: "stdCostPrice",type:"price" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 采购价格单 +export const PurchasePriceSheet = [ + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, + { label: "供应商编号", prop: "supplierCode" }, + { label: "采购价格", prop: "purchasePrice",type:"price" }, + { label: "价格单描述", prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 销售价格单 +export const SalePriceSheet = [ + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE" }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE" }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, + { label: "客户代码", prop: "customerCode" }, + { label: "销售价格", prop: "salePrice",type:"price" }, + { label: "价格单描述", prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 分类信息 export const Category = [ { label: "分类代码", prop: "code" }, - { label: "分类名称", prop: 'name' }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "分类名称", prop: "name" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 计量单位信息 export const Uom = [ { label: "计量单位编号", prop: "code" }, - { label: "计量单位名称", prop: 'name' }, + { label: "计量单位名称", prop: "name" }, { label: "类型", prop: "type", type: "filter", filters: "uomType" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.description, prop: "description" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 日历信息 export const Calendar = [ { label: "模块", prop: "module" }, { label: "状态", prop: "status", type: "filter", filters: "calendarStatus" }, - { label: "开始时间", prop: "beginTime", type: "dateTime" }, + { label: "开始时间", prop: "beginTime",type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 配置信息 export const Configuration = [ { label: "键", prop: "key" }, { label: "值", prop: "value" }, - { label: "描述", prop: "description" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.description, prop: "description" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 文档信息 export const documentBasic = [ { label: "编号", prop: "code" }, { label: "名称", prop: "name" }, - { label: "事务ID", prop: "tenantId" }, - { label: "事务类型", prop: "transactionType" ,type: "filter", filters: "TransTypeBaseForStr" }, + { label: _Public.description, prop: "description" }, + { label: "事务类型", type: "filter", prop: "transactionType", filters: "TransTypeBaseForStr" }, { label: "单号前缀", prop: "numberPrefix" }, { label: "单号格式", prop: "numberFormat" }, { label: "单号流水长度", prop: "numberSerialLength" }, { label: "单号分隔符", prop: "numberSeparator" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "备注", prop: "remark" }, - { label: "描述", prop: "description" }, -] - -// 标准成本价格单 -export const StdCostPriceSheet = [ - { - label: _Names.itemCode, - fixed: "left", - type: "name", - prop: "itemCode", - width:"200px" - }, - { label: "物品名称", prop: "item_nameFromFE" }, - { label: "物品描述1", prop: "item_desc1FromFE" }, - { label: "物品描述2", prop: "item_desc2FromFE" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "标准成本价格", prop: "stdCostPrice",type:"price" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, -] - -// 采购价格单 -export const PurchasePriceSheet = [ - { - label: _Names.itemCode, - fixed: "left", - type: "name", - prop: "itemCode", - width:"200px" - }, - { label: "物品名称", prop: "item_nameFromFE" }, - { label: "物品描述1", prop: "item_desc1FromFE" }, - { label: "物品描述2", prop: "item_desc2FromFE" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "供应商编号", prop: "supplierCode" }, - { label: "采购价格", prop: "purchasePrice",type:"price" }, - { label: "价格单描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, -] - -// 销售价格单 -export const SalePriceSheet = [ - { - label: _Names.itemCode, - fixed: "left", - type: "name", - prop: "itemCode", - width:"200px" - }, - { label: "物品名称", prop: "item_nameFromFE" }, - { label: "物品描述1", prop: "item_desc1FromFE" }, - { label: "物品描述2", prop: "item_desc2FromFE" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "客户代码", prop: "customerCode" }, - { label: "销售价格", prop: "salePrice",type:"price" }, - { label: "价格单描述", prop: "description" }, - { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "备注", prop: "remark" }, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 原料管理 /**/ -// 供应商发货通知 -export const SupplierAsn = [ - { label: "发货单号", prop: "number" }, - { label: "订单号", prop: "poNumber" }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" }, - { label: "发货日期", prop: "shipDate",type: "dateTime" }, - { label: "订单备注", prop: 'remark' }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "车牌号", prop: 'truckNumber' }, - { label: "收货口", prop: 'dockCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "联系人姓名", prop: 'contactName' }, - { label: "联系人电话", prop: 'contactPhone' }, - { label: "联系人邮件", prop: 'contactEmail' }, - { label: "到期日期", prop: 'dueDate', type: "dateTime" }, - { label: "时间窗口", prop: 'timeWindow' }, - { label: "筹措员代码", prop: 'planUserCode' }, - { label: "创建者ID", prop: 'creatorId' }, -] - // 采购订单信息 export const PurchaseOrder = [ { label: "采购订单号", prop: 'number' }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, - { label: "状态", prop: 'orderStatus', type: "filter", filters: "openToClose" }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "操作员", prop: 'worker' }, - { label: "联系人姓名", prop: 'contactName' }, - { label: "联系人电话", prop: 'contactPhone' }, - { label: "联系人邮件", prop: 'contactEmail' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: _Public.status, prop: 'orderStatus', type: "filter", filters: "openToClose" }, + { label: _Public.worker, prop: 'worker' }, { label: "订单类型", prop: 'poType' }, - { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" }, { label: "订单日期", prop: 'orderDate',type: "dateTime" }, { label: "截止日期", prop: 'dueDate',type: "dateTime" }, - { label: "版本", prop: 'version' }, - { label: "税率", prop: 'taxRate' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购订单信息 （有关闭订单行） export const PurchaseOrderHigher = [ { label: "采购订单号", prop: 'number' }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "操作员", prop: 'worker' }, - { label: "联系人姓名", prop: 'contactName' }, - { label: "联系人电话", prop: 'contactPhone' }, - { label: "联系人邮件", prop: 'contactEmail' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: _Public.status, prop: 'orderStatus', type: "filter", filters: "openToClose" }, + { label: _Public.worker, prop: 'worker' }, { label: "订单类型", prop: 'poType' }, - { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" }, { label: "订单日期", prop: 'orderDate',type: "dateTime" }, { label: "截止日期", prop: 'dueDate',type: "dateTime" }, - { label: "版本", prop: 'version' }, - { label: "税率", prop: 'taxRate' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 供应商发货通知 +export const SupplierAsn = [ + { label: "发货单号", prop: "number" }, + { label: "订单号", prop: "poNumber" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress" }, + { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" }, + { label: "发货日期", prop: "shipDate",type: "dateTime" }, + { label: _Public.worker, prop: 'worker' }, + { label: "到期日期", prop: 'dueDate', type: "dateTime" }, + { label: "时间窗口", prop: 'timeWindow' }, + { label: "筹措员代码", prop: 'planUserCode' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 到货请求 export const PurchaseReceiptRequest = [ { label: "到货单号", prop: "number" }, + { label: "请求状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, { label: "订单号", prop: "poNumber" }, { label: "发货单号", prop: 'asnNumber' }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, - { label: "计划到货日期", prop: "planArriveDate",type: "dateTime" }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "操作员", prop: 'worker' }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "请求状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "车牌号", prop: 'truckNumber' }, - { label: "收货口", prop: 'dockCode' }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" }, + { label: _Public.worker, prop: 'worker' }, { label: "时间窗口", prop: 'timeWindow' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购收货任务 export const PurchaseReceiptJob = [ { label: "收货任务编号", prop: "number" }, - { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, + { label: _Public.status, prop: "jobStatus", type: "filter", filters: "jobStatus" }, { label: "发货单号", prop: "asnNumber" }, { label: "到货单号", prop: "purchaseReceiptRequestNumber" }, { label: "采购订单号", prop: "poNumber" }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商名称", prop: "supplierName" }, - { label: "供应商地址", prop: "supplierAddress" }, - { label: "要求到货日期", prop: 'planArriveDate',type:'dateTime' }, - { label: "订单备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "承接用户", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime',type: "dateTime" }, - { label: "完成用户", prop: "completeUserName" }, + { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.supplierName, prop: "supplierName" }, + { label: _Names.supplierAddress, prop: "supplierAddress",showProp: true }, + { label: "要求到货日期", prop: "planArriveDate" ,type: "dateTime" }, { label: "完成时间", prop: "completeTime",type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, - { label: "任务描述", prop: 'jobDescription' }, + { label: _Public.worker, prop: 'worker' }, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者用户名", prop: 'completeUserName' }, { label: "时间窗口", prop: 'timeWindow' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 采购收货记录 export const PurchaseReceiptNote = [ { label: "收货单号", prop: 'number' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "发货单号", prop: "asnNumber" }, - { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, + { label: "到货单号", prop: "purchaseReceiptRequestNumber" }, { label: "采购订单号", prop: "poNumber" }, { label: "供应商代码", prop: "supplierCode" }, { label: "供应商名称", prop: "supplierName" }, { label: "供应商地址", prop: "supplierAddress" }, { label: "备注", prop: 'remark' }, - { label: "收货时间", prop: "receiveTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "要货计划单号", prop: 'rpNumber' }, + { label: "收货时间", prop: 'receiveTime',type: "dateTime" }, { label: "任务代码", prop: 'jobNumber' }, + { label: _Public.worker, prop: 'worker' }, + { label: _Public.activeDate, prop: "activeDate", type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 报检单 export const InspectRequest = [ { label: "检验单号", prop: "number" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: _Public.status, prop: "jobStatus", type: "filter", filters: "jobStatus" }, + { label: "单据号", prop: 'number' }, + { label: _Public.worker, prop: 'worker' }, { label: "采购订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, { label: "收货单号", prop: "receiptNumber" }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接用户", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成用户", prop: 'completeUserName' }, + { label: "供应商代码", prop: "supplierCode" }, + { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "检验单号", prop: 'inspectNumber' }, - { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, + { label: _Public.remark, prop: 'remark' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 检验记录 export const InspectNote = [ { label: "检验单号", prop: "number" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "筹措员代码", prop: "worker" }, + { label: "单据号", prop: 'number' }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "采购订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, - { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "收货单号", prop: "receiptNumber" }, { label: "供应商代码", prop: "supplierCode" }, - { label: "备注", prop: 'remark' }, - { label: "检验单号", prop: 'inspectNumber' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "要货计划单号", prop: 'rpNumber' }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, - { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" }, ] // 不合格转合格记录 export const unqualifiedToQualifiedNote = [ { label: "转合格单号", prop: "number" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "备注", prop: 'remark' }, { label: "操作员", prop: "worker" }, - { label: "创建者ID", prop: "creatorId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "备注", prop: 'remark' }, ] // 采购上架记录 export const PutawayNote = [ { label: "上架记录单号", prop: 'number' }, - { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "供应商代码", prop: 'supplierCode' }, + { label: "供应商名称", prop: 'supplierName',showProp:true }, { label: "操作员", prop: 'worker' }, // { label: "备注", prop: 'remark' },//目前用来区分是否打印进行颜色区分，所以隐藏字段 - { label: "任务单号", prop: 'jobNumber' }, - { label: "创建者ID", prop: "creatorId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "供应商代码", prop: 'supplierCode' }, - { label: "供应商名称", prop: 'supplierName' }, - { label: "检验单号", prop: 'inspectNumber' }, - { label: "收货单号", prop: 'receiptNumber' }, - { label: "发货单号", prop: 'asnNumber' }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "完工收货单号", prop: 'productReceiptNumber' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, ] // 人工叫料申请 @@ -1007,7 +816,6 @@ export const IssueRequest = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, @@ -1015,8 +823,6 @@ export const IssueRequest = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备料计划单号", prop: 'preparationPlanNumber' }, { label: "生产线", prop: 'prodLine' }, @@ -1038,17 +844,12 @@ export const IssueJob = [ { label: "叫料请求类型", prop: 'requestType' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "上游任务编号", prop: 'upStreamJobNumber',}, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "事务ID", prop: "tenantId" }, { label: "工作组", prop: 'workGroupCode' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, @@ -1065,10 +866,7 @@ export const IssueNote = [ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "车间", prop: 'workshop' }, { label: "确认时间", prop: 'confirmTime', type: "dateTime" }, @@ -1081,7 +879,6 @@ export const automaticCallApply = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, @@ -1089,8 +886,6 @@ export const automaticCallApply = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备料计划单号", prop: 'preparationPlanNumber' }, { label: "生产线", prop: 'prodLine' }, @@ -1112,17 +907,12 @@ export const automaticCallJob = [ { label: "叫料请求类型", prop: 'requestType' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "上游任务编号", prop: 'upStreamJobNumber',}, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "事务ID", prop: "tenantId" }, { label: "工作组", prop: 'workGroupCode' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, @@ -1139,10 +929,7 @@ export const automaticCallNote = [ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate' }, { label: "车间", prop: 'workshop' }, { label: "确认时间", prop: 'confirmTime' }, @@ -1151,139 +938,82 @@ export const automaticCallNote = [ // 上架前退货记录 export const beforeGroundingReturnNote = [ { label: "退货单号", prop: "number" }, + { label: "供应商代码", prop: "supplierCode" }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: 'poNumber' }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "退货时间", prop: "returnTime", type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, + { label: "退货时间", prop: "returnTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "收货单号", prop: "rpNumber" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "生效日期", prop: 'activeDate' }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' }, ] // 上架后退货申请 export const PurchaseReturnRequest = [ { label: "退货申请单号", prop: "number" }, - { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, + { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: "supplierCode" }, - { label: "退货时间", prop: "returnTime",type:"dateTime" }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: "creatorId" }, + { label: "退货时间", prop: "returnTime", type:"dateTime" }, + { label: "操作员", prop: "worker" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "收货单号", prop: 'rpNumber' }, ] // 上架后退货审批 export const PurchaseReturnApprove = [ { label: "退货申请单号", prop: "number" }, - { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, + { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: "supplierCode" }, - { label: "退货时间", prop: "returnTime",type:"dateTime" }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, + { label: "退货时间", prop: "returnTime", type:"dateTime" }, + { label: "操作员", prop: "worker" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "收货单号", prop: 'rpNumber' }, ] // 上架后退货任务 export const PurchaseReturnJob = [ { label: "退货任务单号", prop: "number" }, { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, - { label: "退货申请单号", prop: 'purchaseReturnRequestNumber' }, + { label: "退货申请单号", prop: "purchaseReturnRequestNumber" }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "退货原因代码", prop: 'returnReason' }, { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, - { label: "承接用户", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成用户", prop: 'completeUserName' }, + { label: "供应商代码", prop: "supplierCode" }, + { label: "操作员", prop: "worker" }, + { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "供应商代码", prop: "supplierCode" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "操作员", prop: 'worker' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, - { label: "收货单号", prop: 'rpNumber' }, - { label: "任务描述", prop: 'jobDescription' }, ] // 上架后退货记录 export const PurchaseReturnNote = [ - { label: "退货单号", prop: "number" }, + { label: "退货记录单号", prop: "number" }, + { label: "订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, - { label: "订单号", prop: 'poNumber' }, { label: "供应商代码", prop: "supplierCode" }, - { label: "退货时间", prop: "returnTime", type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "收货单号", prop: "rpNumber" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "生效日期", prop: 'activeDate' }, - { label: "任务ID", prop: 'jobNumber' }, + { label: "退货时间", prop: "returnTime", type:"dateTime" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, + { label: "生效日期", prop: 'activeDate',type: "dateTime" }, + { label: "任务单号", prop: 'jobNumber' }, { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' }, + ] // 原料报废记录 export const ScrapNote = [ { label: "报废记录单号", prop: "number" }, { label: "报废日期", prop: "activeDate",type: "dateTime" }, + { label: "报废类型", prop: 'type' }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "报废类型", prop: 'type' }, - { label: "报废请求单号", prop: 'scrapRequestNumber' }, ] // 原料直发记录 @@ -1292,38 +1022,18 @@ export const materialDirectSendNote = [ { label: "发货日期", prop: "deliverTime",type: "dateTime" }, { label: "客户代码", prop: 'customerCode' }, { label: "客户地址", prop: 'customerAddressCode' }, + { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, + { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, { label: "操作员", prop: "worker" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "发货计划单号", prop: 'deliverPlanNumber' }, - { label: "发货申请单号", prop: 'deliverRequestNumber' }, - { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, ] -// 直接发料记录 +// 非生产调拨记录 export const directIssueNote = [ { label: "发料记录单号", prop: "number" }, - { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "叫料请求类型", prop: 'requestType' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "生效日期", prop: 'activeDate' }, - { label: "车间", prop: 'workshop' }, - { label: "确认时间", prop: 'confirmTime' }, + { label: "生效日期", prop: 'activeDate',type: "dateTime" }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, ] // 成品管理 @@ -1340,16 +1050,13 @@ export const ProductReceiptRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "生产计划编号", prop: 'productionPlanNumber' }, { label: "车间", prop: 'workshop' }, { label: "生产线", prop: 'prodLine' }, { label: "班次", prop: 'shift' }, { label: "班组", prop: 'team' }, - { label: "事务ID", prop: "tenantId" }, { label: "计划日期", prop: 'planDate' }, ] @@ -1359,16 +1066,12 @@ export const ProductReceiptNote = [ { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "完工时间", prop: 'completeTime',type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "操作员", prop: 'worker' }, { label: "上级关联菜单号", prop: 'sourceNumber' }, { label: "生产计划单号", prop: 'productionPlanNumber' }, - { label: "任务ID", prop: 'jobNumber' }, { label: "车间", prop: 'workShop' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 完工收货报废申请 @@ -1382,12 +1085,9 @@ export const ProductReceiptScrapRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, { label: "报废类型", prop: 'type' }, ] @@ -1397,12 +1097,8 @@ export const ProductReceiptScrapNote = [ { label: "报废日期", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "任务ID", prop: 'jobNumber' }, { label: "报废类型", prop: 'type' }, { label: "报废请求单号", prop: 'scrapRequestNumber' }, ] @@ -1421,11 +1117,8 @@ export const partiallyPreparedProductsNote = [ { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 成品发货申请 @@ -1444,11 +1137,8 @@ export const DeliverRequest = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 成品发货任务 @@ -1464,19 +1154,14 @@ export const DeliverJob = [ { label: "完成用户", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, { label: "任务类型", prop: 'jobType' }, { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, { label: "任务描述", prop: 'jobDescription' }, { label: "客户地址", prop: 'customerAddressCode' }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, @@ -1492,11 +1177,8 @@ export const DeliverNote = [ { label: "客户地址", prop: 'customerAddressCode' }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, @@ -1516,12 +1198,9 @@ export const FISDeliverRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, ] @@ -1539,12 +1218,9 @@ export const FISDeliverJob = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, ] @@ -1558,11 +1234,8 @@ export const FISDeliverNote = [ { label: "客户地址", prop: 'customerAddressCode' }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, @@ -1575,11 +1248,8 @@ export const customerDismantle = [ { label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "车间", prop: 'workshop' }, { label: "班次", prop: 'shift' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -1620,11 +1290,8 @@ export const customerDismantleJob = [ export const customerDismantleNote = [ { label: "退拆记录单号", prop: "number" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, { label: "操作员", prop: "worker" }, { label: "生效时间", prop: "activeDate",type: "dateTime" }, { label: "回收时间", prop: "recycleTime" ,type: "dateTime" }, @@ -1644,12 +1311,9 @@ export const productionReturnRequest = [ { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 生产退库任务 @@ -1663,9 +1327,7 @@ export const productionReturnJob = [ { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成用户", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, { label: "任务类型", prop: 'jobType' }, @@ -1673,10 +1335,7 @@ export const productionReturnJob = [ { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, { label: "任务描述", prop: 'jobDescription' }, - { label: "事务ID", prop: "tenantId" }, ] // 生产退库记录 @@ -1686,13 +1345,9 @@ export const productionReturnNote = [ { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "退料时间", prop: 'returnTime', type: "dateTime" }, - { label: "任务ID", prop: 'jobNumber' }, ] // 标签管理 @@ -1711,7 +1366,6 @@ export const labelsList = [ { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: "remark" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商代码", prop: 'supplierCode' }, @@ -1728,12 +1382,10 @@ export const labelsList = [ { label: "生产时间", prop: "produceDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId",type:"dateTime" }, { label: "规格", prop: "specifications" }, { label: "生产线", prop: "prodLine" }, { label: "班次", prop: 'shift' }, { label: "班组", prop: 'team' }, - { label: "事务ID", prop: "tenantId" }, { label: "质量级别", prop: "qLevel" }, { label: "质检文件", prop: "qualityFile" }, { label: "器具号", prop: 'containerCode' }, @@ -1748,11 +1400,8 @@ export const InventoryInitialNote = [ { label: "生效日期", prop: "activeDate",type: "dateTime" }, { label: "库存初始化请求单号", prop: "requestNumber" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 库存余额 @@ -1781,11 +1430,8 @@ export const InventoryInitialNote = [ { label: "标准成本单价", prop: "stdCostPrice" }, { label: "标准成本金额", prop: "stdCost" }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "事务ID", prop: "tenantId" }, { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "最后事务编号", prop: "lastTransNumber" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "库区", prop: "locationArea" }, @@ -1818,11 +1464,8 @@ export const InventoryBalanceActive = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "事务ID", prop: "tenantId" }, { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "最后事务编号", prop: "lastTransNumber" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "库区", prop: "locationArea" }, @@ -1854,9 +1497,7 @@ export const InventoryTransaction = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"}, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: "activeDate",type: "dateTime" }, { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "到货日期", prop: "arriveDate",type:"dateTime" }, @@ -1865,7 +1506,6 @@ export const InventoryTransaction = [ { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, { label: "库区", prop: "locationArea" }, { label: "库位组", prop: "locationGroup" }, - { label: "事务ID", prop: "tenantId" }, { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransReplaceType" }, ] @@ -1889,15 +1529,12 @@ export const InventorySnapshot = [ { label: "库区", prop: "locationArea" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"}, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "快照日期", prop: "snapshotDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "到货时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "入库时间", prop: "putInTime", type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 库存转移日志 @@ -1926,12 +1563,9 @@ export const InventoryTransferLog = [ { label: "任务编号", prop: "jobNumber" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "事务ID", prop: "tenantId" }, { label: "单据号", prop: "docNumber" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者", prop: "lastModifierId" }, { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, @@ -1962,16 +1596,13 @@ export const expectIn = [ { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "状态", prop: "status", type: "filter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, { label: "序号", prop: "serialNumber" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 预计入库存 @@ -1991,16 +1622,13 @@ export const expectOut = [ { label: "生产日期", prop: "produceDate", type: "dateTime" }, { label: "状态", prop: "status", type: "filter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, { label: "序号", prop: "serialNumber" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 物品安全库存预警 @@ -2074,11 +1702,8 @@ export const pickingRequest = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产领料审批 @@ -2097,11 +1722,8 @@ export const pickingApproval = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产领料任务 @@ -2137,11 +1759,8 @@ export const pickingNote = [ { label: "部门名称", prop: "deptName" }, { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产退料申请 @@ -2154,9 +1773,7 @@ export const materialReturnRequest = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, @@ -2164,7 +1781,6 @@ export const materialReturnRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产退料审批 @@ -2177,9 +1793,7 @@ export const materialReturnApproval = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, @@ -2187,7 +1801,6 @@ export const materialReturnApproval = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 非生产退料任务 @@ -2222,12 +1835,9 @@ export const materialReturnNote = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 回收料收货记录 @@ -2235,11 +1845,8 @@ export const recycledMaterialsReceipt = [ { label: "回收料收货记录单号", prop: "number" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "操作员", prop: "worker" }, - { label: "创建者ID", prop: "creatorId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2254,11 +1861,8 @@ export const recycledMaterialsAdjustmentApply = [ { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2268,11 +1872,8 @@ export const materialsAdjustment = [ { label: "申请单号", prop: "requestNumber" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "操作员", prop: "worker" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, { label: "任务单号", prop: "jobNumber" }, ] @@ -2290,10 +1891,7 @@ export const lineSideWarehouseAllocationRequest = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2307,11 +1905,7 @@ export const lineSideWarehouseAllocationConfirm = [ { label: "操作员", prop: "worker" }, { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2325,11 +1919,7 @@ export const lineSideWarehouseAllocationNote = [ { label: "操作员", prop: "worker" }, { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2342,11 +1932,7 @@ export const interStorageAllocationNote = [ { label: "操作员", prop: "worker" }, { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2363,10 +1949,7 @@ export const customerStorageAllocationRequest = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2380,11 +1963,7 @@ export const customerStorageAllocationConfirm = [ { label: "操作员", prop: "worker" }, { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2398,11 +1977,7 @@ export const customerStorageAllocationNote = [ { label: "操作员", prop: "worker" }, { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] @@ -2412,15 +1987,11 @@ export const intraStorageTransferNote = [ { label: "移库时间", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "确认时间", prop: 'confirmTime' }, { label: "申请单号", prop: 'requestNumber' }, - { label: "事务ID", prop: "tenantId" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber' }, ] // 线边仓缴库申请 @@ -2435,16 +2006,13 @@ export const lineSideWarehousePaymentRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "生产计划编号", prop: 'productionPlanNumber' }, { label: "车间", prop: 'workshop' }, { label: "生产线", prop: 'prodLine' }, { label: "班次", prop: 'shift' }, { label: "班组", prop: 'team' }, - { label: "事务ID", prop: "tenantId" }, { label: "计划日期", prop: 'planDate' }, ] @@ -2454,16 +2022,12 @@ export const lineSideWarehousePaymentNote = [ { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "完工时间", prop: 'completeTime',type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "操作员", prop: 'worker' }, { label: "上级关联菜单号", prop: 'sourceNumber' }, { label: "生产计划单号", prop: 'productionPlanNumber' }, - { label: "任务ID", prop: 'jobNumber' }, { label: "车间", prop: 'workShop' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓报废申请 @@ -2477,12 +2041,9 @@ export const lineSideWarehouseScrappingRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓报废记录 @@ -2491,12 +2052,8 @@ export const lineSideWarehouseScrappingNote = [ { label: "报废日期", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "任务ID", prop: 'jobNumber' }, { label: "报废请求单号", prop: 'scrapRequestNumber' }, ] @@ -2506,9 +2063,7 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, @@ -2516,7 +2071,6 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, ] // 线边仓调整记录 @@ -2525,13 +2079,9 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "操作员", prop: 'worker' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "调整单号", prop: "requestNumber" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "事务ID", prop: "tenantId" }, ] // 盘点计划 @@ -2552,14 +2102,11 @@ export const CountPlan = [ { label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "生效时间", prop: 'activeDate', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "事务ID", prop: "tenantId" }, ] // 盘点任务 @@ -2582,13 +2129,8 @@ export const CountJob = [ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: "acceptUserId" }, - { label: "完成者ID", prop: "completeUserId" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, { label: "描述", prop: "description" }, { label: "任务描述", prop: 'jobDescription' }, @@ -2608,8 +2150,6 @@ export const CountNote = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改者", prop: "lastModifierId" }, { label: "描述", prop: "description" }, ] @@ -2629,10 +2169,7 @@ export const CountPlanAdjust = [ { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者", prop: "lastModifierId" }, ] // 盘点调整记录 @@ -2645,10 +2182,7 @@ export const CountAdjustNote = [ { label: "生效时间", prop: "activeDate", type: "dateTime" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者", prop: "lastModifierId" }, ] // 消息管理 @@ -2659,14 +2193,11 @@ export const MessageType = [ { label: "消息类别名称", prop: "messageTypeName" }, { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "电子邮件模板", prop: "emailTemplate" }, { label: "sms模板", prop: "smsTemplate" }, { label: "是否发送Email", prop: 'isSendEmail', type: "filter", filters: "whetherOrNot" }, { label: "是否发送Sms", prop: 'isSendSms', type: "filter", filters: "whetherOrNot" }, - { label: "事务ID", prop: "tenantId" }, ] // 系统权限管理 @@ -2680,9 +2211,6 @@ export const Department = [ { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "事务ID", prop: "tenantId" }, ] // 器具 diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue index 9b6a7ab88..39a05236f 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue @@ -85,7 +85,6 @@ :DrawerLoading="Loading.DrawerLoading" :drawer="displayDialog.detailsDialog" :propsData="propsData" - :Butttondata="[]" :tabsDesTions="tabsDesTions" :tableLoading="tableLoading" :dropdownTabsData="dropdownTabsData" @@ -206,13 +205,15 @@ export default { editOptions: {}, CreateForm: [ { type: "input", label: _Names.itemCode, prop: 'code', colSpan: 12, validType:'numberLetter' }, - { type: "input", label: "物品名称", prop: "name", colSpan: 12 }, - { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 }, - { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 }, - { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 }, + { type: "input", label: _Names.itemName, prop: "name", colSpan: 12 }, + { type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 }, + { type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 }, + { type: "input", label: "配置", prop: 'configuration', colSpan: 12 }, { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 }, + { type: "input", label: "种类", prop: 'category', colSpan: 12 }, + { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 }, { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "select", label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 }, @@ -228,9 +229,7 @@ export default { // { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 }, // { type: "input", label: "颜色", prop: 'color', colSpan: 12 }, { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 }, - { type: "input", label: "种类", prop: 'category', colSpan: 12 }, // { type: "input", label: "分组", prop: 'group', colSpan: 12 }, - { type: "input", label: "配置", prop: 'configuration', colSpan: 12 }, // { type: "input", label: "版本", prop: 'version', colSpan: 12 }, // { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 }, { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 }, @@ -239,13 +238,15 @@ export default { ], editForm: [ { type: "input", label: _Names.itemCode, prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' }, - { type: "input", label: "物品名称", prop: "name", colSpan: 12 }, - { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 }, - { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 }, - { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 }, + { type: "input", label: _Names.itemName, prop: "name", colSpan: 12 }, + { type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 }, + { type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 }, + { type: "input", label: "配置", prop: 'configuration', colSpan: 12 }, { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 }, + { type: "input", label: "种类", prop: 'category', colSpan: 12 }, + { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 }, { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "select", label: "制造件", prop: "canMake", options: "whetherOrNot", disabled: true, colSpan: 12 }, { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", disabled: true, colSpan: 12 }, @@ -257,17 +258,15 @@ export default { { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 }, { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 }, { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 }, - { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 }, - { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 }, - { type: "input", label: "颜色", prop: 'color', colSpan: 12 }, + // { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", + // focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")}, + // searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 }, + // { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 }, + // { type: "input", label: "颜色", prop: 'color', colSpan: 12 }, { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 }, - { type: "input", label: "种类", prop: 'category', colSpan: 12 }, - { type: "input", label: "分组", prop: 'group', colSpan: 12 }, - { type: "input", label: "配置", prop: 'configuration', colSpan: 12 }, - { type: "input", label: "版本", prop: 'version', colSpan: 12 }, - { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 }, + // { type: "input", label: "分组", prop: 'group', colSpan: 12 }, + // { type: "input", label: "版本", prop: 'version', colSpan: 12 }, + // { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 }, { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue index 33fc8e7cd..c9b4dd165 100644 --- a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue +++ b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue @@ -117,6 +117,7 @@ export default { }, data () { return { + showTableBaseFromFE:['configuration','name','desc1','desc2'], URL: 'basedata/supplier-item', //常用按钮数据 currenButtonData: [ @@ -167,9 +168,9 @@ export default { { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 }, { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 }, - { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 }, + // { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 }, { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 }, - { type: "input", label: "版本", prop: "version", colSpan: 12 }, + // { type: "input", label: "版本", prop: "version", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ @@ -178,9 +179,9 @@ export default { { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 }, { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 }, - { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 }, + // { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 }, { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 }, - { type: "input", label: "版本", prop: "version", colSpan: 12 }, + // { type: "input", label: "版本", prop: "version", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editRules: { diff --git a/fe/PC/src/views/basicData/WarehouseManage/Area.vue b/fe/PC/src/views/basicData/WarehouseManage/Area.vue index 082d450f8..76ebdc7ce 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Area.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Area.vue @@ -132,18 +132,18 @@ export default { { type: "input", label: "区域代码", prop: "code", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "区域名称", prop: 'name', colSpan: 12 }, { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 }, + // { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 }, // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, - { type: "input", label: "描述", prop: "description", colSpan: 12 }, + // { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ { type: "input", label: "区域代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "区域名称", prop: 'name', colSpan: 12 }, { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 }, + // { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 }, // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, - { type: "input", label: "描述", prop: "description", colSpan: 12 }, + // { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editRules: { diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue index 6336ed8b7..ddb2f58d9 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue @@ -134,7 +134,7 @@ export default { }, data () { return { - showTableBaseFromFE:['desc1','desc2','configuration'], + showTableBaseFromFE:['configuration','name','desc1','desc2'], URL: 'basedata/item-safety-stock', storeValue: { url: '', @@ -190,32 +190,32 @@ export default { { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 }, - { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, + { type: "select", label: "存储关系类型",clearPop:["storeValue"], prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url, this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 }, { type: "input", label: "最小库存", validType:'pointNumber', prop: "minStock", colSpan: 12 }, { type: "input", label: "安全库存", validType:'pointNumber', prop: "safetyStock", colSpan: 12 }, - { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 }, - { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 }, - { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 }, + // { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 }, + // { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 }, + // { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, ], editForm: [ { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 }, - { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, + { type: "select", label: "存储关系类型", clearPop:["storeValue"],prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url, this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 }, { type: "input", label: "最小库存", validType:'pointNumber', prop: "minStock", colSpan: 12 }, { type: "input", label: "安全库存", validType:'pointNumber', prop: "safetyStock", colSpan: 12 }, - { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 }, - { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 }, - { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 }, + // { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 }, + // { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 }, + // { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue index cd36efc66..d08537edb 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue @@ -134,6 +134,7 @@ export default { }, data () { return { + showTableBaseFromFE:['configuration','name','desc1','desc2'], URL: 'basedata/item-store-relation', storeValue: { url: '', @@ -193,35 +194,35 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 }, { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 }, + // { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' }, { type: "input", label: "主存储单位", prop: "storeUM", colSpan: 12 }, { type: "input", label: "次要存储容量", prop: "altUmQty", colSpan: 12, validType:'pointNumber' }, { type: "input", label: "次要存储单位", prop: "altUm", colSpan: 12 }, { type: "select", label: "存储单位", prop: "pramaryUM", options: "pramaryUm", colSpan: 12 }, - { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "库位", prop: "storeValue", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url , this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, - { type: "input", label: "占用多库位", prop: 'multiLoc', disabled:"true", colSpan: 12 }, + // { type: "input", label: "占用多库位", prop: 'multiLoc', disabled:"true", colSpan: 12 }, ], editForm: [ { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 }, { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 }, + // { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' }, { type: "input", label: "主存储单位", prop: "storeUM", colSpan: 12 }, { type: "input", label: "次要存储容量", prop: "altUmQty", colSpan: 12, validType:'pointNumber' }, { type: "input", label: "次要存储单位", prop: "altUm", colSpan: 12 }, { type: "select", label: "存储单位", prop: "pramaryUM", options: "pramaryUm", colSpan: 12 }, - { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "库位", prop: "storeValue", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url , this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, - { type: "input", label: "占用多库位", prop: 'multiLoc', disabled:"true", colSpan: 12 }, + // { type: "input", label: "占用多库位", prop: 'multiLoc', disabled:"true", colSpan: 12 }, ], editRules: { cerateRule: { diff --git a/fe/PC/src/views/basicData/WarehouseManage/Location.vue b/fe/PC/src/views/basicData/WarehouseManage/Location.vue index 5b4e776c9..551433ebc 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Location.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Location.vue @@ -118,6 +118,7 @@ export default { }, data () { return { + showTableBaseFromFE:['configuration','name','desc1','desc2'], URL: 'basedata/Location', tableLoading: false, //常用按钮数据 @@ -362,7 +363,7 @@ export default { name: 'kwljgx', url: 'basedata/item-store-relation', tableColumns: 'ItemStoreRelation', - functionName: 'relationByLocationCode' + functionName: 'relationByLocationCode', }, { label: "库存余额", diff --git a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue index 3c70fc898..49d79314c 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue @@ -209,9 +209,9 @@ export default { { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 }, { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 }, { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, - { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 }, - { type: "input", label: "描述", prop: "description", colSpan: 12 }, - { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 }, + // { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 }, + // { type: "input", label: "描述", prop: "description", colSpan: 12 }, + // { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 }, { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, @@ -228,23 +228,7 @@ export default { { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, - // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, - // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, - { type: "input", label: "描述", prop: 'description', colSpan: 12 }, ], editForm: [ { type: "filterSelect", label: "区域代码", prop: "areaCode", optionsLabel: "name", optionsValue: "code", @@ -254,9 +238,9 @@ export default { { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 }, { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 }, { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, - { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 }, - { type: "input", label: "描述", prop: "description", colSpan: 12 }, - { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 }, + // { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 }, + // { type: "input", label: "描述", prop: "description", colSpan: 12 }, + // { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 }, { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, @@ -273,9 +257,7 @@ export default { { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, - // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, - { type: "input", label: "描述", prop: 'description', colSpan: 12 }, ], editRules: { cerateRule: { @@ -283,14 +265,14 @@ export default { { required: true, trigger: "blur", message: "不可为空" }, ], areaCode: [{ required: true, trigger: "change", message: "不可为空" }], - pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }], + // pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }], name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 }, editRule: { name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 areaCode: [{ required: true, trigger: "change", message: "不可为空" }], - pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }], + // pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }], defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 } }, diff --git a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue index 74bdd8a21..c448719ea 100644 --- a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue +++ b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue @@ -61,6 +61,8 @@ @tableButtonClick="searchSubmit(arguments)" > + { return this.hideButton([1,5,9]) }, size: 'mini', - handleGetJobsUrl:'wms/store/assemble-issue-job', + handleGetJobsUrl:'wms/store/spare-part-issue-job', // handleRequestUrl:'wms/store/kitting-issue-request', }, { diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 6ae165fb1..eb3985431 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -1086,24 +1086,27 @@ export default { // 更新数据============================================================ that.inspectNoticeDetailsShow = false this.loading = false - getDetailed(that.propsData.id, that.URL).then(res => { - that.propsData = res + getDetailed(that.propsData.id, that.URL).then(res1 => { + that.propsData = res1 }) that.paging() that.$message.success('成功完成检验！') }).catch(err => { that.loading = false - that.$message.error('检验失败，请重试！') + that.$message.error('检验失败,请重试!') console.log(err) }) } } else { - completeSummaryDetailStatus({id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData).then(res => { + completeSummaryDetailStatus( + {id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, + that.inspectNoticeDetailsFormData + ).then(res => { // 更新数据============================================================ that.inspectNoticeDetailsShow = false this.loading = false - getDetailed(that.propsData.id, that.URL).then(res => { - that.propsData = res + getDetailed(that.propsData.id, that.URL).then(res1 => { + that.propsData = res1 }) that.paging() that.$message.success('成功完成检验！')