合计、修改接口

config/dev.env.js

@@ -8,14 +8,14 @@ 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.253:8080/"',//田智
-  // BASE_URL: '"http:///192.168.0.42: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:8080/"',//霍续亮

src/http/moudules/task.js

@@ -860,6 +860,15 @@ export const plyFeequery = (data) => {
     data
   })
 }
+
+export const plyFeeRecord= (data) => {
+  return axios({
+    url: "/fnc/plyFee/platformSettlementRecord",
+    method: "post",
+    data
+  })
+}
+
 // 保险公司结算-手续费结算页面-结算接口
 export const plyFeebalance = (data) => {
   return axios({
@@ -1278,6 +1287,14 @@ export const settlementFeesQuery = (data) => {
     data
   })
 }
+
+export const settlementFeesGetRecord = (id) => {
+  return axios({
+    url: "/fnc/SettlementFees/getRecord/" +id,
+    method: "get"
+  })
+}
+
 export const otherTimeDetail = (data) => {
   return axios({
     url: "/fnc/plyFee/otherTimeDetail",

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

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList"  @resetForm="resetForm" :pagination="pageData">
       <template slot="data">
@@ -133,6 +133,8 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
+        showSummary: true,
+        tableHeight: 'auto',
         optBtns: [
             {
               type: 'primary',
@@ -362,5 +364,9 @@ export default {
 };
 </script>
     
-<style scoped></style>
-    
+<style scoped lang="scss">
+  .InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }
+</style>

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

@@ -35,7 +35,7 @@
             <templateTable ref="templateTable1"   :pagination="pageDatarecord" @getList="getListrecord"
                 :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
                 <template slot="imageUrl" slot-scope="scope">
-                    <img v-if="scope.row.imageUrl != process + 'null'" :src='scope.row.imageUrl' class="imageclass"  @click.stop="showViewer=true;ProViewImg=scope.row.imageUrl" />
+                    <img v-if="scope.row.imageUrl" :src='scope.row.imageUrl' class="imageclass"  @click.stop="showViewer=true;ProViewImg=scope.row.imageUrl" />
                 </template>
             </templateTable>
             <span slot="footer" class="dialog-footer">
@@ -527,33 +527,22 @@ export default {
         findPageDetailrecord(data) {
             this.tableConfigDetailrecord.loading = true
             this.$api.task
-                .settlementFeesQuery({
-                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
-                    agreementType: '2',
-                    isNotCar: '0',
-                    handlingFeesStatus: '0',
-                    settlementStatus:'2',
-                    id:this.recorddetailid,
-                    ...data
-                })
-                .then(res => {
-                    if (res.code == 200) {
-                        res.data.content.forEach(ele => {
+            .settlementFeesGetRecord(this.recorddetailid)
+            .then(res => {
+                if (res.code == 200) {
+                    res.data.forEach(ele => {
+                        if (ele.imageUrl) {
                             ele.imageUrl= process.env.BASE_URL+ele.imageUrl
-                        });
-                        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)
-                    }
-                });
+                    });
+                    this.formTableDatarecord = res.data
+                    this.tableConfigDetailrecord.loading = false;
+                }
+                else {
+                    this.tableConfigDetail.loading = false;
+                    this.$message.error(res.msg)
+                }
+            });
         },
         getListrecord(data) {
             this.findPageDetailrecord(data)
@@ -574,9 +563,8 @@ export default {
         },
         haldRecordDetail(row) {
             this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail()
             this.recorddetailid = row.id
-
+            this.getListrecorddetail()
         },
         getListrecorddetail(data) {
             this.findPageDetailrecorddatail(data)

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

@@ -383,30 +383,34 @@ export default {
         this.findPage();
     },
     methods: {
-      // 明细
+      // 记录
       findPageDetailrecord(data) {
             this.tableConfigDetailrecord.loading = true
             this.$api.task
-                .settlementFeesQuery({
-                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
-                    agreementType: '2',
-                    isNotCar: '0',
-                    handlingFeesStatus: '0',
-                    settlementStatus:'2',
-                    id:this.recorddetailid,
-                    ...data
-                })
+                // .settlementFeesQuery({
+                //     partnerCompaniesId: this.formDetail.partnerCompaniesId,
+                //     agreementType: '2',
+                //     isNotCar: '0',
+                //     handlingFeesStatus: '0',
+                //     settlementStatus:'2',
+                //     id:this.recorddetailid,
+                //     ...data
+                // })
+                .settlementFeesGetRecord(this.recorddetailid)
                 .then(res => {
                     if (res.code == 200) {
-                        res.data.content.forEach(ele => {
+                        res.data.forEach(ele => {
+                          if (ele.imageUrl) {
                             ele.imageUrl= process.env.BASE_URL+ele.imageUrl
+                          }
                         });
-                        this.formTableDatarecord = res.data.content;
-                        this.pageDatarecord={
-                            pageNum:res.data.pageNum,
-                            pageSize:res.data.pageSize,
-                            totalSize:res.data.totalSize,
-                        }
+                        // this.formTableDatarecord = res.data.content;
+                        // this.pageDatarecord={
+                        //     pageNum:res.data.pageNum,
+                        //     pageSize:res.data.pageSize,
+                        //     totalSize:res.data.totalSize,
+                        // }
+                        this.formTableDatarecord = res.data
                         this.tableConfigDetailrecord.loading = false;
                     }
                     else {
@@ -426,9 +430,8 @@ export default {
         
         haldRecordDetail(row) {
             this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail()
             this.recorddetailid = row.id
-
+            this.getListrecorddetail()
         },
         getListrecorddetail(data) {
             this.findPageDetailrecorddatail(data)

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

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList" @resetForm="resetForm" :pagination="pageData">
       <template slot="data">
@@ -183,6 +183,8 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
+        showSummary: true,
+        tableHeight: 'auto',
         optBtns: [
           {
             type: 'primary',
@@ -400,6 +402,9 @@ export default {
   }
 };
 </script>
-    
-<style scoped></style>
-    
+<style scoped lang="scss">
+  .InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList"  @resetForm="resetForm" :pagination="pageData">
       <template slot="data">
@@ -133,6 +133,8 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
+        showSummary: true,
+        tableHeight: 'auto',
         optBtns: [
           {
               type: 'primary',
@@ -362,6 +364,10 @@ export default {
   }
 };
 </script>
-    
-<style scoped></style>
+<style scoped lang="scss">
+  .InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }
+</style>
     

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

@@ -35,7 +35,7 @@
             <templateTable ref="templateTable1"   :pagination="pageDatarecord" @getList="getListrecord"
                 :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
                 <template slot="imageUrl" slot-scope="scope">
-                    <img v-if="scope.row.imageUrl != process + 'null'" :src='scope.row.imageUrl' class="imageclass"  @click.stop="showViewer=true;ProViewImg=scope.row.imageUrl" />
+                    <img v-if="scope.row.imageUrl" :src='scope.row.imageUrl' class="imageclass"  @click.stop="showViewer=true;ProViewImg=scope.row.imageUrl" />
                 </template>
             </templateTable>
             <span slot="footer" class="dialog-footer">
@@ -575,26 +575,15 @@ export default {
         findPageDetailrecord(data) {
             this.tableConfigDetailrecord.loading = true
             this.$api.task
-                .settlementFeesQuery({
-                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
-                    agreementType: '2',
-                    isNotCar: '1',
-                    settlementStatus:'2',
-                    handlingFeesStatus: '0',
-                    id:this.recorddetailid,
-                    ...data
-                })
+                .settlementFeesGetRecord(this.recorddetailid)
                 .then(res => {
                     if (res.code == 200) {
-                        res.data.content.forEach(ele => {
+                        res.data.forEach(ele => {
+                          if (ele.imageUrl) {
                             ele.imageUrl= process.env.BASE_URL+ele.imageUrl
+                          }
                         });
-                        this.formTableDatarecord = res.data.content;
-                        this.pageDatarecord={
-                            pageNum:res.data.pageNum,
-                            pageSize:res.data.pageSize,
-                            totalSize:res.data.totalSize,
-                        }
+                        this.formTableDatarecord = res.data
                         this.tableConfigDetailrecord.loading = false;
                     }
                     else {

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

@@ -375,33 +375,22 @@ export default {
       findPageDetailrecord(data) {
             this.tableConfigDetailrecord.loading = true
             this.$api.task
-                .settlementFeesQuery({
-                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
-                    agreementType: '2',
-                    isNotCar: '0',
-                    handlingFeesStatus: '0',
-                    settlementStatus:'2',
-                    id:this.recorddetailid,
-                    ...data
-                })
-                .then(res => {
-                    if (res.code == 200) {
-                        res.data.content.forEach(ele => {
-                            ele.imageUrl= process.env.BASE_URL+ele.imageUrl
-                        });
-                        this.formTableDatarecord = res.data.content;
-                        this.pageDatarecord={
-                            pageNum:res.data.pageNum,
-                            pageSize:res.data.pageSize,
-                            totalSize:res.data.totalSize,
+            .settlementFeesGetRecord(this.recorddetailid)
+            .then(res => {
+                if (res.code == 200) {
+                    res.data.forEach(ele => {
+                        if (ele.imageUrl) {
+                        ele.imageUrl= process.env.BASE_URL+ele.imageUrl
                         }
-                        this.tableConfigDetailrecord.loading = false;
-                    }
-                    else {
-                        this.tableConfigDetail.loading = false;
-                        this.$message.error(res.msg)
-                    }
-                });
+                    });
+                    this.formTableDatarecord = res.data
+                    this.tableConfigDetailrecord.loading = false;
+                }
+                else {
+                    this.tableConfigDetail.loading = false;
+                    this.$message.error(res.msg)
+                }
+            });
         },
         getListrecord(data) {
             this.findPageDetailrecord(data)
@@ -414,9 +403,8 @@ export default {
         
         haldRecordDetail(row) {
             this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail()
             this.recorddetailid = row.id
-
+            this.getListrecorddetail()
         },
         getListrecorddetail(data) {
             this.findPageDetailrecorddatail(data)
@@ -427,7 +415,7 @@ export default {
             .fncplyFeeQuery({
                     partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     agreementType: '2',
-                    isNotCar: '0',
+                    isNotCar: '1',
                     handlingFeesStatus: '0',
                     id:this.recorddetailid,
                     ...data})
@@ -475,6 +463,7 @@ export default {
         },
         haldDetail(row) {
             this.dialogVisible = true
+            this.formDetail = row
             this.findPageDetail(row)
         },
         handleSearchList1(data) {

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

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList" @resetForm="resetForm" :pagination="pageData">
       <template slot="data">
@@ -229,6 +229,8 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
+        showSummary: true,
+        tableHeight: 'auto',
         optBtns: [
           {
             type: 'primary',
@@ -448,6 +450,9 @@ export default {
   }
 };
 </script>
-    
-<style scoped></style>
-    
+<style scoped lang="scss">
+  .InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }
+</style>

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

@@ -850,7 +850,7 @@ export default {
     },
     // 结算
     balanceFun(row){
-        this.$api.task.plyFeebalance(row).then(res => {
+        this.$api.task.plyFeebalance({id: row.id}).then(res => {
             if (res.code == "200") {
                 this.$message({
                     message: res.msg,

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

@@ -25,7 +25,7 @@
     </el-dialog>
     <el-dialog title="明细" :visible.sync="dialogVisibleDetail" width="60%" :before-close="handleCloseDetail">
       <templateTable ref="templateTable2" :pagination="pageDataDetail" @getList="getListDetail"
-        :tableConfig="tableConfigDetailDetail" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+        :tableConfig="tableConfigDetailDetail" :data="formTableDatarecord" @findPage="findPageDetailDetail">
       </templateTable>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleDetail = false">取消</el-button>
@@ -272,9 +272,11 @@ export default {
           }
         });
     },
+    // 明细
     getListDetail(data) {
       this.findPageDetailDetail()
     },
+    // 明细
     haldDetail(row) {
       this.findPageDetailDetail(row)
       this.dialogVisibleDetail = true
@@ -282,28 +284,34 @@ export default {
     handleCloseDetail() {
       this.dialogVisibleDetail = false
     },
-
+    // 记录
     haldRecord(row) {
       this.findPageDetailrecord(row)
       this.dialogVisiblerecord = true
     },
+    // 记录
     findPageDetailrecord(data) {
       this.tableConfigDetailrecord.loading = true
       this.$api.task
-        .settlementFeesQuery({
+        // .settlementFeesQuery({
+        //   partnerCompaniesId: data.partnerCompaniesId,
+        //   agreementType: '1',
+        //   handlingFeesStatus: '0',
+        //   ...this.pageDatarecord
+        // })
+        .plyFeeRecord({
           partnerCompaniesId: data.partnerCompaniesId,
-          agreementType: '1',
-          handlingFeesStatus: '0',
-          ...this.pageDatarecord
+          handlingFeesStatus: '1'
         })
         .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.formTableDatarecord = res.data.content;
+            // this.pageDatarecord = {
+            //   pageNum: res.data.pageNum,
+            //   pageSize: res.data.pageSize,
+            //   totalSize: res.data.totalSize,
+            // }
+            this.formTableDatarecord = res.data
             this.tableConfigDetailrecord.loading = false;
           }
           else {
@@ -312,6 +320,7 @@ export default {
           }
         });
     },
+    // 记录
     getListrecord(data) {
       this.findPageDetailrecord()
     },