diff --git a/src/views/ss/suit/component/SuitEditDialog.vue b/src/views/ss/suit/component/SuitEditDialog.vue index 891abef..1db03f2 100644 --- a/src/views/ss/suit/component/SuitEditDialog.vue +++ b/src/views/ss/suit/component/SuitEditDialog.vue @@ -60,25 +60,15 @@ - - - - {{item}}档电价 - - - {{gearUnit}} - - - - - {{index}} 时 - - - + + + + + @@ -118,11 +108,12 @@ import { addSuit, getSuit, updateSuit } from '@/api/ss/suit' import { $view } from '@/utils/mixins' import UserInput from '@/components/Business/SmUser/UserInput.vue' import { mapGetters } from 'vuex' +import SuitTimePrice from '@/views/ss/suit/component/SuitTimePrice.vue' export default { name: "SuitEditDialog", mixins: [$view], - components: { UserInput, DeviceInput }, + components: { SuitTimePrice, UserInput, DeviceInput }, dicts: ['time_unit', 'suit_fee_mode', 'suit_fee_type'], computed: { UserType() { @@ -150,19 +141,6 @@ export default { return this.isDisabled(this.form.feeMode, option.value); } }, - // 收费方式单位 - gearUnit() { - return this.form.feeType === SuitFeeType.TIME_COUNT ? '元 / 度' : '元 / 时 ' - }, - // 时间显示类型 - timeType() { - return (index) => { - if(this.form.gearTime[index] == null) { - return null; - } - return this.indexStyle[this.form.gearTime[index]]; - } - } }, props: { title: { @@ -198,10 +176,6 @@ export default { }, data() { return { - indexStyle: ['success', 'primary', 'warning', 'danger'], - refresh: false, - // 当前设置电价的索引 - amountIndex: null, span: 12, // 表单参数 form: { @@ -293,14 +267,6 @@ export default { } }); }, - // 处理点击索引按钮 - handleSetAmountIndex(index) { - if (this.amountIndex === index) { - this.amountIndex = null; - } else { - this.amountIndex = index; - } - }, onChangeUser(nv) { if (!isEmpty(this.form.deviceIds)) { this.$message.info("由于切换了用户,请重新选择应用设备") @@ -319,26 +285,6 @@ export default { this.form.feeType = null; } }, - // 全部设置为某一个类型 - handleAllSet(index) { - for(let i = 0; i < 24; i ++) { - this.form.gearTime[i] = index; - } - this.refreshItems(); - }, - handleClickTimeItem(index) { - if (this.amountIndex != null) { - this.form.gearTime[index] = this.amountIndex; - this.refreshItems(); - } - }, - // 刷新列表 - refreshItems() { - this.refresh = true; - this.$nextTick(() => { - this.refresh = false - }) - }, // 取消按钮 cancel() { this.$emit('update:open', false); diff --git a/src/views/ss/suit/component/SuitTimePrice.vue b/src/views/ss/suit/component/SuitTimePrice.vue new file mode 100644 index 0000000..de670e4 --- /dev/null +++ b/src/views/ss/suit/component/SuitTimePrice.vue @@ -0,0 +1,122 @@ + + + + diff --git a/src/views/system/recharge/detail.vue b/src/views/system/recharge/detail.vue index d70b844..6a3784d 100644 --- a/src/views/system/recharge/detail.vue +++ b/src/views/system/recharge/detail.vue @@ -94,7 +94,9 @@ - + {{detail.suitDeposit | money | defaultValue}} 元 {{toDescriptionFromSecond(detail.totalUse).text | defaultValue}} @@ -182,6 +184,15 @@ + + + + @@ -198,11 +209,12 @@ import { $recharge } from '@/utils/mixins' import RefundDialog from '@/views/system/recharge/components/RefundDialog.vue' import { toDescriptionFromSecond } from '@/utils/date' import BooleanTag from '@/components/BooleanTag/index.vue' +import SuitTimePrice from '@/views/ss/suit/component/SuitTimePrice.vue' export default { name: 'Recharge/:billId', mixins: [$recharge], - components: { BooleanTag, RefundDialog, Bonus, PayBill, UserLink, DeviceLink, Refund }, + components: { SuitTimePrice, BooleanTag, RefundDialog, Bonus, PayBill, UserLink, DeviceLink, Refund }, dicts: [ 'channel_type', 'sm_transaction_bill_status', @@ -233,6 +245,7 @@ export default { }, data() { return { + showSuitTimePrice: false, loading: false, detail: {}, id: null,