From cbe8d66c089b8442ef85dedd34fa45e652dca416 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 10 Sep 2024 18:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E9=9B=B6=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/query/coms/comItemDetailCard.vue | 124 ++++++++++++------ .../query/coms/comLocationDetailCard.vue | 81 ++++++++---- src/pages/query/item.vue | 46 ++++++- src/pages/query/location.vue | 43 +++++- 4 files changed, 221 insertions(+), 73 deletions(-) diff --git a/src/pages/query/coms/comItemDetailCard.vue b/src/pages/query/coms/comItemDetailCard.vue index 61486b08..232f29cd 100644 --- a/src/pages/query/coms/comItemDetailCard.vue +++ b/src/pages/query/coms/comItemDetailCard.vue @@ -1,58 +1,63 @@ @@ -109,22 +114,57 @@ type: Boolean, default: true }, + isShowWarehouseCode: { + type: Boolean, + default: false + }, + isShowJobNumber: { + type: Boolean, + default: false + }, + isShowBusinessType: { + type: Boolean, + default: false + }, + isShowTransactionType: { + type: Boolean, + default: false + }, + isShowRecordNumber: { + type: Boolean, + default: false + }, + isShowNumber: { + type: Boolean, + default: false + }, + isShowWorker: { + type: Boolean, + default: false + }, + isShowInventoryAction: { + type: Boolean, + default: false + }, + + + }, methods: { - businessTypeDesc(type){ + businessTypeDesc(type) { return getBusinessTypeName(type) }, - dateFormat(times){ + dateFormat(times) { return dateFormat(times) }, - hasChinese(str){ - var reg = /[\u4e00-\u9fa5]/g; - return reg.test(str); + hasChinese(str) { + var reg = /[\u4e00-\u9fa5]/g; + return reg.test(str); }, - - inventoryActionName(value){ - return value=="IN"?"入库":"出库" + + inventoryActionName(value) { + return value == "IN" ? "入库" : "出库" } } diff --git a/src/pages/query/coms/comLocationDetailCard.vue b/src/pages/query/coms/comLocationDetailCard.vue index 0256eca5..e66ddb48 100644 --- a/src/pages/query/coms/comLocationDetailCard.vue +++ b/src/pages/query/coms/comLocationDetailCard.vue @@ -8,19 +8,16 @@ - + - - 任务号 - {{dataContent.jobNumber}} + + 任务号 + {{dataContent.jobNumber}} - - 业务类型 - {{dataContent.businessType}} - {{businessTypeDesc(dataContent.businessType)}} - + + 业务类型 + {{dataContent.businessType}} + {{businessTypeDesc(dataContent.businessType)}} @@ -31,27 +28,35 @@ - - 事务类型：{{dataContent.transactionType}} + + 事务类型 + {{dataContent.transactionType}} - - 库存动作：{{inventoryActionName(dataContent.inventoryAction)}} + + 库存动作 + {{inventoryActionName(dataContent.inventoryAction)}} - - 业务记录号：{{dataContent.recordNumber}} + + + 业务记录号 + {{dataContent.recordNumber}} - - 事务号：{{dataContent.number}} + + + 事务号 + {{dataContent.number}} - - 操作人：{{dataContent.worker}} + + + 操作人 + {{dataContent.worker}} - - 创建时间：{{dateFormat(dataContent.createTime)}} + + 创建时间 + {{dateFormat(dataContent.createTime)}} - @@ -107,6 +112,34 @@ type: Boolean, default: true }, + isShowJobNumber: { + type: Boolean, + default: false + }, + isShowBusinessType: { + type: Boolean, + default: false + }, + isShowTransactionType: { + type: Boolean, + default: false + }, + isShowRecordNumber: { + type: Boolean, + default: false + }, + isShowNumber: { + type: Boolean, + default: false + }, + isShowWorker: { + type: Boolean, + default: false + }, + isShowInventoryAction: { + type: Boolean, + default: false + }, }, methods: { diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue index 0801eec1..d25566a3 100644 --- a/src/pages/query/item.vue +++ b/src/pages/query/item.vue @@ -6,7 +6,7 @@ - + @@ -18,7 +18,18 @@ ({{index+1}}) - + @@ -141,6 +152,7 @@ console.log('topContent',this.$refs.topContent) }) + this.tabIndex=0; this.tabChange(0) } else { this.showMessage('未查找到物料【' + code + '】'); @@ -153,7 +165,7 @@ }) }, - // 汇总 + // 库存余额 getBalanceItem(pageNo, pageSize, type) { uni.showLoading({ title: "加载中...", @@ -201,6 +213,10 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=true + item.isShowWarehouseCode=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { @@ -216,7 +232,7 @@ this.showMessage(error); }) }, - //明细 + //库存事务 getTransactionByItemCode(pageNo, pageSize, type) { uni.showLoading({ title: "加载中...", @@ -264,6 +280,16 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=true + item.isShowWarehouseCode=true + item.isShowBusinessType=true + item.isShowTransactionType =true + item.isShowInventoryAction=true + item.isShowRecordNumber=true + item.isShowNumber=true + item.isShowWorker=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { @@ -337,6 +363,12 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=false + item.isShowJobNumber=true + item.isShowBusinessType=true + item.isShowWarehouseCode=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { @@ -398,6 +430,12 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=true + item.isShowJobNumber=true + item.isShowBusinessType=true + item.isShowWarehouseCode=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { diff --git a/src/pages/query/location.vue b/src/pages/query/location.vue index 05527c98..d290dbe3 100644 --- a/src/pages/query/location.vue +++ b/src/pages/query/location.vue @@ -4,9 +4,9 @@ - + - + 总数 : {{totalCount}} @@ -15,7 +15,18 @@ ({{index+1}}) - + @@ -131,7 +142,9 @@ this.summarys = []; this.balances = []; this.locationCode = code; + location.type =location.erpLocationCode this.locationDetail = location + this.tabIndex=0 this.tabChange(0) // this.getContentByTab(this.tabIndex); }, @@ -166,6 +179,9 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { @@ -212,6 +228,17 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=true + item.isShowWarehouseCode=true + item.isShowBusinessType=true + item.isShowTransactionType =true + item.isShowInventoryAction=true + item.isShowRecordNumber=true + item.isShowNumber=true + item.isShowWorker=true + }) + this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { @@ -257,6 +284,11 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=false + item.isShowJobNumber=true + item.isShowBusinessType=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) { @@ -302,6 +334,11 @@ uni.stopPullDownRefresh(); } var list = res.data.list; + list.forEach(item=>{ + item.isShowPack=true + item.isShowJobNumber=true + item.isShowBusinessType=true + }) this.totalCount = res.data.total this.loadingType = "loadmore"; if (list == null || list.length == 0) {