diff --git a/src/pages/statistic/accounts/accountsBalance/index.vue b/src/pages/statistic/accounts/accountsBalance/index.vue index 41f5a76..1bd792c 100644 --- a/src/pages/statistic/accounts/accountsBalance/index.vue +++ b/src/pages/statistic/accounts/accountsBalance/index.vue @@ -57,7 +57,7 @@ + :text="item.account+':'+item.availableLimit" size="25rpx" color="#333333" > diff --git a/src/pages/work/accounts/posTransferRecord/addEdit.vue b/src/pages/work/accounts/posTransferRecord/addEdit.vue index 5009ae0..b781054 100644 --- a/src/pages/work/accounts/posTransferRecord/addEdit.vue +++ b/src/pages/work/accounts/posTransferRecord/addEdit.vue @@ -16,9 +16,15 @@ inputAlign="right" border="none"> - + + inputAlign="right" border="none"> + + + inputAlign="right" border="none"> + + + + + + @@ -88,6 +99,8 @@ @confirm="handleMerchantTypeConfirm"> + { getDicts('account_status').then(res => { statusList.value =[res.data] }) + // 类型 + getDicts('rounding_mode').then(res => { + roundingModeList.value =[res.data] + }) if(form.value.id!=null){ getPosmachine(form.value.id).then(res => { form.value = res.data @@ -206,6 +228,10 @@ onLoad((option) => { // 类型 getDicts('account_status').then(result => { form.value.statusName=dictStr(form.value.status, result.data) + }) + // 类型 + getDicts('rounding_mode').then(result => { + form.value.roundingModeName=dictStr(form.value.roundingMode, result.data) }) }) } @@ -287,6 +313,23 @@ onLoad((option) => { function handleStatusCancel() { showStatus.value = false } + function handleShowRoundingMode() { + if (roundingModeList.value[0].length === 0) { + proxy.$refs['uToast'].show({ + message: '舍入模式操作为空 ', type: 'warning' + }) + } else { + showRoundingMode.value = true + } + } + function handleRoundingModeConfirm(e) { + form.value.roundingModeName = e.value[0].dictLabel + form.value.roundingMode = e.value[0].dictValue + showRoundingMode.value = false + } + function handleRoundingModeCancel() { + showRoundingMode.value = false + } function selectDate(type) { dateType.value=type diff --git a/src/pages/work/base/posmachine/details.vue b/src/pages/work/base/posmachine/details.vue index 9f22c4d..350aecf 100644 --- a/src/pages/work/base/posmachine/details.vue +++ b/src/pages/work/base/posmachine/details.vue @@ -13,8 +13,9 @@ - + + @@ -56,6 +57,10 @@ onLoad((option) => { // 类型 getDicts('account_status').then(result => { detailInfo.value.status=dictStr(detailInfo.value.status, result.data) + }) + // 类型 + getDicts('rounding_mode').then(result => { + detailInfo.value.roundingMode=dictStr(detailInfo.value.roundingMode, result.data) }) }) } diff --git a/src/pages/work/base/posmachine/list.vue b/src/pages/work/base/posmachine/list.vue index b47cc99..ce786c4 100644 --- a/src/pages/work/base/posmachine/list.vue +++ b/src/pages/work/base/posmachine/list.vue @@ -31,7 +31,7 @@ 刷卡费率: - {{ item.rate+'+'+ item.ratePlus}} + {{ item.rateName+'+'+ item.ratePlus}} 结算卡: