报价单上现在非车险和交强

src/components/TemplateTable/index.vue

@@ -10,7 +10,7 @@
               :placeholder="'请输入' + f.label"></el-input>
           </template>
           <template v-else-if="f.type === 'company'">
-            <el-select size="small" clearable v-model="searchDataClone[f.prop]" :placeholder="'请输入' + f.label">
+            <el-select size="small" clearable v-model="searchDataClone[f.prop]" :placeholder="'请输入' + f.label" filterable >
               <el-option label="不限" value v-if="f.selectAuto"></el-option>
               <el-option v-for="(s, i) in InsCompanyList" :key="i" :label="s.name" :value="s.id"></el-option>
             </el-select>

src/views/Core/components/quotationDialog.vue

@@ -59,7 +59,31 @@
                 </el-descriptions-item>
             </el-descriptions>
             <el-table
-                v-if="queryOrders.kindinfo"
+                v-if="queryOrders.jqInsuranceType && queryOrders.jqInsuranceType.length>0"
+                :data="queryOrders.jqInsuranceType"
+                stripe
+                border
+                :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '500', color: '#333333' }"
+                style="width: 100%">
+                <el-table-column
+                prop="name"
+                align="center"
+                label="交强险名称">
+                <template  slot-scope="scope">
+                    <span style="color: #D42426;">{{ scope.row.name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                prop="amount"
+                align="center"
+                label="保险金额">
+                <template  slot-scope="scope">
+                        <span >￥{{ scope.row.amount ?scope.row.amount:'-' }}</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-table
+                v-if="queryOrders.kindinfo && queryOrders.kindinfo.length>0"
                 :data="queryOrders.kindinfo"
                 stripe
                 border
@@ -116,6 +140,38 @@
                     </template>
                 </el-table-column>
             </el-table>
+            <el-table
+                v-if="queryOrders.accidentInfo && queryOrders.accidentInfo.length>0"
+                :data="queryOrders.accidentInfo"
+                stripe
+                border
+                :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '500', color: '#333333' }"
+                style="width: 100%">
+                <el-table-column
+                prop="name"
+                align="center"
+                label="驾意险名称">
+                <template  slot-scope="scope">
+                    <span style="color: #D42426;">{{ scope.row.name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                prop="amount"
+                align="center"
+                label="保险金额">
+                <template  slot-scope="scope">
+                        <span >￥{{ scope.row.amount ?scope.row.amount:'-' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                align="center"
+                prop="premium"
+                label="保费">
+                    <template  slot-scope="scope">
+                        <span >￥{{ scope.row.premium?scope.row.premium:'-' }}</span>
+                    </template>
+                </el-table-column>
+            </el-table>
             <div style="margin: 10px 0;">报价时间：{{ queryOrders.createtime }}</div>
             <div>注：本报价单仅供参考，最终以出单价格为准。</div>
         </div>

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

@@ -137,11 +137,21 @@ export default {
             label: "开票号",
             type: "text"
           },
+          {
+            prop: "invoicingMethod",
+            label: " 开票方式",
+            type: "text"
+          },
           {
             prop: "invoicCommissionFeevalue",
             label: "开票金额",
             type: "text"
           },
+          {
+            prop: "taxPoints",
+            label: "税点",
+            type: "text"
+          },
           {
             prop: "invoicTime",
             label: "开票时间",

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

@@ -137,11 +137,21 @@ export default {
             label: "开票号",
             type: "text"
           },
+          {
+            prop: "invoicingMethod",
+            label: " 开票方式",
+            type: "text"
+          },
           {
             prop: "invoicCommissionFeevalue",
             label: "开票金额",
             type: "text"
           },
+          {
+            prop: "taxPoints",
+            label: "税点",
+            type: "text"
+          },
           {
             prop: "invoicTime",
             label: "开票时间",

src/views/Task/daikeComponents/KtLetter.vue

@@ -1094,18 +1094,18 @@
               <div class="flex f-c Driving-risk">
                 <div class="dis a-c" style="margin-top:15px">
                   <span style="margin-right:15px;font-weight:bold;">意外险类型</span>
-                  <el-select style="width: 250px;" size="small" clearable v-model="anshengInsurancetype" placeholder="未选择"
+                  <el-select style="width: 250px;" size="small" clearable v-model="anshengtemplateSelection" placeholder="未选择"
                     @clear="clearAccidentFormAS" @change="anshengInsuranceChange">
                     <el-option v-for="(item, index) in anshengInsuranceData" :key="index"
                       :label="item.projectCode + '   ' + item.projectName" :value="item.projectCode"></el-option>
                   </el-select>
                 </div>
-                <el-table style='margin-top:20px;' size="small" :data="anshengInsuranceData1" border v-if="anshengInsurancetype" ref="RsTable"
+                <el-table style='margin-top:20px;' size="small" :data="anshengInsuranceData1" border v-if="anshengtemplateSelection" ref="RsTable"
                   highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column align="center" width="55" label="选择">
                     <template slot-scope="scope">
-                      <el-radio class="radio" v-model="AStemplateSelection" :label="scope.row.projectCode"
+                      <el-radio class="radio" v-model="anshengInsurancetype" :label="scope.row.projectCode"
                         @click.native.stop.prevent="ASDrivingRadio(scope.row)">&nbsp;</el-radio>
                     </template>
                   </el-table-column>
@@ -1152,14 +1152,14 @@
               <div class="flex f-c Driving-risk">
                 <div class="dis a-c" style="margin:15px 0">
                   <span style="margin-right:15px;font-weight:bold">选择意外险</span>
-                  <el-select style="width: 250px;" filterable size="small" clearable v-model="insuranceZA"
+                  <el-select style="width: 250px;" filterable size="small" clearable v-model="zhongantemplateSelection"
                     placeholder="未选择" @clear="clearAccidentFormZA" @change="zhonganInsuranceChange">
                     <el-option v-for="(item, index) in zhonganInsuranceData" :key="index" :label="item.projectName"
                       :value="item.projectCode"></el-option>
                   </el-select>
                   <!-- 保费： <b>{{ zhonganaccidentalDrivingVo.sumgrosspremium || 0}}&ensp;元</b> -->
                 </div>
-                <el-table size="small" :data="ZRInsuranceData" border v-if="insuranceZA" @row-click="ZADrivingChange"
+                <el-table size="small" :data="ZRInsuranceData" border v-if="zhongantemplateSelection" @row-click="ZADrivingChange"
                   ref="RsTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="name" label="险种名称" align="center"></el-table-column>
@@ -2236,13 +2236,12 @@ export default {
       isRetractZA: false,
       isRetractYC: false,
       isRetractRS: false,
-      templateSelection: "",
-      AStemplateSelection: "",
+      anshengInsurancetype: "",
       iscCrownerShow: false,
       isApplicantShow: false,
       isInsuredShow: false,
       formInline: {},
-      anshengInsurancetype: "", //安盛
+      anshengtemplateSelection: "", //安盛
       anshengInsuranceData: [], //安盛驾意险
       anshengInsuranceData1: [], //安盛驾意险
       anshengaccidentalDrivingVo: {}, //安盛驾意险
@@ -2268,7 +2267,7 @@ export default {
       // ------------紫金意外险
       insuranceRS: "", //人寿
       RSInsuranceData: [],
-      insuranceZA: "", //众安
+      zhongantemplateSelection: "", //众安
       ZRInsuranceData: [],
       insuranceTP: "", //太平
       taipingInsuranceData: [], //太平驾意险
@@ -4491,6 +4490,7 @@ export default {
                         ele.quantity = 1;
                         return ele;
                       });
+                    // this.nonVehicle(res.data,item.cnName)
                       this[item.cnName + "InsuranceData"] =  res.data;
                     break;
                 }
@@ -4609,7 +4609,7 @@ export default {
     },
     nonVehicle(data,type){
       if( data.some(e=>e.isDefault)){
-        this[type]=res.data.find(ele=>ele.isDefault).projectCode
+        this[type + "templateSelection"]=data.find(ele=>ele.isDefault).projectCode
         }
     },
     CheckboxChange(select, row) {
@@ -4641,7 +4641,7 @@ export default {
     },
     //安盛驾意险选择
     ASDrivingRadio(row) {
-      this.AStemplateSelection = row.projectCode;
+      this.anshengInsurancetype = row.projectCode;
       this.anshengaccidentalDrivingVo=Object.assign({...row,...this.anshengaccidentalDrivingVo}) 
       // this.anshengaccidentalDrivingVo.projectCode = row.projectCode;
       // this.anshengaccidentalDrivingVo.projectName = row.projectName;
@@ -8168,7 +8168,7 @@ export default {
 
       // 清空保险公司选中的意外险
       this.insuranceZJ = "";
-      this.insuranceZA = "";
+      this.zhongantemplateSelection = "";
       this.insuranceHB = "";
       this.insuranceTP = "";
       this.insuranceHN = "";