lihongxiao 2 лет назад
Родитель
Сommit
d68cefe132
17 измененных файлов с 451 добавлено и 174 удалено
  1. 2 2
      config/dev.env.js
  2. 17 5
      src/components/TemplateTable/index.vue
  3. 6 0
      src/http/moudules/task.js
  4. 6 4
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue
  5. 27 6
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue
  6. 19 3
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue
  7. 84 21
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue
  8. 21 4
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicedAndSettled.vue
  9. 19 3
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue
  10. 22 4
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/Notinvoiced.vue
  11. 8 33
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue
  12. 25 4
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue
  13. 19 3
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue
  14. 113 72
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue
  15. 22 4
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue
  16. 19 3
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue
  17. 22 3
      src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/Notinvoiced.vue

+ 2 - 2
config/dev.env.js

@@ -9,11 +9,11 @@ module.exports = merge(prodEnv, {
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // BASE_URL:'"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.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/"',

+ 17 - 5
src/components/TemplateTable/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div ref="commonTable">
     <!-- 搜索栏 -->
-    <el-form v-if="formList.length > 0" :inline="true" :model="searchDataClone" label-width="105px" ref="searchDataClone"
+    <el-form v-if="formList.length > 0" :inline="true" :model="searchDataClone" label-width="130px" ref="searchDataClone"
       id="commonTable" class="demo-form-inline device-wrapper">
       <el-form-item v-for="f in formList" :key="f.prop" :label="f.label" :prop="f.prop">
         <template>
@@ -37,6 +37,14 @@
                 :value="f.optionsValue ? option[f.optionsValue] : option.id"></el-option>
             </el-select>
           </template>
+          <template v-else-if="f.type === 'selectCompany'">
+            <el-select  size="small" v-model="searchDataClone[f.prop]" filterable clearable :placeholder="'请选择' + f.label"
+              @change="selectCompanyChange($event, f.prop)">
+              <el-option v-for="(option, index) in f.options" :key="index"
+                :label="f.optionsIabel ? option[f.optionsIabel] : option.name"
+                :value="f.optionsValue ? option[f.optionsValue] : option.id"></el-option>
+            </el-select>
+          </template>
           <template v-else-if="f.type === 'datePicker'">
             <!-- 日期区间 -->
             <el-date-picker style="width: 215px;" type="daterange" size="small" v-model="searchDataClone[f.prop]" align="right" unlink-panels
@@ -45,7 +53,7 @@
           </template>
           <template v-else-if="f.type === 'date'">
             <!-- 一天 -->
-            <el-date-picker type="date" size="small" v-model="searchDataClone[f.prop]" placeholder="选择日期"
+            <el-date-picker type="date" size="small"  v-model="searchDataClone[f.prop]" placeholder="选择日期"
               value-format="yyyy-MM-dd"></el-date-picker>
           </template>
           <!-- 年份 -->
@@ -243,7 +251,7 @@ export default {
         divHg = 100
       }
       let bottomTop = this.$refs.bottomFixed.offsetTop;
-      this.tableHeight = window.innerHeight - bottomTop - divHg - 80 + "px";
+      this.tableHeight = window.innerHeight - divHg -160  + "px";
     }, 10);
   },
   filters: {
@@ -271,6 +279,11 @@ export default {
         this.$emit('areaSelectChange', { id, filed });
       }
     },
+    selectCompanyChange(id, filed) {
+      if (id) {
+        this.$emit('companySelectChange', { id, filed });
+      }
+    },
     formatDateTime(date) {
       let d = new Date(date),
         month = '' + (d.getMonth() + 1),
@@ -331,6 +344,7 @@ export default {
       this.pagination.pageNum = val;
       this.$emit('getList',{...this.pagination,...this.searchDataClone});
     },
+    
     // 搜索
     handleSearchList() {
       // 更新父组件searchData
@@ -342,9 +356,7 @@ export default {
     resetForm(formName) {
       this.searchDataClone = {}
       // this.$refs[formName].resetFields();
-      this.$emit("resetForm", '');
       this.handleSearchList();
-
     },
     handleOpt(row, index) {
       this.$emit('handleOpt', row, index)

+ 6 - 0
src/http/moudules/task.js

@@ -1411,4 +1411,10 @@ export const bxOtherImportData = (data) => {
     method: "post",
     data
   })
+}
+export const esmInsCompany = (val) => {
+  return axios({
+    url: `esmInsCompany/queryListByParentId/`+val,
+    method: "get",
+  })
 }

+ 6 - 4
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -9,7 +9,10 @@
         <el-button size="small" type="primary" :disabled="selectionList.length==0">批量修改</el-button>
       </el-upload>
     </template>
-    
+    <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog
     title="编辑"
@@ -285,10 +288,9 @@ export default {
         },
         {
           label: "保司机构",
-          prop: "partnerCompaniesName",
-          type: "input",
+          name: "保司机构",
+          type: "slot",
         },
-       
         {
           label: "交强保单号",
           prop: "policyno",

+ 27 - 6
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -2,11 +2,20 @@
   <!--布局容器-->
   <div style="width: 99%; margin-top: 0px">
     <templateTable class="invoiceAnd"  :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
-      @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
+      @findPage="findPage" @resetForm="resetForm" @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
         <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData" @getDayData="getDayData">
         </yearMonthYay>
       </template>
+      <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
       <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
@@ -43,6 +52,7 @@ export default {
   },
   data() {
     return {
+      ztreeNodes:[],
       recordDetailData:[],
       pageDatarecorddetail: {
                 pageNum: 1,
@@ -139,9 +149,9 @@ export default {
         },
         {
           label: "合作公司名称",
-          prop: "partnerCompaniesName",
-          type: "input",
-        },
+          name: "保司机构",
+          type: "slot",
+          },
         {
           label: "年月日",
           name: "data",
@@ -230,15 +240,26 @@ export default {
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
   },
   methods: {
+    resetForm() {
+            this.formData={}
+            this.pageData.partnerCompaniesIdList=[]
+            this.$refs.yearMonthYay.clear()
+        },
     handleCloserecorddetail() {
             this.dialogVisiblerecordDetail = false
         },
     haldRecordDetail(row) {
             this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail(row)
+            this.findPageDetailrecorddatail(row)
         },
         getListrecorddetail(data) {
             this.findPageDetailrecorddatail(data)
@@ -249,7 +270,7 @@ export default {
                 .fncplyFeeQuery({ 
                   partnerCompaniesId: data.partnerCompaniesId,
                   agreementType: '2',
-                  handlingFeesStatus: '1',
+                  handlingFeesStatus: '0',
                   isNotCar:'0',
                   ...this.pageDatarecorddetail
                 })

+ 19 - 3
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue

@@ -6,6 +6,15 @@
       <template slot="data">
           <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
       </template>
+      <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog
       title="详情"
@@ -61,6 +70,7 @@ export default {
   },
   data() {
     return {
+      ztreeNodes:[],
       year: '',
       findPageDetailList:{},
       searchData: {},
@@ -75,9 +85,9 @@ export default {
                 },
                 {
                     label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -181,6 +191,12 @@ export default {
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
   },
   methods: {

+ 84 - 21
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -3,7 +3,7 @@
   <div class="container" style="width: 99%; margin-top: 0px">
     <templateTable custom :formList="formList" ref="templateTable" :searchData.sync="searchData"
       :tableConfig="tableConfig" :data="tableData" :btnGroup="btnGroup" @findPage="findPage"
-      @handleSearchList="handleSearchList" @areaSelectChange="areaSelectChange" :pagination="pageData" @getList="getList">
+      @handleSearchList="handleSearchList" @areaSelectChange="areaSelectChange" @companySelectChange="selectCompanyChange" :pagination="pageData" @getList="getList">
       <!-- <template slot="内部机构">
         <el-select v-model="labelData" placeholder="请选择" :popper-append-to-body="false" style="width: 100%" size="small">
           <el-option :value="selectTree" class="deptOption" disabled>
@@ -13,10 +13,10 @@
         </el-select>
       </template> -->
 
-      <template slot="保司机构">
+      <!-- <template slot="保司机构">
         <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
           :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
-      </template>
+      </template> -->
       <template slot="dockingPerson">
         <el-select v-model="pageData.dockingPerson" filterable clearable placeholder="请选择" size="small">
           <el-option v-for="item in dockingPersonOption" :key="item.docking_person" :label="item.docking_person"
@@ -94,8 +94,8 @@
           </el-col>
         </el-row>
       </el-form>
-      <templateTable ref="templateTable1" :tableConfig="tableConfigbatch" :data="batchData" @findPage="findPagegbatch"
-        :pagination="pageDataPro" @getList="getListgbatch" @selectionChange="selectionChange" @selectAll="selectAll">
+      <templateTable  :formList="formListbatch" ref="templateTable1" :tableConfig="tableConfigbatch" :data="batchData" @findPage="findPagegbatch"
+        :pagination="pageDataPro" @getList="getListgbatch" @handleSearchList="handleSearchListbatch" @selectionChange="selectionChange" @selectAll="selectAll">
         <template slot="uploadUrl" slot-scope="scope">
           <span @click="uploadUrlClick(scope.row.uploadUrl)">{{ scope.row.uploadUrl }}</span>
         </template>
@@ -160,7 +160,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="保司机构" prop="partnerCompaniesId">
-              <el-cascader v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
+              <el-cascader  ref="partnerCompaniesCascader"   @change="partnerCompaniesFun" v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
                 :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
@@ -173,7 +173,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="险种" prop="riskcode">
-              <el-select v-model="formDataAdd.riskcode" multiple placeholder="选择险种" size="small">
+              <el-select v-model="formDataAdd.riskcode"  placeholder="选择险种" size="small">
                 <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
               </el-select>
@@ -228,6 +228,13 @@ export default {
   },
   data() {
     return {
+      formListbatch:[
+        {
+              label: "上传时间",
+              prop: "createTime",
+              type: "date",
+          },
+      ],
       rulesAdd: {
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
@@ -312,27 +319,45 @@ export default {
           type: 'selectDept',
           options: []
         },
-        {
-          label: "保司机构",
-          name: "保司机构",
-          type: "slot",
-        },
+        // {
+        //   label: "保司机构",
+        //   name: "保司机构",
+        //   type: "slot",
+        // },
         {
           label: "车牌号",
           prop: "licenseno",
           type: "input",
         },
-        {
-          label: "被保人",
-          prop: "insuredName",
-          type: "input",
-        },
+        
         {
           label: "保险公司",
           prop: "companyName",
           type: "company",
         },
-
+        {
+          prop: 'allPartnerCompaniesId',
+          label: '保司总公司',
+          type: 'selectCompany',
+          options: []
+        },
+        {
+          prop: 'provincePartnerCompaniesId',
+          label: '保司省公司',
+          type: 'selectCompany',
+          options: []
+        },
+        {
+          prop: 'PartnerCompaniesId',
+          label: '保司中心支公司',
+          type: 'selectCompany',
+          options: []
+        },
+        {
+          label: "被保人",
+          prop: "insuredName",
+          type: "input",
+        },
         {
           label: "险种",
           prop: "riskcode",
@@ -547,6 +572,11 @@ export default {
             label: "任务id",
             type: "text"
           },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司名称 ",
+            type: "text"
+          },
           {
             prop: "createdAt",
             label: "开始时间",
@@ -636,6 +666,7 @@ export default {
     this.getDicType("InsInsuranceKind"); //险种类型
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");
+    this.companyqueryList(0,'allPartnerCompaniesId');
 
     let params = {
       classname: "",
@@ -688,6 +719,25 @@ export default {
         default:
       }
     },
+    companyqueryList(parentId, filed) {
+      this.$api.task.esmInsCompany( parentId).then((res) => {
+        this.selectDataMatching(this.formList, filed, res.data);
+      });
+    },
+    selectCompanyChange(obj) {
+      switch (obj.filed) {
+        case 'allPartnerCompaniesId':
+          this.companyqueryList( obj.id, 'provincePartnerCompaniesId')
+          break;
+        case 'provincePartnerCompaniesId':
+          this.companyqueryList( obj.id, 'PartnerCompaniesId')
+          break;
+        case 'PartnerCompaniesId':
+          
+          break;
+        default:
+      }
+    },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {
         if (res.code == 200) {
@@ -710,11 +760,22 @@ export default {
       this.pageData.deptId = data.id
     },
     newAdd() {
+      this.formDataAdd={}
       this.dialogVisibleAdd = true
     },
     handleCloseadd() {
       this.dialogVisibleAdd = false
     },
+    partnerCompaniesFun(val){
+      if(val && val.length>0){
+        this.formDataAdd.partnerCompaniesId=val[val.length-1]
+        this.formDataAdd.partnerCompaniesName=this.$refs.partnerCompaniesCascader.getCheckedNodes()[0].label
+      }
+      else{
+        this.formDataAdd.partnerCompaniesId=''
+        this.formDataAdd.partnerCompaniesName=''
+      }
+    },
     onSubmitAdd(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -722,7 +783,6 @@ export default {
             isNotCar: 0,
             isNotDocumentary: 0,
             companyName: this.formDataAdd.companyId ? this.InsCompanyList.find(val => val.id == this.formDataAdd.companyId).name : '',
-            partnerCompaniesName: this.formDataAdd.partnerCompaniesId ? this.InsCompanyList.find(val => val.id == this.formDataAdd.partnerCompaniesId).name : '',
           }
           this.$api.task.fncplyFeeInsert({ ...this.formDataAdd, ...data })
             .then(res => {
@@ -949,9 +1009,9 @@ export default {
       }
       this.selectionList = val;
     },
-    findPagegbatch() {
+    findPagegbatch(data) {
       this.tableConfigbatch.loading = true
-      this.$api.task.importAsyncQuery({ ...this.pageDataPro, handStatus: 0 })
+      this.$api.task.importAsyncQuery({ ...this.pageDataPro, handStatus: 0 ,...data})
         .then(res => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false
@@ -970,6 +1030,9 @@ export default {
       this.pageDataPro = data
       this.findPagegbatch()
     },
+    handleSearchListbatch(data){
+      this.findPagegbatch(data)
+    },
     templateDownload() {
       let a = document.createElement('a')
       a.href = `${process.env.BASE_URL}/template/handlingFeeTemplate.xlsx`;

+ 21 - 4
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicedAndSettled.vue

@@ -7,6 +7,15 @@
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
                     @getDayData="getDayData"></yearMonthYay>
             </template>
+            <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
         </templateTable>
         <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
             <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1"
@@ -61,6 +70,7 @@ export default {
     },
     data() {
         return {
+            ztreeNodes:[],
             showViewer:false,
             ProViewImg:[],
             formList: [
@@ -70,10 +80,10 @@ export default {
                     type: "company",
                 },
                 {
-                    label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    label: "保司机构",
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -302,6 +312,12 @@ export default {
         };
     },
     created() {
+        this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
         this.findPage();
     },
     methods: {
@@ -423,6 +439,7 @@ export default {
         },
         resetForm() {
             this.formData={}
+            this.pageData.partnerCompaniesIdList=[]
             this.$refs.yearMonthYay.clear()
         },
         //列表数据

+ 19 - 3
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -6,6 +6,15 @@
             <template slot="data">
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
             </template>
+            <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
         </templateTable>
         <el-dialog
       title="详情"
@@ -67,6 +76,7 @@ export default {
     },
     data() {
         return {
+      ztreeNodes:[],
       fileList:[],
             dialogVisiblebalance:false,
             form:{},
@@ -113,9 +123,9 @@ export default {
                 },
                 {
                     label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -194,6 +204,12 @@ export default {
         };
     },
     created() {
+      this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
         this.findPage();
     },
     methods: {

+ 22 - 4
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/Notinvoiced.vue

@@ -7,6 +7,15 @@
         <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData" @getDayData="getDayData">
         </yearMonthYay>
       </template>
+      <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog title="开票" :visible.sync="dialogVisible" width="40%" @close="closdialogVisible">
       <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" :inline="true" size="small" label-width="90px">
@@ -71,6 +80,7 @@
         style="width: 100%">
         <el-table-column type="selection" width="55">
         </el-table-column>
+        <el-table-column prop="year" label="年份"> </el-table-column>
         <el-table-column prop="monthNumber" label="月份">
         </el-table-column>
         <el-table-column prop="allTotalOtherFeevalue" label="总金额">
@@ -132,9 +142,9 @@ export default {
           type: "company",
         },
         {
-          label: "合作公司名称",
-          prop: "partnerCompaniesName",
-          type: "input",
+        label: "合作公司名称",
+        name: "保司机构",
+        type: "slot",
         },
         {
           label: "年月日",
@@ -207,15 +217,23 @@ export default {
         invoicingMethod: [
           { required: true, message: '请输入开票方式', trigger: 'blur' },
         ],
-      }
+      },
+      ztreeNodes:[],
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
   },
   methods: {
     resetForm() {
             this.formData={}
+            this.pageData.partnerCompaniesIdList=[]
             this.$refs.yearMonthYay.clear()
         },
     handleSelectionChange(val) {

+ 8 - 33
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -9,6 +9,10 @@
         <el-button size="small" :disabled="selectionList.length==0" type="primary">批量修改</el-button>
       </el-upload>
     </template>
+    <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog
     title="编辑"
@@ -254,10 +258,9 @@ export default {
         },
         {
           label: "保司机构",
-          prop: "partnerCompaniesName",
-          type: "input",
+          name: "保司机构",
+          type: "slot",
         },
-       
         {
           label: "交强保单号",
           prop: "policyno",
@@ -300,15 +303,7 @@ export default {
           label: "签单日期",
           prop: "signDate",
           type: "datePicker",
-        },{
-          label: "交强起保日期",
-          prop: "jqDate",
-          type: "datePicker",
-        },{
-          label: "商业起保日期",
-          prop: "syDate",
-          type: "datePicker",
-        },
+        }
     ],
       btnGroup:[
         {
@@ -785,10 +780,6 @@ drivinguploadBatchs(file, fileList){
     findPage(data) {
       let signDateStart=''
       let signDateEnd=''
-      let jqStartDate=''
-      let jqEndDate=''
-      let syStartDate=''
-      let syEndDate=''
       if(data && data.signDate && data.signDate.length>0){
         signDateStart=data.signDate[0]
         signDateEnd=data.signDate[1]
@@ -797,25 +788,9 @@ drivinguploadBatchs(file, fileList){
         signDateStart=''
         signDateEnd=''
       }
-      if(data && data.jqDate && data.jqDate.length>0){
-        jqStartDate=data.jqDate[0]
-        jqEndDate=data.jqDate[1]
-      }
-      else{
-        jqStartDate=''
-        jqEndDate=''
-      }
-      if(data && data.syDate && data.syDate.length>0){
-        syStartDate=data.syDate[0]
-        syEndDate=data.syDate[1]
-      }
-      else{
-        syStartDate=''
-        syEndDate=''
-      }
       this.tableConfig.loading = true;
       this.$api.task
-        .plyFeequery({...this.pageData,...data,signDateStart,signDateEnd,jqStartDate,jqEndDate,syStartDate,syEndDate})
+        .plyFeequery({...this.pageData,...data,signDateStart,signDateEnd})
         .then(res => {
           if (res.code==200) {
             this.tableData = res.data.content?res.data.content:[]

+ 25 - 4
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue

@@ -2,10 +2,19 @@
   <!--布局容器-->
   <div class="invoiceAnd" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
-      @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
+      @findPage="findPage" @resetForm="resetForm" @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
           <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
       </template>
+      <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
       <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
@@ -42,6 +51,7 @@ export default {
   },
   data() {
     return {
+      ztreeNodes:[],
       recordDetailData:[],
       pageDatarecorddetail: {
                 pageNum: 1,
@@ -119,9 +129,9 @@ export default {
                     type: "company",
                 },
                 {
-                    label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
+                label: "合作公司名称",
+                name: "保司机构",
+                type: "slot",
                 },
                 {
                     label: "年月日",
@@ -212,9 +222,20 @@ export default {
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
   },
   methods: {
+    resetForm() {
+            this.formData={}
+            this.pageData.partnerCompaniesIdList=[]
+            this.$refs.yearMonthYay.clear()
+        },
     handleCloserecorddetail() {
             this.dialogVisiblerecordDetail = false
         },

+ 19 - 3
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -6,6 +6,15 @@
       <template slot="data">
           <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
       </template>
+      <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog
       title="详情"
@@ -61,6 +70,7 @@ export default {
   },
   data() {
     return {
+      ztreeNodes:[],
       year: '',
       searchData: {},
       dialogVisiblebalance:false,
@@ -74,9 +84,9 @@ export default {
                 },
                 {
                     label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -181,6 +191,12 @@ export default {
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
   },
   methods: {

+ 113 - 72
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -2,8 +2,8 @@
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
     <templateTable custom :formList="formList" ref="templateTable" :searchData.sync="searchData"
-      :tableConfig="tableConfig" :data="tableData" :btnGroup="btnGroup" @findPage="findPage"
-      @handleSearchList="handleSearchList" :pagination="pageData" @areaSelectChange="areaSelectChange" @getList="getList">
+      :tableConfig="tableConfig" :data="tableData" :btnGroup="btnGroup" @findPage="findPage" @companySelectChange="selectCompanyChange"
+      @handleSearchList="handleSearchList" :pagination="pageData" @areaSelectChange="areaSelectChange"  @getList="getList">
       <!-- <template slot="内部机构">
         <el-select v-model="labelData" placeholder="请选择" :popper-append-to-body="false" style="width: 100%" size="small">
           <el-option :value="selectTree" class="deptOption" disabled>
@@ -12,10 +12,10 @@
           </el-option>
         </el-select>
       </template> -->
-      <template slot="保司机构">
+      <!-- <template slot="保司机构">
         <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
           :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
-      </template>
+      </template> -->
 
       <template slot="dockingPerson">
         <el-select v-model="pageData.dockingPerson" filterable clearable placeholder="请选择" size="small">
@@ -35,10 +35,10 @@
         </el-row>
       </div>
     </templateTable>
-    <el-dialog :visible.sync="dialogVisibleBatch" width="30%" :before-close="handleCloseBatch">
-      <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" size="small" label-width="90px">
+    <el-dialog :visible.sync="dialogVisibleBatch" width="45%" :before-close="handleCloseBatch">
+      <!-- <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" size="small" label-width="100px">
         <el-row>
-          <el-col :span="10">
+          <el-col :span="9">
             <el-form-item label="开票方式:" prop="invoicingMethod">
               <el-select v-model="InvoicingData.invoicingMethod" placeholder="请选择">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@@ -46,25 +46,47 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="9" :offset="1">
             <el-form-item label="税点:" prop="taxPoints">
               <el-input v-model="InvoicingData.taxPoints"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10" v-if="InvoicingData.invoicingMethod == '1'">
+          <el-col :span="9" v-if="InvoicingData.invoicingMethod == '1'">
             <el-form-item label="开票号:" prop="invoicId">
               <el-input v-model="InvoicingData.invoicId"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="9" :offset="1">
             <el-form-item label="总手续费:">
               <span> {{ batchData.totalAmount }}</span>
             </el-form-item>
           </el-col>
         </el-row>
+      </el-form> -->
+      <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" size="small" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="开票方式:" prop="invoicingMethod">
+              <el-select v-model="InvoicingData.invoicingMethod" placeholder="请选择">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="税点:" prop="taxPoints">
+              <el-input v-model="InvoicingData.taxPoints"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="InvoicingData.invoicingMethod == '1'">
+            <el-form-item label="开票号:" prop="invoicId">
+              <el-input v-model="InvoicingData.invoicId"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <templateTable ref="templateTable1" :tableConfig="tableConfigbatch" :data="batchData" @findPage="findPagegbatch"
-        :pagination="pageDataPro" @getList="getListgbatch" @selectionChange="selectionChange" @selectAll="selectAll">
+      <templateTable ref="templateTable1" :formList="formListbatch" :tableConfig="tableConfigbatch" :data="batchData" @findPage="findPagegbatch"
+        :pagination="pageDataPro" @getList="getListgbatch"  @handleSearchList="handleSearchListbatch"  @selectionChange="selectionChange" @selectAll="selectAll">
         <template slot="uploadUrl" slot-scope="scope">
           <span @click="uploadUrlClick(scope.row.uploadUrl)">{{ scope.row.uploadUrl }}</span>
         </template>
@@ -109,8 +131,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="保司机构" prop="partnerCompaniesId">
-              <el-cascader v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
-                :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
+              <el-cascader ref="partnerCompaniesCascader" v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small" 
+                :options="ztreeNodes" @change="partnerCompaniesFun" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -122,7 +144,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="险种" prop="riskcode">
-              <el-select v-model="formDataAdd.riskcode" multiple placeholder="选择险种" size="small">
+              <el-select v-model="formDataAdd.riskcode"  placeholder="选择险种" size="small">
                 <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
               </el-select>
@@ -167,8 +189,6 @@ import { mapState } from 'vuex'
 export default {
   name: "baosi",
   components: { KtCommonTable, templateTable },
-  created() {
-  },
   computed: {
     ...mapState({
       perms: state => state.user.perms
@@ -200,6 +220,13 @@ export default {
         pageNum: 1,
         pageSize: 20,
       },
+      formListbatch:[
+        {
+              label: "上传时间",
+              prop: "createTime",
+              type: "date",
+          },
+      ],
       ztreeNodes: [],
       InsInsuranceKindoptions: [],
       optionProps: {
@@ -255,26 +282,39 @@ export default {
           type: 'selectDept',
           options: []
         },
-        {
-          label: "保司机构",
-          name: "保司机构",
-          type: "slot",
-        },
         {
           label: "车牌号",
           prop: "licenseno",
           type: "input",
         },
-        {
-          label: "被保人",
-          prop: "insuredName",
-          type: "input",
-        },
         {
           label: "保险公司",
           prop: "companyName",
           type: "company",
         },
+        {
+          prop: 'allPartnerCompaniesId',
+          label: '保司总公司',
+          type: 'selectCompany',
+          options: []
+        },
+        {
+          prop: 'provincePartnerCompaniesId',
+          label: '保司省公司',
+          type: 'selectCompany',
+          options: []
+        },
+        {
+          prop: 'PartnerCompaniesId',
+          label: '保司中心支公司',
+          type: 'selectCompany',
+          options: []
+        },
+        {
+          label: "被保人",
+          prop: "insuredName",
+          type: "input",
+        },
 
         {
           label: "险种",
@@ -282,17 +322,6 @@ export default {
           type: "select",
           options:[]
         },
-       
-        // {
-        //   label: "交强保单号",
-        //   prop: "policyno",
-        //   type: "input",
-        // },
-        // {
-        //   label: "商业保单号",
-        //   prop: "syPolicyno",
-        //   type: "input",
-        // }, 
         {
           label: "非车保单号",
           prop: "noPolicyno",
@@ -334,14 +363,6 @@ export default {
           label: "签单日期",
           prop: "signDate",
           type: "datePicker",
-        }, {
-          label: "交强起保日期",
-          prop: "jqStartDate",
-          type: "datePicker",
-        }, {
-          label: "商业起保日期",
-          prop: "syDate",
-          type: "datePicker",
         },
       ],
       tableConfigbatch: {
@@ -351,6 +372,11 @@ export default {
             label: "任务id",
             type: "text"
           },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司名称 ",
+            type: "text"
+          },
           {
             prop: "createdAt",
             label: "开始时间",
@@ -543,7 +569,7 @@ export default {
       },
       dialogVisibleBatch: false,
       totalAmount: '',
-      batchData: {},
+      batchData: [],
       dockingPersonOption: [],
       fileList:[],
       progressPercent:0,
@@ -558,6 +584,7 @@ export default {
     this.getDicType("InsInsuranceKind"); //险种类型
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");
+    this.companyqueryList(0,'allPartnerCompaniesId');
 
     this.findPage();
     let params = {
@@ -584,6 +611,38 @@ export default {
     });
   },
   methods: {
+    companyqueryList(parentId, filed) {
+      this.$api.task.esmInsCompany( parentId).then((res) => {
+        this.selectDataMatching(this.formList, filed, res.data);
+      });
+    },
+    selectCompanyChange(obj) {
+      switch (obj.filed) {
+        case 'allPartnerCompaniesId':
+          this.companyqueryList( obj.id, 'provincePartnerCompaniesId')
+          break;
+        case 'provincePartnerCompaniesId':
+          this.companyqueryList( obj.id, 'PartnerCompaniesId')
+          break;
+        case 'PartnerCompaniesId':
+          
+          break;
+        default:
+      }
+    },
+    partnerCompaniesFun(val){
+      if(val && val.length>0){
+        this.formDataAdd.partnerCompaniesId=val[val.length-1]
+        this.formDataAdd.partnerCompaniesName=this.$refs.partnerCompaniesCascader.getCheckedNodes()[0].label
+      }
+      else{
+        this.formDataAdd.partnerCompaniesId=''
+        this.formDataAdd.partnerCompaniesName=''
+      }
+    },
+    handleSearchListbatch(data){
+      this.findPagegbatch(data)
+    },
     selectAll (selection,ref){
           ref.clearSelection()
           return
@@ -595,9 +654,9 @@ export default {
         }
     this.selectionList = val;      
     },
-    findPagegbatch() {
+    findPagegbatch(data) {
       this.tableConfigbatch.loading = true
-      this.$api.task.importAsyncQuery({...this.pageDataPro,handStatus:1})
+      this.$api.task.importAsyncQuery({...this.pageDataPro,handStatus:1,...data})
         .then(res => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false
@@ -665,6 +724,7 @@ export default {
       this.pageData.deptId = data.id
     },
     newAdd() {
+      this.formDataAdd={}
       this.dialogVisibleAdd = true
     },
     handleCloseadd() {
@@ -677,7 +737,7 @@ export default {
         isNotCar: 1,
         isNotDocumentary: 0,
         companyName:this.formDataAdd.companyId? this.InsCompanyList.find(val => val.id == this.formDataAdd.companyId).name:'',
-        partnerCompaniesName:this.formDataAdd.partnerCompaniesId? this.InsCompanyList.find(val => val.id == this.formDataAdd.partnerCompaniesId).name:'',
+        // partnerCompaniesName:this.formDataAdd.partnerCompaniesId? this.InsCompanyList.find(val => val.id == this.formDataAdd.partnerCompaniesId).name:'',
       }
       this.$api.task.fncplyFeeInsert({ ...this.formDataAdd, ...data })
         .then(res => {
@@ -730,10 +790,6 @@ export default {
     handleSearchList(data) {
       let signDateStart = ''
       let signDateEnd = ''
-      let jqStartDate = ''
-      let jqEndDate = ''
-      let syStartDate = ''
-      let syEndDate = ''
       if (data && data.signDate && data.signDate.length > 0) {
         signDateStart = data.signDate[0]
         signDateEnd = data.signDate[1]
@@ -742,24 +798,9 @@ export default {
         signDateStart = ''
         signDateEnd = ''
       }
-      if (data && data.jqStartDate && data.jqStartDate.length > 0) {
-        jqStartDate = data.jqStartDate[0]
-        jqEndDate = data.jqStartDate[1]
-      }
-      else {
-        jqStartDate = ''
-        jqEndDate = ''
-      }
-      if (data && data.syDate && data.syDate.length > 0) {
-        syStartDate = data.syDate[0]
-        syEndDate = data.syDate[1]
-      }
-      else {
-        syStartDate = ''
-        syEndDate = ''
-      }
+     
       this.$api.task
-        .bxTotalAmount({ ...this.pageData, ...data, signDateStart, signDateEnd, jqStartDate, jqEndDate, syStartDate, syEndDate })
+        .bxTotalAmount({ ...this.pageData, ...data, signDateStart, signDateEnd })
         .then(res => {
           if (res.code == 200) {
             this.moneyList = res.data ? res.data : []
@@ -768,7 +809,7 @@ export default {
             this.$message.error(res.msg)
           }
         });
-      this.findPage({ ...data, signDateStart, signDateEnd, jqStartDate, jqEndDate, syStartDate, syEndDate });
+      this.findPage({ ...data, signDateStart, signDateEnd });
     },
     templateDownload() {
       let a = document.createElement('a')

+ 22 - 4
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue

@@ -7,6 +7,15 @@
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
                     @getDayData="getDayData"></yearMonthYay>
             </template>
+            <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
         </templateTable>
         <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
             <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1"
@@ -52,6 +61,13 @@ export default {
         "el-image-viewer": () =>
       import("element-ui/packages/image/src/image-viewer") },
     created() {
+        this.$api.insCompany.findLeftInsTree( {
+            classname: "",
+            type: '1',
+            }).then((res) => {
+        this.ztreeNodes = res.data;
+        });
+        this.findPage();
     },
     computed: {
         ...mapState({
@@ -60,6 +76,7 @@ export default {
     },
     data() {
         return {
+            ztreeNodes:[],
             showViewer:false,
             dialogVisiblerecordDetail:false,
             recordDetailData:[],
@@ -72,10 +89,10 @@ export default {
                     type: "company",
                 },
                 {
-                    label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    label: "保司机构",
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -308,6 +325,7 @@ export default {
         },
         resetForm() {
             this.formData={}
+            this.pageData.partnerCompaniesIdList=[]
             this.$refs.yearMonthYay.clear()
         },
         //列表数据

+ 19 - 3
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -7,6 +7,15 @@
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
                     @getDayData="getDayData"></yearMonthYay>
             </template>
+            <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
         </templateTable>
         <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
             <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
@@ -64,6 +73,7 @@ export default {
     },
     data() {
         return {
+      ztreeNodes:[],
       fileList:[],
             dialogVisiblebalance:false,
             form:{},
@@ -111,9 +121,9 @@ export default {
                 },
                 {
                     label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -188,6 +198,12 @@ export default {
         };
     },
     created() {
+        this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
         this.findPage();
     },
     methods: {

+ 22 - 3
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/Notinvoiced.vue

@@ -6,6 +6,15 @@
       <template slot="data">
           <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
       </template>
+      <template slot="保司机构">
+        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+          :options="ztreeNodes" :props='{
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+        }' clearable filterable></el-cascader>
+      </template>
     </templateTable>
     <el-dialog title="开票" :visible.sync="dialogVisible" width="40%" @close="closdialogVisible">
       <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" :inline="true" size="small" label-width="80px">
@@ -100,6 +109,8 @@
             type="selection"
             width="55">
           </el-table-column>
+        <el-table-column prop="year" label="年份"> </el-table-column>
+
           <el-table-column
               prop="monthNumber"
               label="月份">
@@ -146,6 +157,7 @@ export default {
   },
   data() {
     return {
+      ztreeNodes:[],
       myDialogVisible:false,
       yeartsStart:'',
       isSingle:'1',
@@ -164,9 +176,9 @@ export default {
                 },
                 {
                     label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
-                },
+                    name: "保司机构",
+                    type: "slot",
+                    },
                 {
                     label: "年月日",
                     name: "data",
@@ -245,11 +257,18 @@ export default {
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
   },
   methods: {
     resetForm() {
           this.formData={}
+          this.pageData.partnerCompaniesIdList=[]
           this.$refs.yearMonthYay.clear()
       },
     getYearData(val){