diff --git a/fe/PC/src/components/UploadExcelByFe/index.vue b/fe/PC/src/components/UploadExcelByFe/index.vue index 933147fe5..d68f6720a 100644 --- a/fe/PC/src/components/UploadExcelByFe/index.vue +++ b/fe/PC/src/components/UploadExcelByFe/index.vue @@ -63,7 +63,7 @@ import { supplierAsnExcel } from "@/filters/excelOrReportsOption"; import {SupplierAsnCtypeStaBack} from "@/filters/status" export default { - name:"UploadExcel", + name:"UploadExcelByFe", mixins:[mixins], watch: { show () { diff --git a/fe/PC/src/filters/excelOrReportsOption.js b/fe/PC/src/filters/excelOrReportsOption.js index e6495b6ce..e4e6168e7 100644 --- a/fe/PC/src/filters/excelOrReportsOption.js +++ b/fe/PC/src/filters/excelOrReportsOption.js @@ -59,7 +59,7 @@ export const zpRequestExcel = { // 备品申请 export const bpRequestExcel = { toLocationCode:"目标库位", - qty:"需求数量", + qty:"需求数量/箱数", itemCode:_Names.itemCode, } diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 710e0292a..9dd66d280 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2116,25 +2116,25 @@ export const labelsList = [ { label: "生产时间", prop: "produceDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "采购单号", prop: "asnNumber",width:orderWidth }, - { label: "要货计划单号", prop: "rpNumber",width:orderWidth }, + // { label: "要货计划单号", prop: "rpNumber",width:orderWidth }, { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "供应商名称", prop: 'supplierName' }, { label: "供应商简称", prop: 'supplierSimpleName' }, { label: "供应商物品代码", prop: "supplierItemCode" }, { label: "供应商物品名称", prop: 'supplierItemName' }, - { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" }, + // { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" }, { label: "完整条码文本", prop: "fullBarcodeString" }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "标包数量", prop: 'stdPackQty',isNumber:true }, - { label: "器具号", prop: 'containerCode' }, - { label: "质量级别", prop: "qLevel" }, - { label: "质检文件", prop: "qualityFile" }, - { label: "生产线", prop: 'prodLine' }, - { label: "班组", prop: 'team' }, - { label: "班次", prop: 'shift' }, - { label: "规格", prop: "specifications" }, - { label: "labelStatus", prop: "labelStatus" }, + // { label: "器具号", prop: 'containerCode' }, + // { label: "质量级别", prop: "qLevel" }, + // { label: "质检文件", prop: "qualityFile" }, + // { label: "生产线", prop: 'prodLine' }, + // { label: "班组", prop: 'team' }, + // { label: "班次", prop: 'shift' }, + // { label: "规格", prop: "specifications" }, + // { label: "labelStatus", prop: "labelStatus" }, ] // 库存管理 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index a9cad6382..70619cbaf 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1336,36 +1336,27 @@ export const labelsList = [ { label: _Names.itemName, prop: "itemName" }, { label: _Names.itemDesc1, prop: "itemDesc1" }, { label: _Names.itemDesc2, prop: "itemDesc2" }, - { label: "数量", prop: "qty" }, + { label: "数量", prop: "qty",isNumber:true }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, { label: "库位", prop: "recommendLocationCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, - { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "备注", prop: "remark" }, - { label: "标包数量", prop: 'stdPackQty' }, + { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, + { label: "备注", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"}, + { label: "到达时间", prop: "arriveDate",type:"dateTime" }, + { label: "生产时间", prop: "produceDate",type:"dateTime" }, + { label: "过期时间", prop: "expireDate",type:"dateTime" }, + { label: "采购单号", prop: "asnNumber" }, + { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "供应商名称", prop: 'supplierName' }, { label: "供应商简称", prop: 'supplierSimpleName' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "供应商物品代码", prop: 'supplierItemCode' }, + { label: "供应商物品代码", prop: "supplierItemCode" }, { label: "供应商物品名称", prop: 'supplierItemName' }, { label: "完整条码文本", prop: "fullBarcodeString" }, - { label: "发货单号", prop: "asnNumber" }, - { label: "采购订单号", prop: "poNumber" }, - { label: "要货计划单号", prop: "rpNumber" }, - { label: "到达时间", prop: "arriveDate",type:"dateTime" }, - { label: "生产时间", prop: "produceDate",type:"dateTime" }, - { label: "过期时间", prop: "expireDate",type:"dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" }, - { label: "规格", prop: "specifications" }, - { label: "生产线", prop: "prodLine" }, - { label: "班次", prop: 'shift' }, - { label: "班组", prop: 'team' }, - { label: "质量级别", prop: "qLevel" }, - { label: "质检文件", prop: "qualityFile" }, - { label: "器具号", prop: 'containerCode' }, + { label: "供应商批次", prop: 'supplierBatch' }, + { label: "标包数量", prop: 'stdPackQty',isNumber:true }, ] // 库存管理 diff --git a/fe/PC/src/views/kittingManage/KittingIssueRequest.vue b/fe/PC/src/views/kittingManage/KittingIssueRequest.vue index 377ce9e3a..2b1d5c1c5 100644 --- a/fe/PC/src/views/kittingManage/KittingIssueRequest.vue +++ b/fe/PC/src/views/kittingManage/KittingIssueRequest.vue @@ -103,7 +103,7 @@ URL: "wms/store/kitting-issue-request", //常用按钮数据 currenButtonData: [ - this.defaultImportBtn(),//导入 + // this.defaultImportBtn(),//导入 this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选 diff --git a/fe/PC/src/views/materialIssuePT/IssueRequestPT.vue b/fe/PC/src/views/materialIssuePT/IssueRequestPT.vue index 86eafd5ec..af8e1fe37 100644 --- a/fe/PC/src/views/materialIssuePT/IssueRequestPT.vue +++ b/fe/PC/src/views/materialIssuePT/IssueRequestPT.vue @@ -104,7 +104,7 @@ export default { URL: "wms/store/coating-issue-request", //常用按钮数据 currenButtonData: [ - this.defaultImportBtn(),//导入 + // this.defaultImportBtn(),//导入 this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选 diff --git a/fe/PC/src/views/materialIssueZP/IssueRequestZP.vue b/fe/PC/src/views/materialIssueZP/IssueRequestZP.vue index 959cfd5dd..ff4bf96d7 100644 --- a/fe/PC/src/views/materialIssueZP/IssueRequestZP.vue +++ b/fe/PC/src/views/materialIssueZP/IssueRequestZP.vue @@ -104,7 +104,7 @@ export default { URL: "wms/store/assemble-issue-request", //常用按钮数据 currenButtonData: [ - this.defaultImportBtn(),//导入 + // this.defaultImportBtn(),//导入 this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选 diff --git a/fe/PC/src/views/materialIssueZS/IssueRequestZS.vue b/fe/PC/src/views/materialIssueZS/IssueRequestZS.vue index 58e0013ca..9abc20ec8 100644 --- a/fe/PC/src/views/materialIssueZS/IssueRequestZS.vue +++ b/fe/PC/src/views/materialIssueZS/IssueRequestZS.vue @@ -104,7 +104,7 @@ export default { URL: "wms/store/injection-issue-request", //常用按钮数据 currenButtonData: [ - this.defaultImportBtn(),//导入 + // this.defaultImportBtn(),//导入 this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选