diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css index 727d5140..7981b891 100644 --- a/src/common/style/pdabasic.css +++ b/src/common/style/pdabasic.css @@ -731,6 +731,15 @@ page { font-size: 35rpx; padding: 10rpx 20rpx 20rpx; } +.page-header .header-view { + display: flex; + flex-direction: column; + background-color: #fff; + font-size: 35rpx; + padding: 10rpx 20rpx; + border-radius:4px; +} + .page-header-box{ background-color: #fff !important; padding:0px 20rpx 20rpx; diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue index 24d849f0..629888bc 100644 --- a/src/mycomponents/scan/winComScanBalanceLocation.vue +++ b/src/mycomponents/scan/winComScanBalanceLocation.vue @@ -200,9 +200,9 @@ export default { .then((res) => { if (res.data != null && res.data.list.length > 0) { const result = res.data.list[0] - const { status } = result + const status = result.available const { type } = result - if (status == 'ENABLE') { + if (status == 'TRUE') { if (checkDirectoryItemExist(this.itemTypesList, type)) { callBack() } else { diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue index 34ef16f8..be67298f 100644 --- a/src/mycomponents/scan/winScanItem.vue +++ b/src/mycomponents/scan/winScanItem.vue @@ -85,14 +85,14 @@ const getScanResult = (resultParams) => { uni.hideLoading() if (res.data != null && res.data.list.length > 0) { const result1 = res.data.list[0] - const { status } = result1 + const status =result1.available const { type } = result1 const itemCode = result1.code const itemName = result1.name const { uom } = result1 const std = result1.uom result1.package = scanResult.package - if (status == 'ENABLE') { + if (status == 'TRUE') { if (checkDirectoryItemExist(props.itemCodeTypeList, type)) { result.value = result1 callBack() diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue index 34726460..f02cfe0e 100644 --- a/src/pages/count/job/countBlindDetail.vue +++ b/src/pages/count/job/countBlindDetail.vue @@ -1,26 +1,28 @@