Просмотр исходного кода

开票已结算增加记录操作

lihongxiao 2 лет назад
Родитель
Сommit
c71d90eb71

+ 2 - 2
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/"',//霍续亮

+ 7 - 0
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
+  })
 }

+ 169 - 97
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: '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)
+                    }
+                });
+        },
+        findPageDetailrecord(data) {
+            this.tableConfigDetailrecord.loading = true
+            this.$api.task
+                .settlementFeesQuery({
+                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
+                    agreementType: '2',
+                    isNotCar: '0',
+                    handlingFeesStatus: '1',
+                    ...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>
   

+ 162 - 91
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'
+                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: '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
+                })
+                .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: '1',
+                    ...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>
   

+ 1 - 1
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'
                 })