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

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

@@ -267,7 +267,7 @@ export default {
         findPageDetailrecorddatail(data) {
             this.tableConfigDetailrecorddetail.loading = true;
             this.$api.task
-                .fncplyFeeQuery({ 
+                .fncplyFeeQuery({
                   partnerCompaniesId: data.partnerCompaniesId,
                   agreementType: '2',
                   handlingFeesStatus: '0',
@@ -301,6 +301,7 @@ export default {
           partnerCompaniesId: data.partnerCompaniesId,
           agreementType: '2',
           handlingFeesStatus: '1',
+          settlementStatus:'2',
           isNotCar:'0',
           ...this.pageDatarecord
         })
@@ -369,11 +370,10 @@ export default {
   }
 };
 </script>
-    
+
 <style scoped>
 .invoiceAnd>>>.el-table__body-wrapper {
   overflow-y: auto !important;
   height: auto !important;
 }
 </style>
-    

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

@@ -1,7 +1,7 @@
 <template>
     <!--布局容器-->
     <div  style="width: 99%; margin-top: 0px">
-        <templateTable class="invoiceAnd" :formList="formList"  :tableConfig="tableConfig" :data="tableData" 
+        <templateTable class="invoiceAnd" :formList="formList"  :tableConfig="tableConfig" :data="tableData"
             @findPage="findPage" @handleSearchList="handleSearchList" @resetForm="resetForm" :pagination="pageData" @getList="getList">
             <template slot="data">
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
@@ -40,12 +40,12 @@
             <templateTable ref="templateTable1"   :pagination="pageDatarecorddetail" @getList="getListrecorddetail"
                 :tableConfig="tableConfigDetailrecorddetail" :data="recordDetailData" @findPage="findPageDetailrecorddatail">
             </templateTable>
-               
+
             <span slot="footer" class="dialog-footer">
                 <el-button size="small" @click="dialogVisiblerecordDetail = false">取消</el-button>
             </span>
         </el-dialog>
-        
+
         <el-image-viewer v-if="showViewer"  :on-close="closeViewer"  :z-index="9999" :url-list="[ProViewImg]" />
     </div>
 </template>
@@ -119,7 +119,7 @@ export default {
                         type: "text"
                     },
                     {
-                        prop: "jqPolicyno",
+                        prop: "policyno",
                         label: "交强保单号",
                         type: "text"
                     },
@@ -372,6 +372,7 @@ export default {
                     agreementType: '2',
                     isNotCar: '0',
                     handlingFeesStatus: '0',
+                    settlementStatus:'2',
                     id:this.recorddetailid,
                     ...data
                 })
@@ -423,7 +424,7 @@ export default {
         findPageDetailrecorddatail(data) {
             this.tableConfigDetailrecorddetail.loading = true;
             this.$api.task
-            .fncplyFeeQuery({ 
+            .fncplyFeeQuery({
                     partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     agreementType: '2',
                     isNotCar: '0',
@@ -476,7 +477,7 @@ export default {
         getList(data) {
             this.findPage(data)
         },
-       
+
         // 结算
         balanceFun(row) {
             this.$api.task
@@ -518,4 +519,3 @@ export default {
   text-align: center;
 }
 </style>
-  

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

@@ -249,7 +249,7 @@ export default {
         findPageDetailrecorddatail(data) {
             this.tableConfigDetailrecorddetail.loading = true;
             this.$api.task
-                .fncplyFeeQuery({ 
+                .fncplyFeeQuery({
                   partnerCompaniesId: data.partnerCompaniesId,
                   agreementType: '2',
                   handlingFeesStatus: '1',
@@ -284,6 +284,7 @@ export default {
           agreementType: '2',
           handlingFeesStatus: '1',
           isNotCar:'1',
+          settlementStatus:'2',
           ...this.pageDatarecord
         })
         .then(res => {
@@ -347,14 +348,14 @@ export default {
       this.pageData.pageNum = val;
       this.findPage();
     },
-   
+
   }
 };
 </script>
-    
+
 <style scoped>
 
 .invoiceAnd >>>.el-table__body-wrapper {
     overflow-y: auto !important;
     height: auto !important;
-  }</style>
+  }</style>

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

@@ -40,7 +40,7 @@
             <templateTable ref="templateTable1"   :pagination="pageDatarecorddetail" @getList="getListrecorddetail"
                 :tableConfig="tableConfigDetailrecorddetail" :data="recordDetailData" @findPage="findPageDetailrecorddatail">
             </templateTable>
-               
+
             <span slot="footer" class="dialog-footer">
                 <el-button size="small" @click="dialogVisiblerecordDetail = false">取消</el-button>
             </span>
@@ -267,7 +267,7 @@ export default {
                         label: "非车保单号",
                         type: "text"
                     },
-                  
+
                     {
                         prop: "licenseno",
                         label: "车牌号",
@@ -283,7 +283,7 @@ export default {
                         label: "非车保费",
                         type: "text"
                     },
-                   
+
                     {
                         prop: "noSuperviseCostsPremiums",
                         label: "非车手续费金额",
@@ -397,7 +397,7 @@ export default {
         findPageDetailrecorddatail(data) {
             this.tableConfigDetailrecorddetail.loading = true;
             this.$api.task
-                .fncplyFeeQuery({ 
+                .fncplyFeeQuery({
                     partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     agreementType: '2',
                     isNotCar: '0',
@@ -422,6 +422,7 @@ export default {
                     partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     agreementType: '2',
                     isNotCar: '1',
+                    settlementStatus:'2',
                     handlingFeesStatus: '0',
                     id:this.recorddetailid,
                     ...data
@@ -470,11 +471,10 @@ export default {
     }
 };
 </script>
-  
+
 <style scoped>
 .invoiceAnd>>>.el-table__body-wrapper {
     overflow-y: auto !important;
     height: auto !important;
 }
 </style>
-