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

config/dev.env.js

@@ -12,10 +12,10 @@ module.exports = merge(prodEnv, {
   // 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.0.253:8080/"',//田智
+  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8、080/"',//霍续亮

src/http/moudules/task.js

@@ -1277,4 +1277,11 @@ export const getDockingPersonList = () => {
     url: "/plt/agreement/getDockingPersonList",
     method: "get",
   })
+}
+export const settlementFeesQuery = (data) => {
+  return axios({
+    url: "/fnc/SettlementFees/query",
+    method: "post",
+    data
+  })
 }

src/views/Core/components/detailsDialog.vue

@@ -259,7 +259,38 @@
           <OpenCloseBox id="jyx" v-if="orderInfo.accidentInfo && orderInfo.accidentInfo.length > 0">
             <span slot="title">驾意险</span>
             <div slot="boby">
-              <div class="quotation-style driving-style">
+              <el-table
+                :data="orderInfo.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 class="quotation-style driving-style">
                 <b>产品</b>
                 <b>份数</b>
                 <b>价格</b>
@@ -268,7 +299,7 @@
                   <span>{{ kindinfoitem.quantity ? kindinfoitem.quantity : '1' }}</span>
                   <span>{{ kindinfoitem.actualPremium }}/份</span>
                 </div>
-              </div>
+              </div> -->
             </div>
           </OpenCloseBox>
           <OpenCloseBox id="qsxx" v-if="orderInfo.taxArrears && orderInfo.taxArrears.length > 0">

src/views/Core/components/detailsDialogPro.vue

@@ -243,16 +243,37 @@
         <OpenCloseBox id="jyx" v-if="orderInfo.accidentInfo && orderInfo.accidentInfo.length > 0">
           <span slot="title">驾意险</span>
           <div slot="boby">
-            <div class="quotation-style driving-style">
-              <b>产品</b>
-              <b>份数</b>
-              <b>价格</b>
-              <div v-for="(kindinfoitem, taxArrearsindex) in orderInfo.accidentInfo" :key="taxArrearsindex">
-                <span>{{ kindinfoitem.projectName }}</span>
-                <span>{{ kindinfoitem.quantity ? kindinfoitem.quantity : '1' }}</span>
-                <span>{{ kindinfoitem.actualPremium }}/份</span>
-              </div>
-            </div>
+            <el-table
+                :data="orderInfo.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>
         </OpenCloseBox>
 

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

@@ -8,6 +8,14 @@
         </yearMonthYay>
       </template>
     </templateTable>
+    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+      <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
+        :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+      </templateTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -27,6 +35,30 @@ export default {
   },
   data() {
     return {
+      dialogVisiblerecord: false,
+      formTableDatarecord: [],
+      tableConfigDetailrecord: {
+        columns: [
+          {
+            prop: "settlementTime",
+            label: "进账日期",
+            type: "text"
+          },
+          {
+            prop: "settlementAmount",
+            label: "进帐金额",
+            type: "text"
+          },
+
+        ],
+        loading: true,
+        isPaginationShow: true
+      },
+      pageDatarecord: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0
+      },
       year: '',
       searchData: {},
       formList: [
@@ -92,7 +124,14 @@ export default {
         loading: true,
         isPaginationShow: true,
         showSummary: true,
-        tableHeight: 'none'
+        tableHeight: 'none',
+        optBtns: [
+          {
+            type: 'primary',
+            label: '记录',
+            click: (row, index) => { return this.haldRecord(row) },
+          }
+        ]
       },
       tableData: [],
       formData: {},
@@ -109,6 +148,42 @@ export default {
     this.findPage();
   },
   methods: {
+    haldRecord(row) {
+      this.findPageDetailrecord(row)
+      this.dialogVisiblerecord = true
+    },
+    findPageDetailrecord(data) {
+      this.tableConfigDetailrecord.loading = true
+      this.$api.task
+        .settlementFeesQuery({
+          partnerCompaniesId: data.partnerCompaniesId,
+          agreementType: '2',
+          handlingFeesStatus: '1',
+          isNotCar:'0',
+          ...this.pageDatarecord
+        })
+        .then(res => {
+          if (res.code == 200) {
+            this.formTableDatarecord = res.data.content;
+            this.pageDatarecord = {
+              pageNum: res.data.pageNum,
+              pageSize: res.data.pageSize,
+              totalSize: res.data.totalSize,
+            }
+            this.tableConfigDetailrecord.loading = false;
+          }
+          else {
+            this.tableConfigDetail.loading = false;
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    getListrecord(data) {
+      this.findPageDetailrecord()
+    },
+    handleCloserecord() {
+      this.dialogVisiblerecord = false
+    },
     getYearData(val) {
       this.formData.year = val
     },

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

@@ -187,8 +187,8 @@ export default {
       this.formData.day=val
     },
     // 查询
-    handleSearchList() {
-      this.findPage();
+    handleSearchList(data) {
+      this.findPage(data);
     },
     //列表数据
     findPage(data) {

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

@@ -4,21 +4,26 @@
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
             @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData" @getList="getList">
             <template slot="data">
-                <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+                <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
+                    @getDayData="getDayData"></yearMonthYay>
             </template>
         </templateTable>
-        <el-dialog
-      title="详情"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :before-close="handleClose">
-      <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
-      @findPage="findPageDetail" >
-    </templateTable>
-      <span slot="footer" class="dialog-footer">
-      <el-button  size="small" @click="dialogVisible = false">取消</el-button>
-    </span>
-  </el-dialog>
+        <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
+            <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1"
+                :tableConfig="tableConfigDetail" :data="formTableData" @findPage="findPageDetail">
+            </templateTable>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisible = false">取消</el-button>
+            </span>
+        </el-dialog>
+        <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+            <templateTable ref="templateTable1"   :pagination="pageDatarecord" @getList="getListrecord"
+                :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+            </templateTable>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -29,7 +34,7 @@ import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
 
 export default {
     name: "baosi",
-    components: { KtCommonTable, templateTable,yearMonthYay },
+    components: { KtCommonTable, templateTable, yearMonthYay },
     created() {
     },
     computed: {
@@ -55,8 +60,25 @@ export default {
                     label: "年月日",
                     name: "data",
                     type: "slot",
-                    },
+                },
             ],
+            tableConfigDetailrecord: {
+                columns: [
+                    {
+                        prop: "settlementTime",
+                        label: "进账日期",
+                        type: "text"
+                    },
+                    {
+                        prop: "settlementAmount",
+                        label: "进帐金额",
+                        type: "text"
+                    },
+
+                ],
+                loading: true,
+                isPaginationShow:true
+            },
             tableConfig: {
                 columns: [
                     {
@@ -69,7 +91,7 @@ export default {
                         label: "合作公司名称",
                         type: "text"
                     },
-                    
+
                     {
                         prop: "commissionFeevalue",
                         label: "总金额",
@@ -103,9 +125,9 @@ export default {
                 ],
                 loading: true,
                 isPaginationShow: true,
-                showSummary:true,
+                showSummary: true,
                 isShowIndex: true,
-                tableHeight:'auto',
+                tableHeight: 'auto',
                 // optBtns: [
                 //     {
                 //         type: 'primary',
@@ -127,98 +149,148 @@ export default {
                 pageSize: 20,
                 agreementType: '2',
                 isNotCar: '0',
-                isNotDocumentary : '0',
-                handlingFeesStatus:'0'
+                isNotDocumentary: '0',
+                handlingFeesStatus: '0'
+            },
+            pageDatarecord: {
+                pageNum: 1,
+                pageSize: 20,
+                totalSize:0
             },
             formList1: [
                 {
                     label: "结算状态",
                     prop: "handlingFeesStatus",
                     type: "select",
-                    options:[
+                    options: [
                         {
-                            label:'开票已结算',
-                            value:'1'
+                            label: '开票已结算',
+                            value: '1'
                         }, {
-                            label:'开票未结算',
-                            value:'2'
+                            label: '开票未结算',
+                            value: '2'
                         },
                     ]
                 },
-               
+
             ],
-            tableConfigDetail:{
+            tableConfigDetail: {
                 columns: [
-                {
-                    prop: "invoicId",
-                    label: "开票号",
-                    type: "text"
-                },
-                {
-                    prop: "invoicCommissionFeevalue",
-                    label: "开票金额",
-                    type: "text"
-                },
-                {
-                    prop: "invoicTime",
-                    label: "开票时间",
-                    type: "text"
-                },
-                
+                    {
+                        prop: "invoicId",
+                        label: "开票号",
+                        type: "text"
+                    },
+                    {
+                        prop: "invoicCommissionFeevalue",
+                        label: "开票金额",
+                        type: "text"
+                    },
+                    {
+                        prop: "invoicTime",
+                        label: "开票时间",
+                        type: "text"
+                    },
+
                 ],
-            loading: true,
-      },
-            dialogVisible:false,
+                loading: true,
+                optBtns: [
+                    {
+                        type: 'primary',
+                        label: '记录',
+                        click: (row, index) => { return this.haldRecord(row) },
+                    }
+                ]
+            },
+            dialogVisible: false,
+            dialogVisiblerecord: false,
             formData: {},
-            formDetail:{},
-            formTableData:[]
-            
+            formDetail: {},
+            formTableData: [],
+            formTableDatarecord:[]
+
         };
     },
     created() {
         this.findPage();
     },
     methods: {
-        getYearData(val){
-      this.formData.year=val
-    },
-    getMonthData(val){
-      this.formData.month=val
-    },
-    getDayData(val){
-      this.formData.day=val
-    },
-    handleSearchList1(data){
-            this.findPageDetail({...this.formDetail,...data})
+        getYearData(val) {
+            this.formData.year = val
+        },
+        getMonthData(val) {
+            this.formData.month = val
+        },
+        getDayData(val) {
+            this.formData.day = val
         },
-        haldDetail(row){
-            this.dialogVisible=true
-            this.formDetail=row
+        handleSearchList1(data) {
+            this.findPageDetail({ ...this.formDetail, ...data })
+        },
+        haldDetail(row) {
+            this.dialogVisible = true
+            this.formDetail = row
             this.findPageDetail(row)
         },
         findPageDetail(data) {
-        this.tableConfigDetail.loading=true
-        this.$api.task
-        .invicdetai({
-            partnerCompaniesId:data.partnerCompaniesId,
-            agreementType: '2',
-            isNotCar: '0',
-            isNotDocumentary : '0',
-            handlingFeesStatus:'1'
-        })
-        .then(res => {
-            if (res.code==200) {
-            this.formTableData = res.data;
-            this.tableConfigDetail.loading = false;
-            }
-            else{
-            this.tableConfigDetail.loading = false;
-            this.$message.error(res.msg)
-            }
-        });
-    },
-    handleClose(){
-            this.dialogVisible=false
+            this.tableConfigDetail.loading = true
+            this.$api.task
+                .invicdetai({
+                    partnerCompaniesId: data.partnerCompaniesId,
+                    agreementType: '2',
+                    isNotCar: '0',
+                    isNotDocumentary: '0',
+                    handlingFeesStatus: '0'
+                })
+                .then(res => {
+                    if (res.code == 200) {
+                        this.formTableData = res.data;
+                        this.tableConfigDetail.loading = false;
+                    }
+                    else {
+                        this.tableConfigDetail.loading = false;
+                        this.$message.error(res.msg)
+                    }
+                });
+        },
+        findPageDetailrecord(data) {
+            this.tableConfigDetailrecord.loading = true
+            this.$api.task
+                .settlementFeesQuery({
+                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
+                    agreementType: '2',
+                    isNotCar: '0',
+                    handlingFeesStatus: '0',
+                    ...data
+                })
+                .then(res => {
+                    if (res.code == 200) {
+                        this.formTableDatarecord = res.data.content;
+                        this.pageDatarecord={
+                            pageNum:res.data.pageNum,
+                            pageSize:res.data.pageSize,
+                            totalSize:res.data.totalSize,
+                        }
+                        this.tableConfigDetailrecord.loading = false;
+                    }
+                    else {
+                        this.tableConfigDetail.loading = false;
+                        this.$message.error(res.msg)
+                    }
+                });
+        },
+        getListrecord(data) {
+            this.findPageDetailrecord(data)
+        },
+        handleClose() {
+            this.dialogVisible = false
+        },
+        handleCloserecord() {
+            this.dialogVisiblerecord = false
+        },
+        haldRecord(row) {
+            this.findPageDetailrecord()
+            this.dialogVisiblerecord = true
         },
         // 查询
         handleSearchList() {
@@ -232,16 +304,16 @@ export default {
             }
             this.tableConfig.loading = true;
             this.$api.task
-                .totalBxAmount({...this.pageData,...this.formData})
+                .totalBxAmount({ ...this.pageData, ...this.formData })
                 .then(res => {
-                    if (res.code==200) {
-                        this.tableData = res.data?res.data:[]
+                    if (res.code == 200) {
+                        this.tableData = res.data ? res.data : []
                         // this.pageData.pageNum = res.data.pageNum;
                         // this.pageData.pageSize = res.data.pageSize;
                         // this.pageData.totalSize = res.data.totalSize;
                         this.tableConfig.loading = false;
                     }
-                    else{
+                    else {
                         this.tableConfig.loading = false;
                         this.$message.error(res.msg)
                     }
@@ -250,19 +322,19 @@ export default {
         getList(data) {
             this.findPage(data)
         },
-      
+
         // 结算
         balanceFun(row) {
             this.$api.task
-                .batchBxBalance({ids:row.ids})
+                .batchBxBalance({ ids: row.ids })
                 .then(res => {
-                    if (res.code==200) {
+                    if (res.code == 200) {
                         this.$message({
-                            message: res.msg ||'操作成功',
+                            message: res.msg || '操作成功',
                             type: 'success'
                         })
                     }
-                    else{
+                    else {
                         this.$message.error(res.msg)
                     }
                 });
@@ -281,9 +353,9 @@ export default {
 </script>
 
 <style scoped>
-.invoiceAnd >>>.el-table__body-wrapper {
+.invoiceAnd>>>.el-table__body-wrapper {
     overflow-y: auto !important;
     height: auto !important;
-  }
-  </style>
+}
+</style>
   

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

@@ -7,6 +7,14 @@
           <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
       </template>
     </templateTable>
+    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+      <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
+        :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+      </templateTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -26,6 +34,30 @@ export default {
   },
   data() {
     return {
+      dialogVisiblerecord: false,
+      formTableDatarecord: [],
+      tableConfigDetailrecord: {
+        columns: [
+          {
+            prop: "settlementTime",
+            label: "进账日期",
+            type: "text"
+          },
+          {
+            prop: "settlementAmount",
+            label: "进帐金额",
+            type: "text"
+          },
+
+        ],
+        loading: true,
+        isPaginationShow: true
+      },
+      pageDatarecord: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0
+      },
       year: '',
       searchData: {},
       formList: [
@@ -91,7 +123,15 @@ export default {
         loading: true,
         isPaginationShow: true,
         showSummary:true,
-        tableHeight:'none'
+        tableHeight:'none',
+        optBtns: [
+          {
+            type: 'primary',
+            label: '记录',
+            click: (row, index) => { return this.haldRecord(row) },
+          }
+        ]
+
       },
       tableData: [],
       formData: {},
@@ -108,6 +148,42 @@ export default {
     this.findPage();
   },
   methods: {
+    haldRecord(row) {
+      this.findPageDetailrecord(row)
+      this.dialogVisiblerecord = true
+    },
+    findPageDetailrecord(data) {
+      this.tableConfigDetailrecord.loading = true
+      this.$api.task
+        .settlementFeesQuery({
+          partnerCompaniesId: data.partnerCompaniesId,
+          agreementType: '2',
+          handlingFeesStatus: '1',
+          isNotCar:'1',
+          ...this.pageDatarecord
+        })
+        .then(res => {
+          if (res.code == 200) {
+            this.formTableDatarecord = res.data.content;
+            this.pageDatarecord = {
+              pageNum: res.data.pageNum,
+              pageSize: res.data.pageSize,
+              totalSize: res.data.totalSize,
+            }
+            this.tableConfigDetailrecord.loading = false;
+          }
+          else {
+            this.tableConfigDetail.loading = false;
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    getListrecord(data) {
+      this.findPageDetailrecord()
+    },
+    handleCloserecord() {
+      this.dialogVisiblerecord = false
+    },
     getYearData(val){
       this.formData.year=val
     },

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

@@ -187,8 +187,8 @@ export default {
       this.formData.day=val
     },
     // 查询
-    handleSearchList() {
-      this.findPage();
+    handleSearchList(data) {
+      this.findPage(data);
     },
     //列表数据
     findPage(data) {

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

@@ -4,21 +4,26 @@
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
             @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData" @getList="getList">
             <template slot="data">
-                <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+                <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
+                    @getDayData="getDayData"></yearMonthYay>
             </template>
         </templateTable>
-        <el-dialog
-      title="详情"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :before-close="handleClose">
-      <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
-      @findPage="findPageDetail" >
-    </templateTable>
-      <span slot="footer" class="dialog-footer">
-      <el-button  size="small" @click="dialogVisible = false">取消</el-button>
-    </span>
-  </el-dialog>
+        <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
+            <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1"
+                :tableConfig="tableConfigDetail" :data="formTableData" @findPage="findPageDetail">
+            </templateTable>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisible = false">取消</el-button>
+            </span>
+        </el-dialog>
+        <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+            <templateTable ref="templateTable1"   :pagination="pageDatarecord" @getList="getListrecord"
+                :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+            </templateTable>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -29,7 +34,7 @@ import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
 
 export default {
     name: "baosi",
-    components: { KtCommonTable, templateTable,yearMonthYay },
+    components: { KtCommonTable, templateTable, yearMonthYay },
     created() {
     },
     computed: {
@@ -55,7 +60,7 @@ export default {
                     label: "年月日",
                     name: "data",
                     type: "slot",
-                    },
+                },
             ],
             tableConfig: {
                 columns: [
@@ -102,9 +107,9 @@ export default {
                 ],
                 loading: true,
                 isPaginationShow: true,
-                showSummary:true,
+                showSummary: true,
                 isShowIndex: true,
-                tableHeight:'none',
+                tableHeight: 'none',
                 // optBtns: [
                 //     {
                 //         type: 'primary',
@@ -126,66 +131,97 @@ export default {
                     label: "结算状态",
                     prop: "handlingFeesStatus",
                     type: "select",
-                    options:[
+                    options: [
                         {
-                            label:'开票已结算',
-                            value:'1'
+                            label: '开票已结算',
+                            value: '1'
                         }, {
-                            label:'开票未结算',
-                            value:'2'
+                            label: '开票未结算',
+                            value: '2'
                         },
                     ]
                 },
-               
+
             ],
-            tableConfigDetail:{
+            tableConfigDetailrecord: {
                 columns: [
-                {
-                    prop: "invoicId",
-                    label: "开票号",
-                    type: "text"
-                },
-                {
-                    prop: "invoicCommissionFeevalue",
-                    label: "开票金额",
-                    type: "text"
-                },
-                {
-                    prop: "invoicTime",
-                    label: "开票时间",
-                    type: "text"
-                },
-                
+                    {
+                        prop: "settlementTime",
+                        label: "进账日期",
+                        type: "text"
+                    },
+                    {
+                        prop: "settlementAmount",
+                        label: "进帐金额",
+                        type: "text"
+                    },
+
                 ],
-            loading: true,
-      },
-            dialogVisible:false,
+                loading: true,
+                isPaginationShow:true
+            },
+            tableConfigDetail: {
+                columns: [
+                    {
+                        prop: "invoicId",
+                        label: "开票号",
+                        type: "text"
+                    },
+                    {
+                        prop: "invoicCommissionFeevalue",
+                        label: "开票金额",
+                        type: "text"
+                    },
+                    {
+                        prop: "invoicTime",
+                        label: "开票时间",
+                        type: "text"
+                    },
+
+                ],
+                loading: true,
+                optBtns: [
+                    {
+                        type: 'primary',
+                        label: '记录',
+                        click: (row, index) => { return this.haldRecord(row) },
+                    }
+                ]
+            },
+            dialogVisible: false,
+            dialogVisiblerecord: false,
             pageData: {
                 pageNum: 1,
                 pageSize: 20,
                 agreementType: '2',
-                isNotCar: '0',
-                isNotDocumentary : '0',
-                handlingFeesStatus:'0'
+                isNotCar: '1',
+                isNotDocumentary: '0',
+                handlingFeesStatus: '0'
+            },
+            pageDatarecord: {
+                pageNum: 1,
+                pageSize: 20,
+                totalSize:0
             },
             formData: {},
-            formDetail:{},
-            formTableData:[]
+            formDetail: {},
+            formTableData: [],
+            formTableDatarecord:[]
         };
     },
     created() {
         this.findPage();
     },
     methods: {
-        getYearData(val){
-      this.formData.year=val
-    },
-    getMonthData(val){
-      this.formData.month=val
-    },
-    getDayData(val){
-      this.formData.day=val
-    },
+        getYearData(val) {
+            this.formData.year = val
+        },
+        getMonthData(val) {
+            this.formData.month = val
+        },
+        getDayData(val) {
+            this.formData.day = val
+        },
         // 查询
         handleSearchList() {
             this.findPage();
@@ -198,16 +234,16 @@ export default {
             }
             this.tableConfig.loading = true;
             this.$api.task
-                .totalBxAmount({...this.pageData,...this.formData})
+                .totalBxAmount({ ...this.pageData, ...this.formData })
                 .then(res => {
-                    if (res.code==200) {
-                        this.tableData = res.data? res.data:[]
+                    if (res.code == 200) {
+                        this.tableData = res.data ? res.data : []
                         // this.pageData.pageNum = res.data.pageNum;
                         // this.pageData.pageSize = res.data.pageSize;
                         // this.pageData.totalSize = res.data.totalSize;
                         this.tableConfig.loading = false;
                     }
-                    else{
+                    else {
                         this.tableConfig.loading = false;
                         this.$message.error(res.msg)
                     }
@@ -216,38 +252,70 @@ export default {
         getList(data) {
             this.findPage(data)
         },
-        handleSearchList1(data){
-            this.findPageDetail({...this.formDetail,...data})
+        handleSearchList1(data) {
+            this.findPageDetail({ ...this.formDetail, ...data })
         },
-        haldDetail(row){
-            this.dialogVisible=true
-            this.formDetail=row
+        haldDetail(row) {
+            this.dialogVisible = true
+            this.formDetail = row
             this.findPageDetail(row)
         },
         findPageDetail(data) {
-        this.tableConfigDetail.loading=true
-        this.$api.task
-        .invicdetai({
-            partnerCompaniesId:data.partnerCompaniesId,
-            agreementType: '2',
-            isNotCar: '0',
-            isNotDocumentary : '0',
-            handlingFeesStatus:'1'
+            this.tableConfigDetail.loading = true
+            this.$api.task
+                .invicdetai({
+                    partnerCompaniesId: data.partnerCompaniesId,
+                    agreementType: '2',
+                    isNotCar: '1',
+                    isNotDocumentary: '0',
+                    handlingFeesStatus: '0'
 
-        })
-        .then(res => {
-            if (res.code==200) {
-            this.formTableData = res.data;
-            this.tableConfigDetail.loading = false;
-            }
-            else{
-            this.tableConfigDetail.loading = false;
-            this.$message.error(res.msg)
-            }
-        });
-    },
-    handleClose(){
-            this.dialogVisible=false
+                })
+                .then(res => {
+                    if (res.code == 200) {
+                        this.formTableData = res.data;
+                        this.tableConfigDetail.loading = false;
+                    }
+                    else {
+                        this.tableConfigDetail.loading = false;
+                        this.$message.error(res.msg)
+                    }
+                });
+        },
+        findPageDetailrecord(data) {
+            this.tableConfigDetailrecord.loading = true
+            this.$api.task
+                .settlementFeesQuery({
+                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
+                    agreementType: '2',
+                    isNotCar: '1',
+                    handlingFeesStatus: '0',
+                    ...data
+                })
+                .then(res => {
+                    if (res.code == 200) {
+                        this.formTableDatarecord = res.data.content;
+                        this.pageDatarecord={
+                            pageNum:res.data.pageNum,
+                            pageSize:res.data.pageSize,
+                            totalSize:res.data.totalSize,
+                        }
+                        this.tableConfigDetailrecord.loading = false;
+                    }
+                    else {
+                        this.tableConfigDetail.loading = false;
+                        this.$message.error(res.msg)
+                    }
+                });
+        },
+        getListrecord(data) {
+            this.findPageDetailrecord(data)
+        },
+        handleClose() {
+            this.dialogVisible = false
+        },
+        handleCloserecord() {
+            this.dialogVisiblerecord = false
         },
         tablePageChange(val) {
             this.pageData.pageSize = val;
@@ -257,15 +325,18 @@ export default {
             this.pageData.pageNum = val;
             this.findPage();
         },
-
+        haldRecord(row) {
+            this.findPageDetailrecord()
+            this.dialogVisiblerecord = true
+        }
     }
 };
 </script>
   
 <style scoped>
-
-.invoiceAnd >>>.el-table__body-wrapper {
+.invoiceAnd>>>.el-table__body-wrapper {
     overflow-y: auto !important;
     height: auto !important;
-  }</style>
+}
+</style>
   

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

@@ -198,7 +198,7 @@ export default {
                 .invicdetai({ 
                     partnerCompaniesId:data.partnerCompaniesId,
                     agreementType: '2',
-                    isNotCar: '0',
+                    isNotCar: '1',
                     isNotDocumentary : '0',
                     handlingFeesStatus:'0'
                 })

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -242,7 +242,8 @@ export default {
         {
           label: "险种",
           prop: "riskcode",
-          type: "input",
+          options: [],
+          type: "select",
         },
         {
           label: "保司机构",
@@ -620,6 +621,16 @@ export default {
             this.$message.error(res.msg)
           }
         });
+     this.$api.insCompany.dicType('productsType').then(res => {
+      if (res.code == 200) {
+        this.formList.forEach(filed => {
+        if (filed.prop == "riskcode") {
+          res.data.ddList.forEach(e=>e.value=e.dictTag)
+          filed.options = res.data.ddList;
+        }
+      })
+      }
+    });
   },
   
   methods: {

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceyes.vue

@@ -1,31 +1,31 @@
 <template>
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
-    <templateTable
-      :formList="formList"
-      :tableConfig="tableConfig"
-      :data="tableData"
-      @findPage="findPage"
-      @handleSearchList="handleSearchList"
-      :pagination="pageData"
-    >
-    <template  slot="data">
-      <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
-    </template>
-    <template slot="dockingPerson">
-      <el-select v-model="formData.dockingPerson" filterable clearable  placeholder="请选择" size="small">
-      <el-option
-        v-for="item in dockingPersonOption"
-        :key="item.docking_person"
-        :label="item.docking_person"
-        :value="item.docking_person">
-      </el-option>
-    </el-select>
-    </template>
+    <templateTable :formList="formList" :tableConfig="tableConfig" :data="tableData" @findPage="findPage"
+      @handleSearchList="handleSearchList" :pagination="pageData">
+      <template slot="data">
+        <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData" @getDayData="getDayData">
+        </yearMonthYay>
+      </template>
+      <template slot="dockingPerson">
+        <el-select v-model="formData.dockingPerson" filterable clearable placeholder="请选择" size="small">
+          <el-option v-for="item in dockingPersonOption" :key="item.docking_person" :label="item.docking_person"
+            :value="item.docking_person">
+          </el-option>
+        </el-select>
+      </template>
     </templateTable>
+    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+      <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
+        :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+      </templateTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
-  <script>
+<script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue";//表格组件
 import templateTable from '@/components/TemplateTable/index.vue'
 import { mapState } from 'vuex'
@@ -33,18 +33,42 @@ import yearMonthYay from './yearMonthYay.vue'
 
 export default {
   name: "baosi",
-  components: { KtCommonTable,templateTable,yearMonthYay },
+  components: { KtCommonTable, templateTable, yearMonthYay },
   created() {
   },
   computed: {
     ...mapState({
-      perms: state =>state.user.perms
+      perms: state => state.user.perms
     })
   },
   data() {
     return {
-      searchData:{},
-        formList:[
+      dialogVisiblerecord: false,
+      formTableDatarecord: [],
+      tableConfigDetailrecord: {
+        columns: [
+          {
+            prop: "settlementTime",
+            label: "进账日期",
+            type: "text"
+          },
+          {
+            prop: "settlementAmount",
+            label: "进帐金额",
+            type: "text"
+          },
+
+        ],
+        loading: true,
+        isPaginationShow: true
+      },
+      pageDatarecord: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0
+      },
+      searchData: {},
+      formList: [
         {
           label: "保险公司",
           prop: "companyName",
@@ -65,8 +89,8 @@ export default {
           name: "data",
           type: "slot",
         },
-    ],
-    tableConfig:{
+      ],
+      tableConfig: {
         columns: [
           {
             prop: "companyName",
@@ -99,44 +123,86 @@ export default {
             type: "text"
           },
         ],
-        loading:true,
-        isPaginationShow:true,
+        loading: true,
+        isPaginationShow: true,
         isShowIndex: true,
-    },
-    tableData: [],
+        optBtns: [
+          {
+            type: 'primary',
+            label: '记录',
+            click: (row, index) => { return this.haldRecord(row) },
+          }
+        ]
+      },
+      tableData: [],
       formData: {},
       dialogVisible: false,
-      pageData:{
+      pageData: {
         pageNum: 1,
         pageSize: 20,
-        agreementType:1,
-        handlingFeesStatus:1
+        agreementType: 1,
+        handlingFeesStatus: 1
       },
-      dockingPersonOption:[]
+      dockingPersonOption: []
     };
   },
-  created(){
+  created() {
     this.findPage();
     this.$api.task
-        .getDockingPersonList()
+      .getDockingPersonList()
+      .then(res => {
+        if (res.code == 200) {
+          this.dockingPersonOption = res.data
+        }
+        else {
+          this.$message.error(res.msg)
+        }
+      });
+  },
+  methods: {
+    haldRecord(row) {
+      this.findPageDetailrecord(row)
+      this.dialogVisiblerecord = true
+    },
+    findPageDetailrecord(data) {
+      this.tableConfigDetailrecord.loading = true
+      this.$api.task
+        .settlementFeesQuery({
+          partnerCompaniesId: data.partnerCompaniesId,
+          agreementType: '1',
+          handlingFeesStatus: '0',
+          ...this.pageDatarecord
+        })
         .then(res => {
-          if (res.code==200) {
-              this.dockingPersonOption=res.data
+          if (res.code == 200) {
+            this.formTableDatarecord = res.data.content;
+            this.pageDatarecord = {
+              pageNum: res.data.pageNum,
+              pageSize: res.data.pageSize,
+              totalSize: res.data.totalSize,
+            }
+            this.tableConfigDetailrecord.loading = false;
           }
-          else{
+          else {
+            this.tableConfigDetail.loading = false;
             this.$message.error(res.msg)
           }
         });
-  },
-  methods: {
-    getYearData(val){
-      this.formData.year=val
     },
-    getMonthData(val){
-      this.formData.month=val
+    getListrecord(data) {
+      this.findPageDetailrecord()
     },
-    getDayData(val){
-      this.formData.day=val
+    handleCloserecord() {
+      this.dialogVisiblerecord = false
+    },
+    getYearData(val) {
+      this.formData.year = val
+    },
+    getMonthData(val) {
+      this.formData.month = val
+    },
+    getDayData(val) {
+      this.formData.day = val
     },
     // 查询
     handleSearchList(val) {
@@ -146,23 +212,23 @@ export default {
     findPage(data) {
       this.tableConfig.loading = true;
       this.$api.task
-        .totalPinAmount({...this.pageData,...data,...this.formData} )
+        .totalPinAmount({ ...this.pageData, ...data, ...this.formData })
         .then(res => {
-          if (res.code==200) {
+          if (res.code == 200) {
             this.tableData = res.data;
             // this.pageData.pageNum = res.data.pageNum;
             // this.pageData.pageSize = res.data.pageSize;
             // this.pageData.totalSize = res.data.totalSize;
             this.tableConfig.loading = false;
           }
-          else{
+          else {
             this.tableConfig.loading = false;
             this.$message.error(res.msg)
           }
         });
     },
-   
- 
+
+
     tablePageChange(val) {
       this.pageData.pageSize = val;
       this.findPage();
@@ -171,15 +237,14 @@ export default {
       this.pageData.pageNum = val;
       this.findPage();
     },
-  
+
   }
 };
 </script>
     
-  <style scoped>
-
-  >>> .dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
- 	 display: none;
+<style scoped>
+>>>.dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
+  display: none;
 }
 </style>
     

src/views/Task/daikeComponents/KtLetter.vue

@@ -1009,14 +1009,14 @@
                 <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="insuranceHB" placeholder="未选择" @clear="clearAccidentFormHB"
+                    v-model="hengbangtemplateSelection" placeholder="未选择" @clear="clearAccidentFormHB"
                     @change="hengbangInsuranceChange">
                     <el-option v-for="(item, index) in hengbangInsuranceData" :key="index" :label="item.projectName"
                       :value="item.projectCode"></el-option>
                   </el-select>
-                  保费： <b>{{ hengbangaccidentalDrivingVo.sumgrosspremium || 0 }}&ensp;元</b>
+                  保费： <b>{{ hengbangaccidentalDrivingVo.sumPremium || 0 }}&ensp;元</b>
                 </div>
-                <el-table size="small" :data="HBInsuranceData" border v-if="insuranceHB" @row-click="HBDrivingChange"
+                <el-table size="small" :data="hengbangInsuranceDataTable" border v-if="hengbangtemplateSelection"
                   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>
@@ -1051,7 +1051,7 @@
                     <!-- <span style="margin-left: 5px;">份</span> -->
                   </el-form-item>
                 </el-form>
-                <el-table v-if="accidentFormHN.accidentType" size="small" :data="HNInsuranceData" border ref="expandTable"
+                <el-table v-if="accidentFormHN.accidentType" size="small" :data="huanongInsuranceDataTable" border ref="expandTable"
                   highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="name" label="保险责任" align="center"></el-table-column>
@@ -1068,25 +1068,17 @@
                 <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="insuranceTP" placeholder="未选择" @clear="clearAccidentFormTP" @change="taipingInsuranceChange">
+                    v-model="taipingtemplateSelection" placeholder="未选择" @clear="clearAccidentFormTP" @change="taipingInsuranceChange">
                     <el-option v-for="(item, index) in taipingInsuranceData" :key="index" :label="item.projectName"
                       :value="item.projectCode"></el-option>
                   </el-select>
                   每份价税合计： <b>{{ taipingaccidentalDrivingVo.sumPremium || 0 }}&ensp;元</b>
                 </div>
-                <el-table size="small" :data="TPInsuranceData" border v-if="insuranceTP" ref="RsTable"
+                <el-table size="small" :data="taipingInsuranceDataTable" border v-if="taipingtemplateSelection" 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="rationName" label="投保产品" align="center"></el-table-column>
-                  <el-table-column label="投保份数" align="center" prop="quantity">
-                    <template>
-                      <span>1</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="price" label="每份价税合计" align="center"></el-table-column>
-                  <el-table-column prop="endSeatNum" label="最大座位数" align="center"></el-table-column> -->
                 </el-table>
               </div>
             </template>
@@ -1100,7 +1092,7 @@
                       :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="anshengtemplateSelection" ref="RsTable"
+                <el-table style='margin-top:20px;' size="small" :data="anshengInsuranceDataTable" 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="选择">
@@ -1125,13 +1117,13 @@
               <div class="flex f-c Driving-risk">
                 <div class="dis a-c">
                   <span style="margin-right:15px;font-weight:bold">选择意外险</span>
-                  <el-select style="width: 250px;" filterable size="small" clearable v-model="insuranceRS"
+                  <el-select style="width: 250px;" filterable size="small" clearable v-model="renshoutemplateSelection"
                     placeholder="未选择" @clear="clearAccidentFormRS" @change="renshouInsuranceChange">
                     <el-option v-for="(item, index) in renshouInsuranceData" :key="index" :label="item.projectName"
                       :value="item.projectCode"></el-option>
                   </el-select>
                 </div>
-                <el-table size="small" style="margin-top:20px"  :data="RSInsuranceData" border v-if="insuranceRS" @row-click="RSDrivingChange"
+                <el-table size="small" style="margin-top:20px"  :data="renshouInsuranceDataTable" border v-if="renshoutemplateSelection" @row-click="RSDrivingChange"
                   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>
@@ -1159,7 +1151,7 @@
                   </el-select>
                   <!-- 保费： <b>{{ zhonganaccidentalDrivingVo.sumgrosspremium || 0}}&ensp;元</b> -->
                 </div>
-                <el-table size="small" :data="ZRInsuranceData" border v-if="zhongantemplateSelection" @row-click="ZADrivingChange"
+                <el-table size="small" :data="zhonganInsuranceDataTable" 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>
@@ -1176,13 +1168,13 @@
               <div class="flex f-c Driving-risk">
                 <div class="dis a-c" style="margin-bottom:15px">
                   <span style="margin-right:15px;font-weight:bold">选择意外险</span>
-                  <el-select style="width: 250px;" filterable multiple size="small" clearable v-model="insuranceZJ"
+                  <el-select style="width: 250px;" filterable multiple size="small" clearable v-model="zijintemplateSelection"
                     placeholder="未选择" @clear="clearAccidentFormZJ" @change="zijinInsuranceChange">
                     <el-option v-for="(item, index) in ziJinInsuranceData" :key="index" :label="item.projectName"
                       :value="item.projectCode"></el-option>
                   </el-select>
                 </div>
-                <el-table size="small" :data="ZJInsuranceData" border v-if="insuranceZJ" @select="CheckboxChange"
+                <el-table size="small" :data="zijinInsuranceDataTable" border v-if="zijintemplateSelection" @select="CheckboxChange"
                   filterable ref="expandTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column type="selection" width="55"></el-table-column>
@@ -1213,8 +1205,8 @@
                 <el-form :inline="true" :model="accidentForm" class="demo-form-inline" size="small"
                   style="font-weight:bold;margin-top:15px">
                   <el-form-item label="意外险类型" style="margin-right:30px;">
-                    <el-select clearable v-model="accidentForm.accidentType" placeholder="未选择" @clear="clearAccidentForm"
-                      @change="ywxxxchange">
+                    <el-select clearable v-model="yongchengtemplateSelection" placeholder="未选择" @clear="clearAccidentForm"
+                      @change="yongchengInsuranceChange">
                       <el-option v-for="(item, index) in accidentDataList" :key="index" :label="item.projectName"
                         :value="item.projectCode"></el-option>
                     </el-select>
@@ -1228,7 +1220,7 @@
                     <span>{{ accidentForm.sumPremium }}&ensp;元</span>
                   </el-form-item>
                 </el-form>
-                <el-table v-if="accidentForm.accidentType" size="small" :data="accidenttableData" border ref="expandTable"
+                <el-table v-if="yongchengtemplateSelection" size="small" :data="yongchengInsuranceDataTable" border ref="expandTable"
                   highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="name" label="保险责任" align="center"></el-table-column>
@@ -1268,7 +1260,7 @@
                     <span>{{ guoRenaccidentForm.sumPremium }}&ensp;元</span>
                   </el-form-item>
                 </el-form>
-                <el-table v-if="guoRenaccidentForm.prodCode" size="small" :data="guoRenaccidenttableData" border
+                <el-table v-if="guoRenaccidentForm.prodCode" size="small" :data="guoRenInsuranceDataTable" border
                   ref="expandTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="name" label="保险责任" align="center"></el-table-column>
@@ -1284,7 +1276,7 @@
                 <el-form :inline="true" :model="accidentFormZM" class="demo-form-inline" size="small"
                   style="font-weight:bold;margin-top:15px">
                   <el-form-item label="意外险类型" style="margin-right:30px;">
-                    <el-select style="width: 250px;" size="small" clearable v-model="zhongmeiInsurancetype"
+                    <el-select style="width: 250px;" size="small" clearable v-model="zhongmeitemplateSelection"
                       placeholder="未选择" @clear="numberCopieschangeZM" @change="zhongmeiInsuranceChange">
                       <el-option v-for="(item, index) in zhongmeiInsuranceData" :key="index" :label="item.projectName"
                         :value="item.projectCode"></el-option>
@@ -1299,7 +1291,7 @@
                     <span>{{ accidentFormZM.sumPremium }}&ensp;元</span>
                   </el-form-item>
                 </el-form>
-                <el-table size="small" :data="zhongmeiInsuranceDataDetail" border ref="ZmMultipleTable"
+                <el-table size="small" :data="zhongmeiInsuranceDataTable" border ref="ZmMultipleTable" v-if="zhongmeitemplateSelection"
                   :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>
@@ -1323,13 +1315,13 @@
               <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;" filterable size="small" clearable v-model="insuranceDJ"
+                  <el-select style="width: 250px;" filterable size="small" clearable v-model="dajiatemplateSelection"
                     placeholder="未选择" @clear="clearAccidentFormDJ" @change="dajiaInsuranceChange">
                     <el-option v-for="(item, index) in dajiaInsuranceData" :key="index" :label="item.productName"
                       :value="item.id"></el-option>
                   </el-select>
                 </div>
-                <el-table size="small" :data="DJInsuranceData" border v-if="insuranceDJ" @row-click="DJDrivingChange"
+                <el-table size="small" :data="dajiaInsuranceDataTable" border v-if="dajiatemplateSelection" @row-click="DJDrivingChange"
                   ref="RsTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="cvrgName" label="保险责任名称" align="center"></el-table-column>
@@ -1343,7 +1335,7 @@
               <div class="flex f-c Driving-risk" style="margin-top:15px">
                 <el-form :inline="true" :model="boHaiaccidentForm" class="demo-form-inline" size="small">
                   <el-form-item label="意外险类型" style="margin-right:30px;">
-                    <el-select clearable placeholder="未选择" @clear="clearAccidentFormBh" @change="bhcxchange"
+                    <el-select clearable placeholder="未选择" @clear="clearAccidentFormBh" @change="bohaiInsuranceChange"
                       v-model="boHaiaccidentForm.packageCode">
                       <el-option v-for="(item, index) in boHaiaccidentDataList" :key="index" :label="item.packageName"
                         :value="item.packageCode"></el-option>
@@ -1357,7 +1349,7 @@
                     <span>{{ boHaiaccidentForm.premium * boHaiaccidentForm.copies }}&ensp;元</span>
                   </el-form-item>
                 </el-form>
-                <el-table v-if="boHaiaccidentForm.packageCode" size="small" :data="boHaiaccidenttableData" border
+                <el-table v-if="boHaiaccidentForm.packageCode" size="small" :data="bohaiInsuranceDataTable" border
                   v-loading="accidentLoadingbh" ref="expandTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="coverageName" label="保险责任名称" align="center"></el-table-column>
@@ -2222,9 +2214,9 @@ export default {
       ],
       packageValue: "",
       packageOptions: [],
-      zhongmeiInsurancetype: "", //中煤驾意险产品选中值
+      zhongmeitemplateSelection: "", //中煤驾意险产品选中值
       zhongmeiInsuranceData: [], //中煤驾意险产品列表数据
-      zhongmeiInsuranceDataDetail: [], //中煤驾意险产品明细方案数据
+      zhongmeiInsuranceDataTable: [], //中煤驾意险产品明细方案数据
       zhongmeiaccidentalDrivingVo: {}, //中煤驾意险最终选中字段
       currentCell: null,
       feeDetailInfo: [], //费用明细信息
@@ -2243,15 +2235,15 @@ export default {
       formInline: {},
       anshengtemplateSelection: "", //安盛
       anshengInsuranceData: [], //安盛驾意险
-      anshengInsuranceData1: [], //安盛驾意险
+      anshengInsuranceDataTable: [], //安盛驾意险
       anshengaccidentalDrivingVo: {}, //安盛驾意险
-      insuranceHB: "", //恒邦
+      hengbangtemplateSelection: "", //恒邦
       hengbangInsuranceData: [], //恒邦驾意险
-      HBInsuranceData: [],
+      hengbangInsuranceDataTable: [],
       hengbangaccidentalDrivingVo: {}, //恒邦驾意险
       insuranceHN: "", //华农
       huanongInsuranceData: [], //华农驾意险
-      HNInsuranceData: [],
+      huanongInsuranceDataTable: [],
       huanongaccidentalDrivingVo: {}, //华农驾意险
 
       renshouaccidentalDrivingVo: {}, //人寿意外险
@@ -2259,17 +2251,17 @@ export default {
       ziJinInsuranceData: [], //-紫金意外险list
       zhonganInsuranceData: [], //众安驾意险
       zhonganaccidentalDrivingVo: {}, //众安驾意险
-      ZJInsuranceData: [],
-      insuranceZJ: "",
+      zijinInsuranceDataTable: [],
+      zijintemplateSelection: "",
       accidentalDrivingVo: [], //-紫金意外险传参
       zijinengageListData: [], //紫金特约
       zijinengageList: [], //紫金特约
       // ------------紫金意外险
-      insuranceRS: "", //人寿
-      RSInsuranceData: [],
+      renshoutemplateSelection: "", //人寿
+      renshouInsuranceDataTable: [],
       zhongantemplateSelection: "", //众安
-      ZRInsuranceData: [],
-      insuranceTP: "", //太平
+      zhonganInsuranceDataTable: [],
+      taipingtemplateSelection: "", //太平
       taipingInsuranceData: [], //太平驾意险
       TPDrivingChangeInsuranceData: [],
       taipingaccidentalDrivingVo: {}, //太平驾意险
@@ -2284,15 +2276,16 @@ export default {
         quantity:'1'
       }, //华农意外险内容
       accidentDataList: [], //永诚意外险
+      yongchengtemplateSelection:'',
       guoRenaccidentDataList: [], //国任意外险
-      guoRenaccidenttableData: [],
+      guoRenInsuranceDataTable: [],
       guoRenaccidentDataListChild: [],
       guoRenaccidentalDrivingVo: {}, //国任驾意险
-      insuranceDJ: "",
+      dajiatemplateSelection: "",
       dajiaInsuranceData: [], //大家意外险
-      DJInsuranceData: [],
+      dajiaInsuranceDataTable: [],
       dajiaaccidentalDrivingVo: {},
-      accidenttableData: [],
+      yongchengInsuranceDataTable: [],
       guoRenaccidentLoading: false,
       contributingLoading: false,
       guoRenaccidentPremium: "",
@@ -2310,7 +2303,7 @@ export default {
         policyNum: 0
       },
       accidentLoadingbh: false,
-      boHaiaccidenttableData: [],
+      bohaiInsuranceDataTable: [],
       accidentPremium: "",
       accidentPremiumZM: "",
       contributingState: false, //是否为国任特约
@@ -3855,8 +3848,9 @@ export default {
     //中煤意外险选中对应产品带出方案明细
     zhongmeiInsuranceChange(index) {
       //每次选中产品，清空之前选中的数据
+      this.zhongmeitemplateSelection=index
       this.zhongmeiaccidentalDrivingVo = {};
-      this.zhongmeiInsuranceDataDetail = [];
+      this.zhongmeiInsuranceDataTable = [];
       let data = this.zhongmeiInsuranceData.find(
         val => val.projectCode == index
       );
@@ -3865,7 +3859,7 @@ export default {
       this.accidentFormZM.quantity = "1";
       if (data && data.son) {
         this.accidentPremiumZM = data.sumPremium;
-        this.zhongmeiInsuranceDataDetail = data.son;
+        this.zhongmeiInsuranceDataTable = data.son;
       }
     },
     // 截图粘贴
@@ -4074,27 +4068,26 @@ export default {
       }
     },
     anshengInsuranceChange(index) {
+      this.anshengtemplateSelection=index
       let data = this.anshengInsuranceData.find(val => val.projectCode == index);
-      // this.anshengaccidentalDrivingVo.personFlag = data.personFlag;
-      // this.anshengaccidentalDrivingVo.projectName = data.projectName;
-      // this.anshengaccidentalDrivingVo.planCode = data.projectCode;
-      // this.anshengaccidentalDrivingVo.planSeries = data.planSeries;
       this.anshengaccidentalDrivingVo.parentName = data.projectName;
       this.anshengaccidentalDrivingVo.parentCode = data.projectCode;
-      this.anshengInsuranceData1 = [];
-      this.anshengInsuranceData1 = data.children;
+      this.anshengInsuranceDataTable = [];
+      this.anshengInsuranceDataTable = data.children;
+      this.anshengInsuranceDataTable .forEach(e=>e.quantity='1')
     },
     hengbangInsuranceChange(index) {
-      this.HBInsuranceData = this.hengbangInsuranceData.find(val => val.projectCode == index).son
-
-      if (this.HBInsuranceData.length) {
-        this.HBDrivingChange(this.hengbangInsuranceData.find(val => val.projectCode == index));
+      this.hengbangInsuranceDataTable = this.hengbangInsuranceData.find(val => val.projectCode == index).son
+      this.hengbangtemplateSelection=index
+      if (this.hengbangInsuranceDataTable.length) {
+        this.hengbangaccidentalDrivingVo = this.hengbangInsuranceData.find(val => val.projectCode == index);
       }
     },
     huanongInsuranceChange(index) {
-      this.HNInsuranceData = this.huanongInsuranceData.find(
+      this.huanongInsuranceDataTable = this.huanongInsuranceData.find(
         val => val.projectCode == index
       ).son;
+      this.accidentFormHN.accidentType=index
       this.huanongaccidentalDrivingVo = Object.assign(
         this.huanongInsuranceData.find(val => val.projectCode == index),
         this.accidentFormHN,
@@ -4102,31 +4095,35 @@ export default {
 
     },
     taipingInsuranceChange(index) {
-      this.TPInsuranceData = this.taipingInsuranceData.find(val => val.projectCode == index).son
-      if (this.TPInsuranceData && this.TPInsuranceData.length) {
+      this.taipingtemplateSelection=index
+      this.taipingInsuranceDataTable = this.taipingInsuranceData.find(val => val.projectCode == index).son
+      if (this.taipingInsuranceDataTable && this.taipingInsuranceDataTable.length) {
         this.taipingaccidentalDrivingVo = this.taipingInsuranceData.find(val => val.projectCode == index);
       }
     },
     zijinInsuranceChange(index) {
-      this.ZJInsuranceData = [];
+      this.zijintemplateSelection=index
+      console.log(index,222222);
+      this.zijinInsuranceDataTable = []; 
       this.$refs.expandTable[0].clearSelection();
       index.forEach(item => {
-        this.ZJInsuranceData.push(
+        this.zijinInsuranceDataTable.push(
           this.ziJinInsuranceData.find(val => val.projectCode == item)
         );
       });
-      this.ZJInsuranceData.forEach(item => {
+      this.zijinInsuranceDataTable.forEach(item => {
         this.$nextTick(() => {
           this.$refs.expandTable[0].toggleRowSelection(item);
         });
       });
-      this.CheckboxChange(this.ZJInsuranceData);
+      this.CheckboxChange(this.zijinInsuranceDataTable);
     },
     renshouInsuranceChange(index) {
-      // this.RSInsuranceData = [
+      // this.renshouInsuranceDataTable = [
       //   this.renshouInsuranceData.find(val => val.projectCode == index)
       // ];
-      this.RSInsuranceData = this.renshouInsuranceData.find(val => val.projectCode == index).son
+      this.renshoutemplateSelection=index
+      this.renshouInsuranceDataTable = this.renshouInsuranceData.find(val => val.projectCode == index).son
       if (index) {
         this.RSDrivingChange(this.renshouInsuranceData.find(val => val.projectCode == index));
       }
@@ -4141,18 +4138,20 @@ export default {
             .productName,
           quantity: "1"
         };
-        this.DJInsuranceData = data.data;
+        this.dajiaInsuranceDataTable = data.data;
       }
     },
     zhonganInsuranceChange(index) {
-      this.ZRInsuranceData = this.zhonganInsuranceData.find(val => val.projectCode == index).son
+      this.zhongantemplateSelection=index
+      this.zhonganInsuranceDataTable = this.zhonganInsuranceData.find(val => val.projectCode == index).son
       if (index) {
         this.ZADrivingChange(this.zhonganInsuranceData.find(val => val.projectCode == index));
       }
     },
     // 渤海选择意外险类型
-    async bhcxchange(index) {
+    async bohaiInsuranceChange(index) {
       if (index) {
+        this.boHaiaccidentForm.packageCode=index
         this.accidentLoadingbh = true;
         this.boHaiaccidentForm.copies = "1";
         this.boHaiaccidentForm.premium = Number(
@@ -4167,10 +4166,10 @@ export default {
         });
         if (data.code == 200 && data.data) {
           this.accidentLoadingbh = false;
-          this.boHaiaccidenttableData = data.data;
+          this.bohaiInsuranceDataTable = data.data;
         } else {
           this.$message.error(data.msg);
-          this.boHaiaccidenttableData = [];
+          this.bohaiInsuranceDataTable = [];
         }
       }
     },
@@ -4178,28 +4177,12 @@ export default {
     async grcxchange(index) {
       if (index) {
         this.accidentLoading = true;
+        this.guoRenaccidentForm.goodsCode=index
         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
-        // });
-        // if (data.code == 200) {
-        //   let num = 0;
-        //   data.data.forEach(item => {
-        //     num += Number(item.premium);
-        //   });
-
-        //   this.accidentLoading = false;
-          
-        // } else {
-          // this.accidentLoading = false;
-        //   this.$message.error(data.msg);
-        //   this.guoRenaccidentDataListChild = [];
-        // }
       }
     },
     // 国任选择意外险子级类型
@@ -4209,21 +4192,23 @@ export default {
       );
       this.guoRenaccidentForm = {
         ...this.guoRenaccidentForm,
+        prodCode:index,
         policyNum: Number(list.sumPremium),
         riskCode: list.riskCode,
         // amount: list.amount,
         sumPremium: Number(list.sumPremium)
         // appnum:Number(list.appnum)
       };
-      this.guoRenaccidenttableData = list.son;
+      this.guoRenInsuranceDataTable = list.son;
       this.guoRenaccidentalDrivingVo=Object.assign({...list,...this.guoRenaccidentalDrivingVo}) 
 
     },
     // 选择意外险类型
-    async ywxxxchange(index) {
+    async yongchengInsuranceChange(index) {
       if (!index) {
         return;
       }
+      this.yongchengtemplateSelection=index
       this.accidentForm = Object.assign(
         this.accidentForm,
         this.accidentDataList.find(val =>val.projectCode == index)
@@ -4231,25 +4216,9 @@ export default {
       this.accidentDataList.find(val => val.projectCode == index).son.forEach(item => {
         item.sumAmount= Number(item.amount) * Number(this.accidentForm.seatNum);
         });
-      this.accidenttableData =  this.accidentDataList.find(val => val.projectCode == index).son
-    
-        this.accidentPremium =  this.accidentForm.sumPremium;
-      // this.accidentForm.fen = "1";
-      // let data = await this.$api.letter.ycgainAccidentSchemeList({
-      //   companyCode: this.accidentForm.companyId,
-      //   code: index,
-      //   agreementId: this.accidentForm.agreementId,
-      //   seatNum: Number(this.carInfo.seatCount)
-      // });
-      // if (data.code == 200) {
-      //   let num = 0;
-      //   data.data.forEach(item => {
-      //     num += Number(item.premium);
-      //   });
-      //   this.accidentPremium = num;
-      //   this.accidentForm.premium = num;
-      //   this.accidenttableData = data.data;
-      // }
+      this.yongchengInsuranceDataTable =  this.accidentDataList.find(val => val.projectCode == index).son
+      this.accidentPremium =  this.accidentForm.sumPremium;
+      
     },
     numberCopieschange(index) {
       this.accidentForm.sumPremium = Number(this.accidentPremium) * index;
@@ -4456,6 +4425,7 @@ export default {
             })
             .then(res => {
               if (res.code == 200) {
+                this.nonVehicle(res.data,item.cnName)
                 switch(item.namesimple) {
                   case "永诚财险":
                     this.accidentDataList = res.data;
@@ -4490,7 +4460,6 @@ export default {
                         ele.quantity = 1;
                         return ele;
                       });
-                    // this.nonVehicle(res.data,item.cnName)
                       this[item.cnName + "InsuranceData"] =  res.data;
                     break;
                 }
@@ -4499,9 +4468,6 @@ export default {
                 this.$message.error(res.msg)
               }
             });
-
-
-
       // switch (item.namesimple) {
       //   case "永诚财险":
       //     this.accidentForm.agreementId = item.agreementId;
@@ -4609,7 +4575,20 @@ export default {
     },
     nonVehicle(data,type){
       if( data.some(e=>e.isDefault)){
-        this[type + "templateSelection"]=data.find(ele=>ele.isDefault).projectCode
+          if(type=='guoRen'){
+            this.grcxchange(data.find(ele=>ele.isDefault).projectCode)
+            this.grcxchangeChild((data.find(ele=>ele.isDefault).children).find(ele=>ele.isDefault).projectCode)
+          }
+          if(type=='ansheng'){
+            this.anshengInsuranceChange(data.find(ele=>ele.isDefault).projectCode)
+            this.ASDrivingRadio((data.find(ele=>ele.isDefault).children).find(ele=>ele.isDefault))
+          }
+          if(type=='zijin'){
+              this[type + "InsuranceChange"]([data.find(ele=>ele.isDefault).projectCode])
+          }
+          else{
+            this[type + "InsuranceChange"](data.find(ele=>ele.isDefault).projectCode)
+          }
         }
     },
     CheckboxChange(select, row) {
@@ -4620,10 +4599,7 @@ export default {
       });
     },
 
-    //恒邦驾意险选择
-    HBDrivingChange(row) {
-      this.hengbangaccidentalDrivingVo = row;
-    },
+   
 
     //人寿驾意险选择
     RSDrivingChange(row) {
@@ -4636,9 +4612,6 @@ export default {
     RSDrivingRadio(row) {
       this.RSDrivingChange(row);
     },
-    HBDrivingRadio(row) {
-      this.HBDrivingChange(row);
-    },
     //安盛驾意险选择
     ASDrivingRadio(row) {
       this.anshengInsurancetype = row.projectCode;
@@ -4725,6 +4698,7 @@ export default {
             })
             .then(res => {
               if (res.code == 200) {
+                this.nonVehicle(res.data,name)
                 switch(ins) {
                   case "永诚财险":
                     this.accidentDataList = res.data;
@@ -4908,7 +4882,7 @@ export default {
       this.accidentForm.premium = 0;
     },
     clearAccidentFormGr() {
-      (this.guoRenaccidenttableData = []),
+      (this.guoRenInsuranceDataTable = []),
         (this.guoRenaccidentDataListChild = []);
       this.guoRenaccidentForm = {
         quantity: "1",
@@ -4916,7 +4890,7 @@ export default {
       };
     },
     clearAccidentFormBh() {
-      this.boHaiaccidenttableData = [];
+      this.bohaiInsuranceDataTable = [];
       this.boHaiaccidentForm = {
         copies: "1",
         premium: 0
@@ -5809,7 +5783,7 @@ export default {
       let accidentalDrivingVo = {};
       if (this.accidentForm.projectCode) {
         let data= this.accidentDataList.find(
-          val => val.projectCode == this.accidentForm.accidentType
+          val => val.projectCode == this.yongchengtemplateSelection
         );
         accidentalDrivingVo = {
           ...data,
@@ -8167,13 +8141,13 @@ export default {
       this.imgList8 = [];
 
       // 清空保险公司选中的意外险
-      this.insuranceZJ = "";
+      this.zijintemplateSelection = "";
       this.zhongantemplateSelection = "";
-      this.insuranceHB = "";
-      this.insuranceTP = "";
+      this.hengbangtemplateSelection = "";
+      this.taipingtemplateSelection = "";
       this.insuranceHN = "";
-      this.insuranceRS = "";
-      this.insuranceDJ = "";
+      this.renshoutemplateSelection = "";
+      this.dajiatemplateSelection = "";
       this.accidentForm = {
         fen: "1",
         premium: 0