结算

config/dev.env.js

@@ -13,10 +13,10 @@ module.exports = merge(prodEnv, {
   // 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.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
-  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
+  // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
 })
 
 

src/views/Core/components/detailsDialog.vue

@@ -428,7 +428,7 @@
           </div>
         </OpenCloseBox>
         <OpenCloseBox id="fymx" v-if="orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee && Feepermissions">
-          <span slot="title">费用明细<el-button v-if="isTaskPool" type="primary" style="margin-left: 30px;" size="mini" @click="productCostAddVehicleFactorVisible = true">匹配费用信息</el-button></span>
+          <span slot="title">费用明细<el-button v-if="isTaskPool" type="primary" style="margin-left: 30px;" size="mini" @click="agreementProductCostsSaveFun()">匹配费用信息</el-button></span>
           <div slot="boby" style="font-size:12px;width: 100%" class="FeeEnclosure">
             <el-table :data="orderInfo.feeOrderNewVo.exportFee"  :border="true" width="100%"
               :stripe="true" size="mini" :header-cell-style="{
@@ -492,7 +492,7 @@
         over-size="small"  :disabled="true"
         @cancelForm="productCostFactorCancelForm"></Product-Cost-Form>
     </el-dialog>
-  <el-dialog title="产品编辑" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
+  <el-dialog title="产品编辑" v-if="orderInfo.agreementProductCostsSave" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
       @close="productcloseDialog">
       <el-collapse accordion>
         <div class="productstitle flex j-s" style="margin-top: 10px">
@@ -846,6 +846,14 @@ export default {
     productcloseDialog() {
      this.productCostAddVehicleFactorVisible=false
     },
+    agreementProductCostsSaveFun() {
+      if(this.orderInfo.agreementProductCostsSave){
+        this.productCostAddVehicleFactorVisible=true
+      }
+      else{
+        this.$message.error('暂无费用信息')
+      }
+    },
     productCostFactoropenDialog() {
       this.productCostFactorDialogVisible =false
     },

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

@@ -183,7 +183,11 @@ export default {
     findPageDetail(data) {
       this.tableConfigDetail.loading=true
       this.$api.task
-        .otherSettldetail({incomeIds:data.incomeIds})
+        .otherSettldetail({
+          incomeIds:data.incomeIds,
+          settlementStatus:1,
+          isNotCar:0
+        })
         .then(res => {
           if (res.code==200) {
             this.formTableData = res.data;

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

@@ -12,7 +12,7 @@
       :visible.sync="dialogVisible"
       width="80%"
       :before-close="handleClose">
-      <templateTable ref="templateTable"   :tableConfig="tableConfigDetail" :data="formTableData"
+      <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
       @findPage="findPageDetail" >
     </templateTable>
       <span slot="footer" class="dialog-footer">
@@ -85,6 +85,23 @@ export default {
                     type: "slot",
                     },
             ],
+            formList1: [
+                {
+                    label: "结算状态",
+                    prop: "handlingFeesStatus",
+                    type: "select",
+                    options:[
+                        {
+                            label:'开票已结算',
+                            value:'1'
+                        }, {
+                            label:'开票未结算',
+                            value:'2'
+                        },
+                    ]
+                },
+               
+            ],
             dialogVisible:false,
             tableConfig: {
                 columns: [
@@ -133,6 +150,7 @@ export default {
                 handlingFeesStatus:'0'
             },
             formData: {},
+            formDetail:{}
         };
     },
     created() {
@@ -148,29 +166,40 @@ export default {
     getDayData(val){
       this.formData.day=val
     },
-        // 查询
-        handleSearchList() {
-            this.findPage();
-        },
+    // 查询
+    handleSearchList() {
+        this.findPage();
+    },
+    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({ids:data.ids})
-        .then(res => {
-          if (res.code==200) {
-            this.formTableData = res.data;
-            this.tableConfigDetail.loading = false;
-          }
-          else{
-            this.tableConfigDetail.loading = false;
-            this.$message.error(res.msg)
-          }
-        });
-    },
+    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)
+        }
+    });
+},
+       
         //列表数据
         findPage(data) {
             if (data) {

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

@@ -203,7 +203,11 @@ export default {
     findPageDetail(data) {
       this.tableConfigDetail.loading=true
       this.$api.task
-        .otherSettldetail({incomeIds:data.incomeIds})
+        .otherSettldetail({
+          incomeIds:data.incomeIds,
+          settlementStatus:2,
+          isNotCar:1
+        })
         .then(res => {
           if (res.code==200) {
             this.formTableData = res.data;

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/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>
@@ -91,7 +103,8 @@ export default {
                 loading: true,
                 isPaginationShow: true,
                 showSummary:true,
-                tableHeight:'none'
+                isShowIndex: true,
+                tableHeight:'none',
                 // optBtns: [
                 //     {
                 //         type: 'primary',
@@ -99,18 +112,44 @@ export default {
                 //         click: (row, index) => { return this.balanceFun(row) },
                 //     }
                 // ]
+                optBtns: [
+                    {
+                        type: 'primary',
+                        label: '详情',
+                        click: (row, index) => { return this.haldDetail(row) },
+                    }
+                ]
             },
             tableData: [],
+            formList1: [
+                {
+                    label: "结算状态",
+                    prop: "handlingFeesStatus",
+                    type: "select",
+                    options:[
+                        {
+                            label:'开票已结算',
+                            value:'1'
+                        }, {
+                            label:'开票未结算',
+                            value:'2'
+                        },
+                    ]
+                },
+               
+            ],
+            dialogVisible:false,
             pageData: {
                 pageNum: 1,
                 pageSize: 20,
                 agreementType: '2',
-                isNotCar: '1',
+                isNotCar: '0',
                 isNotDocumentary : '0',
                 handlingFeesStatus:'0'
             },
             formData: {},
-            
+            formDetail:{},
+            formTableData:[]
         };
     },
     created() {
@@ -156,7 +195,35 @@ export default {
         getList(data) {
             this.findPage(data)
         },
-      
+        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)
+            }
+        });
+    },
         // 结算
         balanceFun(row) {
             this.$api.task

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

@@ -9,7 +9,7 @@
             </template>
         </templateTable>
         <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
-            <templateTable ref="templateTable" :tableConfig="tableConfigDetail" :data="formTableData"
+            <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
                 @findPage="findPageDetail">
             </templateTable>
             <span slot="footer" class="dialog-footer">
@@ -81,7 +81,24 @@ export default {
                     label: "年月日",
                     name: "data",
                     type: "slot",
+                    },
+            ],
+            formList1: [
+                {
+                    label: "结算状态",
+                    prop: "handlingFeesStatus",
+                    type: "select",
+                    options:[
+                        {
+                            label:'开票已结算',
+                            value:'1'
+                        }, {
+                            label:'开票未结算',
+                            value:'2'
+                        },
+                    ]
                 },
+               
             ],
             tableConfig: {
                 columns: [
@@ -127,7 +144,7 @@ export default {
                 handlingFeesStatus: '0'
             },
             formData: {},
-
+            formDetail:{}
         };
     },
     created() {
@@ -147,10 +164,19 @@ export default {
             this.dialogVisible = true
             this.findPageDetail(row)
         },
+        handleSearchList1(data){
+            this.findPageDetail({...this.formDetail,...data})
+        },
         findPageDetail(data) {
             this.tableConfigDetail.loading = true
             this.$api.task
-                .invicdetai({ ids: data.ids })
+                .invicdetai({ 
+                    partnerCompaniesId:data.partnerCompaniesId,
+                    agreementType: '2',
+                    isNotCar: '0',
+                    isNotDocumentary : '0',
+                    handlingFeesStatus:data.handlingFeesStatus
+                })
                 .then(res => {
                     if (res.code == 200) {
                         this.formTableData = res.data;