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

src/components/TemplateTable/index.vue

@@ -291,11 +291,12 @@ export default {
 
     handleSizeChange(value) {
       this.pagination.pageSize = value;
-      this.$emit('getList');
+      this.pagination.pageNum = 1;
+      this.$emit('getList',this.pagination);
     },
     handleCurrentChange(val) {
       this.pagination.pageNum = val;
-      this.$emit('getList');
+      this.$emit('getList',this.pagination);
     },
     // 搜索
     handleSearchList() {

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

@@ -1,13 +1,13 @@
 <template>
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
-    <!-- <kt-common-table 
+    <!-- <kt-common-table
     permsButton3="sys:handlingFees:balance"
-    :data="pageResult" 
-    :columns="columns"  
+    :data="pageResult"
+    :columns="columns"
     :button3Name="'结算'"
     @handleButton3="balanceFun"
-    :showBatchDelete="false" 
+    :showBatchDelete="false"
     @findPage="findPage" >
     </kt-common-table> -->
     <templateTable
@@ -18,6 +18,7 @@
       @findPage="findPage"
       @handleSearchList="handleSearchList"
       :pagination="pageData"
+      @getList="getList"
     >
     </templateTable>
     <el-dialog
@@ -260,6 +261,10 @@ export default {
     },
     //列表数据
     findPage(data) {
+      if(data){
+        this.pageData.pageNum=data.pageNum;
+        this.pageData.pageSize=data.pageSize;
+      }
       this.tableConfig.loading = true;
       this.$api.task
         .plyFeeQuery(this.pageData)
@@ -274,6 +279,9 @@ export default {
           }
         });
     },
+    getList(data){
+      this.findPage(data)
+    },
     closdialogVisible() {
       this.dialogVisible = false;
     },
@@ -288,10 +296,10 @@ export default {
             commissionFeevalue:row.commissionFeevalue,
         }
         this.dialogVisible=true
-       
+
     },
      // 上传图片的方法Start
-     beforeAvatarUpload(file) {
+    beforeAvatarUpload(file) {
       // var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
       // const extension = testmsg === "pdf";//限制只能上传pdf文件，否则阻止上传
       // const extension1 = testmsg === "docx";//限制只能上传pdf文件，否则阻止上传
@@ -343,8 +351,8 @@ export default {
                 return false;
             }
         });
-       
-        
+
+
     },
     tablePageChange(val) {
       this.pageData.pageSize = val;
@@ -354,12 +362,11 @@ export default {
       this.pageData.pageNum = val;
       this.findPage();
     },
-  
+
   }
 };
 </script>
-    
+
   <style scoped>
 
 </style>
-    

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -428,6 +428,7 @@ export default {
             })
             this.oldVersionHistory = res.data.feeOrderNewVo;
           }
+          res.data.carinfo.carnature=res.data.carinfo.carnature=='02'?"非营业":"营业";
           this.orderInfo = res.data
           this.feeDetailInfo = res.data.orderFeeResult;
           this.oldFeeInfo = res.data.adjustFeeDescVo;