订单查看详情页面，字段回显问题

config/dev.env.js

@@ -11,9 +11,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

src/utils/validate.js

@@ -57,8 +57,6 @@ export function getAgeByIdCard(idCard){
 	if (monthNow > monthBirth || (monthNow == monthBirth && dayNow > dayBirth)) {
 		age++
 	}
-  console.log(monthNow,monthBirth,age,22222);
-
 	// 得到年龄
 	sexAndAge.age = age
 

src/views/Core/components/detailsDialog.vue

@@ -101,7 +101,7 @@
           <span slot="title">保费因素</span>
           <div slot="boby">
             <el-row class="premium-style " :gutter="20">
-              <el-col :span="6"><span>评分：</span>{{ orderInfo.extendInfo.score }}</el-col>
+              <el-col :span="6"><span>评分：</span>{{ orderInfo.extendInfo.score ?orderInfo.extendInfo.score :'' }}</el-col>
               <el-col :span="6"><span>总赔付率：</span>{{ orderInfo.extendInfo.lossRation }}</el-col>
               <el-col :span="6"><span>总折扣率：</span>{{ orderInfo.extendInfo.totalAdjustRate }}</el-col>
               <el-col :span="6"><span>出险信息：</span>{{ orderInfo.extendInfo.accidentInfoStr }}</el-col>
@@ -145,7 +145,7 @@
               <el-col :span="6"><span>使用性质：</span>{{ orderInfo.carinfo.carnature }}</el-col>
             </el-row>
             <el-row class="premium-style " :gutter="20">
-              <el-col :span="6"><span>车辆用途：</span>{{ orderInfo.carinfo.vehicleUse }}</el-col>
+              <el-col :span="6"><span>车辆用途：</span>{{orderInfo.carinfo.vehicleUse }} </el-col>
               <el-col :span="6"><span>车辆类型：</span>{{ orderInfo.carinfo.cartype }}</el-col>
               <el-col :span="6"><span>车辆种类：</span>{{ orderInfo.carinfo.cimodelclass }}</el-col>
               <el-col :span="6"><span>能源种类：</span>{{ orderInfo.carinfo.energyType }}</el-col>
@@ -423,7 +423,7 @@
         <OpenCloseBox id="fymx" v-if="orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee && Feepermissions">
           <span slot="title">费用明细</span>
           <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
-            <el-table :data="orderInfo.feeOrderNewVo.exportFee" :span-method="feeOrderNewVomergeRows" :border="true" width="100%"
+            <el-table :data="orderInfo.feeOrderNewVo.exportFee"  :border="true" width="100%"
               :stripe="true" size="mini" :header-cell-style="{
                 background: '#F7F7F9',
                 fontWeight: '700',
@@ -507,6 +507,7 @@ export default {
       default: () => { }
     },
   },
+
   components: { OpenCloseBox },
   methods: {
     selectItem(item) {

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -86,9 +86,9 @@ export default {
         { prop: "documentaryAmountWithdrawal", label: "非跟单费提现总金额", minWidth: 120 },
         { prop: "documentaryAmountAccount", label: "非跟单费已到账金额", minWidth: 120 },
         { prop: "documentaryAmountpayment", label: "非跟单费支付中金额", minWidth: 120 },
-        { prop: "promotionAmountWithdrawal", label: "分销费提现总金额", minWidth: 120 },
-        { prop: "promotionAmountAccount", label: "分销费已到账总金额", minWidth: 130 },
-        { prop: "promotionAmountPayment", label: "分销费支付中金额", minWidth: 120 },
+        { prop: "promotionAmountWithdrawal", label: "推广费提现总金额", minWidth: 120 },
+        { prop: "promotionAmountAccount", label: "推广费已到账总金额", minWidth: 130 },
+        { prop: "promotionAmountPayment", label: "推广费支付中金额", minWidth: 120 },
       ],
     };
   },

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicedAndSettled.vue

@@ -65,7 +65,7 @@ export default {
                     },
                     {
                         prop: "invoicCommissionFeevalue",
-                        label: "已开票手续费",
+                        label: "已开票未结算手续费",
                         type: "text"
                     },
                     {
@@ -73,14 +73,15 @@ export default {
                         label: "已开票已结算手续费",
                         type: "text"
                     },
+                    {
+                        prop: "unSettledAmount",
+                        label: "已开票未结算手续费",
+                        type: "text"
+                    },
                     {
                         prop: "noInvoicCommissionFeevalue",
                         label: "未开票手续费",
                         type: "text"
-                    },{
-                        prop: "unSettledAmount",
-                        label: "未结算手续费",
-                        type: "text"
                     },
                 ],
                 loading: true,

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue

@@ -72,14 +72,15 @@ export default {
                         label: "已开票已结算手续费",
                         type: "text"
                     },
+                    {
+                        prop: "unSettledAmount",
+                        label: "已开票未结算手续费",
+                        type: "text"
+                    },
                     {
                         prop: "noInvoicCommissionFeevalue",
                         label: "未开票手续费",
                         type: "text"
-                    },{
-                        prop: "unSettledAmount",
-                        label: "未结算手续费",
-                        type: "text"
                     },
                 ],
                 loading: true,

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -238,6 +238,11 @@ export default {
           prop: "partnerCompaniesName",
           type: "input",
         },
+        {
+          label: "对接人",
+          prop: "dockingPerson",
+          type: "input",
+        },
         {
           label: "协议号",
           prop: "agreementName",

src/views/Task/DaikeLetter.vue

@@ -166,6 +166,7 @@ export default {
      reslistCurrentChange(row, column, event) {
       this.salespersonForm = row; //名称
       this.activeName='999'
+      this.$refs.Ktletter.add()
       this.$refs.Ktletter.userId=row.userId
       this.$refs.Ktletter.obtainProtocol()
       this.dialogVisible = false;

src/views/Task/daikeComponents/KtLetter.vue

@@ -1412,7 +1412,7 @@
       </div>
     </div>
     <!-- 查看详情 -->
-    <detailsDialog ref="detailsDialog" :orderInfo="queryOrders" :Feepermissions="false"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :orderInfo.sync="queryOrders" :Feepermissions="false"></detailsDialog>
     <el-dialog title="车型选择" :visible.sync="chexingdialogVisible" width="1300px">
       <el-form :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="厂牌型号">
@@ -6090,6 +6090,15 @@ export default {
         this.totalCompanyList[num].apiType
       );
     },
+    capTypedictTag(val,option) {
+      if(option.find(item =>  item.dictValue == val)){
+        return option.find(item =>  item.dictValue == val).dictTag;
+        }
+      else{
+        return '-'
+      }
+    
+    },
     // 爬虫对接
     qoutedetail(companyId) {
       let params = {
@@ -6118,6 +6127,15 @@ export default {
             }
             return ele;
           });
+          if(data.carinfo.carnature &&  data.carinfo.carnature == '02' || data.carinfo.carnature == '非营业'){
+            data.carinfo.vehicleUse=this.capTypedictTag(data.carinfo.vehicleUse,this.outOfBusinessVehicleUseoptions)
+          }else{
+            data.carinfo.vehicleUse=this.capTypedictTag(data.carinfo.vehicleUse,this.businessVehicleUseoptions)
+          }
+          data.carinfo.carnature = this.capTypedictTag(data.carinfo.carnature,this.natureOfVehicleUseoptions);
+          data.carinfo.cartype=data.carinfo.cartype?this.capTypedictTag(data.carinfo.cartype,this.trafficManagementVehicleTypeoptions):''
+         data.carinfo.cimodelclass=data.carinfo.cimodelclass?this.capTypedictTag(data.carinfo.cimodelclass,this.vehicleTypeoptions):''
+          data.carinfo.energyType=data.carinfo.energyType?this.capTypedictTag(data.carinfo.energyType,this.energyTypeoptions):''
           this.queryOrders = data;
           //赋值费用信息
           // this.feeDetailInfo=data.orderFeeResult;

src/views/Task/daikeComponents/KtOrder.vue

@@ -460,7 +460,7 @@
       </span>
     </el-dialog>
     <!-- 车辆报价新页面 -->
-    <detailsDialog ref="detailsDialog" :orderInfo="orderInfo"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :orderInfo.sync="orderInfo"></detailsDialog>
     <!-- 订单轨迹 -->
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class="dialog-title">
@@ -694,6 +694,11 @@ export default {
       quotationhistorydialogVisible: false, //报价历史显示状态
       HistoryList: [], //报价历史数据
       natureOfVehicleUseoptions: [],
+      businessVehicleUseoptions:[],
+      energyTypeoptions:[],
+      vehicleTypeoptions:[],
+      trafficManagementVehicleTypeoptions:[],
+      outOfBusinessVehicleUseoptions: [],
       userIdPor:'',
       statusPor:'',
       deptIdPor:''
@@ -702,6 +707,11 @@ export default {
   components: { quotationDialog, detailsDialog, quotationDialogPro },
   created() {
     this.getDicType("natureOfVehicleUse"); //车辆使用性质
+    this.getDicType("vehicleType"); //车辆种类
+    this.getDicType("trafficManagementVehicleType"); //车辆类型
+    this.getDicType("energyType"); //能源种类
+    this.getDicType("businessVehicleUse"); //（车辆用途）营业
+    this.getDicType("outOfBusinessVehicleUse"); //（车辆用途）非营业
     this.$api.letter.gainTopList().then(res => {
       this.companyList = res.data;
     });
@@ -1235,14 +1245,14 @@ export default {
         }
       });
     },
-    natureOfVehicleUseCap(ele) {
-      if (this.natureOfVehicleUseoptions.find(item => item.dictValue == ele)) {
-        return this.natureOfVehicleUseoptions.find(item => {
-          return item.dictValue === ele;
-        }).dictTag;
-      } else {
-        return "";
+    capTypedictTag(val,option) {
+      if(option.find(item =>  item.dictValue == val)){
+        return option.find(item =>  item.dictValue == val).dictTag;
+        }
+      else{
+        return '-'
       }
+    
     },
     //应用详情
     OrderDetails(dy, item) {
@@ -1270,9 +1280,18 @@ export default {
         if (res.code == 200) {
           this.licenseNo = res.data.licenseno; //车牌号
           this.inscompany = res.data.inscompany; //保险公司
-          res.data.carinfo.carnature = this.natureOfVehicleUseCap(
-            res.data.carinfo.carnature
-          );
+          // res.data.carinfo.carnature = this.natureOfVehicleUseCap(
+          //   res.data.carinfo.carnature
+          // );
+          if(res.data.carinfo.carnature &&  res.data.carinfo.carnature == '02' || res.data.carinfo.carnature == '非营业'){
+            res.data.carinfo.vehicleUse=this.capTypedictTag(res.data.carinfo.vehicleUse,this.outOfBusinessVehicleUseoptions)
+          }else{
+            res.data.carinfo.vehicleUse=this.capTypedictTag(res.data.carinfo.vehicleUse,this.businessVehicleUseoptions)
+          }
+          res.data.carinfo.carnature = this.capTypedictTag( res.data.carinfo.carnature,this.natureOfVehicleUseoptions);
+          res.data.carinfo.cartype=res.data.carinfo.cartype?this.capTypedictTag(res.data.carinfo.cartype,this.trafficManagementVehicleTypeoptions):''
+          res.data.carinfo.cimodelclass=res.data.carinfo.cimodelclass?this.capTypedictTag(res.data.carinfo.cimodelclass,this.vehicleTypeoptions):''
+          res.data.carinfo.energyType=res.data.carinfo.energyType?this.capTypedictTag(res.data.carinfo.energyType,this.energyTypeoptions):''
           if (res.data.accidentInfo) {
             res.data.accidentInfo.constructor === Object
               ? [res.data.accidentInfo]