重复投保状态、费用因子车辆列表、订单样式

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -429,10 +429,10 @@
                       @change="productFilterListChange">
                       <el-option v-for="item in [{
                         label: '是',
-                        value: '1'
+                        value: 1
                       }, {
                         label: '否',
-                        value: '0'
+                        value: 0
                       }]" :key="item.value" :label="item.label" :value="item.value"></el-option>
                     </el-select>
                   </el-form-item>

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -1225,7 +1225,7 @@ export default {
       permissions: null,
       showUpdate1: false,
       batchUpdateForm1: {},
-      batchUpdatelist:[],
+      carClassList: [],
     }
   },
   // 生命周期函数
@@ -1237,6 +1237,7 @@ export default {
     this.licenseQuery();
     this.getFactorTemplate();
     this.getDicType("productsType"); //车险产品
+    this.getDicType('trafficManagementVehicleType')   // 车辆列表
     //获取操作符
     this.$api.dict.findPage(this.operator).then(res => {
       this.operatorlist = res.data.content;
@@ -1338,7 +1339,9 @@ export default {
             if (val.attrCode == 'LicenseArea') {
               val.dictLabal = this.licenseAreaList;
             }
-            // LicenseArea
+            if (val.attrCode == 'CarClass') {
+              val.dictLabal = this.carClassList
+            }
             return val;
           })
           this.dynamicFormArray = obj.costsAttrLinkList;
@@ -1721,6 +1724,9 @@ export default {
             if (val.attrCode == 'LicenseArea') {
               val.dictLabal = this.licenseAreaList;
             }
+            if (val.attrCode == 'CarClass') {
+              val.dictLabal = this.carClassList
+            }
             return val;
           })
           this.dynamicFormArray = obj.costsAttrLinks;
@@ -1835,7 +1841,19 @@ export default {
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {
         if (res.code == 200) {
-          this[type + "options"] = res.data.ddList;
+          if (type == 'trafficManagementVehicleType') {
+            let data = [];
+            res.data.ddList.map(val => {
+              data.push({
+                code: val.dictValue,
+                name: val.dictTag,
+              })
+              return val;
+            })
+            this.carClassList = data;
+          } else {
+            this[type + "options"] = res.data.ddList;
+          }
         }
       });
     },

src/views/Task/daikeComponents/KtLetter1.vue

@@ -873,14 +873,19 @@
                   <span class="letter letter11">.</span>
                   </p>
                 </div>
-                <div class="dis f-c" v-show="reslistitem.quoteCode == '200'">
+                <div class="dis f-c" v-show="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'">
                   <span style="color: #d42426; font-weight: bold">
                     ￥{{ reslistitem.result.sumPermium }}
                   </span>
                   <!-- <span style="font-size: 13px; color: #2d4d89" class="m-top-5">{{ reslistitem.result.feeView ? '总科技币：' : '优惠：' }}{{ reslistitem.result.sumExportFee}}</span> -->
                 </div>
+                <div class="dis f-c" v-show="reslistitem.quoteCode == '200' && (reslistitem.result.orderstatus == '10' || reslistitem.result.orderstatus == '11')">
+                  <span style="color: #d42426; font-weight: bold">
+                    {{ reslistitem.result.orderStatusInfo }}
+                  </span>
+                </div>
               </el-col>
-              <el-col :span="3" v-show="reslistitem.quoteCode == '200'">
+              <el-col :span="3" v-show="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'">
                 <div class="dis f-c">
                   <span style="color: #d42426; font-weight: bold">
                     ￥{{ reslistitem.result.jqPremium }}
@@ -888,12 +893,12 @@
                   <!-- <span v-if="reslistitem.result.jqPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">{{ reslistitem.result.feeView ? '掌柜科技币：' : '优惠：' }}{{ reslistitem.result.jqExportFee }}</span> -->
                 </div>
               </el-col>
-              <el-col :span="3" v-show="reslistitem.quoteCode == '200'">
+              <el-col :span="3" v-show="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'">
                 <span style="color: #d42426; font-weight: bold">
                   ￥{{ reslistitem.result.taxAmount }}
                 </span>
               </el-col>
-              <el-col :span="3" v-show="reslistitem.quoteCode == '200'">
+              <el-col :span="3" v-show="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'">
                 <div class="dis f-c">
                   <span style="color: #d42426; font-weight: bold">
                     ￥{{ reslistitem.result.syPremium }}
@@ -901,7 +906,7 @@
                   <!-- <span v-if="reslistitem.result.syPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">{{ reslistitem.result.feeView ? '掌柜科技币：' : '优惠：' }}{{ reslistitem.result.syExportFee }}</span> -->
                 </div>
               </el-col>
-              <el-col :span="2" v-if="reslistitem.quoteCode == '200'" style="">
+              <el-col :span="2" v-if="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'" style="">
                 <div class="dis f-c">
                   <span style="color: #d42426; font-weight: bold">
                     {{
@@ -947,6 +952,12 @@
                   }}
                 </div>
               </el-col>
+              <el-col :span="24" v-show="reslistitem.quoteCode == '200' &&
+                (reslistitem.result.orderstatus == '10' || reslistitem.result.orderstatus == '11')">
+                <div class="flex j-s offer-time" style="color: #d42426">
+                  {{ reslistitem.result.quoteErrMsg }}
+                </div>
+              </el-col>
               <div class="baofeijisuan" @click="handleListJisuan(reslistitem, reslistindex)">计算保费</div>
             </el-row>
 
@@ -1042,7 +1053,7 @@
                           </div>
                           <div class="w-60"> {{ toWan(kinds.amount) }}</div>
                         </div>
-                        <div class="table-list-content" v-if="!reslistitem.programme.kinds.main.length && !reslistitem.programme.kinds.additional.length">暂无</div>
+                        <div class="table-list-content" v-if="reslistitem.programme && reslistitem.programme.kinds && !reslistitem.programme.kinds.main.length && !reslistitem.programme.kinds.additional.length">暂无</div>
                       </div>
                     </div>
                     <div class="card-table" v-if="reslistitem.programme && reslistitem.programme.drivingList && reslistitem.programme.drivingList.length > 0">
@@ -1066,7 +1077,7 @@
                             <span v-show="reslistitem.checkedProgramme == 99"><i class="el-icon-delete" @click="deleteJiaYi(reslistindex, drivingIndex)"></i></span>
                           </div>
                         </div>
-                        <div class="table-list-content" v-if="!reslistitem.programme.drivingList.length">暂无</div>
+                        <div class="table-list-content" v-if="reslistitem.programme && reslistitem.programme.drivingList && !reslistitem.programme.drivingList.length">暂无</div>
                       </div>
                     </div>
                     <div class="card-table" v-show="reslistitem.cnName == 'guoRen'">
@@ -1113,13 +1124,13 @@
                           </div>
                           <div class="w-50 w-55">{{ toWan(kinds.amount, 'fw') }}</div>
                         </div>
-                        <div class="table-list-content" v-if="!reslistitem.programme.kinds.service.length">暂无</div>
+                        <div class="table-list-content" v-if="reslistitem.programme && reslistitem.programme.kinds && !reslistitem.programme.kinds.service.length">暂无</div>
                       </div>
                     </div>
                   </div>
                 </el-col>
                 <!-- 优惠明细 -->
-                <el-col :span="4" class="card-bg" style="padding-left: 0;" v-if="reslistitem.quoteCode == '200'">
+                <el-col :span="4" class="card-bg" style="padding-left: 0;" v-if="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'">
                   <div class="card-mingxi youhui">
                     <div class="card-mingxi-title">优惠明细：</div>
                     <div class="card-table">
@@ -1230,7 +1241,7 @@
                 </el-col>
 
                 <!-- 保险期限 -->
-                <el-col :span="6" class="card-bg" style="padding-left: 0;" v-if="reslistitem.quoteCode == '200'">
+                <el-col :span="6" class="card-bg" style="padding-left: 0;" v-if="reslistitem.quoteCode == '200' && reslistitem.result.orderstatus != '10' && reslistitem.result.orderstatus != '11'">
                   <div class="card-mingxi baoxian">
                     <div class="card-mingxi-title">保险期限：
                       <div @click="syncData(reslistitem.result)">
@@ -13239,7 +13250,7 @@ export default {
     overflow-x: auto;
 
     .width1280 {
-      min-width: 1280px;
+      min-width: 1576px;
     }
     .bg-white {
       background: #FFF;

src/views/Task/daikeComponents/KtOrder.vue

@@ -212,13 +212,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="orderno" label="订单号" align="center" width="180"></el-table-column>
-      <el-table-column prop="username" :label="managementSource==1?'会员名称':'业务员'" align="center" width="180">
+      <el-table-column prop="orderno" label="订单号" align="center" width="160"></el-table-column>
+      <el-table-column prop="username" :label="managementSource==1?'会员名称':'业务员'" align="center" width="80">
         <template slot-scope="scope">
           <span>{{ scope.row.username }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="username" :label="managementSource==1?'会员号':'业务员工号'" align="center" width="180">
+      <el-table-column prop="username" :label="managementSource==1?'会员号':'业务员工号'" align="center" width="150">
         <template slot-scope="scope">
           <span>{{ scope.row.userid }}</span>
         </template>
@@ -228,7 +228,7 @@
           <span>{{ scope.row.insCompany ? scope.row.insCompany : "--" }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="partnerCompaniesName" label="合作公司" width="100" align="center">
+      <el-table-column prop="partnerCompaniesName" label="合作公司" width="80" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.partnerCompaniesName ? scope.row.partnerCompaniesName : "--" }}</span>
         </template>
@@ -258,8 +258,8 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
-      <el-table-column prop="insureTime" label="承保确认时间" align="center" width="200"></el-table-column>
+      <el-table-column prop="createtime" label="录单日期" align="center" width="150"></el-table-column>
+      <el-table-column prop="insureTime" label="承保确认时间" align="center" width="150"></el-table-column>
 
       <el-table-column label="操作" align="center" fixed="right" min-width="250">
         <template slot-scope="scope">
@@ -884,7 +884,7 @@ export default {
       productsTypeoptions: [],
       InsInsuranceKindoptions: [],
       width: document.documentElement.clientWidth,
-      tabelHeight: document.documentElement.clientHeight - 390,
+      tabelHeight: document.documentElement.clientHeight - 440,
       insAreaCompanyList: [], //子订单list
       companyList: [], //保险公司
       querystatusLoaing: false,