diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue index 4a3b396a..4a687b4e 100644 --- a/src/mycomponents/query/balanceQuery.vue +++ b/src/mycomponents/query/balanceQuery.vue @@ -39,24 +39,24 @@ - - + + - 序号 批次 - 库位 + 库位 状态 数量 - {{index+1}} {{item.batch}} {{item.locationCode}} {{statusDesc(item.inventoryStatus)}} - {{item.qty}} + {{item.totalQty}} @@ -69,7 +69,7 @@ --> - + @@ -80,6 +80,7 @@ + @@ -103,7 +104,7 @@ itemCodeResult: [], current: 1, total: 18, - tableData:[] + tableData: [] // tableData: [{ // batch: "20240814", // locationCode: "901", @@ -213,11 +214,12 @@ selectItemCode(item) { this.itemCode = item.code this.itemCodeResult = [] - this.getBalanceByBusiness(this.itemCode,this.businessTypeCode) + this.getBalanceByBusiness(this.itemCode, this.businessTypeCode) }, clearItemCode() { this.itemCode = "" this.itemCodeResult = [] + this.tableData =[] }, onConfirmItemCode() { if (!this.itemCode) { @@ -231,14 +233,15 @@ getBasicItemByCodeSenior(this.itemCode).then(res => { if (res.data && res.data.list.length > 0) { - if (res.data.list.length == 1) { + if (res.data.list.length == 1) { this.itemCode = res.data.list[0].code - this.getBalanceByBusiness(this.itemCode,this.businessTypeCode) + this.getBalanceByBusiness(this.itemCode, this.businessTypeCode) } else { uni.hideLoading() this.itemCodeResult = res.data.list } } else { + uni.hideLoading() this.showErrorMessage("未查找到物料[" + this.itemCode + "]") } @@ -247,26 +250,31 @@ this.showErrorMessage(error) }) }, - getBalanceByBusiness(itemCode,businessType){ - var params ={ - itemCode:itemCode, - businessType:businessType + getBalanceByBusiness(itemCode, businessType) { + var params = { + itemCode: itemCode, + businessType: businessType } - getBalanceByBusinessType(params).then(res=>{ + getBalanceByBusinessType(params).then(res => { uni.hideLoading() - if(res.data&&res.data.length>0){ - console.log(this.tableData) - this.tableData= res.data - }else { - this.showErrorMessage("发料中未查询到物料号["+itemCode+"]的库存") + if (res.data && res.data.length > 0) { + this.tableData = res.data + } else { + var hint ="" + if(businessType=="Issue"){ + hint="发料中" + }else if(businessType=="Repleinment"){ + hint="补料中" + } + this.showErrorMessage(hint+"未查询到物料号[" + itemCode + "]的库存") } - - }).catch(error=>{ + + }).catch(error => { uni.hideLoading() this.showErrorMessage(error) }) }, - + showDrawer() { this.$refs.showRight.open(); }, diff --git a/src/pages.json b/src/pages.json index fa0e473d..a9689c54 100644 --- a/src/pages.json +++ b/src/pages.json @@ -819,7 +819,25 @@ "navigationBarTitleText": "直接补料", "enablePullDownRefresh": false, "titleNView": { - "autoBackButton": "true" + "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } } }, diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index ec0e2955..c65782ef 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -48,7 +48,7 @@ - + @@ -99,7 +99,7 @@ import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue' import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' - // import balanceQuery from '@/mycomponents/query/balanceQuery.vue' + import balanceQuery from '@/mycomponents/query/balanceQuery.vue' export default { @@ -114,7 +114,7 @@ recordDetailCard, balanceSelect, winComScanBalance, - // balanceQuery + balanceQuery }, data() { return { @@ -166,8 +166,8 @@ if (e.index === 0) { goHome(); } else if (e.index == 1) { - // this.$refs.refBalanceQuery.showDrawer(); - // this.closeScanPopup(); + this.$refs.refBalanceQuery.showDrawer(); + this.closeScanPopup(); } }, //拦截返回按钮事件 @@ -178,10 +178,6 @@ mounted() {}, methods: { - // showDrawer() { - // this.$refs.showRight.open(); - // }, - getBusinessType() { getBusinessType(this.businessTypeCode, res => { if (res.success) { diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index 479ba4bc..b1a0d33d 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -44,6 +44,7 @@ + @@ -94,6 +95,7 @@ import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' + import balanceQuery from '@/mycomponents/query/balanceQuery.vue' export default { components: { @@ -104,7 +106,8 @@ winScanLocation, winScanPackAndLocation, recordComDetailCard, - winComScanBalance + winComScanBalance, + balanceQuery }, data() { return { @@ -137,6 +140,9 @@ onNavigationBarButtonTap(e) { if (e.index === 0) { goHome(); + } else if (e.index == 1) { + this.$refs.refBalanceQuery.showDrawer(); + this.closeScanPopup(); } }, //拦截返回按钮事件