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

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

@@ -7,15 +7,24 @@
           <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>
+          <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>
+      <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="详情"
@@ -112,6 +121,7 @@ export default {
   },
   data() {
     return {
+      ztreeNodes:[],
       year: '',
       searchData: {},
       formDataList:{},
@@ -127,8 +137,8 @@ export default {
                 },
                 {
                     label: "合作公司名称",
-                    prop: "partnerCompaniesName",
-                    type: "input",
+                    name: "保司机构",
+                    type: "slot",
                 },
                 {
                     label: "年月日",
@@ -300,6 +310,12 @@ export default {
     };
   },
   created() {
+    this.$api.insCompany.findLeftInsTree( {
+        classname: "",
+        type: '1',
+        }).then((res) => {
+      this.ztreeNodes = res.data;
+    });
     this.findPage();
     this.$api.task
         .getDockingPersonList()

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

@@ -7,14 +7,14 @@
                 <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>
+              <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="详情"
@@ -252,8 +252,8 @@ export default {
       this.formData.day=val
     },
     // 查询
-    handleSearchList() {
-        this.findPage();
+    handleSearchList(data) {
+        this.findPage(data);
     },
     handleSearchList1(data){
         this.findPageDetail({...this.formDetail,...data})
@@ -289,13 +289,13 @@ export default {
        
         //列表数据
         findPage(data) {
-            if (data) {
-                this.pageData.pageNum = data.pageNum;
-                this.pageData.pageSize = data.pageSize;
-            }
+            // if (data) {
+            //     this.pageData.pageNum = data.pageNum;
+            //     this.pageData.pageSize = data.pageSize;
+            // }
             this.tableConfig.loading = true;
             this.$api.task
-                .totalBxAmount({...this.pageData,...this.formData})
+                .totalBxAmount({...this.pageData,...this.formData, ...data})
                 .then(res => {
                     if (res.code==200) {
                         this.tableData = res.data? res.data:[]

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

@@ -386,9 +386,9 @@ export default {
                 });
         },
         haldRecordDetail(row) {
+            this.recorddetailid = row.id
             this.dialogVisiblerecordDetail = true
             this.getListrecorddetail()
-            this.recorddetailid = row.id
 
         },
         getListrecorddetail(data) {
@@ -400,7 +400,7 @@ export default {
                 .fncplyFeeQuery({
                     partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     agreementType: '2',
-                    isNotCar: '0',
+                    isNotCar: '1',
                     handlingFeesStatus: '0',
                     id:this.recorddetailid,
                     ...data})

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

@@ -282,8 +282,8 @@ export default {
             this.dialogVisible = false
         },
         // 查询
-        handleSearchList() {
-            this.findPage();
+        handleSearchList(data) {
+            this.findPage(data);
         },
         resetForm() {
             this.formData = {}
@@ -291,13 +291,13 @@ export default {
         },
         //列表数据
         findPage(data) {
-            if (data) {
-                this.pageData.pageNum = data.pageNum;
-                this.pageData.pageSize = data.pageSize;
-            }
+            // if (data) {
+            //     this.pageData.pageNum = data.pageNum;
+            //     this.pageData.pageSize = data.pageSize;
+            // }
             this.tableConfig.loading = true;
             this.$api.task
-                .totalBxAmount({ ...this.pageData, ...this.formData })
+                .totalBxAmount({ ...this.pageData, ...this.formData, ...data })
                 .then(res => {
                     if (res.code == 200) {
                         this.tableData = res.data ? res.data : []