lihongxiao 2 years ago
parent
commit
1829427bf3

+ 1 - 1
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue

@@ -184,7 +184,7 @@ export default {
       this.tableConfigDetail.loading=true
       this.$api.task
         .otherSettldetail({
-          incomeIds:data.incomeIds,
+          partnerCompaniesId:data.partnerCompaniesId,
           settlementStatus:1,
           isNotCar:0
         })

+ 94 - 1
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicedAndSettled.vue

@@ -7,6 +7,18 @@
                 <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>
     </div>
 </template>
 <script>
@@ -92,7 +104,8 @@ export default {
                 loading: true,
                 isPaginationShow: true,
                 showSummary:true,
-                tableHeight:'auto'
+                isShowIndex: true,
+                tableHeight:'auto',
                 // optBtns: [
                 //     {
                 //         type: 'primary',
@@ -100,6 +113,13 @@ export default {
                 //         click: (row, index) => { return this.balanceFun(row) },
                 //     }
                 // ]
+                optBtns: [
+                    {
+                        type: 'primary',
+                        label: '详情',
+                        click: (row, index) => { return this.haldDetail(row) },
+                    }
+                ]
             },
             tableData: [],
             pageData: {
@@ -110,7 +130,48 @@ export default {
                 isNotDocumentary : '0',
                 handlingFeesStatus:'0'
             },
+            formList1: [
+                {
+                    label: "结算状态",
+                    prop: "handlingFeesStatus",
+                    type: "select",
+                    options:[
+                        {
+                            label:'开票已结算',
+                            value:'1'
+                        }, {
+                            label:'开票未结算',
+                            value:'2'
+                        },
+                    ]
+                },
+               
+            ],
+            tableConfigDetail:{
+                columns: [
+                {
+                    prop: "invoicId",
+                    label: "开票号",
+                    type: "text"
+                },
+                {
+                    prop: "invoicCommissionFeevalue",
+                    label: "开票金额",
+                    type: "text"
+                },
+                {
+                    prop: "invoicTime",
+                    label: "开票时间",
+                    type: "text"
+                },
+                
+                ],
+            loading: true,
+      },
+            dialogVisible:false,
             formData: {},
+            formDetail:{},
+            formTableData:[]
             
         };
     },
@@ -127,6 +188,38 @@ export default {
     getDayData(val){
       this.formData.day=val
     },
+    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:data.handlingFeesStatus
+        })
+        .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
+        },
         // 查询
         handleSearchList() {
             this.findPage();

+ 2 - 1
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -204,7 +204,8 @@ export default {
       this.tableConfigDetail.loading=true
       this.$api.task
         .otherSettldetail({
-          incomeIds:data.incomeIds,
+          // incomeIds:data.incomeIds,
+          partnerCompaniesId:data.partnerCompaniesId,
           settlementStatus:2,
           isNotCar:1
         })

+ 23 - 15
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue

@@ -138,6 +138,27 @@ export default {
                 },
                
             ],
+            tableConfigDetail:{
+                columns: [
+                {
+                    prop: "invoicId",
+                    label: "开票号",
+                    type: "text"
+                },
+                {
+                    prop: "invoicCommissionFeevalue",
+                    label: "开票金额",
+                    type: "text"
+                },
+                {
+                    prop: "invoicTime",
+                    label: "开票时间",
+                    type: "text"
+                },
+                
+                ],
+            loading: true,
+      },
             dialogVisible:false,
             pageData: {
                 pageNum: 1,
@@ -224,21 +245,8 @@ export default {
             }
         });
     },
-        // 结算
-        balanceFun(row) {
-            this.$api.task
-                .batchBxBalance({ids:row.ids})
-                .then(res => {
-                    if (res.code==200) {
-                        this.$message({
-                            message: res.msg ||'操作成功',
-                            type: 'success'
-                        })
-                    }
-                    else{
-                        this.$message.error(res.msg)
-                    }
-                });
+    handleClose(){
+            this.dialogVisible=false
         },
         tablePageChange(val) {
             this.pageData.pageSize = val;