From 0ee6ff4bd1326d70e03e7e40f73bf0800629ba8d Mon Sep 17 00:00:00 2001 From: "dong.ai" Date: Thu, 10 Oct 2024 14:12:27 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E4=BA=BA=E8=A2=AB=E4=BF=9D=E4=BA=BA=E8=AF=81=E4=BB=B6=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 12 +++++++----- src/views/ebiz/sale/InsuredPerson.vue | 9 +++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index a6ae62812..1cd16bc3c 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -993,6 +993,7 @@ }, //证件起始截止日期 onDateConfirm(val, type) { + console.log(val,type,); switch (type) { case '0': { @@ -1009,9 +1010,10 @@ let age = utilsAge.getAge(this.userInfo.birthday, new Date()) // 长期按钮是否禁用 this.effectiveDateTypeAble = age <= 45 - if(this.userInfo.birthday){ + if(this.userInfo.birthday && !this.userInfo.certiexpiredate){ this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,val) if(this.userInfo.certiexpiredate) { + this.userInfo.certiexpiredate= this.userInfo.certiexpiredate this.effectiveDateTypeAble = true this.userInfo.effectiveDateType = false } @@ -1030,9 +1032,9 @@ } //身份证证件类型的判断 if (this.userInfo.idType == '1') { - if(this.userInfo.birthday){ - this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val) - } + // if(this.userInfo.birthday){ + // this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val) + // } } } break @@ -1057,7 +1059,7 @@ if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) { this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,this.userInfo.certificateValidate) } - if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) { + if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) { this.userInfo.certificateValidate = countCredentialValidity.getEndDate(this.userInfo.birthday,this.userInfo.certiexpiredate) } } diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue index ab6dd1ae7..52bdda47d 100644 --- a/src/views/ebiz/sale/InsuredPerson.vue +++ b/src/views/ebiz/sale/InsuredPerson.vue @@ -1109,9 +1109,10 @@ let age = utilsAge.getAge(this.userInfo.birthday, new Date()) // 长期按钮是否禁用 this.effectiveDateTypeAble = age <= 45 - if(this.userInfo.birthday){ + if(this.userInfo.birthday && !this.userInfo.certiexpiredate){ this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,val) if(this.userInfo.certiexpiredate) { + this.userInfo.certiexpiredate= this.userInfo.certiexpiredate this.effectiveDateTypeAble = true this.userInfo.effectiveDateType = false } @@ -1142,9 +1143,9 @@ //获取年龄 let age = utilsAge.getAge(this.userInfo.birthday, new Date()) console.log(age) - if(this.userInfo.birthday){ - this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val) - } + // if(this.userInfo.birthday){ + // this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val) + // } } } break From 92cdc8fe152925e6549ac079328e36682d3e7d26 Mon Sep 17 00:00:00 2001 From: "dong.ai" Date: Tue, 29 Oct 2024 10:17:40 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/generateImg/generateImg.vue | 47 ++++++++++++++++------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue index 114844df2..573dd0690 100644 --- a/src/views/ebiz/generateImg/generateImg.vue +++ b/src/views/ebiz/generateImg/generateImg.vue @@ -94,19 +94,29 @@ export default { // URL.revokeObjectURL(newimg.src) // callback(newimg) // } - this.blobToBase64(blob).then((base64String) => { - console.log(base64String, '==') + // this.blobToBase64(blob).then((base64String) => { + // console.log(base64String, '==') + // EWebBridge.webCallAppInJs('download', { + // name: '业绩贺报.png', + // url: base64String + // }) + // .then(() => { + // console.log('下载完成') + // }) + // .catch(() => { + // this.$toast.fail('图片下载失败，请重新下载！') + // }) + // }) + let newimg = new Image() + newimg.src = URL.createObjectURL(blob) + newimg.onload = function () { + URL.revokeObjectURL(newimg.src) + console.log(newimg.src); EWebBridge.webCallAppInJs('download', { - name: '业绩贺报.png', - url: base64String + name: '开门红方案.png', + url: newimg.src }) - .then(() => { - console.log('下载完成') - }) - .catch(() => { - this.$toast.fail('图片下载失败，请重新下载！') - }) - }) + } }, 'image/png' // quality @@ -126,31 +136,37 @@ img { width: 100%; position: relative; } + .box { position: absolute; width: 80%; height: 40%; top: 38%; left: 10%; + .title { position: absolute; width: 100%; // left: 30%; top: 24%; font-weight: bold; + p { display: flex; justify-content: center; } + .organ { font-size: 12px; color: #b7170b; } + .name { font-size: 17px; color: #b7170b; } } + .pName { position: absolute; top: 44%; @@ -160,6 +176,7 @@ img { display: flex; justify-content: center; } + .type { font-size: 22px; color: #efbc4f; @@ -169,6 +186,7 @@ img { display: flex; justify-content: center; } + .yuan { font-size: 30px; color: #efbc4f; @@ -178,11 +196,13 @@ img { text-align: center; display: inline-block; vertical-align: bottom; + span { font-size: 14px; margin-left: 5px; } } + .time { font-size: 14px; color: #efbc4f; @@ -193,13 +213,16 @@ img { justify-content: center; } } + .border-color { z-index: 9999; border: 2px solid; border-image: radial-gradient(circle, rgba(255, 233, 124, 1), rgba(222, 144, 34, 1)) 2 2; } + /deep/ .van-button--danger { - background: linear-gradient(to right, #f26e43, #ac0209) !important; /*设置按钮为渐变颜色*/ + background: linear-gradient(to right, #f26e43, #ac0209) !important; + /*设置按钮为渐变颜色*/ border: none !important; } \ No newline at end of file From 3a5978b8d51f0a1fee067a04dfa50f825751232f Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Thu, 14 Nov 2024 15:43:08 +0800 Subject: [PATCH 03/20] =?UTF-8?q?1.=E6=95=B0=E6=8D=AE=E7=B4=A7=E5=87=91?= =?UTF-8?q?=E4=BA=9B2.=E7=AD=9B=E9=80=89=E6=89=BF=E4=BF=9D=E9=A2=84?= =?UTF-8?q?=E6=94=B6=E6=97=B6=E9=97=B43.=E6=97=B6=E9=97=B4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=94=B9=E7=89=884.=E5=8A=A0=E4=B8=AA=E4=BF=9D?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B55.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A86.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=B4=BA=E6=8A=A5=E6=A0=B7=E5=BC=8F7.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=A1=B58.=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/billingDetail/billingDetail.js | 8 + .../ebiz/billingDetail/tableDetail2.vue | 60 ++++++- src/router/ebiz/billingDetail.js | 12 +- .../ebiz/billingDetail/billingDetail.vue | 151 ++++++++++++++---- .../ebiz/billingDetail/policyDetails.vue | 107 +++++++++++++ src/views/ebiz/generateImg/generateImg.vue | 5 +- 6 files changed, 302 insertions(+), 41 deletions(-) create mode 100644 src/views/ebiz/billingDetail/policyDetails.vue diff --git a/src/api/ebiz/billingDetail/billingDetail.js b/src/api/ebiz/billingDetail/billingDetail.js index 667435e18..62ad5bbc4 100644 --- a/src/api/ebiz/billingDetail/billingDetail.js +++ b/src/api/ebiz/billingDetail/billingDetail.js @@ -24,4 +24,12 @@ export function queryOutOrderList(data) { method: 'post', data }) + } + // 出单详情 + export function queryOutOrderDetail(data) { + return request({ + url: getUrl(`/sale/order/queryOutOrderDetail`, 1), + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue index 39bdf69a5..91c9c0360 100644 --- a/src/components/ebiz/billingDetail/tableDetail2.vue +++ b/src/components/ebiz/billingDetail/tableDetail2.vue @@ -11,13 +11,18 @@ {{ Number(index) + 1 }} - {{ item.signDate }} - {{ item.appntDate }} + {{ item.signDate }} + {{ item.appntDate }} {{ item.productName }} {{ item.prem }} {{ item.name }} {{ item.manageComName }} + + 下载贺报 + 查看 + + @@ -28,6 +33,8 @@
上一页
{{ pageNum }}/{{ Math.ceil(total / pageSize) }}
下一页 >
+
+
@@ -62,9 +69,19 @@ export default { } }, data() { - return {} + return { + timeShow: false, + } + }, + created() { + for(let i=0;i import('@/views/ebiz/billingDetail/billingDetail') const generateImg = () => import('@/views/ebiz/generateImg/generateImg') +const policyDetails = () => import('@/views/ebiz/billingDetail/policyDetails') + export default [ { @@ -18,5 +20,13 @@ export default [ meta: { title: '业绩贺报' } - } + }, + { + path: '/policyDetails', + name: 'policyDetails', + component: policyDetails, + meta: { + title: '保单详情', + } + }, ] diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index c43f8f4ef..ce40fecb7 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -1,11 +1,11 @@ @@ -284,7 +300,7 @@ export default { timeShow: false, dialogForm: { outOrderType: '', - dateFlag: '', + dateFlag: 'all', startDate: '', endDate: '' }, @@ -293,7 +309,7 @@ export default { dateFlag: '', style02: 'style02', //style02 时，显示红字红三角的样式，不写的话展示默认样式 currentIndex: 0, //0 当月 1当天 - theads: ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员姓名', '机构'], + theads: ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员姓名', '机构','查看'], tableData: [], total: 0, maxDate: new Date(), @@ -333,10 +349,23 @@ export default { // 1: 中心支公司, 2: 营销服务部, 3: 下辖营业区 queryCom: '' }, - isJzg: false //是否是内勤账号 branchType=JZG 、N 开头的是 (fasle)内勤账号 ；branchType= 数字的是外勤(true) + isJzg: false, //是否是内勤账号 branchType=JZG 、N 开头的是 (fasle)内勤账号 ；branchType= 数字的是外勤(true) + titleText: '全部', + firstTime: true, + monthValue: '', + maxDate: new Date(), + monthDate: new Date(), + overlayShow: false, + } + }, + created() { + this.getyaerMonth(); + if (this.outOrderType === 'accept') { + this.theads.splice(2,1) + } else { + this.theads.splice(1,1) } }, - created() {}, mounted() { // this.getInfo() let date = new Date() @@ -358,7 +387,7 @@ export default { }, openTime(flag) { this.TimeFlag = flag - this.dialogForm.dateFlag = '' + // this.dialogForm.dateFlag = '' this.timeShow = true }, timeConfirm(t) { @@ -416,6 +445,7 @@ export default { this.queryOutOrderListFunc() }, openPopup() { + this.dialogForm = { outOrderType: this.outOrderType, dateFlag: this.dateFlag, @@ -426,6 +456,11 @@ export default { this.dialogForm.startDate = '' this.dialogForm.endDate = '' } + if(this.firstTime == true) { + this.dialogForm.dateFlag = 'all' + this.firstTime = false + } + console.log(this.dialogForm.dateFlag); this.show = true }, //时间筛选 @@ -461,10 +496,10 @@ export default { this.OrgLv3Name = '营业部' this.OrgLv4Name = '营业组' } else { - this.OrgLvName = '总公司' - this.OrgLv2Name = '分公司' - this.OrgLv3Name = '中支公司' - this.OrgLv4Name = '支公司' + this.OrgLvName = '全部' + this.OrgLv2Name = '全部' + this.OrgLv3Name = '全部' + this.OrgLv4Name = '全部' } const resf = await getMisBranchComList2({ // isJzg: this.isJzg, @@ -537,11 +572,10 @@ export default { loadingType: 'spinner', message: '加载中……' }) - queryOutOrderList({ outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance - startDate: this.startDate, // "2024-09-01", - endDate: this.endDate, //"2024-09-30", + startDate: this.dialogForm.startDate, // "2024-09-01", + endDate: this.dialogForm.endDate, //"2024-09-30", dateFlag: this.dateFlag, // -最近一月-m,最近一年y ,全部-all // appntDate: this.postDate, distCode: this.OrgLv2Code, @@ -596,8 +630,8 @@ export default { // this.params.manageLv = '01' // } this.OrgLv2Name = data - this.OrgLv3Name = this.isJzg ? '营业部' : '中支公司' - this.OrgLv4Name = this.isJzg ? '营业组' : '支公司' + this.OrgLv3Name = this.isJzg ? '营业部' : '全部' + this.OrgLv4Name = this.isJzg ? '营业组' : '全部' this.OrgLv3Code = '' this.OrgLv4Code = '' // 点击其他筛选条件-重置当前页为第一页 @@ -632,7 +666,7 @@ export default { this.OrgLv3Code = '' } this.OrgLv4Code = '' - this.OrgLv4Name = this.isJzg ? '营业组' : '支公司' + this.OrgLv4Name = this.isJzg ? '营业组' : '全部' // this.OrgLv2Code = '' // this.OrgLv4Code = '' // 点击其他筛选条件-重置当前页为第一页 @@ -670,6 +704,52 @@ export default { this.pageNum = 1 this.tableData = [] this.queryOutOrderListFunc() + }, + getyaerMonth() { + var currentDate = new Date(); + var currentYear = currentDate.getFullYear(); + var currentMonth = currentDate.getMonth() + 1; // 月份从0开始，所以要加1 + this.monthValue = currentYear + '-' + currentMonth + }, + typeCheck(e) { + this.dialogForm.dateFlag = e + if(e == 'all') { + this.titleText = '全部' + }if(e == 'm') { + this.overlayShow = true + this.titleText = '按月份查询' + }if(e == 'y') { + this.titleText = '按时间范围查询' + } + + }, + // 选择月份事件 + formatter(type, value) { + if (type === 'year') { + return `${value}年`; + } else if (type === 'month') { + return `${value}月` + } + return value + }, + // 月份选择取消按钮 + cancelChange() { + this.overlayShow = false + }, + // 月份选择确认按钮 + confirmChange(t) { + this.$nextTick(() => { + console.log(this.currentDate) + let time = new Date(t) + let y = time.getFullYear() + let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1 + console.log(y, m) + this.monthValue = y + '-' + m + this.dialogForm.startDate = y + '-' + m + '-' + '01' // "2024-09-01", + this.dialogForm.endDate = y + '-' + m + '-' + '30'//"2024-09-30", + console.log(this.startDate); + }) + this.overlayShow = false } } } @@ -685,7 +765,14 @@ export default { .van-icon { font-weight: bolder; } - +.titlebtn { + background-color: #fff; + border: none; + font-size: 12px; + color: #333; + padding: 8px 17px; + border-radius: 2px; +} ::v-deep .classification .van-icon { vertical-align: middle; margin-right: 5px; @@ -716,7 +803,7 @@ export default { background: #fff; } .table th { - width: 130px; + width: 100px; } table { width: 180vw; @@ -791,7 +878,7 @@ table { display: flex; justify-content: space-between; .van-button { - padding: 2px 20px; + padding: 2px 10px; } } .timeField { diff --git a/src/views/ebiz/billingDetail/policyDetails.vue b/src/views/ebiz/billingDetail/policyDetails.vue new file mode 100644 index 000000000..caa5ffb51 --- /dev/null +++ b/src/views/ebiz/billingDetail/policyDetails.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue index af7235081..e11d33c1a 100644 --- a/src/views/ebiz/generateImg/generateImg.vue +++ b/src/views/ebiz/generateImg/generateImg.vue @@ -216,7 +216,10 @@ img { border: 2px solid; border-image: radial-gradient(circle, rgba(255, 233, 124, 1), rgba(222, 144, 34, 1)) 2 2; } - +/deep/ .van-button { + border-radius: 12px; + width: 49%; +} /deep/ .van-button--danger { background: linear-gradient(to right, #f26e43, #ac0209) !important; /*设置按钮为渐变颜色*/ From 0f96837149a5eccfd10131afe10af9defc2e0809 Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Thu, 14 Nov 2024 16:27:17 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E5=87=BA=E5=8D=95=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E7=95=99=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ebiz/billingDetail/tableDetail2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue index 91c9c0360..77d50aa46 100644 --- a/src/components/ebiz/billingDetail/tableDetail2.vue +++ b/src/components/ebiz/billingDetail/tableDetail2.vue @@ -163,7 +163,7 @@ export default { //width: 1000px; } .statisticsTable_table .table { - width: 1000px; + width: 211.6vw !important; } .statisticsTable th { width: 120px; From 4c475ce1ebeaf51a6429defad775e92f4faeb733 Mon Sep 17 00:00:00 2001 From: "zhang.lei3" Date: Fri, 15 Nov 2024 10:36:03 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B4=A3=E4=BB=BB=E7=9A=84=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 9 ++++++--- src/views/ebiz/goodStart/PerformanceReport.vue | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 4d7a676b4..02e09a9c1 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -115,7 +115,8 @@ item.productCode == 'GFRS_M0073' || item.productCode == 'GFRS_M0057' || item.productCode == 'GFRS_M0086' || - item.productCode == 'GFRS_M0092' + item.productCode == 'GFRS_M0092' || + item.productCode == 'GFRS_M0096' ) " class="fs14 w100" @@ -135,7 +136,8 @@ item.productCode == 'GFRS_M0073' || item.productCode == 'GFRS_M0057' || item.productCode == 'GFRS_M0086' || - item.productCode == 'GFRS_M0092' + item.productCode == 'GFRS_M0092' || + item.productCode == 'GFRS_M0096' ) " v-model="dutyItem.defaultDutyAmt" @@ -3115,7 +3117,8 @@ export default { this.trialList[index].productCode == 'GFRS_M0077' || this.trialList[index].productCode == 'GFRS_M0057' || this.trialList[index].productCode == 'GFRS_M0086' || - this.trialList[index].productCode == 'GFRS_M0092' + this.trialList[index].productCode == 'GFRS_M0092' || + this.trialList[index].productCode == 'GFRS_M0096' ) { riskItem['dutyLst'] = this.trialInfos[index].duty } diff --git a/src/views/ebiz/goodStart/PerformanceReport.vue b/src/views/ebiz/goodStart/PerformanceReport.vue index a8ac5052f..aee50c138 100644 --- a/src/views/ebiz/goodStart/PerformanceReport.vue +++ b/src/views/ebiz/goodStart/PerformanceReport.vue @@ -29,7 +29,7 @@ {{ levelNames[levelLength + index] }} - + lanC
From d3076d795a0d0d3b6999ab88d4ec92152b360919 Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Fri, 15 Nov 2024 14:13:53 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E7=9A=84=E8=A1=A8=E6=A0=BC=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/billingDetail/tableDetail2.vue | 26 ++++++++++++----- .../ebiz/billingDetail/billingDetail.vue | 28 +++++++++++++------ 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue index 77d50aa46..0eed6a640 100644 --- a/src/components/ebiz/billingDetail/tableDetail2.vue +++ b/src/components/ebiz/billingDetail/tableDetail2.vue @@ -15,7 +15,9 @@ {{ item.appntDate }} {{ item.productName }} {{ item.prem }} - {{ item.name }} + + {{ item.name }} + {{ item.manageComName }} 下载贺报 @@ -76,9 +78,9 @@ export default { created() { for(let i=0;i diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index ce40fecb7..53e213947 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -2,7 +2,10 @@
- {{ outOrderType === 'accept' ? '承保' : '预收' }} + + {{ outOrderType === 'accept' ? '承保' : '预收' }} + +
@@ -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 From 706fa9216773e202fa65a717bcd29a060775cb64 Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Sat, 16 Nov 2024 12:44:52 +0800 Subject: [PATCH 08/20] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B52.=E6=81=A2=E5=A4=8D=E5=85=A8=E9=83=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/billingDetail/tableDetail2.vue | 2 +- .../ebiz/billingDetail/billingDetail.vue | 22 ++++++---- .../ebiz/billingDetail/policyDetails.vue | 43 ++++++++++++++----- src/views/ebiz/generateImg/generateImg.vue | 2 +- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue index b092a3338..3ceb0e518 100644 --- a/src/components/ebiz/billingDetail/tableDetail2.vue +++ b/src/components/ebiz/billingDetail/tableDetail2.vue @@ -125,7 +125,7 @@ export default { // 查看详情 跳转至详情页面 look(num) { this.$emit('fro-child', num); - console.log(num); + // console.log(num); // this.$router.push({ // path: '/policyDetails', // query: { diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 31801adb8..37ff216e8 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -127,7 +127,7 @@
时间
- + 全部 按月份查询 按时间范围查询
@@ -247,13 +247,17 @@ @child-colse="closeHebao" >
-
+ -
+ + @@ -465,7 +469,9 @@ export default { this.outOrderType = this.dialogForm.outOrderType this.dateFlag = this.dialogForm.dateFlag this.show = false - this.titleText = this.dialogForm.startDate.toString() + '~' + this.dialogForm.endDate.toString() + if(this.dateFlag == 'y') { + this.titleText = this.dialogForm.startDate.toString() + '~' + this.dialogForm.endDate.toString() + } this.outOrderTypeChange() this.queryOutOrderListFunc() }, @@ -482,7 +488,7 @@ export default { this.dialogForm.endDate = '' } if(this.firstTime == true) { - this.dialogForm.dateFlag = 'all' + this.dialogForm.dateFlag = 'm' this.firstTime = false } // console.log(this.dialogForm.dateFlag); @@ -742,9 +748,9 @@ export default { }, typeCheck(e) { this.dialogForm.dateFlag = e - // if(e == 'all') { - // this.titleText = '全部' - // } + if(e == 'all') { + this.titleText = '全部' + } if(e == 'm') { this.overlayShow = true this.titleText = this.monthValue diff --git a/src/views/ebiz/billingDetail/policyDetails.vue b/src/views/ebiz/billingDetail/policyDetails.vue index 4476932a0..dd255f6a3 100644 --- a/src/views/ebiz/billingDetail/policyDetails.vue +++ b/src/views/ebiz/billingDetail/policyDetails.vue @@ -21,13 +21,12 @@ -

{{ item }}

-

暂无主险信息

+

{{ item }}

+

暂无主险信息

 - -

{{ itemm }}

-

暂无附加险信息

+

{{ itemm }}

+

暂无附加险信息
@@ -57,22 +56,42 @@ export default { return { currentDate: '', // orderNo: '', - activeName: ['1'], + activeName: ['1','2','3'], policyData: {}, + mainShow: false, + subRiskShow: false, } }, created() { - console.log(this.orderNo); - this.getpolicyInfo(); + console.log(this.orderNo); + this.getpolicyInfo(); }, mounted() { + // console.log(this.orderNo); + // this.getpolicyInfo(); }, methods: { getpolicyInfo() { - queryOutOrderDetail({ + this.$toast.loading({ + duration: 0, // 持续展示 toast + forbidClick: true, // 禁用背景点击 + loadingType: 'spinner', + message: '加载中……' + }) + queryOutOrderDetail({ orderNo: this.orderNo, }).then((res) => { this.policyData = res.content; + if(this.policyData.mainRiskNameList == []) { + this.mainShow = false + } else { + this.mainShow = true + } + if(this.policyData.subRiskNameList.length == 0) { + this.subRiskShow = false + } else { + this.subRiskShow = true + } }) }, goback() { @@ -133,5 +152,9 @@ export default { text-align: center; } } - +::v-deep .van-cell__right-icon { + margin-left: 1.33333vw; + color: #969799; + display: none; +} diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue index fe96d017c..692cdc265 100644 --- a/src/views/ebiz/generateImg/generateImg.vue +++ b/src/views/ebiz/generateImg/generateImg.vue @@ -18,7 +18,7 @@ 下载
- +
From 093f8cde83b36ec86bab0768badfd7143a8faf7d Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Mon, 18 Nov 2024 10:17:36 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=9A=84=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/billingDetail/billingDetail.vue | 15 ++++++++++++--- src/views/ebiz/generateImg/generateImg.vue | 9 ++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 37ff216e8..2c12fe566 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -469,6 +469,13 @@ export default { this.outOrderType = this.dialogForm.outOrderType this.dateFlag = this.dialogForm.dateFlag this.show = false + if(this.dateFlag == 'all') { + this.titleText = '全部' + } + if(this.dateFlag == 'm') { + this.titleText = this.monthValue + } + if(this.dateFlag == 'y') { this.titleText = this.dialogForm.startDate.toString() + '~' + this.dialogForm.endDate.toString() } @@ -607,7 +614,8 @@ export default { outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance startDate: this.dialogForm.startDate, // "2024-09-01", endDate: this.dialogForm.endDate, //"2024-09-30", - dateFlag: this.dateFlag, // -最近一月-m,最近一年y ,全部-all + // dateFlag: this.dateFlag, // -最近一月-m,最近一年y ,全部-all + dateFlag: '', // 暂不使用改参数，默认给空 // appntDate: this.postDate, distCode: this.OrgLv2Code, depCode: this.OrgLv3Code, @@ -749,11 +757,12 @@ export default { typeCheck(e) { this.dialogForm.dateFlag = e if(e == 'all') { - this.titleText = '全部' + // this.titleText = '全部' + console.log(this.titleText); } if(e == 'm') { this.overlayShow = true - this.titleText = this.monthValue + // this.titleText = this.monthValue } }, diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue index 692cdc265..a07f14ac9 100644 --- a/src/views/ebiz/generateImg/generateImg.vue +++ b/src/views/ebiz/generateImg/generateImg.vue @@ -37,7 +37,14 @@ export default { }, data() { return { - orderList: {} + orderList: {}, + isIOS: false, + } + }, + created() { + this.isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + if(this.isIOS) { + document.getElementsByClassName('box').style.top = '38%' } }, mounted() { From d7ddab1cdd36acb9e679d42a840629f0a652915a Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Mon, 18 Nov 2024 11:05:08 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/billingDetail/billingDetail.vue | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 2c12fe566..385a4118c 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -484,16 +484,12 @@ export default { }, openPopup() { - this.dialogForm = { - outOrderType: this.outOrderType, - dateFlag: this.dateFlag, - startDate: this.startDate, - endDate: this.endDate - } - if (this.dateFlag) { - this.dialogForm.startDate = '' - this.dialogForm.endDate = '' - } + this.dialogForm.outOrderType = this.outOrderType; + this.dialogForm.dateFlag = this.dateFlag; + // if (this.dateFlag) { + // this.dialogForm.startDate = '' + // this.dialogForm.endDate = '' + // } if(this.firstTime == true) { this.dialogForm.dateFlag = 'm' this.firstTime = false From 892ff39f141c46e09f9dc2c0368a475bb4cf9088 Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Mon, 18 Nov 2024 13:42:27 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/billingDetail/billingDetail.vue | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 385a4118c..494dcb70b 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -606,19 +606,35 @@ export default { loadingType: 'spinner', message: '加载中……' }) - queryOutOrderList({ - outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance - startDate: this.dialogForm.startDate, // "2024-09-01", - endDate: this.dialogForm.endDate, //"2024-09-30", - // dateFlag: this.dateFlag, // -最近一月-m,最近一年y ,全部-all - dateFlag: '', // 暂不使用改参数，默认给空 - // appntDate: this.postDate, - distCode: this.OrgLv2Code, - depCode: this.OrgLv3Code, - orgCode: this.OrgLv4Code, - pageNum: this.pageNum, - pageSize: this.pageSize - }).then((res) => { + let data = {} + if(this.dateFlag == 'all') { + data = { + outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance + // dateFlag: this.dateFlag, // -最近一月-m,最近一年y ,全部-all + dateFlag: '', // 暂不使用改参数，默认给空 + // appntDate: this.postDate, + distCode: this.OrgLv2Code, + depCode: this.OrgLv3Code, + orgCode: this.OrgLv4Code, + pageNum: this.pageNum, + pageSize: this.pageSize + } + } else { + data = { + outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance + startDate: this.dialogForm.startDate, // "2024-09-01", + endDate: this.dialogForm.endDate, //"2024-09-30", + // dateFlag: this.dateFlag, // -最近一月-m,最近一年y ,全部-all + dateFlag: '', // 暂不使用改参数，默认给空 + // appntDate: this.postDate, + distCode: this.OrgLv2Code, + depCode: this.OrgLv3Code, + orgCode: this.OrgLv4Code, + pageNum: this.pageNum, + pageSize: this.pageSize + } + } + queryOutOrderList(data).then((res) => { this.$toast.clear() if (res.result == 0) { if (res.content) { From eed8a9a1cbc455b4089467383979e189901f8e2c Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Tue, 19 Nov 2024 10:39:21 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E4=B8=9A=E5=8A=A1=E5=91=98=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/billingDetail/tableDetail2.vue | 31 +++++--- .../ebiz/billingDetail/billingDetail.vue | 79 +++++++++++++++---- .../ebiz/billingDetail/policyDetails.vue | 2 +- src/views/ebiz/generateImg/generateImg.vue | 4 +- 4 files changed, 88 insertions(+), 28 deletions(-) diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue index 3ceb0e518..3f0431ee7 100644 --- a/src/components/ebiz/billingDetail/tableDetail2.vue +++ b/src/components/ebiz/billingDetail/tableDetail2.vue @@ -11,8 +11,8 @@ {{ Number(index) + 1 }} - {{ item.signDate }} - {{ item.appntDate }} + {{ item.signDate }} + {{ item.appntDate }} {{ item.productName }} {{ item.prem }} @@ -75,15 +75,28 @@ export default { timeShow: false, } }, - created() { - for(let i=0;i diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 494dcb70b..bb87eb8cb 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -1,14 +1,25 @@