1、开票新增，开票科目不能输入问题

2、报价后，显示 交强折扣系数等字段
3、报价详情页面保费因素部分字段修改

config/dev.env.js

@@ -5,10 +5,10 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  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: '"http://192.168.0.115:8080/"' //凯森
+  // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -575,6 +575,7 @@ export default {
       },
       modelText: "提 交",
       formData: {
+        accountName:"",
         revBankCardNum: "", //收入卡号
         outBankCardNum: "", //支出卡号
         biller: "", //开票员
@@ -924,14 +925,14 @@ export default {
     },
     //选择开票方change事件
     companyChange(item) {
-      if(item.accountName=="太原天勤保险代理有限公司"){
-        this.formData.invoiceSubjects1 ='经纪代理服务' 
-        this.formData.invoiceSubjects2 ='保险代理手续费' 
-      }
-      else{
-        this.formData.invoiceSubjects1 ='' 
-        this.formData.invoiceSubjects2 ='' 
-      }
+        if(item.accountName=="太原天勤保险代理有限公司"){
+          this.formData.invoiceSubjects1 ='经纪代理服务' 
+          this.formData.invoiceSubjects2 ='保险代理手续费' 
+        }
+      // else{
+      //   this.formData.invoiceSubjects1 ='' 
+      //   this.formData.invoiceSubjects2 ='' 
+      // }
       this.formData.revBankCardNum = item.bankCardNum;
       this.formData.biller = item.biller;
       this.formData.accountId = item.accountId;
@@ -987,8 +988,10 @@ export default {
     //新增开票
     addPayment() {
       this.title = "开票新增";
+      this.formData={}
      this.formData.invoiceTime= this.getTodayDate()
       this.detailDialog = true;
+      console.log(this.formData,222222222);
     },
     getTodayDate() {
       const today = new Date();

src/views/Letter/Letter.vue

@@ -1297,27 +1297,39 @@
                     reslistitem.result.ilogPreUdwMess : '无' }}
                   </span>
                 </span>
-                <span v-if="reslistitem.result.jqScore">
+                <span v-if="reslistitem.result.jqScore" class="marginL">
                   交强类型评分：
                   <span>{{ reslistitem.result.jqScore }}</span>
                 </span>
-                <span v-if="reslistitem.result.syScore">
+                <span v-if="reslistitem.result.syScore" class="marginL">
                   商业类型评分：
                   <span>{{ reslistitem.result.syScore }}</span>
                 </span>
-                <span v-if="reslistitem.result.lossRation">
+                <span v-if="reslistitem.result.lossRation" class="marginL">
                   总赔付率：
                   <span>{{ reslistitem.result.lossRation }}</span>
                 </span>
-                <span v-if="reslistitem.result.jqLossRation">
+                <span v-if="reslistitem.result.jqLossRation" class="marginL">
                   交强赔付率：
                   <span>{{ reslistitem.result.jqLossRation }}</span>
                 </span>
-                <span v-if="reslistitem.result.syLossRation">
+                <span v-if="reslistitem.result.syLossRation" class="marginL">
                   商业赔付率：
                   <span>{{ reslistitem.result.syLossRation }}</span>
                 </span>
-                <span v-if="reslistitem.result.accidentInfoStr">
+                <span v-if="reslistitem.result.totalAdjustRate" class="marginL">
+                  自主定价系数：
+                  <span>{{ reslistitem.result.totalAdjustRate }}</span>
+                </span>
+                <span v-if="reslistitem.result.jgAdjustRate" class="marginL">
+                  交强折扣系数：
+                  <span>{{ reslistitem.result.jgAdjustRate }}</span>
+                </span>
+                <span v-if="reslistitem.result.syAdjustRate" class="marginL">
+                  商业折扣系数：
+                  <span>{{ reslistitem.result.syAdjustRate }}</span>
+                </span>
+                <span v-if="reslistitem.result.accidentInfoStr" class="marginL">
                   出险信息：
                   <span>
                     {{
@@ -1584,7 +1596,7 @@
               v-if="reslistitem.namesimple == '中国人寿' && reslistitem.checked && reslistitem.agreementId"
             >
             <div style="margin:15px 0 15px 100px">
-                <span >折扣：</span>
+                <span>商业险折扣：</span>
                 <el-input style="width:220px" :disabled="!lastCompanyId" size="small" v-model="reslistitem.discount" placeholder="请输入内容" @input="reslistitem.discount= reslistitem.discount.replace(/[^\d.]/g, '')"></el-input>
               </div>
               <div class="flex f-c Driving-risk">
@@ -1844,15 +1856,15 @@
                   </el-form-item>
                   <el-form-item label="选择份数" style="margin-right:30px;">
                     <el-input-number
-                      v-model="guoRenaccidentForm.policyNum"
+                      v-model="guoRenaccidentForm.quantity"
                       :min="1"
                       controls-position="right"
-                      :max="guoRenaccidentForm.quantity"
+                      @change="numberCopieschangeGR"
                     ></el-input-number>
                     <!-- <span style="margin-left: 5px;">份</span> -->
                   </el-form-item>
                   <el-form-item label="保费：">
-                    <span>{{guoRenaccidentForm.premium*guoRenaccidentForm.policyNum}}&ensp;元</span>
+                    <span>{{guoRenaccidentForm.premium}}&ensp;元</span>
                   </el-form-item>
                 </el-form>
                 <el-table
@@ -5222,11 +5234,11 @@ else{
       let list=this.guoRenaccidentDataListChild.find(val => val.prodCode == index)
       this.guoRenaccidentForm={
         ... this.guoRenaccidentForm,
-        premium:list.premium,
-        quantity:Number(list.appnum),
+        policyNum:Number(list.premium),
         riskCode:list.riskCode,
         amount:list.amount,
-        policyNum:Number(list.policyNum)
+        premium:Number(list.premium)
+        // appnum:Number(list.appnum)
       }
       this.guoRenaccidenttableData=list.prodCvgLiabList
     },
@@ -5264,6 +5276,9 @@ else{
     numberCopieschangeZM(index) {
       this.accidentFormZM.unitPremium = Number(this.accidentPremiumZM) * index;
     },
+    numberCopieschangeGR(index) {
+      this.guoRenaccidentForm.premium = Number(this.guoRenaccidentForm.policyNum) * index;
+    },
     continuousChange(id) {
       this.continuousCompanyList.map(ele => {
         if (ele.id == id) {
@@ -5682,7 +5697,7 @@ else{
           });
           break;
         case '中煤财险':
-        this.guoRenaccidentForm.agreementId = this.totalCompanyList[index].agreement[0].id;
+        this.accidentFormZM.agreementId = this.totalCompanyList[index].agreement[0].id;
           this.$api.letter.zmGetDrivingPro({ agreementId: this.totalCompanyList[index].agreement[0].id,seatNum:this.carInfo.seatCount}).then(res => {
             if (res.code == 200) {
               let data = res.data;
@@ -8746,9 +8761,13 @@ else{
 
 </style>
 <style lang="scss" scoped>
+.marginL{
+  margin-left: 10px;
+}
 .el-notification{
   width: 600px;
 }
+
 .styleB .el-upload--picture-card {
   // display: none;
   opacity: 0;

src/views/Letter/components/detailsDialog.vue

@@ -49,24 +49,22 @@
                     <el-col :span="6"><span>评分：</span>{{ orderInfo.extendInfo.score }}</el-col>
                     <el-col :span="6"><span>总赔付率：</span>{{ orderInfo.extendInfo.lossRation }}</el-col>
                     <el-col :span="6"><span>出险信息：</span>{{ orderInfo.extendInfo.accidentInfoStr }}</el-col>
-                    <el-col :span="6"><span>自主定价系数：</span>{{ orderInfo.extendInfo.pricingAdjustValue }}</el-col>
+                    <el-col :span="6"><span>总折扣率：</span>{{ orderInfo.extendInfo.totalAdjustRate }}</el-col>
                 </el-row>
                 <el-row  class="premium-style " :gutter="20">
                     <el-col :span="6"><span>交强类型评分：</span>{{ orderInfo.extendInfo.jqScore }}</el-col>
                     <el-col :span="6"><span>交强赔付率：</span>{{ orderInfo.extendInfo.jqLossRation }}</el-col>
-                    <el-col :span="6"><span>交强险折扣比例：</span>{{ orderInfo.extendInfo.nirrratioCI }}</el-col>
-                    <el-col :span="6"><span>业务员交强险销售费用浮动率：</span>{{ orderInfo.extendInfo.jqFeeSaleChangeRateA4 }}</el-col>
+                    <el-col :span="6"><span>交强险折扣：</span>{{ orderInfo.extendInfo.jqAdjustRate }}</el-col>
                 </el-row>
                 <el-row  class="premium-style " :gutter="20">
                     <el-col :span="6"><span>商业类型评分：</span>{{ orderInfo.extendInfo.syScore }}</el-col>
                     <el-col :span="6"><span>商业赔付率：</span>{{ orderInfo.extendInfo.syLossRation }}</el-col>
-                    <el-col :span="6"><span>商业险折扣比例：</span>{{ orderInfo.extendInfo.nirrratio }}</el-col>
-                    <el-col :span="6"><span>业务员商业险销售费用浮动率：</span>{{ orderInfo.extendInfo.syFeeSaleChangeRateA4 }}</el-col>
+                    <el-col :span="6"><span>商业险折扣：</span>{{ orderInfo.extendInfo.syAdjustRate }}</el-col>
                 </el-row>
-                <el-row  class="premium-style " :gutter="20">
+                <!-- <el-row  class="premium-style " :gutter="20">
                     <el-col :span="6"><span>交强深度定价分档：</span>{{ orderInfo.extendInfo.deepPriceGradeCI }}</el-col>
                     <el-col :span="6"><span>商业深度定价分档：</span>{{ orderInfo.extendInfo.deepPriceGradeBI }}</el-col>
-                </el-row>
+                </el-row> -->
             </div>
         </OpenCloseBox>
         <OpenCloseBox >