合并解决冲突

.env.production

@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'

.env.test

@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'

src/api/ysjl.js

@@ -134,6 +134,17 @@ export function getNeedRecordList(query) {
   })
 }
 
+/**
+ *  待办原始记录列表查询
+ */
+export function getListUnDoneYsjl(params) {
+  return api({
+    url: '/ysjl/getListUnDoneYsjl',
+    method: 'get',
+    params
+  })
+}
+
 export function exportExcel(params) {
   return preview({
     url: '/download/downloadGrantList' + '?' + qs.stringify(params, { indices: false }),

src/components/Crud/index.vue

@@ -126,10 +126,10 @@ export default {
       this.allColumnsSelectedIndeterminate = false
     },
     handleCheckedTableColumnsChange(item) {
-      let totalCount = 0
+      let total = 0
       let selectedCount = 0
       for (const key in this.crud.props.tableColumns) {
-        ++totalCount
+        ++total
         if (Object.prototype.hasOwnProperty.call(this.crud.props.tableColumns, key)) {
           selectedCount += this.crud.props.tableColumns[key].visible ? 1 : 0
         }
@@ -141,8 +141,8 @@ export default {
         })
         return
       }
-      this.allColumnsSelected = selectedCount === totalCount
+      this.allColumnsSelected = selectedCount === total
-      this.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0
+      this.allColumnsSelectedIndeterminate = selectedCount !== total && selectedCount !== 0
     },
     toggleSearch() {
       this.crud.props.searchToggle = !this.crud.props.searchToggle

src/components/Notice/message.vue

@@ -234,7 +234,7 @@ export default {
         params: this.readListQuery
       }).then(data => {
         this.readMessage = data.list
-        this.readMessageTotal = data.totalCount
+        this.readMessageTotal = data.total
         // this.systemMessageCount = data.systemMessageCount
         // this.readMessageCount = data.readMessageCount
         // this.recycleMessageCount = data.recycleMessageCount
@@ -287,7 +287,7 @@ export default {
         params: this.recycleListQuery
       }).then(data => {
         this.recycleMessage = data.list
-        this.recycleMessageTotal = data.totalCount
+        this.recycleMessageTotal = data.total
         this.systemMessageCount = data.systemMessageCount
         this.readMessageCount = data.readMessageCount
         this.recycleMessageCount = data.recycleMessageCount

src/components/drawerDialog/index.vue

@@ -356,8 +356,8 @@
                 </el-table>
                 <div class="bottomPage">
                   <pagination
-                    v-show="totalCount > 0"
+                    v-show="total > 0"
-                    :total="totalCount"
+                    :total="total"
                     :page-num.sync="listQuery.pageNum"
                     :page-row.sync="listQuery.pageRow"
                     @pagination="getList"
@@ -424,8 +424,8 @@
                 </el-table>
                 <div class="bottomPage">
                   <pagination
-                    v-show="totalCount1 > 0"
+                    v-show="total1 > 0"
-                    :total="totalCount1"
+                    :total="total1"
                     :page-num.sync="jyxmParams.pageNum"
                     :page-row.sync="jyxmParams.pageSize"
                     @pagination="getDemoList"
@@ -808,7 +808,7 @@ export default {
       shebeipinzhongdaima: [],
       sblbList: [],
       sbpzList: [],
-      totalCount: 0,
+      total: 0,
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
@@ -825,7 +825,7 @@ export default {
         templateId: '',
         templateSettingId: ''
       },
-      totalCount1: 0,
+      total1: 0,
       jyxmModes: ['检验项目', '附表', '不合格整改检验项目', '大型起重机械检验项目', '报告检验项目'],
       writeModes: ['CN模式', 'DN模式', 'KV模式', 'CFI模式', 'SA模式'],
       affiliatedAddModes: ['固定表格', '附页文件', 'word自动切换']
@@ -925,7 +925,7 @@ export default {
         //   if(item.tableMode)
         // })
         this.list = data.list
-        this.totalCount = data.total * 1
+        this.total = data.total * 1
         this.gridData = []
         if (data.list[0]) {
           this.templateSettingId = data.list[0].id
@@ -976,7 +976,7 @@ export default {
           }
         })
         this.gridData = data.list
-        this.totalCount1 = data.total
+        this.total1 = data.total
       })
     },
     toggleFn(val) {

src/layout/components/AppMain.vue

@@ -1,23 +1,21 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive v-if="!$route.meta.iframe" :include="cachedViews">
+      <keep-alive :include="cachedViews">
         <router-view :key="key" />
       </keep-alive>
     </transition>
-    <elFrame v-show="!!$route.meta.iframe" :src="oldURL" />
     <message :result="dialogFormVisible" :message-info="message" @dialogData="closeDialog" />
   </section>
 </template>
 
 <script>
 import Message from '../../components/Notice/message'
-import elFrame from '../../components/Iframe/index'
 import Utils from '../../utils/contact.js'
 import { transactionTable } from '@/api/dashboard'
 export default {
   name: 'AppMain',
-  components: { Message, elFrame },
+  components: { Message },
   data() {
     return {
       userId: this.$store.getters.userId,
@@ -35,8 +33,7 @@ export default {
         shebeizhonglei: '',
         shebeizhongleidaima: '',
         jianyanleibie: ''
-      },
+      }
-      oldURL: process.env.VUE_APP_OLD_API + 'user/index'
     }
   },
   computed: {

src/permission.js

@@ -2,20 +2,20 @@ import router from './router'
 import store from './store'
 import NProgress from 'nprogress' // Progress 进度条
 import 'nprogress/nprogress.css'// Progress 进度条样式
-import { getToken, getRememberMeToken } from '@/utils/auth' // 验权
+import { getToken } from '@/utils/auth' // 验权
 const whiteList = ['/login', '/remote', '/404', '/viewhzd', '/upload', '/xingshi', '/wenjian', '/fangwei', '/qiye'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  if (getToken() || getRememberMeToken()) {
+  if (getToken()) {
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done() // 结束Progress
-    } else if (!store.getters.roles.length) {
+    } else if (store.getters.roles.length) {
+      next()
+    } else {
       store.dispatch('GetInfo').then(() => {
-        next({ ...to })
+        next({ ...to, replace: true })
       })
-    } else {
-      next()
     }
   } else {
     const ppath = to.path

src/store/modules/user.js

@@ -22,7 +22,7 @@ const user = {
     allUser: [],
     allCategory: [],
     messageCount: [],
-    prodName: process.env.NODE_ENV === 'test' ? '/sdmaFront' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
+    prodName: process.env.NODE_ENV === 'development' ? '' : '/sdmaFront' // 开发环境下为空，生产环境下请设置为tomcat项目名称或者nginx代理项目名称。(例如：/dist)
   },
   mutations: {
     SET_USER: (state, userInfo) => {
@@ -135,7 +135,7 @@ const user = {
           }).then(task => {
             messagePush.push({
               key: 'MyTask',
-              value: task.totalCount
+              value: task.total
             })
           })
           getRenwuListByPath({ // 待分配任务
@@ -147,10 +147,10 @@ const user = {
           }, 'list').then(task => {
             messagePush.push({
               key: 'AllotList',
-              value: task.totalCount
+              value: task.total
             }, {
               key: 'allot',
-              value: task.totalCount > 0 ? 1 : 0
+              value: task.total > 0 ? 1 : 0
             })
           })
           getRenwuListByPath({ // 退回任务
@@ -160,7 +160,7 @@ const user = {
           }, 'getTuihuiList').then(task => {
             messagePush.push({
               key: 'BackRenwu',
-              value: task.totalCount
+              value: task.total
             })
           })
           getNeedRecordList({ // 待办记录
@@ -173,10 +173,10 @@ const user = {
           }).then((ysjl) => {
             messagePush.push({
               key: 'TODOYsjl',
-              value: ysjl.totalCount
+              value: ysjl.total
             }, {
               key: 'ysjl',
-              value: ysjl.totalCount > 0 ? 1 : 0
+              value: ysjl.total > 0 ? 1 : 0
             })
           })
           getNeedRecordList({ // 检验报告列表
@@ -190,10 +190,10 @@ const user = {
           }).then((ysjl) => {
             messagePush.push({
               key: 'TODOReport',
-              value: ysjl.totalCount
+              value: ysjl.total
             }, {
               key: 'bggl',
-              value: ysjl.totalCount > 0 ? 1 : 0
+              value: ysjl.total > 0 ? 1 : 0
             })
           })
           getNeedRecordList({ // 待审报告列表
@@ -205,7 +205,7 @@ const user = {
           }).then((ysjl) => {
             messagePush.push({
               key: 'dsbg-list',
-              value: ysjl.totalCount
+              value: ysjl.total
             })
           })
           if (departmentId === 75) { // 锅炉科室定检
@@ -222,7 +222,7 @@ const user = {
             }).then((data) => {
               messagePush.push({
                 key: 'PrintReportGlKsWdy',
-                value: data.totalCount
+                value: data.total
               })
             })
             getNeedRecordList({ // 未发放
@@ -239,10 +239,10 @@ const user = {
             }).then((data) => {
               messagePush.push({
                 key: 'GrantReportGlCreate',
-                value: data.totalCount
+                value: data.total
               }, {
                 key: 'grant',
-                value: data.totalCount > 0 ? 1 : 0
+                value: data.total > 0 ? 1 : 0
               })
             })
             getNeedRecordList({ // 已发放
@@ -259,7 +259,7 @@ const user = {
             }).then((data) => {
               messagePush.push({
                 key: 'GrantReportGlYiFafang',
-                value: data.totalCount
+                value: data.total
               })
             })
           }

src/views/allot/components/chengya_list.vue

@@ -246,7 +246,7 @@
     <el-pagination
       :current-page="listQuery.pageNum"
       :page-size="listQuery.pageSize"
-      :total="totalCount"
+      :total="total"
       :page-sizes="[10, 20, 40, 100]"
       background
       layout="total, sizes, prev, pager, next, jumper"
@@ -450,7 +450,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       listQuery: {
@@ -519,7 +519,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/allot/components/jidian_list.vue

@@ -139,7 +139,7 @@
     <el-pagination
       :current-page="listQuery.pageNum"
       :page-size="listQuery.pageSize"
-      :total="totalCount"
+      :total="total"
       :page-sizes="[10, 20, 40, 100]"
       background
       layout="total, sizes, prev, pager, next, jumper"
@@ -262,7 +262,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       listQuery: {
@@ -333,7 +333,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/allot/hasAllot.vue

@@ -260,13 +260,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
-      v-show="totalCount > 0"
-      :total="totalCount"
-      :page-num.sync="listQuery.pageNum"
-      :page-row.sync="listQuery.pageSize"
-      @pagination="getList"
-    />
   </div>
 </template>
 
@@ -279,7 +273,7 @@ export default {
   components: { Pagination, Sticky },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       teams: [],
@@ -389,7 +383,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/allot/project.vue

@@ -83,7 +83,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog :visible.sync="dialogVisible" title="任务分配" @close="closeDialog">
       <el-container>
         <el-header>
@@ -144,7 +144,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCountBase>0" :total="totalCountBase" :page-num.sync="listQueryBase.pageNum" :page-row.sync="listQueryBase.pageRow" @pagination="getListBase" />
+      <pagination v-show="totalBase>0" :total="totalBase" :page-num.sync="listQueryBase.pageNum" :page-row.sync="listQueryBase.pageRow" @pagination="getListBase" />
     </el-dialog>
 
     <el-dialog :visible.sync="dialogFormVisibleAddBase" title="添加设备">
@@ -195,8 +195,8 @@ export default {
       dialogVisible: false,
       dialogBaseInfoVisible: false,
       dialogFormVisibleAddBase: false,
-      totalCount: 0,
+      total: 0,
-      totalCountBase: 0,
+      totalBase: 0,
       list: [],
       listBase: [],
       listLoading: false,
@@ -252,7 +252,7 @@ export default {
       }).then(data => {
         this.listLoading = false
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     getListBase() {
@@ -265,7 +265,7 @@ export default {
       }).then(data => {
         this.listLoading = false
         this.listBase = data.list
-        this.totalCountBase = data.totalCount
+        this.totalBase = data.total
       })
     },
     getSblbList(val) {

src/views/allot/rwd_list.vue

@@ -105,7 +105,7 @@
     <el-pagination
       :current-page="listQuery.pageNum"
       :page-size="listQuery.pageSize"
-      :total="totalCount"
+      :total="total"
       :page-sizes="[10, 20, 40, 100]"
       background
       layout="total, sizes, prev, pager, next, jumper"
@@ -158,7 +158,7 @@ export default {
   components: { Sticky },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       teams: [],
       listQuery: {
@@ -208,7 +208,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/allot/team_list.vue

@@ -64,7 +64,7 @@
     <el-pagination
       :current-page="listQuery.pageNum"
       :page-size="listQuery.pageSize"
-      :total="totalCount"
+      :total="total"
       :page-sizes="[10, 20, 40, 100]"
       background
       layout="total, sizes, prev, pager, next, jumper"
@@ -118,7 +118,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -167,7 +167,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/allot/tuihui_list.vue

@@ -53,10 +53,10 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="40" />
-      <el-table-column align="center" label="序号" width="60">
+      <el-table-column align="center" label="序号" width="60" type="index">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <span v-text="getIndex(scope.$index)" />
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column align="center" label="报检单号" prop="serialNumber" width="170" />
       <el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="120" />
@@ -79,7 +79,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <!-- 驳回操作 -->
     <el-dialog :visible.sync="dialogBohuiVisible" title="驳回意见" width="50%">
       <el-table :data="infoNotes">
@@ -151,7 +151,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       tempDepartment: {},
@@ -203,7 +203,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.showLoading = false
       })
     },
@@ -236,7 +236,10 @@ export default {
         params: {
           renwuids: this.$refs.list.selection.map(rw => {
             return rw.id
-          }).join(',')
+          })
+        },
+        paramsSerializer: function(params) {
+          return qs.stringify(params, { indices: false })
         }
       }).then(data => {
         this.allotList = data.list

src/views/archive/list.vue

@@ -70,7 +70,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
   </div>
 </template>
 
@@ -84,7 +84,7 @@ export default {
   components: { Sticky, Pagination, ArchiveInfo, ArchiveScan },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1,
@@ -116,7 +116,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     // 获取设备种类列表方法

src/views/assign/hasAssign.vue

@@ -106,7 +106,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 
@@ -117,7 +117,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       listQuery: {
@@ -141,7 +141,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/assign/list.vue

@@ -110,7 +110,7 @@
     <el-pagination
       :current-page="listQuery.pageNum"
       :page-size="listQuery.pageRow"
-      :total="totalCount"
+      :total="total"
       :page-sizes="[10, 20, 40, 100]"
       background
       layout="total, sizes, prev, pager, next, jumper"
@@ -173,7 +173,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       listQuery: {
@@ -234,7 +234,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/assign/missionList.vue

@@ -72,7 +72,7 @@
       <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
       <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
 
     <el-dialog :title="textMap[category]" :visible.sync="dialogFormVisible" @close="closeDialog">
       <el-row style="margin-bottom: 15px;">
@@ -169,7 +169,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCountCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
+      <pagination v-show="total>0" :total="totalCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
     </el-dialog>
   </div>
 </template>
@@ -184,9 +184,9 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
-      totalCountCopy: 0,
+      totalCopy: 0,
       listCopy: [],
       sbzlList: [],
       sblbList: [],
@@ -252,7 +252,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     getListCopy() {
@@ -266,7 +266,7 @@ export default {
         params: this.listQueryCopy
       }).then(data => {
         this.listCopy = data.list
-        this.totalCountCopy = data.totalCount
+        this.totalCopy = data.total
       })
     },
     onDialogRowClick(row) {

src/views/assign/old_list.vue

@@ -70,7 +70,7 @@
     <el-pagination
       :current-page="listQuery.pageNum"
       :page-size="listQuery.pageRow"
-      :total="totalCount"
+      :total="total"
       :page-sizes="[10, 20, 40, 100]"
       background
       layout="total, sizes, prev, pager, next, jumper"
@@ -121,7 +121,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      totalCount: 0,
+      total: 0,
       list: [],
       sbzlList: [],
       listQuery: {
@@ -164,7 +164,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.showLoading = false
       })
     },

src/views/audit/list.vue

@@ -69,7 +69,7 @@
       </el-table-column>
     </el-table>
     <div>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
       <div style="float: right;margin-top:8px;">
         <div style="width: 50px;float:left;margin-left: 20px;">
           驳回：
@@ -156,7 +156,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -235,7 +235,7 @@ export default {
           }
         }
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/bggl/banjie_list.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <div v-show="hasPerm('bggl:update') || hasPerm('bggl:regenerate')" class="sub-navbar">
+      <div v-show="hasPerm('bggl:banjie:update') || hasPerm('bggl:banjie:regenerate')" class="sub-navbar">
         <sticky>
-          <el-button v-if="hasPerm('bggl:update')" type="danger" icon="el-icon-refresh" @click="resetFlow">
+          <el-button v-if="hasPerm('bggl:banjie:update')" type="danger" icon="el-icon-refresh" @click="resetFlow">
             重启流程
           </el-button>
-          <template v-if="hasPerm('bggl:regenerate')">
+          <template v-if="hasPerm('bggl:banjie:regenerate')">
             <el-button type="warning" icon="el-icon-refresh" @click="generatePdf('YSJL')">
               生成记录
             </el-button>
@@ -50,15 +50,6 @@
             @keyup.enter.native="handleFilter"
           />
           <br>
-          <span class="radio-group-label">查看类型：</span>
-          <el-radio-group v-model="listQuery.createBy" @change="handleFilter">
-            <el-radio :label="$store.getters.userId">
-              只看创建人
-            </el-radio>
-            <el-radio :label="undefined">
-              全部
-            </el-radio>
-          </el-radio-group>
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -165,8 +156,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
+      v-show="total>0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -366,7 +357,7 @@
         <el-table-column align="center" label="监检日期" prop="jianyanjieshuriqi" width="150" />
         <el-table-column align="center" label="监检员" prop="jianyanrenyuan" width="150" />
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCountExport" :page-num.sync="listQueryExport.pageNum" :page-row.sync="listQueryExport.pageRow" @pagination="getExportReportList" />
+      <pagination v-show="total>0" :total="totalExport" :page-num.sync="listQueryExport.pageNum" :page-row.sync="listQueryExport.pageRow" @pagination="getExportReportList" />
     </el-dialog>
     <!--重启申请选择方式窗口-->
     <el-dialog :visible.sync="dialogSelectionMethod" title="重启申请方式" width="23%">
@@ -525,16 +516,13 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'shenpiriqi desc,id', // 排序字段
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
-        sort: 'desc', // 排序方式
+        hasChild: true
-        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
-        hasChild: true,
-        hasFinish: true
       },
       multipleSelection: [],
       dialogQueryVisible: false,
@@ -564,15 +552,13 @@ export default {
       listQueryExport: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'shenpiriqi desc,id', // 排序字段
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
-        sort: 'desc', // 排序方式
         searchYsjl: {
           createBy: this.$store.getters.userId
         },
-        hasChild: false,
+        hasChild: false
-        hasFinish: true
       },
-      totalCountExport: 0,
+      totalExport: 0,
       outFile: '', // 导出文件el
       jianyanrenyuanmingcheng: '',
       departmentName: '',
@@ -630,12 +616,12 @@ export default {
     },
     getList() {
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListBanjie',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },
@@ -656,7 +642,7 @@ export default {
             this.exportList[i].guigexinghao = this.exportList[i].shebeimingcheng
           }
         }
-        this.totalCountExport = data.totalCount
+        this.totalExport = data.total
       })
     },
     ExportShow: function() {
@@ -692,8 +678,7 @@ export default {
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -902,11 +887,8 @@ export default {
       this.listQuery = {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'shenpiriqi desc,id', // 排序字段
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
-        sort: 'desc', // 排序方式
+        hasChild: true
-        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
-        hasChild: true,
-        hasFinish: true
       }
       this.getList()
     },

src/views/bggl/components/original_db_list.vue

@@ -6,7 +6,7 @@
           <el-button type="success" @click="batchSend">
             <svg-icon icon-class="send" /> 批量发送
           </el-button>
-          <el-button v-if="hasPerm('bggl:reject')" type="primary" @click="batchBohui">
+          <el-button v-if="hasPerm('bggl:un-done-jybg:reject')" type="primary" @click="batchBohui">
             <svg-icon icon-class="reject" /> 批量驳回
           </el-button>
           <el-button type="success" @click="batchSign">
@@ -18,9 +18,6 @@
           <el-button type="danger" icon="el-icon-delete" @click="delReport">
             退回到记录
           </el-button>
-          <el-button v-if="$store.getters.departmentId === 68 || $store.getters.username === 'admin'" type="success" @click="batchEnd">
-            <svg-icon icon-class="send" /> 办结报告
-          </el-button>
         </div>
       </sticky>
       <el-form>
@@ -151,7 +148,7 @@
       </el-table-column>
     </el-table>
     <div>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
       <div style="float: right;margin-top:8px;">
         <div style="width: 80px;float:left;margin-left: 50px;">
           重启流程：
@@ -413,7 +410,7 @@ export default {
   components: { Sticky, Pagination, Enclosure },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -482,7 +479,7 @@ export default {
         pageRow: 20, // 每页条数
         searchYsjl: {}
       },
-      totalCountCopy: 0,
+      totalCopy: 0,
       copyNum: 1, // 复制份数
       manufacturParam: {},
       bzrQianming: false,
@@ -566,7 +563,7 @@ export default {
     },
     getList() {
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListUnDoneJybg',
         method: 'get',
         params: this.listQuery
       }).then(data => {
@@ -578,7 +575,7 @@ export default {
           }
         }
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },
@@ -1306,7 +1303,7 @@ export default {
         params: this.listQueryCopy
       }).then(data => {
         this.listCopy = data.list
-        this.totalCountCopy = data.totalCount
+        this.totalCopy = data.total
       })
     },
     handleFilterCopy() {

src/views/bggl/daiban_list.vue

@@ -1,17 +1,11 @@
 <template>
-  <boiler-db-list v-if="ifBoiler" />
+  <original-db-list />
-  <original-db-list v-else />
 </template>
 <script>
 import originalDbList from './components/original_db_list'
-import boilerDbList from './components/boiler_db_list'
+
 export default {
   name: 'TODOReport',
-  components: { originalDbList, boilerDbList },
+  components: { originalDbList }
-  data() {
-    return {
-      ifBoiler: this.$store.getters.departmentId === 75
-    }
-  }
 }
 </script>

src/views/bggl/daishen_list.vue

@@ -78,7 +78,7 @@
       </el-table-column>
     </el-table>
     <div>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
       <div style="float: right;margin-top:8px;">
         <div style="width: 80px;float:left;margin-left: 50px;">
           重启流程：
@@ -171,7 +171,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -241,7 +241,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/bggl/eliminatingred_list.vue

@@ -137,8 +137,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
+      v-show="total>0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -302,7 +302,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -365,7 +365,7 @@ export default {
     },
     getTemplateList() {
       this.api({
-        url: '/template/getAll',
+        url: '/template/all',
         method: 'get',
         params: {
           bglx: 1,
@@ -399,7 +399,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.$nextTick(() => {
           this.$refs.list.doLayout()
         })

src/views/bggl/sign_list.vue

@@ -93,8 +93,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
+      v-show="total>0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -157,7 +157,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -187,7 +187,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/bggl/yiban_list.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <sticky style="margin-bottom: 10px;">
+      <!--      <sticky style="margin-bottom: 10px;">
         <div class="sub-navbar">
           <el-button type="danger" icon="el-icon-back" @click="withDraw">
             撤回报告
           </el-button>
         </div>
-      </sticky>
+      </sticky>-->
       <el-form>
         <el-form-item>
           <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.ownRoles" placeholder="请选择所处角色" style="width: 165px" clearable @change="changeOwnRoles">
+          <el-select v-model="listQuery.flowstatus" placeholder="请选择所处角色" style="width: 165px" clearable @change="changeOwnRoles">
             <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@@ -23,15 +23,6 @@
             清空条件
           </el-button>
           <br>
-          <span class="radio-group-label">查看类型：</span>
-          <el-radio-group v-model="listQuery.createBy" @change="handleFilter">
-            <el-radio :label="$store.getters.userId">
-              只看创建人
-            </el-radio>
-            <el-radio :label="undefined">
-              全部
-            </el-radio>
-          </el-radio-group>
         </el-form-item>
       </el-form>
     </div>
@@ -101,20 +92,20 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 
 <script>
-import Sticky from '@/components/Sticky'
+// import Sticky from '@/components/Sticky'
 import Pagination from '@/components/Pagination'
 import Utils from '../../utils/contact.js'
 export default {
   name: 'OwnDoneReport',
-  components: { Sticky, Pagination },
+  components: { /* Sticky, */Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -130,15 +121,12 @@ export default {
       sbzlList: [],
       statusList: [
         {
-          value: 1,
-          label: '检验人员'
-        }, {
           value: 2,
           label: '审核人员'
-        }/*, {
+        }, {
           value: 3,
           label: '审批人员'
-        }*/
+        }
       ],
       userList: this.$store.getters.allUser,
       userId: this.$store.getters.userId
@@ -158,12 +146,12 @@ export default {
     getList() {
       this.listQuery.cjState = 'bggl'
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListDoneJybg',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/bjd/dj_create.vue

@@ -317,8 +317,8 @@
     </el-table>
     <div class="uFlex mt-10">
       <pagination
-        v-show="totalCount > 0"
+        v-show="total > 0"
-        :total="totalCount"
+        :total="total"
         :page-num.sync="listQuery.pageNum"
         :page-row.sync="listQuery.pageRow"
         @pagination="getList"
@@ -342,7 +342,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       shoppingSize: 0,
       list: [],
       listQuery: {
@@ -413,7 +413,7 @@ export default {
                 params: this.listQuery
               }).then((data) => {
                 this.list = data.list
-                this.totalCount = data.total
+                this.total = data.total
               })
             })
             .catch(() => {
@@ -421,7 +421,7 @@ export default {
             })
         } else {
           this.list = data.list
-          this.totalCount = data.total
+          this.total = data.total
         }
       })
     },

src/views/bjd/dj_input.vue

@@ -1441,8 +1441,8 @@
           </el-table-column>
         </el-table>
         <pagination
-          v-show="totalCount > 0"
+          v-show="total > 0"
-          :total="totalCount"
+          :total="total"
           :page-num.sync="listQuery.pageNum"
           :page-row.sync="listQuery.pageRow"
           @pagination="getBaseList"
@@ -1573,7 +1573,7 @@ export default {
         shidaima: '3701'
       },
       jianyanleibie: '定期检验',
-      totalCount: 0,
+      total: 0,
       baseSelection: [],
       formYJVisible: false,
       postInfo: {
@@ -1973,7 +1973,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.baseList = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     clearSearch() {

src/views/bjd/dj_list.vue

@@ -290,21 +290,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
-      v-show="totalCount > 0"
+    <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
-      :total="totalCount"
-      :page-num.sync="listQuery.pageNum"
-      :page-row.sync="listQuery.pageSize"
-      style="float: left"
-      @pagination="getList"
-    />
-    <iframe
-      :src="printbutton"
-      frameborder="0"
-      scrolling="no"
-      height="0px"
-      aria-disabled="true"
-    />
   </div>
 </template>
 
@@ -319,7 +306,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -364,7 +351,7 @@ export default {
         this.$nextTick(() => {
           this.$refs.bjdList.doLayout()
         })
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/bjd/dt_list.vue

@@ -146,7 +146,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left" @pagination="getList" />
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
   </div>
 </template>
@@ -162,7 +162,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -203,7 +203,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/bjd/jj_create.vue

@@ -106,7 +106,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 <script>
@@ -117,7 +117,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       shoppingSize: 0,
       list: [],
       listQuery: {
@@ -146,7 +146,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/bjd/jj_input.vue

@@ -616,7 +616,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="margin-top:20px" @pagination="getBaseList" />
+        <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getBaseList" />
       </el-dialog>
     </el-tabs>
     <el-dialog title="原始材料内容比对" width="98%" top="5px" :visible.sync="baseInfoContentVisible" :close-on-press-escape="false" @close="baseInfoContentVisible = false">
@@ -736,7 +736,7 @@ export default {
         shidaima: '3701'
       },
       jianyanleibie: '监督检验',
-      totalCount: 0,
+      total: 0,
       baseSelection: [],
       formYJVisible: false,
       postInfo: {
@@ -1051,7 +1051,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.baseList = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getIndex($index) {

src/views/bjd/jj_list.vue

@@ -176,7 +176,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
     <el-dialog title="修改施工联系人电话" :visible.sync="updateSgLxrDhDialog">
       <el-form ref="sgInfo" :model="sgInfo" label-width="80px" :rules="rules">
@@ -215,7 +215,7 @@ export default {
       }
     }
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -265,7 +265,7 @@ export default {
         this.$nextTick(() => {
           this.$refs.bjdList.doLayout()
         })
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/bjd/qy_list.vue

@@ -129,7 +129,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
   </div>
 </template>
@@ -145,7 +145,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -184,7 +184,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/bjd/zf_list.vue

@@ -79,7 +79,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left" @pagination="getList" />
   </div>
 </template>
 
@@ -91,7 +91,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -125,7 +125,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/chargeBill/JD/create.vue

@@ -52,7 +52,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="query.pageNum" :page-row.sync="query.pageSize" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="query.pageNum" :page-row.sync="query.pageSize" @pagination="getList" />
       <bill-add :selection="reportData" :charge-bill="chargeBill" :version="version" />
     </div>
   </div>
@@ -97,7 +97,7 @@ export default {
         payerPhone: '',
         inspectionPhone: ''
       },
-      totalCount: 0,
+      total: 0,
       reportData: []
     }
   },
@@ -130,7 +130,7 @@ export default {
         params: this.query
       }).then(data => {
         this.data = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     /**

src/views/chargeBill/ZJ/create.vue

@@ -56,7 +56,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="query.pageNum" :page-row.sync="query.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="query.pageNum" :page-row.sync="query.pageSize" @pagination="getList" />
     <bill-add :selection="selection" :charge-bill.sync="chargeBill" :disabled-unit="true" />
   </div>
 </template>
@@ -103,7 +103,7 @@ export default {
         payerPhone: '',
         inspectionPhone: ''
       },
-      totalCount: 0
+      total: 0
     }
   },
   mounted() {
@@ -174,7 +174,7 @@ export default {
         params: this.query
       }).then(data => {
         this.data = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     // 表格单击选中行

src/views/chargeBill/index.vue

@@ -163,7 +163,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <detail v-if="detailListVisible" :charge-bill="chargeBill" :data="tableDetailsList" :editor="editor" :version="version" />
     <el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogEnclosureVisible">
       <enclosure :relation-id.sync="currentRenwuId" :if-liaison="false" :view-button="false" />
@@ -232,7 +232,7 @@ export default {
       ifShowPerson: this.notHasRole('RQZZJYY') && this.notHasRole('JDJYY'),
       inspectors: [],
       list: [],
-      totalCount: 0,
+      total: 0,
       chargeBill: {},
       selection: [],
       detailListVisible: false,
@@ -476,7 +476,7 @@ export default {
         this.$nextTick(() => {
           this.$refs.list.doLayout()
         })
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     /**

src/views/chargeBill/other/create.vue

@@ -50,7 +50,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="query.pageNum" :page-row.sync="query.pageSize" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="query.pageNum" :page-row.sync="query.pageSize" @pagination="getList" />
       <bill-add :selection="selection" :charge-bill="chargeBill" :version="version" />
     </div>
   </div>
@@ -92,7 +92,7 @@ export default {
         payerPhone: '',
         inspectionPhone: ''
       },
-      totalCount: 0,
+      total: 0,
       reportData: []
     }
   },
@@ -117,7 +117,7 @@ export default {
         params: this.query
       }).then(data => {
         this.data = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     /**

src/views/chargeBill/statistic.vue

@@ -58,7 +58,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getListStatistics" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getListStatistics" />
     <statistic-detail v-if="detailListVisible" :data="tableDetailsList" />
   </div>
 </template>
@@ -92,7 +92,7 @@ export default {
       tableDetailsList: [],
       chanpinshuliang: 0,
       totalAmount: 0,
-      totalCount: 0
+      total: 0
     }
   },
   watch: {
@@ -164,7 +164,7 @@ export default {
         }
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.chanpinshuliang = this.getSummaries(this.list, 'chanpinshuliang')
         this.totalAmount = this.getSummaries(this.list, 'totalAmount')
         //  刷新el-table防止表头错位

src/views/chargeBill/task.vue

@@ -43,7 +43,7 @@
       <el-table-column :formatter="formatter.getChineseName" align="center" prop="shenpiren" label="审批人" />
       <el-table-column align="center" prop="shenpiriqi" label="审批时间" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
   </div>
 </template>
 <script>
@@ -68,7 +68,7 @@ export default {
         pageSize: 20 // 每页条数
       },
       list: [],
-      totalCount: 0
+      total: 0
     }
   },
   created() {
@@ -85,7 +85,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     /**

src/views/chargeTask/db_list.vue

@@ -80,7 +80,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
       <el-dialog title="核价" :visible.sync="dialogFormVisible" @close="closeDialog">
         <el-form ref="chargeTaskYsjl" :model="chargeTaskYsjl" :rules="rules" label-width="100px">
           <!--          <el-row :gutter="10">
@@ -203,7 +203,7 @@ export default {
         renlingren: this.$store.getters.userId,
         flowstatus: 1
       },
-      totalCount: 0,
+      total: 0,
       dialogFormVisible: false,
       chargeTaskYsjl: {},
       biliOptions: ['0.4', '0.5', '0.6', '0.7', '0.8', '0.9', '1'],
@@ -244,7 +244,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/chargeTask/yb_list.vue

@@ -70,7 +70,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
       <el-dialog title="详情" :visible.sync="dialogFormVisible" @close="closeDialog">
         <el-form ref="chargeTaskYsjl" :model="chargeTaskYsjl" label-width="100px">
           <!--          <el-row :gutter="10">
@@ -168,7 +168,7 @@ export default {
         jianyanrenyuan: this.$store.getters.userId,
         flowstatus: 2
       },
-      totalCount: 0,
+      total: 0,
       dialogFormVisible: false,
       chargeTaskYsjl: {}
     }
@@ -187,7 +187,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/dashboard/components/SubmoduleTable.vue

@@ -47,7 +47,7 @@
         />
       </template>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="query.pageNum" :page-row.sync="query.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="query.pageNum" :page-row.sync="query.pageRow" @pagination="getList" />
   </div>
 </template>
 <script>
@@ -74,7 +74,7 @@ export default {
         }
       }
     },
-    totalCount: {
+    total: {
       type: Number,
       default: 0,
       required: true

src/views/dashboard/index.vue

@@ -58,7 +58,7 @@
         :name="name"
         :list="bodyDetailsList"
         :query="listQuery"
-        :total-count="totalCount"
+        :total-count="total"
         :col-configs="columnList"
         @getBodyDetailsLists="getBodyDetailsLists"
       />
@@ -93,7 +93,7 @@ export default {
         pageRow: 20, // 每页条数
         searchYsjl: {}
       },
-      totalCount: 0,
+      total: 0,
       barChartData: {
         axis: [],
         list: []
@@ -152,7 +152,7 @@ export default {
         case '我的任务':
           getOwnList(query).then(data => {
             this.bodyDetailsList = data.list
-            this.totalCount = data.totalCount
+            this.total = data.total
             this.getColumn('MyTask')
           })
           break
@@ -166,7 +166,7 @@ export default {
           }
           getNeedRecordList(query).then((data) => {
             this.bodyDetailsList = data.list
-            this.totalCount = data.totalCount
+            this.total = data.total
             this.getColumn('TODOYsjl')
           })
           break
@@ -181,7 +181,7 @@ export default {
             hasFinish: false
           }).then((data) => {
             this.bodyDetailsList = data.list
-            this.totalCount = data.totalCount
+            this.total = data.total
             this.getColumn('TODOReport')
           })
           break
@@ -194,7 +194,7 @@ export default {
           query.searchYsjl.printState = 0
           getNeedRecordList(query).then((data) => {
             this.bodyDetailsList = data.list
-            this.totalCount = data.totalCount
+            this.total = data.total
             this.getColumn('PrintReport')
           })
           break
@@ -209,7 +209,7 @@ export default {
           query.searchYsjl.flowstatus = 4
           getNeedRecordList(query).then((data) => {
             this.bodyDetailsList = data.list
-            this.totalCount = data.totalCount
+            this.total = data.total
             this.getColumn('PrintReport')
           })
           break

src/views/dic/category.vue

@@ -93,8 +93,8 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="totalCount > 0"
+            v-show="total > 0"
-            :total="totalCount"
+            :total="total"
             :page-num.sync="listQuery.pageNum"
             :page-row.sync="listQuery.pageSize"
             @pagination="getList"
@@ -231,7 +231,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       subList: [],
       list: [], // 表格的数据
       listQuery: {
@@ -268,7 +268,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/dic/dic_data.vue

@@ -47,7 +47,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="tempDicData" :model="tempDicData" class="small-space" label-position="left" label-width="120px" style="width: 300px; margin-left:50px;">
         <el-form-item label="字典类型" prop="typeId" required>
@@ -97,7 +97,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -135,7 +135,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.spanArr = []
         this.getSpanArr(this.list)
       })

src/views/dic/dic_type.vue

@@ -106,8 +106,8 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="totalCount > 0"
+            v-show="total > 0"
-            :total="totalCount"
+            :total="total"
             :page-num.sync="listQuery.pageNum"
             :page-row.sync="listQuery.pageSize"
             @pagination="getList"
@@ -192,7 +192,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="subtotalCount>0" :total="subtotalCount" :page-num.sync="sublistQuery.pageNum" :page-row.sync="sublistQuery.pageSize" @pagination="getsubList" />
+          <pagination v-show="subtotal>0" :total="subtotal" :page-num.sync="sublistQuery.pageNum" :page-row.sync="sublistQuery.pageSize" @pagination="getsubList" />
         </el-card>
       </el-col>
     </el-row>
@@ -284,7 +284,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       sublist: [],
       listQuery: {
@@ -307,7 +307,7 @@ export default {
       multipleSelection: [],
       dicTypeList: [],
       dicDataList: [],
-      subtotalCount: 0,
+      subtotal: 0,
       tempDicData: {
 
       }
@@ -326,7 +326,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getAllDicData() {
@@ -344,7 +344,7 @@ export default {
         params: this.sublistQuery
       }).then((data) => {
         this.sublist = data.list
-        this.subtotalCount = data.total
+        this.subtotal = data.total
         this.spanArr = []
         this.getSpanArr(this.list)
       })

src/views/dic/dic_xinghao.vue

@@ -91,7 +91,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog title="添加型号" :visible.sync="dialogFormVisible">
       <el-form ref="tempDicXinghao" :model="tempDicXinghao" class="small-space" label-position="left" label-width="100px">
         <el-row :gutter="20">
@@ -166,7 +166,7 @@ export default {
   data() {
     return {
       isSystem: this.$store.getters.clientType === 'System',
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -225,7 +225,7 @@ export default {
           this.$set(v, 'originalJiandingbaogaobianhao', v.jiandingbaogaobianhao)
         })
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {
@@ -235,7 +235,7 @@ export default {
         this.getList()
       } else {
         this.list = []
-        this.totalCount = 0
+        this.total = 0
       }
     },
     onRowClick(row) {

src/views/dwxx/examine.vue

@@ -44,7 +44,7 @@
       </el-table-column>
     </el-table>
     <div>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
     </div>
     <!--申请处理：审核、驳回-->
     <el-dialog title="申请处理" :visible.sync="dialogFormVisible" width="70%" top="10px" @close="closeDialog">
@@ -62,7 +62,7 @@ export default {
   data() {
     const isGlZz = this.hasRole('GLZZJYY') || this.hasRole('GLZZKZ')
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       isGlZz: isGlZz,
       listQuery: {
@@ -151,7 +151,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getInspectorsList() {

src/views/dwxx/list.vue

@@ -66,7 +66,7 @@
       </el-table-column>
     </el-table>
     <div>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
       <div style="float: right;margin-top:8px;">
         <div style="width: 50px;float:left;margin-left: 20px;">
           预警：
@@ -100,7 +100,7 @@ export default {
     const isRQZZJYY = (this.$store.getters.departmentId === 84 && this.hasRole('RQZZJYY')) || this.hasRole('WZHM')
     const getJudge = (this.$store.getters.departmentId === 74 && this.hasRole('GLZZJYY')) || isRQZZJYY
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -191,7 +191,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/dwxx/reviewed.vue

@@ -89,7 +89,7 @@
       </el-table-column>
     </el-table>
     <div>
-      <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
     </div>
     <!--申请处理：审核、驳回-->
     <el-dialog title="申请处理" :visible.sync="dialogFormVisible" width="70%" top="10px" @close="closeDialog">
@@ -108,7 +108,7 @@ export default {
   data() {
     const isGlZz = this.hasRole('GLZZJYY') || this.hasRole('GLZZKZ')
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       isGlZz: isGlZz,
       listQuery: {
@@ -198,7 +198,7 @@ export default {
         }
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getInspectorsList() {

src/views/finance/djList.vue

@@ -102,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="收费详细页" @close="closeDialog">
       <el-form ref="charge" :model="charge" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -188,7 +188,7 @@ export default {
   components: { Sticky, Pagination, InvoiceCreate },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -249,7 +249,7 @@ export default {
         params: paramList
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/jfjd_list.vue

@@ -124,7 +124,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 <script>
@@ -137,7 +137,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -187,7 +187,7 @@ export default {
         params: paramList
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/jjList.vue

@@ -90,7 +90,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="收费详细页" @close="closeDialog">
       <el-form ref="charge" :model="charge" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -176,7 +176,7 @@ export default {
   components: { Sticky, Pagination, InvoiceCreate },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -237,7 +237,7 @@ export default {
         params: paramList
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/web_jfdqr_list.vue

@@ -80,7 +80,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog title="驳回当前收费单" :modal-append-to-body="false" :visible.sync="dialogFileStateVisible" width="450px" @close="dialogFileStateVisible = false">
       <el-form ref="form" :model="bill" label-width="80px">
         <el-form-item label="驳回原因">
@@ -105,7 +105,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       listQuery: {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
@@ -143,7 +143,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/web_sfdsf_list.vue

@@ -73,7 +73,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="添加缴费码详情" @close="closeDialog">
       <el-form ref="bjd" :model="bjd" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -177,7 +177,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         toCharge: true,
@@ -217,7 +217,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/web_xxsfd_list.vue

@@ -79,7 +79,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog title="驳回当前收费单" :modal-append-to-body="false" :visible.sync="dialogFileStateVisible" width="450px" @close="dialogFileStateVisible = false">
       <el-form ref="form" :model="bill" label-width="80px">
         <el-form-item label="驳回原因">
@@ -127,7 +127,7 @@ export default {
   components: { Sticky, Pagination, Detail },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       listQuery: {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
@@ -176,7 +176,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/wsf_list.vue

@@ -50,7 +50,7 @@
       <el-table-column align="center" label="受理日期" prop="shouliriqi" width="100" />
       <el-table-column :formatter="formatter.moneyFormat" align="center" label="检验员核定（总）" prop="sumJine" width="140" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="添加缴费码详情" @close="closeDialog">
       <el-form ref="bjd" :model="bjd" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -119,7 +119,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -148,7 +148,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/ycdw_list.vue

@@ -50,7 +50,7 @@
       <el-table-column align="center" label="受理日期" prop="shouliriqi" width="100" />
       <el-table-column :formatter="formatter.moneyFormat" align="center" label="检验员核定（总）" prop="sumJine" width="140" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="添加缴费码详情" @close="closeDialog">
       <el-form ref="bjd" :model="bjd" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -119,7 +119,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -148,7 +148,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/ysf_list.vue

@@ -50,7 +50,7 @@
       <el-table-column align="center" label="受理日期" prop="shouliriqi" width="100" />
       <el-table-column :formatter="formatter.moneyFormat" align="center" label="检验员核定（总）" prop="sumJine" width="140" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="添加缴费码详情" @close="closeDialog">
       <el-form ref="bjd" :model="bjd" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -119,7 +119,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -148,7 +148,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/finance/zzList.vue

@@ -90,7 +90,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog :visible.sync="chargeFormVisible" title="收费详细页" @close="closeDialog">
       <el-form ref="charge" :model="charge" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="18">
@@ -176,7 +176,7 @@ export default {
   components: { Sticky, Pagination, InvoiceCreate },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       chargeFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -238,7 +238,7 @@ export default {
         params: paramList
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/flow/definition.vue

@@ -123,8 +123,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
+      v-show="total > 0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageSize"
       @pagination="getList"
@@ -297,7 +297,7 @@ export default {
   data() {
     return {
       active: 1,
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -369,7 +369,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.spanArr = []
         this.getSpanArr(this.list)
       })

src/views/flow/detail.vue

@@ -137,8 +137,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
+      v-show="total > 0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -229,7 +229,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       drawer: false,
       dialogVisible: false,
@@ -330,7 +330,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getDemoList() {

src/views/flow/link.vue

@@ -37,7 +37,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <!--打开录入框-->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="formlink" :model="formlink" class="small-space" label-position="left" label-width="80px" style="width: 500px; margin-left:50px;">
@@ -78,7 +78,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -109,7 +109,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getBglxList() {

src/views/flow/message.vue

@@ -39,7 +39,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="tempMessage" :model="tempMessage" class="small-space" label-position="left" label-width="120px" style="width: 300px; margin-left:50px;">
         <el-form-item label="消息标题" prop="title" required>
@@ -82,7 +82,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -113,7 +113,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     getIndex($index) {

src/views/flow/restart.vue

@@ -125,8 +125,8 @@
     </el-table>
 
     <pagination
-      v-show="totalCount>0"
+      v-show="total>0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageSize"
       style="float: left;"
@@ -526,7 +526,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -579,7 +579,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     withdrawApply(item) {

src/views/flow/template.vue

@@ -199,8 +199,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
+      v-show="total > 0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -259,7 +259,7 @@ export default {
   components: { Pagination, drawerDialog },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -350,7 +350,7 @@ export default {
       }).then((data) => {
         this.list = data.list
         console.log(data, '返回参数')
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSblbList(val) {

src/views/invoice/list.vue

@@ -72,7 +72,7 @@
       </el-table-column>
       <el-table-column align="center" label="作废原因" prop="zfShuoming" mini-width="200" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 <script>
@@ -83,7 +83,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -112,7 +112,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     onRowClick(row) {

src/views/invoice/toBeInvoiced.vue

@@ -64,7 +64,7 @@
       <el-table-column align="center" label="发票个数" prop="fpCount" />
       <el-table-column align="center" label="开票金额" prop="fpJine" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <invoice-create :fapiao-info.sync="fapiaoInfo" :fapiao-list-visible.sync="fapiaoListVisible" />
   </div>
 </template>
@@ -78,7 +78,7 @@ export default {
   components: { Sticky, Pagination, InvoiceCreate },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       fapiaoFormVisible: false,
       listQuery: {
         pageNum: 1, // 页码
@@ -129,7 +129,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     onRowClick(row) {

src/views/liaison/list.vue

@@ -65,7 +65,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" style="float: left;" @pagination="getList" />
     <!--选择文件类型-->
     <el-dialog title="文件类型" :visible.sync="dialogVisibleType" width="20%">
       <el-button type="warning" plain @click="setLiaisonTpye(true)">
@@ -218,7 +218,7 @@ export default {
         inspector: this.ifClientType ? this.$store.getters.userId : ''
       },
       workItemQuerys: [],
-      totalCount: 0,
+      total: 0,
       manufacturerList: [],
       dialogStatus: '',
       liaison: {},
@@ -269,7 +269,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     /**

src/views/monitor/log_error.vue

@@ -28,7 +28,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
 
     <el-dialog title="异常详情" :visible.sync="dialog">
       <el-form :model="row">
@@ -82,7 +82,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1,
@@ -107,7 +107,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/monitor/log_info.vue

@@ -100,8 +100,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
+      v-show="total > 0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -159,7 +159,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       row: {},
       dialogFormVisible: false,
@@ -194,7 +194,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     checkDetail(row) {

src/views/monitor/online.vue

@@ -54,7 +54,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 
@@ -65,7 +65,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1,
@@ -85,7 +85,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/monitor/redis.vue

@@ -41,7 +41,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 
@@ -52,7 +52,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1,
@@ -71,7 +71,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/print/1000/grant_create.vue

@@ -120,7 +120,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="handleFilter" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -145,13 +145,12 @@ export default {
   components: { Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
@@ -198,12 +197,11 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -327,7 +325,7 @@ export default {
           }
         }
       }).then(data => {
-        if (data.totalCount !== 0) {
+        if (data.total !== 0) {
           this.$message({
             type: 'warning',
             message: '该单位名下存在未收费的检验项，请确认后在进行操作！'

src/views/print/1000/grant_list_yff.vue

@@ -80,7 +80,7 @@
       <el-table-column align="center" label="检验结论" prop="jianyanjielun" width="80" />
       <el-table-column align="center" label="发放日期" prop="fafangTime" width="120" fixed="right" />
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 
@@ -91,13 +91,12 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
@@ -143,12 +142,11 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -168,8 +166,7 @@ export default {
     },
     clearQuery() {
       this.listQuery = {
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,

src/views/print/1000/print_list.vue

@@ -42,11 +42,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -54,14 +54,14 @@
             清空
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
             <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
-          <el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
           <span class="radio-group-label">发放状态：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.fafangState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
             <el-radio :label="0">
               未发放
             </el-radio>
@@ -137,7 +137,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="handleFilter" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -153,20 +153,16 @@ export default {
   components: { Sticky, Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
-        hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
         shebeizhongleidaima: '1000',
         fafangState: 0
-        }
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -199,17 +195,16 @@ export default {
     },
     getList() {
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListPrint',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -260,7 +255,6 @@ export default {
       })
     },
     batchToPrint(type) {
-      const ysjl = this.multipleSelection[0]
       if (this.multipleSelection.length === 0) {
         this.$message('请选择单条或者多条设备进行打印。')
         return false
@@ -280,27 +274,6 @@ export default {
           return false
         }
       }
-      this.api({ // 记录打印详细，不做打印状态改变。
-        url: '/ysjl/getListBanjie',
-        method: 'get',
-        params: {
-          pageNum: 1,
-          pageRow: 20,
-          searchYsjl: {
-            baogaobianhao: '(' + new Date().getFullYear() + ')',
-            shiyongdanwei: ysjl.shiyongdanwei,
-            jfState: false,
-            shebeizhongleidaima: '1000'
-          }
-        }
-      }).then(data => {
-        if (data.totalCount !== 0) {
-          this.$message({
-            type: 'warning',
-            message: '该单位名下存在未收费的检验项，请确认后在进行操作！'
-          })
-          return false
-        } else {
       this.preview({
         url: '/print/createXml',
         method: 'post',
@@ -329,13 +302,16 @@ export default {
           })
         }
       })
-        }
-      })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.$set(this, 'listQuery', {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        orderBy: 'id desc', // 排序字段
+        hasChild: false,
+        flowstatus: undefined,
         shebeizhongleidaima: '1000',
-        printState: 0
+        fafangState: 0
       })
       this.getList()
     },

src/views/print/2000/print_list.vue

@@ -42,11 +42,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -54,11 +54,11 @@
             清空
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
-          <el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
           <span class="radio-group-label">发放状态：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.fafangState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
             <el-radio :label="0">
               未发放
             </el-radio>
@@ -134,7 +134,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="handleFilter" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -150,21 +150,16 @@ export default {
   components: { Sticky, Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
-        hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
         shebeizhongleidaima: '2000',
-          jianyanleibie: 'DJ',
         fafangState: 0
-        }
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -197,17 +192,16 @@ export default {
     },
     getList() {
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListPrint',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -315,9 +309,14 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.$set(this, 'listQuery', {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        orderBy: 'id desc', // 排序字段
+        hasChild: false,
+        flowstatus: undefined,
         shebeizhongleidaima: '2000',
-        printState: 0
+        fafangState: 0
       })
       this.getList()
     },

src/views/print/3000/print_list.vue

@@ -45,11 +45,11 @@
       </sticky>
       <el-form ref="testrefprint">
         <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.weibaodanwei" placeholder="维保单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.weibaodanwei" placeholder="维保单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -57,15 +57,15 @@
             清空
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
             <el-option v-for="item in jylbList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
-          <el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
           <span class="radio-group-label">打印状态：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.printState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.printState" @change="handleFilter">
             <el-radio :label="0">
               未打印
             </el-radio>
@@ -125,7 +125,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="getList" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -143,18 +143,15 @@ export default {
   components: { Sticky, Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       fafangListTable: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
         shebeizhongleidaima: '3000',
         printState: 0
-        }
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -206,17 +203,16 @@ export default {
     },
     getList() {
       this.api({
-        url: '/report/getList',
+        url: '/ysjl/getListPrint',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -322,7 +318,10 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.$set(this, 'listQuery', {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        orderBy: 'id desc', // 排序字段
         shebeizhongleidaima: '3000',
         printState: 0
       })

src/views/print/4000/print_list.vue

@@ -60,11 +60,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -72,14 +72,14 @@
             清空
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
             <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.name" />
           </el-select>
-          <el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
           <span class="radio-group-label">打印状态：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.printState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.printState" @change="handleFilter">
             <el-radio :label="0">
               未打印
             </el-radio>
@@ -140,7 +140,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="handleFilter" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -158,17 +158,14 @@ export default {
   components: { Sticky, Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
         shebeizhongleidaima: '4000',
         printState: 0
-        }
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -213,17 +210,16 @@ export default {
     },
     getList() {
       this.api({
-        url: '/report/getList',
+        url: '/ysjl/getListPrint',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -313,7 +309,10 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.$set(this, 'listQuery', {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        orderBy: 'id desc', // 排序字段
         shebeizhongleidaima: '4000',
         printState: 0
       })

src/views/print/5000/print_list.vue

@@ -42,11 +42,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -54,14 +54,14 @@
             清空
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
             <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
-          <el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
           <span class="radio-group-label">打印状态：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.printState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.printState" @change="handleFilter">
             <el-radio :label="0">
               未打印
             </el-radio>
@@ -120,7 +120,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="handleFilter" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -137,17 +137,14 @@ export default {
   components: { Sticky, Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
         shebeizhongleidaima: '5000',
         printState: 0
-        }
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -186,17 +183,16 @@ export default {
     },
     getList() {
       this.api({
-        url: '/report/getList',
+        url: '/ysjl/getListPrint',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -302,7 +298,10 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.$set(this, 'listQuery', {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        orderBy: 'id desc', // 排序字段
         shebeizhongleidaima: '5000',
         printState: 0
       })

src/views/print/8000/print_list.vue

@@ -127,7 +127,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <sign-info v-if="fafangVisible" :fafanglisttable="multipleSelection" @closeFafang="fafangVisible = false" @refulshList="handleFilter" />
     <!-- 高级查询窗口 -->
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -144,13 +144,12 @@ export default {
   components: { Sticky, Pagination, SignInfo },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
@@ -188,17 +187,16 @@ export default {
     },
     getList() {
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListPrint',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
-      this.listQuery.sort = column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -298,13 +296,14 @@ export default {
     },
     clearQuery() {
       this.listQuery = {
-        shebeizhongleidaima: '8000',
+        pageNum: 1, // 页码
-        printState: 0,
+        pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
+        orderBy: 'id desc', // 排序字段
-        sort: 'desc', // 排序方式
         hasChild: false,
         hasFinish: true,
-        flowstatus: undefined
+        flowstatus: undefined,
+        shebeizhongleidaima: '8000',
+        fafangState: 0
       }
       this.getList()
     },

src/views/print/grant/grant_list_chengya.vue

@@ -66,7 +66,7 @@
       <el-table-column align="center" :formatter="formatter.getChineseName" label="检验员" prop="jianyanrenyuan" />
       <el-table-column align="center" label="发放日期" prop="createTime" />
     </el-table>
-    <pagination v-show="totalCount > 0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
   </div>
 </template>
 
@@ -83,10 +83,9 @@ export default {
       listQuery: {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
-        orderBy: 'create_time desc', // 排序字段
+        orderBy: 'create_time desc' // 排序字段
-        sort: 'desc' // 排序方式
       },
-      totalCount: 0,
+      total: 0,
       list: [],
       flowUserList: [],
       dialogFormVisible: false,
@@ -133,7 +132,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/print/grant/grant_list_jidian.vue

@@ -55,7 +55,7 @@
       <el-table-column align="center" label="发票号码" prop="lingqurenDianhua" />
       <el-table-column align="center" label="发放日期" prop="createTime" />
     </el-table>
-    <pagination v-show="totalCount > 0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
   </div>
 </template>
 
@@ -72,10 +72,9 @@ export default {
       listQuery: {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
-        orderBy: 'create_time desc', // 排序字段
+        orderBy: 'create_time desc' // 排序字段
-        sort: 'desc' // 排序方式
       },
-      totalCount: 0,
+      total: 0,
       list: [],
       flowUserList: [],
       dialogFormVisible: false,
@@ -124,7 +123,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.sumTaishu = this.getSummaries('taishu', this.list)
         this.sumJine = this.getSummaries('hejijine', this.list)
       })

src/views/print/grant_list.vue

@@ -56,7 +56,7 @@
       <el-table-column align="center" label="台数" prop="taishu" />
       <el-table-column align="center" label="交费金额(元)" prop="hejijine" />
     </el-table>
-    <pagination v-show="totalCount > 0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
   </div>
 </template>
 
@@ -73,10 +73,9 @@ export default {
       listQuery: {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
-        orderBy: 'create_time desc', // 排序字段
+        orderBy: 'create_time desc' // 排序字段
-        sort: 'desc' // 排序方式
       },
-      totalCount: 0,
+      total: 0,
       list: [],
       flowUserList: [],
       dialogFormVisible: false,
@@ -124,7 +123,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.sumTaishu = this.getSummaries('taishu', this.list)
         this.sumJine = this.getSummaries('hejijine', this.list)
       })

src/views/search/list.vue

@@ -132,7 +132,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </div>
 </template>
 
@@ -144,7 +144,7 @@ export default {
   data() {
     return {
       list: [],
-      totalCount: 0,
+      total: 0,
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
@@ -185,7 +185,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getSbzlList() {

src/views/statistics/filing.vue

@@ -37,7 +37,7 @@
       <el-pagination
         :current-page="listQuery.pageNum"
         :page-size="listQuery.pageRow"
-        :total="totalCount"
+        :total="total"
         :page-sizes="[10, 20, 40, 100]"
         background
         layout="total, sizes, prev, pager, next, jumper"
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       exportData: [], // 归档报告
-      totalCount: 1, // 分页组件--数据总条数
+      total: 1, // 分页组件--数据总条数
       listQuery: {
         pageNum: 1,
         pageRow: 10
@@ -75,7 +75,7 @@ export default {
     handleFilter() {
       getStaticsList(this.listQuery).then((data) => {
         this.exportData = data.filingReports
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     clearQuery() {

src/views/statistics/gldj.vue

@@ -104,8 +104,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
+      v-show="total>0"
-      :total="totalCount"
+      :total="total"
       :page-num.sync="listQuery.pageNum"
       :page-row.sync="listQuery.pageRow"
       @pagination="getList"
@@ -121,7 +121,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -167,7 +167,7 @@ export default {
         hasChild: false,
         hasFinish: true
       },
-      totalCountExport: 0,
+      totalExport: 0,
       outFile: '', // 导出文件el
       jianyanrenyuanmingcheng: '',
       departmentName: '',
@@ -196,7 +196,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },

src/views/task/list.vue

@@ -110,7 +110,7 @@
         <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
       </template>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
 
     <el-dialog :title="textMap[category]" :visible.sync="dialogFormVisible" @close="closeDialog">
       <el-row style="margin-bottom: 15px;">
@@ -207,7 +207,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalCount>0" :total="totalCountCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
+      <pagination v-show="total>0" :total="totalCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
     </el-dialog>
   </div>
 </template>
@@ -231,9 +231,9 @@ export default {
   },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
-      totalCountCopy: 0,
+      totalCopy: 0,
       listCopy: [],
       sbzlList: [],
       sblbList: [],
@@ -311,7 +311,7 @@ export default {
     getList() {
       getOwnList(this.listQuery).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     getListCopy() {
@@ -325,7 +325,7 @@ export default {
         params: this.listQueryCopy
       }).then(data => {
         this.listCopy = data.list
-        this.totalCountCopy = data.totalCount
+        this.totalCopy = data.total
       })
     },
     onDialogRowClick(row) {

src/views/tool/quartz.vue

@@ -71,7 +71,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <!--Form表单-->
     <el-dialog :visible.sync="dialog" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px" @close="closeDialog">
       <el-form ref="quartzForm" :model="quartzForm" size="small" label-width="100px">
@@ -123,7 +123,7 @@ export default {
   components: { Pagination, QuartzLog },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1,
@@ -146,7 +146,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/tool/quartz_log.vue

@@ -41,7 +41,7 @@
         {{ errorInfo }}
       </span>
     </el-dialog>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
   </el-dialog>
 </template>
 
@@ -51,7 +51,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1,
@@ -76,7 +76,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     info(errorInfo) {

src/views/user/department.vue

@@ -43,7 +43,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closeDialog">
       <el-form ref="tempDepartment" :model="tempDepartment" class="small-space" label-width="80px">
         <el-form-item label="部门名称" required>
@@ -114,7 +114,7 @@ export default {
   data() {
     return {
       list: [],
-      totalCount: 0,
+      total: 0,
       dialogStatus: 'create',
       dialogFormVisible: false,
       listQuery: {

src/views/user/user.vue

@@ -268,7 +268,7 @@ export default {
       ],
       treeData: [],
       filterText: '',
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1,
@@ -349,7 +349,7 @@ export default {
         params: this.listQuery
       }).then((data) => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleNodeClick(data) {

src/views/user/version.vue

@@ -31,7 +31,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-alert title="内容如果为多条，需要以中文符号句号（。）结尾。例如：优化了A。优化了B。" type="info" close-text="知道了" />
       <el-form ref="tempVersion" :model="tempVersion" class="small-space" label-position="left" label-width="150px" style="width: 300px; margin-left:50px; margin-top: 10px;">
@@ -79,7 +79,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      totalCount: 0, // 分页组件--数据总条数
+      total: 0, // 分页组件--数据总条数
       list: [], // 表格的数据
       listQuery: {
         pageNum: 1, // 页码
@@ -106,7 +106,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     handleFilter() {

src/views/ysjl/2000/sfqk.vue

@@ -12,15 +12,6 @@
             查询
           </el-button>
           <br>
-          <span class="radio-group-label">查看类型：</span>
-          <el-radio-group v-model="listQuery.printStatus" @change="handleFilter">
-            <el-radio :label="!isPrint">
-              未打印
-            </el-radio>
-            <el-radio :label="isPrint">
-              已打印
-            </el-radio>
-          </el-radio-group>
         </el-form-item>
       </el-form>
     </div>
@@ -61,7 +52,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog title="收费单详情列表" width="70%" :visible.sync="sfdListVisible" @close="sfdListVisible = false">
       <el-form>
         <el-form-item>
@@ -153,7 +144,7 @@ export default {
         printStatus: false
       },
       tableDetailsList: [], // 收费通知单详情列表
-      totalCount: 0,
+      total: 0,
       isPrint: true,
       sfd: {},
       sfdListVisible: false,
@@ -302,7 +293,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
       })
     },
     /**