From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/components/business/BillDetailWindow.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/BillDetailWindow.vue b/admin/src/components/business/BillDetailWindow.vue
index 48a51a5..8cd7b44 100644
--- a/admin/src/components/business/BillDetailWindow.vue
+++ b/admin/src/components/business/BillDetailWindow.vue
@@ -4,8 +4,8 @@
:visible.sync="visible"
:confirm-working="isWorking"
>
- <NoBikeBillDetail v-if="form.type==4" ref="noBikeBillDetail"/>
- <BillDetail v-else ref="billDetail"/>
+ <NoBikeBillDetail v-if="form.type == 4" ref="noBikeBillDetail"/>
+ <BillDetail v-else ref="billDetail"/>
</GlobalWindow>
</template>
@@ -26,7 +26,7 @@
startDate: '',
type: ''
},
-
+
}
},
created () {
@@ -42,14 +42,15 @@
// 鏂板缓
this.form = target
this.$nextTick(() => {
+ console.log(target)
if (target.type == 4) {
- this.$refs.noBikeBillDetail.reload(target)
+ this.$refs.noBikeBillDetail.reload({ ...target, isBikeFee: 1 })
} else {
this.$refs.billDetail.reload(target)
}
})
},
},
-
+
}
</script>
--
Gitblit v1.9.3