Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -8,10 +8,12 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // 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.253:8080/"',//田智
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',

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

@@ -165,7 +165,7 @@ export default {
             type: "text"
           },
           {
-            prop: "settleMentAmount",
+            prop: "readyCommissionFeevalue",
             label: "已开票已结算跟单费",
             type: "text"
           },

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

@@ -477,6 +477,7 @@ export default {
         agreementId:this.batchData.agreementId,
         partnerCompaniesId:this.batchData.partnerCompaniesId,
         companyId:this.batchData.companyId,
+        isNotCar:'0',
       }
       this.$api.task.batchInvoicing(data)
           .then(res => {

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

@@ -167,7 +167,7 @@ export default {
             type: "text"
           },
           {
-            prop: "settleMentAmount",
+            prop: "readyCommissionFeevalue",
             label: "已开票已结算跟单费",
             type: "text"
           },

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

@@ -567,6 +567,7 @@ export default {
         agreementId:this.batchData.agreementId,
         partnerCompaniesId:this.batchData.partnerCompaniesId,
         companyId:this.batchData.companyId,
+        isNotCar:'1',
       }
       // this.$api.task.batchInvoicing( {ids:this.batchData.ids,invoicId:this.invoicId})
       this.$api.task.batchInvoicing( data)

src/views/Task/daikeComponents/KtLetter.vue

@@ -2288,6 +2288,7 @@ export default {
       guoRenaccidentDataList: [], //国任意外险
       guoRenaccidenttableData: [],
       guoRenaccidentDataListChild: [],
+      guoRenaccidentalDrivingVo: {}, //国任驾意险
       insuranceDJ: "",
       dajiaInsuranceData: [], //大家意外险
       DJInsuranceData: [],
@@ -4128,7 +4129,7 @@ export default {
       // ];
       this.RSInsuranceData = this.renshouInsuranceData.find(val => val.projectCode == index).son
       if (index) {
-        this.RSDrivingChange(this.RSInsuranceData[0]);
+        this.RSDrivingChange(this.renshouInsuranceData.find(val => val.projectCode == index));
       }
     },
     async dajiaInsuranceChange(index) {
@@ -4181,7 +4182,8 @@ export default {
         this.guoRenaccidentForm.quantity = "1";
         this.guoRenaccidentForm.prodCode = "";
         this.guoRenaccidentDataListChild =this.guoRenaccidentDataList.find(e=>e.projectCode==index).children;
-
+        this.guoRenaccidentalDrivingVo.parentName = this.guoRenaccidentDataList.find(e=>e.projectCode==index).projectName;
+        this.guoRenaccidentalDrivingVo.parentCode = this.guoRenaccidentDataList.find(e=>e.projectCode==index).projectCode;
         // let data = await this.$api.letter.syncNonAutoInsGuoren({
         //   goodsCode: index,
         //   agreementId: this.guoRenaccidentForm.agreementId
@@ -4215,6 +4217,8 @@ export default {
         // appnum:Number(list.appnum)
       };
       this.guoRenaccidenttableData = list.son;
+      this.guoRenaccidentalDrivingVo=Object.assign({...list,...this.guoRenaccidentalDrivingVo}) 
+
     },
     // 选择意外险类型
     async ywxxxchange(index) {
@@ -4447,8 +4451,9 @@ export default {
               companyCode: item.id,
               agreementId: item.agreementId,
               seatNum:item.namesimple=='永诚财险' ||item.namesimple=='中煤财险'? Number(this.carInfo.seatCount):'',
-              ruleUseNature:this.carInfo.carnature
-
+              ruleUseNature:this.carInfo.carnature,
+              ruleSeatNum: Number(this.carInfo.seatCount),
+              ruleThirdPartyInsurance: this.insureList[1].amount
             })
             .then(res => {
               if (res.code == 200) {
@@ -4602,6 +4607,11 @@ export default {
       //     break;
       // }
     },
+    nonVehicle(data,type){
+      if( data.some(e=>e.isDefault)){
+        this[type]=res.data.find(ele=>ele.isDefault).projectCode
+        }
+    },
     CheckboxChange(select, row) {
       this.accidentalDrivingVo = [];
       select.map(val => {
@@ -4709,7 +4719,9 @@ export default {
             .getDrivingInsuranceRule({
               agreementId: this.totalCompanyList[index].agreement[0].id,
               seatNum:ins=='永诚财险' || ins=='中煤财险'? Number(this.carInfo.seatCount):'',
-              ruleUseNature:this.carInfo.carnature
+              ruleUseNature:this.carInfo.carnature,
+              ruleSeatNum: Number(this.carInfo.seatCount),
+              ruleThirdPartyInsurance: this.insureList[1].amount
             })
             .then(res => {
               if (res.code == 200) {
@@ -4740,8 +4752,8 @@ export default {
                     case "中国人寿":
                     case "恒邦财险":
                     case "太平财险":
-                    case "安盛天平":
                     case "华农财险":
+                    case "安盛天平":
                     case "众安财险":
                     res.data.map(ele => {
                         ele.quantity = 1;
@@ -4889,6 +4901,7 @@ export default {
       } else {
       }
     },
+   
     clearAccidentForm() {
       this.accidentForm = {};
       this.accidentForm.fen = 1;
@@ -5904,11 +5917,7 @@ export default {
       });
       let accidentalDrivingVo = {};
       if (this.guoRenaccidentForm.goodsCode) {
-        let data= this.guoRenaccidentDataList.find(val => val.projectCode == this.guoRenaccidentForm.goodsCode)
-        accidentalDrivingVo = {
-          ...data,
-          ...this.guoRenaccidentForm,
-        };
+        accidentalDrivingVo = this.guoRenaccidentalDrivingVo
       }
       let params = {
         accidentalDrivingVo,