Merge branch 'bochk-poc' of http://192.168.0.110:11080/fukai/vue-gjjs into bochk-poc

src/business/holiday/views/index.vue

@@ -199,7 +199,7 @@
                 if (res.respCode === "AAAAAA") {
                    loading.close()
                    this.tableData = res.data
-                   this.pagination.total = Number(res.data.length)
+                   this.pagination.total = Number(res.data[0].countSize)
                 }
             },
 			httpRequest(params) {
@@ -265,7 +265,7 @@
 				this.holidayList = []
 
 				this.searchParams = {
-                    pageNum: this.pagination.pageIndex,
+                    pageIndex: this.pagination.pageIndex,
                     pageSize: this.pagination.pageSize,
 					...params.data
 				}

src/components/business/docpan/views/index.vue

@@ -649,6 +649,7 @@ export default {
       let params = {
         ...this.model,
         transName: this.root.trnName,
+        userId: window.sessionStorage.userId || 'ZL',
         spt: {
           inr: this.$route.query.businessInr,
         },