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

src/views/Core/components/detailsDialog.vue

@@ -37,8 +37,8 @@
               :class="{ 'li-selected': selectedItem === 'shyj' }" @click="selectItem('shyj')">审核意见</li>
             <li v-if="orderInfo && orderInfo.orderstatus == 3 && !isAuditing"
               :class="{ 'li-selected': selectedItem === 'dzbd' }" @click="selectItem('dzbd')">保单信息</li>
-              <li v-if="['1','4'].includes(orderInfo.orderstatus)"
-              :class="{ 'li-selected': selectedItem === 'dzbd' }" @click="selectItem('hbyy')">核保原因</li>
+            <li v-if="['1', '4'].includes(orderInfo.orderstatus)" :class="{ 'li-selected': selectedItem === 'dzbd' }"
+              @click="selectItem('hbyy')">核保原因</li>
           </ul>
         </div>
         <div style="margin:20px;height: 60vh;overflow-y: auto;width: 100%;">
@@ -639,10 +639,10 @@
               </el-table>
             </div>
           </OpenCloseBox>
-          <OpenCloseBox id="hbyy" >
+          <OpenCloseBox id="hbyy">
             <span slot="title">核保原因</span>
             <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
-                <span>{{orderInfo.underwritingReason}}</span>
+              <span>{{ orderInfo.underwritingReason }}</span>
             </div>
           </OpenCloseBox>
         </div>
@@ -888,7 +888,8 @@
         <el-button :size="overSize" @click="productCostAddVehicleFactorVisible = false">取 消</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="影像信息" :visible.sync="carImageVisible" width="50%">
+    <el-dialog title="影像信息" :visible.sync="carImageVisible" width="50%"
+      v-if="obj && obj.carImageList">
       <div>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -903,7 +904,7 @@
           <el-col :span="12">
             <div>
               <h4>行驶证副本</h4>
-              <viewer :images="obj.ownerImageList">
+              <viewer :images="obj.carImageList">
                 <img v-if="obj.carImageList[1]" class="imageStyle" :src="obj.carImageList[1]" />
                 <div v-else class="imageStyle flex j-c a-c ">
                   <span style="margin: 10px;">暂无影像资料 请返回订单查询页“补全影像”</span>
@@ -918,7 +919,7 @@
           style="background: #EAEDF1;color:#D42426;border-color:#EAEDF1">关闭</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="影像信息" :visible.sync="ownerImageVisible" width="50%">
+    <el-dialog title="影像信息" :visible.sync="ownerImageVisible" width="50%" v-if="obj && obj.ownerImageList">
       <div>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -946,7 +947,7 @@
           style="background: #EAEDF1;color:#D42426;border-color:#EAEDF1">关闭</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="影像信息" :visible.sync="applyImageVisible" width="50%">
+    <el-dialog title="影像信息" :visible.sync="applyImageVisible" width="50%" v-if="obj && obj.policyImageList">
       <div>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -974,7 +975,7 @@
           style="background: #EAEDF1;color:#D42426;border-color:#EAEDF1">关闭</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="影像信息" :visible.sync="insureImageVisible" width="50%">
+    <el-dialog title="影像信息" :visible.sync="insureImageVisible" width="50%" v-if="obj && obj.insuredImageList">
       <div>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -1002,7 +1003,7 @@
           style="background: #EAEDF1;color:#D42426;border-color:#EAEDF1">关闭</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="全部影像" :visible.sync="allImageVisible" width="50%">
+    <el-dialog title="全部影像" :visible.sync="allImageVisible" width="50%" v-if="obj && obj.carImageList">
       <el-row>
         <el-col :span="4">
           <div class="tab-style">
@@ -1248,6 +1249,7 @@ export default {
     },
   },
   created() {
+    console.log(this.obj)
     //获取操作符
     this.$api.dict.findPage(this.operator).then(res => {
       this.operatorlist = res.data.content;

src/views/Sys/Deptall.vue

@@ -71,7 +71,7 @@
         <!-- 表格渲染 -->
         <el-table
           permsEdit="sys:dept:edit"
-          height="600"
+          height="720"
           permsDelete="sys:dept:delete"
           row-key="id"
           :expand-row-keys="['9']"

src/views/Task/daikeComponents/KtLetter.vue

@@ -1718,7 +1718,47 @@
                     style="margin-left: 10px;"></el-switch>
                 </div>
               </div>
-
+              <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; margin-right: 60px" filterable size="small" clearable
+                    v-model="chengtaitemplateSelection" placeholder="未选择" @clear="clearAccidentFormCT"
+                    @change="chengtaiInsuranceChange">
+                    <el-option v-for="(item, index) in chengtaiInsuranceData" :key="index" :label="item.projectName"
+                      :value="item.projectCode"></el-option>
+                  </el-select>
+                  <div class="flex a-c" style="margin-right:15px;">
+                    份数：
+                    <el-input-number size="small" v-model="chengtaiaccidentalDrivingVo.quantity" :min="1" :max="1" controls-position="right"
+                    ></el-input-number>
+                    <span style="margin-left: 5px;">份</span>
+                  </div>
+                  保费：
+                  <b>{{
+                    chengtaiaccidentalDrivingVo.sumPremium || 0
+                  }}&ensp;元</b>
+                </div>
+                <el-table size="small" :data="chengtaiInsuranceDataTable" border v-if="chengtaitemplateSelection"
+                  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>
+                  <el-table-column prop="amount" label="保额" align="center"></el-table-column>
+                  <el-table-column prop="premium" label="保费/座" align="center"></el-table-column>
+                  <!-- <el-table-column prop="sumgrosspremium" label="保费 (元)/每份" align="center">
+                    <template slot-scope="scope">
+                      <span>￥{{ scope.row.sumgrosspremium }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="份数" align="center">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.quantity }}</span>
+                    </template>
+                  </el-table-column> -->
+                </el-table>
+              </div>
             </template>
             <template v-if="reslistitem.namesimple == '众安财险' &&
               reslistitem.checked &&
@@ -3328,6 +3368,12 @@ export default {
       hengbangInsuranceData: [], //恒邦驾意险
       hengbangInsuranceDataTable: [],
       hengbangaccidentalDrivingVo: {}, //恒邦驾意险
+
+      chengtaitemplateSelection: "", //诚泰
+      chengtaiInsuranceData: [], //诚泰驾意险
+      chengtaiInsuranceDataTable: [],
+      chengtaiaccidentalDrivingVo: {}, //诚泰驾意险
+
       insuranceHN: "", //华农
       huanongInsuranceData: [], //华农驾意险
       huanongInsuranceDataTable: [],
@@ -3376,7 +3422,6 @@ export default {
       dajiaInsuranceData: [], //大家意外险
       dajiaInsuranceDataTable: [],
       dajiaaccidentalDrivingVo: {},
-      chengtaiaccidentalDrivingVo: {},//诚泰驾意险
       yongchengInsuranceDataTable: [],
       guoRenaccidentLoading: false,
       contributingLoading: false,
@@ -5410,6 +5455,17 @@ export default {
         );
       }
     },
+    chengtaiInsuranceChange(index) {
+      this.chengtaiInsuranceDataTable = this.chengtaiInsuranceData.find(
+        (val) => val.projectCode == index
+      ).son;
+      this.chengtaitemplateSelection = index;
+      if (this.chengtaiInsuranceDataTable.length) {
+        this.chengtaiaccidentalDrivingVo = this.chengtaiInsuranceData.find(
+          (val) => val.projectCode == index
+        );
+      }
+    },
     huanongInsuranceChange(index) {
       this.huanongInsuranceDataTable = this.huanongInsuranceData.find(
         (val) => val.projectCode == index
@@ -6642,6 +6698,9 @@ export default {
     clearAccidentFormHB() {
       this.hengbangaccidentalDrivingVo = {};
     },
+    clearAccidentFormCT() {
+      this.chengtaiaccidentalDrivingVo = {};
+    },
     clearAccidentFormTP() {
       this.taipingaccidentalDrivingVo = {};
     },
@@ -10994,6 +11053,7 @@ export default {
       this.zijintemplateSelection = "";
       this.zhongantemplateSelection = "";
       this.hengbangtemplateSelection = "";
+      this.chengtaitemplateSelection = "";
       this.taipingtemplateSelection = "";
       this.insuranceHN = "";
       this.renshoutemplateSelection = "";