@dongkboy 1 年之前
父节点
当前提交
3ff44df2dc

+ 8 - 8
pages/quote/checkOption.vue

@@ -30,7 +30,8 @@
 						</view>
 						<view class="tr dis a-c j-c">
 							<text class="td special">交通事故强制责任险</text>
-							<text class="td">{{item.costs.jqPremium?'¥'+item.costs.jqPremium:'-'}}</text>
+							<text class="td">{{item.result.costs.ciPremium?'¥'+item.result
+.costs.ciPremium:'-'}}</text>
 						</view>
 					</view>
 				</view>
@@ -49,13 +50,13 @@
 							size="mini" @click="syterms">商业条款</u-button>
 					</view>
 					<text style="margin-left: 10px;">{{systartDate}}-{{syendDate}} </text>
-					<view class="table " v-if="item.kindInfoVo.length>0">
+					<view class="table " v-if="item.result.kindInfoVo.length>0">
 						<view class="header dis a-c j-s">
 							<text class="th special">险种</text>
 							<text class="th">保额</text>
 							<text class="th">保费(元)</text>
 						</view>
-						<view class="tr dis a-c j-c" v-for="(item,index) in item.kindInfoVo" :key="index">
+						<view class="tr dis a-c j-c" v-for="(item,index) in item.result.kindInfoVo" :key="index">
 							<view class="td special dis a-c  ">
 								<view class="circle dis a-c j-c"></view>
 								<text class="ml-2">{{item.kindName}}</text>
@@ -69,15 +70,15 @@
 							<text class="td"
 								v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(item.kindCode)">{{item.serviceTimes}}次</text>
 							<text v-else class="td">{{convertedValue(item.amount)}}</text>
-							<text class="td">{{item.coveragePremium?item.coveragePremium:'-'}}</text>
+							<text class="td">{{item.premium?item.premium:'-'}}</text>
 						</view>
 					</view>
 				</view>
 				<view class="Plancontent dis  f-c " style="padding: 0;"
-					v-if=" item.accidentalDrivings && item.accidentalDrivings.length>0 ">
+					v-if=" item.insurancePlanInfo.drivings && item.insurancePlanInfo.drivings.length>0 ">
 					<image src="../../static/image/car-insure/ywrisk.png" mode="" style="height: 22px;width: 88px;"
 						class="mb-1"></image>
-					<view class="policyInfo" v-for="(drivingsitem,risksindex) in item.accidentalDrivings"
+					<view class="policyInfo" v-for="(drivingsitem,risksindex) in item.insurancePlanInfo.drivings"
 						:key="risksindex">
 						<text class="tagHeader dis a-c mb-2">
 							<text>{{drivingsitem.riskName}}
@@ -129,7 +130,7 @@
 					</view>
 				</view>
 				<view class="Plancontent dis  f-c policyInfo " style="padding: 0;"
-					v-if="item.editingDto && item.result.jyPremium && item.insurancePlanInfo.drivings.length==0 ">
+					v-if="item.insurancePlanInfo && item.result.costs.niPremium && item.insurancePlanInfo.drivings.length==0 ">
 					<image src="../../static/image/car-insure/ywrisk.png" mode="" style="height: 22px;width: 88px;"
 						class="mb-1"></image>
 					<view class=" ">
@@ -282,7 +283,6 @@
 	}
 
 	.selectedCoverage {
-		width: 100%;
 		background: linear-gradient(90deg, #CCE5FE 0%, #D4EDFF 100%);
 		border-radius: 6px 6px 0px 0px;
 		padding: 8px 6px;

+ 2 - 0
pages/quote/chooseOption.vue

@@ -1550,8 +1550,10 @@
 				let prevPage = pages[pages.length - 2]; //上一页页面实例
 				let prevPage1 = pages[pages.length - 3]; //上一页页面实例
 				this.quotableCompanyList.map(val => {
+					console.log(val);
 					if (val.id == this.planDataExpansion.id) {
 						val.insurancePlanInfo = this.planDataExpansion.genericPlanInfo;
+						console.log(val.insurancePlanInfo);
 						if (val.insurancePlanInfo.kinds.length > 0) {
 							let objkindList = [];
 							val.insurancePlanInfo.kinds.map((ele, index) => {

+ 54 - 24
pages/quote/modules/insuranceInfo.vue

@@ -3,7 +3,7 @@
 		<view class="score">
 			<view class="item">
 				<text class="mr-2">评分</text>
-				<text>A</text>
+				<text>{{scoreVo.score}}</text>
 			</view>
 			<view class="item">
 				<text class="mr-2">交强险系数</text>
@@ -37,28 +37,28 @@
 					<text>止 {{biRiskInfoVo.endDate}}</text>
 				</view>
 			</view>
-			<view class="item dis a-start j-s">
+			<view class="item dis a-start j-s" v-if="policy.ciApplyNumber">
 				<text>交强投保单号</text>
 				<view class="Right dis f-c ">
-					<text>01PAIC3702210016233</text>
+					<text>{{policy.ciApplyNumber}}</text>
 				</view>
 			</view>
-			<view class="item dis a-start j-s">
+			<view class="item dis a-start j-s" v-if="policy.biApplyNumber">
 				<text>商业投保单号</text>
 				<view class="Right dis f-c ">
-					<text>01PAIC37022100124233</text>
+					<text>{{policy.biApplyNumber}}</text>
 				</view>
 			</view>
-			<view class="item dis a-start j-s">
+			<view class="item dis a-start j-s" v-if="policy.ciPolicyNumber">
 				<text>交强保单号</text>
 				<view class="Right dis f-c ">
-					<text>01PAIC3702224233</text>
+					<text>{{policy.ciPolicyNumber}}</text>
 				</view>
 			</view>
-			<view class="item dis a-start j-s">
+			<view class="item dis a-start j-s" v-if="policy.biPolicyNumber">
 				<text>商业保单号</text>
 				<view class="Right dis f-c ">
-					<text>01PAIC3702210016233</text>
+					<text>{{policy.biPolicyNumber}}</text>
 				</view>
 			</view>
 		</view>
@@ -70,21 +70,21 @@
 					<text>保费合计</text>
 					<text class="price">¥{{costs.sumPremium}}</text>
 				</view>
-				<view class="item dis a-c j-s" v-if="costs.jqPremium">
+				<view class="item dis a-c j-s" v-if="costs.ciPremium">
 					<text>交强险</text>
-					<text>¥{{costs.jqPremium}}</text>
+					<text>¥{{costs.ciPremium}}</text>
 				</view>
-				<view class="item dis a-c j-s" v-if="costs.taxPremium">
+				<view class="item dis a-c j-s" v-if="costs.vvTax">
 					<text>车船税</text>
-					<text>¥{{costs.taxPremium}}</text>
+					<text>¥{{costs.vvTax}}</text>
 				</view>
-				<view class="item dis a-start j-s" v-if="costs.syPremium">
+				<view class="item dis a-start j-s" v-if="costs.biPremium">
 					<text>商业险</text>
-					<text>¥{{costs.syPremium}}</text>
+					<text>¥{{costs.biPremium}}</text>
 				</view>
-				<view class="item dis a-start j-s" v-if="costs.jyPremium">
+				<view class="item dis a-start j-s" v-if="costs.niPremium">
 					<text>驾意险</text>
-					<text>¥{{costs.jyPremium}}</text>
+					<text>¥{{costs.niPremium}}</text>
 				</view>
 				<view class="table mb-3" v-if="kindInfoVo.length>0">
 					<view class="header dis a-c j-s">
@@ -92,13 +92,20 @@
 						<text class="th">保额</text>
 						<text class="th">保费</text>
 					</view>
-					<view class="tr dis a-c j-c" v-for="i in 3" :key="i">
-						<text class="td special">附加外部电网故障损失险</text>
-						<text class="td">投保</text>
-						<text class="td">10252.00</text>
+					<view class="tr dis a-c j-c" v-for="(item,index) in kindInfoVo" :key="index">
+						<text class="td special">{{item.kindName}}</text>
+						<text v-if="['A'].includes(item.kindCode)" class="td">投保</text>
+						<text v-else-if="['D4', 'SY_FJ_YBW2'].includes(item.kindCode)"
+							class="td">{{convertedValue(item.unitAmount)}}</text>
+						<text v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(item.kindCode)"
+							class="td">{{item.amount}}%</text>
+						<text v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(item.kindCode)"
+							class="td">{{item.serviceTimes}}次</text>
+						<text v-else class="td">{{convertedValue(item.amount)}}</text>
+						<text class="td">{{item.premium?item.premium:'-'}}</text>
 					</view>
 				</view>
-				<view class="table">
+				<view class="table" v-if="accidentalDrivings.length>0">
 					<view class="header dis a-c j-s">
 						<text class="th special">驾意险</text>
 						<text class="th">单价/数量</text>
@@ -225,15 +232,29 @@
 				type: Object,
 				default: null,
 			},
-			costs: {
+			costs: { //报价金额数据
+				type: Object,
+				default: null,
+			},
+			policy: { //保单号数据
+				type: Object,
+				default: null,
+			},
+			scoreVo: { //保费因素
 				type: Object,
 				default: null,
 			},
-			kindInfoVo: {
+			kindInfoVo: { //险别
 				type: Array,
 				default: () => {
 					return [];
 				}
+			},
+			accidentalDrivings: { //驾意险信息
+				trpe: Array,
+				default: () => {
+					return [];
+				}
 			}
 		},
 		computed: {},
@@ -249,6 +270,15 @@
 			this.specialAgreementimg = await turnBase64Image('/static/image/specialAgreement.png')
 		},
 		methods: {
+			convertedValue(num) {
+				if (num < 10000) {
+					return num.toString();
+				} else if (num < 100000000) {
+					return (Math.floor(num / 10000 * 10) / 10) + '万';
+				} else {
+					return (Math.floor(num / 100000000 * 10) / 10) + '亿';
+				}
+			},
 			viewDiscount() {
 				this.$emit('viewDiscount')
 			},

+ 23 - 31
pages/quote/premiumCalc.vue

@@ -150,7 +150,7 @@
 									<ls-loading v-if="totalitem.quoteCode ==1" text="掌柜正在为您报价,请稍等......"
 										:animation="animation" fontSize="22" />
 									<text v-if="totalitem.quoteCode=='3'" class="quoteFailed"
-										@tap.stop.prevent="ErrorMsg(errorMessage,totalitem.nameSimple)">报价失败,查看原因</text>
+										@tap.stop.prevent="ErrorMsg(totalitem.msg,totalitem.nameSimple)">报价失败,查看原因</text>
 								</view>
 								<view class=" dis j-end a-c mt-2 f-wrap">
 									<view class="ml-2 mb-1 "
@@ -180,7 +180,7 @@
 									</view>
 									<view class="ml-2 mb-1" v-if="totalitem.insurancePlanInfo"
 										style="border: 1px solid #0052FF;border-radius: 2px;padding:1px 6px;color:#0052FF;font-size: 24rpx;"
-										@click="checkSelection">查看方案</view>
+										@click="checkSelection(totalitem)">查看方案</view>
 									<view class="ml-2 mb-1" v-if="totalitem.insurancePlanInfo"
 										style="background:#FF4D4D;color: #fff;border: 1px solid #FF4D4D;border-radius: 2px;padding:1px 6px;font-size: 24rpx;"
 										@click="individualQuote(totalitem)">单独报价</view>
@@ -288,10 +288,10 @@
 												:custom-style="{borderRadius:'2px'}"
 												style="background: linear-gradient( 90deg, #FF9415 0%, #FFB525 100%);"
 												@click="querydetial(totalitem.result.ordersNo,totalitem.cnName)">查看详情</u-button>
-											<u-button class="ml-2" type="primary" size="mini"
+											<!-- 	<u-button class="ml-2" type="primary" size="mini"
 												v-if="order.orderStatus==1" :custom-style="{borderRadius:'2px'}"
 												style="background: linear-gradient( 90deg, #0052FF 0%, #0D8BFF 100%);"
-												@click="submitUnderwriting(totalitem.result.ordersNo,totalitem.result.apiType ,totalitem.nameSimple)">提交核保</u-button>
+												@click="submitUnderwriting(totalitem.result.ordersNo,totalitem.result.apiType ,totalitem.nameSimple)">提交核保</u-button> -->
 										</view>
 									</view>
 								</view>
@@ -1685,7 +1685,6 @@
 				this.quotableCompanyList = JSON.parse(JSON.stringify(res.data.insCompanyVo));
 				this.order = res.data.order;
 				this.costs = res.data.costs; //价格
-				this.errorMessage = res.data.errorMessage; //报价失败原因
 				this.accidentalDrivings = res.data.accidentalDrivings; //驾意险
 				this.carInfo = res.data.carInfoVo; //车辆信息
 				this.ownerInfo = res.data.ownersInfo; //车主信息
@@ -1697,7 +1696,7 @@
 				this.vehicleAndVesselTaxVo = res.data.vehicleAndVesselTaxVo; //车船税信息
 				this.orderno = res.data.order.ordersNo;
 				this.quoteno = res.data.order.quoteNo;
-				await this.commpanyList();
+				await this.commpanyList(res.data);
 				this.imageEcho(this.quoteno) // 影像获取完毕
 				if (this.ciRiskInfoVo) {
 					if (this.isDateBeforeToday(this.ciRiskInfoVo.startDate)) {
@@ -2470,7 +2469,6 @@
 						this.quotableCompanyList.splice(num, 1, updatedItem);
 						this.quotableCompanyList[num].result = res.data;
 						this.subOrderId = res.data.ordersNo;
-						console.log(this.quotableCompanyList);
 					} else {
 						const updatedItem = {
 							...this.quotableCompanyList[num],
@@ -3182,31 +3180,25 @@
 
 			//查看详情
 			querydetial(id, cnName) {
-				this.navigate({
-					url: '/pages/carInsure/quoteDetail',
+				console.log(cnName);
+				uni.navigateTo({
+					url: '/pages/quote/quoteDetail',
 					success: (res) => {
 						res.eventChannel.emit("acceptData", {
-							companyId: id,
+							id: id,
 							cnName: cnName,
 							quotableCompanyList: this.quotableCompanyList,
 
 						})
 					}
-				}, "navigateTo", true);
+				});
 			},
 			//报价单
 			bjdpreview(id) {
-				let pro = this.quotationType.themeCode;
-				if (pro == "QD") {
-					uni.navigateTo({
-						url: "/pages/orders/quotation?companyId=" + id
-					})
-				} else {
-					uni.navigateTo({
-						url: "/pages/orders/quotation1?companyId=" + id
-					})
-				}
-
+				console.log(id);
+				uni.navigateTo({
+					url: "/pages/quote/quotation?ordersNo=" + id
+				})
 			},
 			//预核保信息
 			preUnderwriting(list) {
@@ -3367,16 +3359,12 @@
 				}
 			},
 			//查看方案
-			checkSelection() {
+			checkSelection(item) {
 				uni.navigateTo({
 					url: '/pages/quote/checkOption',
 					success: (res) => {
 						res.eventChannel.emit("acceptData", {
-							item: {
-								costs: this.costs, //价格
-								kindInfoVo: this.kindInfoVo, //商业险险别
-								accidentalDrivings: this.accidentalDrivings, //驾意险
-							},
+							item: item,
 							seatNum: this.carInfo.seatCount,
 							jqstartDate: this.jqstartDate,
 							jqendDate: this.jqendDate,
@@ -3431,7 +3419,7 @@
 				}
 			},
 			//获取保险公司列表
-			commpanyList() {
+			commpanyList(item) {
 				let list = [];
 				this.quotableCompanyList.map(ele => {
 					ele["result"] = {};
@@ -3453,11 +3441,16 @@
 					ele['insurancePlanInfo'] = null;
 					if (this.order && this.order.orderStatus) {
 						if (this.costs.sumPremium) {
+							ele.result = item;
 							ele.insurancePlanInfo = {};
+							ele.insurancePlanInfo.drivings = item.accidentalDrivings;
+							ele.insurancePlanInfo.kinds = item.kindInfoVo;
 							ele.quoteCode = 200;
 						} else {
-							ele.msg = this.errorMessage;
+							ele.msg = item.errorMessage;
 							ele.insurancePlanInfo = {};
+							ele.insurancePlanInfo.drivings = item.accidentalDrivings;
+							ele.insurancePlanInfo.kinds = item.kindInfoVo;
 							ele.quoteCode = 3;
 						}
 
@@ -3465,7 +3458,6 @@
 					return ele;
 				})
 				console.log(this.quotableCompanyList);
-				console.log(this.costs);
 				this.comparableQuantity = list.length;
 
 			},

+ 30 - 11
pages/quote/quotation.vue

@@ -7,7 +7,7 @@
 			<view class="header-title dis a-c j-s ">
 				<view class="dis a-c  left">
 					<image :src="detailbackimg" mode=""></image>
-					<text class="ml-1">保险公司</text>
+					<text class="ml-1">{{companyName}}</text>
 				</view>
 				<text>2024.02.03 12:20:12</text>
 			</view>
@@ -53,19 +53,26 @@
 									<text class="th">保额</text>
 									<text class="th">保费</text>
 								</view>
-								<view class="tr dis a-c j-c" v-for="i in 3" :key="i">
-									<text class="td special">附加外部电网故障损失险</text>
-									<text class="td">投保</text>
-									<text class="td">10252.00</text>
+								<view class="tr dis a-c j-c" v-for="(item,index) in kindInfoVo" :key="index">
+									<text class="td special">{{item.kindName}}</text>
+									<text v-if="['A'].includes(item.kindCode)" class="td">投保</text>
+									<text v-else-if="['D4', 'SY_FJ_YBW2'].includes(item.kindCode)"
+										class="td">{{convertedValue(item.unitAmount)}}</text>
+									<text v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(item.kindCode)"
+										class="td">{{item.amount}}%</text>
+									<text v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(item.kindCode)"
+										class="td">{{item.serviceTimes}}次</text>
+									<text v-else class="td">{{convertedValue(item.amount)}}</text>
+									<text class="td">{{item.premium?item.premium:'-'}}</text>
 								</view>
 							</view>
-							<view class="table">
+							<view class="table" v-if="accidentalDrivings.length>0">
 								<view class="header dis a-c j-s">
 									<text class="th special">驾意险</text>
 									<text class="th">单价/数量</text>
 									<text class="th">保费</text>
 								</view>
-								<view class="tr dis a-c j-c" v-for="i in 2" :key="i">
+								<view class="tr dis a-c j-c" v-for="(item,index) in accidentalDrivings" :key="index">
 									<text class="td special">1119险种5座非营运客车 保额21000保费5(山西)</text>
 									<text class="td">投保</text>
 									<text class="td">10252.00</text>
@@ -73,19 +80,19 @@
 							</view>
 							<view class="item dis a-c j-s mt-3">
 								<text>交强险</text>
-								<text>¥{{costs.jqPremium}} </text>
+								<text>¥{{costs.ciPremium}} </text>
 							</view>
 							<view class="item dis a-c j-s">
 								<text>车船税</text>
-								<text>¥{{costs.taxPremium}} </text>
+								<text>¥{{costs.vvTax}} </text>
 							</view>
 							<view class="item dis a-start j-s">
 								<text>商业险</text>
-								<text>¥{{costs.syPremium}} </text>
+								<text>¥{{costs.biPremium}} </text>
 							</view>
 							<view class="item dis a-start j-s">
 								<text>驾意险</text>
-								<text>¥{{costs.jyPremium}} </text>
+								<text>¥{{costs.niPremium}} </text>
 							</view>
 							<view class="item dis a-c j-s ">
 								<text>保费合计</text>
@@ -135,6 +142,7 @@
 				insuredPersonInfo: {}, //被保人信息
 				order: {},
 				costs: {},
+				accidentalDrivings: [], //驾意险
 			}
 		},
 		onShow() {
@@ -154,6 +162,7 @@
 					this.biRiskInfoVo = res.data.biRiskInfoVo;
 					this.kindInfoVo = res.data.kindInfoVo;
 					this.costs = res.data.costs;
+					this.accidentalDrivings = res.data.accidentalDrivings;
 					this.carInfoVo = res.data.carInfoVo;
 					this.ownersInfo = res.data.ownersInfo;
 					this.policyHolderInfo = res.data.policyHolderInfo;
@@ -162,6 +171,16 @@
 			}
 		},
 		methods: {
+			//商业险保额换算
+			convertedValue(num) {
+				if (num < 10000) {
+					return num.toString();
+				} else if (num < 100000000) {
+					return (Math.floor(num / 10000 * 10) / 10) + '万';
+				} else {
+					return (Math.floor(num / 100000000 * 10) / 10) + '亿';
+				}
+			},
 			//分享图片到微信
 			sendPayCode() {
 				console.log(this.payImg);

+ 57 - 27
pages/quote/quoteDetail.vue

@@ -5,8 +5,11 @@
 			<uni-NavBar headerTitle="订单详情" background="transparent" :isSlot="false" @share="share"></uni-NavBar>
 			<view class="statusFeedbackArea" v-for="(item,index) in statusList" :key="index"
 				v-if="item.value==orderStatus">
-				<view class="dis a-c j-s">
+				<view class="dis f-c a-start">
 					<text>{{item.text}}</text>
+					<div>
+						<text class="text">核保时间可能较长,如长时间无结果</text>
+					</div>
 				</view>
 			</view>
 			<view class="details-content">
@@ -38,7 +41,8 @@
 							</userViewVue>
 						</template>
 						<insuranceInfoVue v-if="current==1" @viewDiscount="viewDiscountShow=true"
-							:ciRiskInfoVo="ciRiskInfoVo" :biRiskInfoVo="biRiskInfoVo" :costs="costs"
+							:ciRiskInfoVo="ciRiskInfoVo" :biRiskInfoVo="biRiskInfoVo" :costs="costs" :policy="policy"
+							:scoreVo="scoreVo" :accidentalDrivings="accidentalDrivings" :kindInfoVo="kindInfoVo"
 							@updateDiscount="updateDiscountShow=true"></insuranceInfoVue>
 						<template v-if="current==2">
 							<imageDataVue @previewImage="previewImage" @delCheckImage="delCheckImage"
@@ -85,9 +89,6 @@
 			<view class="btn dis a-c j-c " @click="ePolicy" v-if="['5'].includes(orderStatus)">
 				<text>下载电子保单</text>
 			</view>
-			<view class="btn dis a-c j-c" @tap="quotation" v-if="['1'].includes(orderStatus)">
-				<text>报价单</text>
-			</view>
 
 		</view>
 		<uni-Popup :show="viewDiscountShow" @close='viewDiscountShow=false' headerTitle="商业险折扣系数" overflow="auto"
@@ -193,13 +194,16 @@
 				quoteNo: "",
 				costs: {},
 				companyName: "",
+				policy: {}, //保单号信息
 				ciRiskInfoVo: {}, //交强险
 				biRiskInfoVo: {}, //商业险
 				kindInfoVo: [], //险别信息
+				accidentalDrivings: [], //驾意险
 				carInfoVo: {}, //车辆信息
 				ownersInfo: {}, //车主信息
 				policyHolderInfo: {}, //投保人信息
 				insuredPersonInfo: {}, //被保人信息
+				scoreVo: {}, //保费因素
 				order: {},
 				detailbackimg: "", //背景图
 				value: "",
@@ -216,7 +220,7 @@
 					name: '影像资料'
 				}],
 				current: 0,
-				orderStatus: '',
+				orderStatus: '3',
 				statusList: [{
 						label: '订单已提交',
 						value: 0,
@@ -230,12 +234,12 @@
 					{
 						label: '核保中',
 						value: 2,
-						tiptext: "订单核保中,请耐心等待"
+						text: "订单核保中,请耐心等待"
 					},
 					{
 						label: '人工处理',
 						value: 3,
-						tiptext: "订单核保中,请耐心等待"
+						text: "订单核保中,请耐心等待"
 					},
 					{
 						label: '待缴费',
@@ -284,6 +288,9 @@
 				policyImageListId: [],
 				insuredImageListId: [],
 				imageCollection: {}, //影像集合
+				id: "",
+				cnName: "",
+				quotableCompanyList: [],
 			}
 		},
 		async onLoad() {
@@ -299,19 +306,27 @@
 			await eventChannel.on('acceptData', async (data) => {
 				if (data.id) {
 					this.id = data.id;
+					this.cnName = data.cnName;
+					if (data.quotableCompanyList) {
+						this.quotableCompanyList = data.quotableCompanyList;
+					}
 					let res = await this.$http.get('/supplementOrder/getOrderDetail?ordersNo=' + data.id);
 					if (res.code == 200) {
-						this.orderStatus = res.data.order.orderStatus;
-						this.companyName = res.data.order.companyName;
-						this.ordersNo = res.data.order.ordersNo;
-						this.quoteNo = res.data.order.quoteNo;
-						this.ciRiskInfoVo = res.data.ciRiskInfoVo;
-						this.biRiskInfoVo = res.data.biRiskInfoVo;
-						this.costs = res.data.costs;
-						this.carInfoVo = res.data.carInfoVo;
-						this.ownersInfo = res.data.ownersInfo;
-						this.policyHolderInfo = res.data.policyHolderInfo;
-						this.insuredPersonInfo = res.data.insuredPersonInfo;
+						// this.orderStatus = res.data.order.orderStatus; //订单状态
+						this.companyName = res.data.order.companyName; //保险公司简称
+						this.ordersNo = res.data.order.ordersNo; //订单号
+						this.quoteNo = res.data.order.quoteNo; //报价号
+						this.ciRiskInfoVo = res.data.ciRiskInfoVo; //交强大类
+						this.biRiskInfoVo = res.data.biRiskInfoVo; //商业大类
+						this.costs = res.data.costs; //报价金额信息
+						this.policy = res.data.policy; //保单号信息
+						this.kindInfoVo = res.data.kindInfoVo; //商业险险别
+						this.accidentalDrivings = res.data.accidentalDrivings; //驾意险
+						this.carInfoVo = res.data.carInfoVo; //车辆信息
+						this.ownersInfo = res.data.ownersInfo; //车主信息
+						this.policyHolderInfo = res.data.policyHolderInfo; //投保人信息
+						this.insuredPersonInfo = res.data.insuredPersonInfo; //被保人信息
+						this.scoreVo = res.data.scoreVo; //保费因素
 						this.order = res.data.order;
 						this.carInfoVo.carNatureCode = dictionaryMatch(this.car_nature_codeoptions, res
 							.data.carInfoVo
@@ -354,11 +369,27 @@
 					order: this.order,
 				});
 				if (images.code == '200') {
-					let res = await this.$http.post('/unify/order/underwriting', {
+					let underwriting = await this.$http.post('/unify/order/underwriting', {
 						order: {
 							ordersNo: this.ordersNo,
 						}
 					});
+					if (underwriting.code = '200') {
+						let res = await this.$http.get('/supplementOrder/getOrderDetail?ordersNo=' + this.id);
+						if (res.code == '200') {
+							this.orderStatus = res.data.order.orderStatus; //订单状态
+						}
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
+					}
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: res.msg
+					})
 				}
 			},
 			//影像预览
@@ -478,11 +509,7 @@
 					url: '/pages/quote/paymentCode?ordersNo=' + this.ordersNo,
 				})
 			},
-			quotation() {
-				uni.navigateTo({
-					url: '/pages/quote/quotation?ordersNo=' + this.ordersNo
-				})
-			},
+
 			ePolicy() {
 				uni.navigateTo({
 					url: '/pages/quote/ePolicy?ordersNo=1910157401009868800',
@@ -687,9 +714,12 @@
 		z-index: 1;
 		background: transparent;
 
-		.dis {
-			justify-content: space-between;
+		.text {
+			font-size: 28rpx;
+			color: rgba(51, 51, 51, 0.7);
+			font-weight: 500;
 		}
+
 	}
 
 	/* 主要内容容器 */

+ 1 - 1
pages/quote/quoteInfo.vue

@@ -170,7 +170,7 @@
 					firstBeneMan: "", //第一受益人
 					noLicenseFlag: false, //是否新车
 					carTypeCode: "K33", //客车A0 货车H0          
-					carNatureCode: "02", //使用性质 家庭自用8A  非营业企业8B   非营业党政机关,事业团体8C  非营业货车8D					
+					carNatureCode: "02", //使用性质 			
 					propertyCode: "1", //所属性质 1个人 2企业 3个人
 					outOfInsurance: false, //脱保
 					usedCar: false, //二手车