diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue index 0eed6a640..b092a3338 100644 --- a/src/components/ebiz/billingDetail/tableDetail2.vue +++ b/src/components/ebiz/billingDetail/tableDetail2.vue @@ -124,13 +124,14 @@ export default { }, // 查看详情 跳转至详情页面 look(num) { + this.$emit('fro-child', num); console.log(num); - this.$router.push({ - path: '/policyDetails', - query: { - orderNo: num, - } - }) + // this.$router.push({ + // path: '/policyDetails', + // query: { + // orderNo: num, + // } + // }) } } } @@ -173,6 +174,13 @@ export default { table { // width: 200vw; } +.th-fixed { + position: sticky; + border: 1px solid #999 !important; + left: 0; + width: 35px !important; + padding: 0 5px; +} .statisticsTable { width: 100%; overflow-x: hidden; @@ -198,12 +206,7 @@ table { } } } -.th-fixed { - // position: sticky; - left: 0; - width: 35px !important; - padding: 0 5px; -} + .td-fixed { // position: sticky; width: 33px !important; diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 53e213947..31801adb8 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -103,6 +103,7 @@ @currentChange="currentChange" @double_click="double_click" @from-child="double_click" + @fro-child="xiangqing" > @@ -126,7 +127,7 @@
时间
- 全部 + 按月份查询 按时间范围查询
@@ -234,18 +235,33 @@ title="请选择月份" v-model="currentDate" type="year-month" + :min-date="minDate" :max-date="maxDate" :formatter="formatter" @confirm="confirmChange" @cancel="cancelChange" /> +
+ +
+
+ + +
@@ -908,4 +950,13 @@ table { border-color: #ee3030; } } +.hebao, +.xiangqing { + width: 100%; + height: 100vh; + background-color: #fff; + position: fixed; + top: 0; + left: 0; +} diff --git a/src/views/ebiz/billingDetail/policyDetails.vue b/src/views/ebiz/billingDetail/policyDetails.vue index caa5ffb51..4476932a0 100644 --- a/src/views/ebiz/billingDetail/policyDetails.vue +++ b/src/views/ebiz/billingDetail/policyDetails.vue @@ -30,6 +30,9 @@

暂无附加险信息

+
+ +
@@ -39,14 +42,21 @@ import { queryOutOrderDetail } from '@/api/ebiz/billingDetail/billingDetail' // 当前时间 const currentDate = new Date() export default { + name: 'policyDetails', components: { [Collapse.name]: Collapse, [CollapseItem.name]: CollapseItem, }, + props: { + orderNo: { + type: String, + default: false + } + }, data() { return { currentDate: '', - orderNo: this.$route.query.orderNo, + // orderNo: '', activeName: ['1'], policyData: {}, } @@ -64,6 +74,9 @@ export default { }).then((res) => { this.policyData = res.content; }) + }, + goback() { + this.$emit('child-back', '1'); } } } @@ -104,4 +117,21 @@ export default { .list { padding: 12px 0; } +.bottom { + width: 100%; + position: fixed; + bottom: 0; + left: 0; + .back { + width: 100%; + background-color: #e9332e; + border: none; + padding: 12px 0px; + border-radius: 28px; + color: #fff; + font-size: 20px; + text-align: center; + } +} + diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue index e11d33c1a..fe96d017c 100644 --- a/src/views/ebiz/generateImg/generateImg.vue +++ b/src/views/ebiz/generateImg/generateImg.vue @@ -17,6 +17,9 @@ 分享 下载 +
+ +
@@ -25,6 +28,13 @@ import html2canvas from 'html2canvas' import { base64Excel } from '@/api/ebiz/nbs' export default { name: 'generateImg', + // generateImgData + props: { + // generateImgData: { + // type: Object, + // default: {} + // }, + }, data() { return { orderList: {} @@ -122,6 +132,9 @@ export default { }, downLoadImagesFunc() { this.domToImage(this.$refs.generateImg) + }, + close() { + this.$emit('child-colse', '1') } } } @@ -225,4 +238,9 @@ img { /*设置按钮为渐变颜色*/ border: none !important; } +.close { + position: fixed; + top: 0; + right: 0; +} \ No newline at end of file