diff --git a/.env.production b/.env.production
index 99b00d4..1953fee 100644
--- a/.env.production
+++ b/.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/'
diff --git a/.env.test b/.env.test
index abe1fde..135c37a 100644
--- a/.env.test
+++ b/.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/'
diff --git a/src/api/ysjl.js b/src/api/ysjl.js
index 45b9a59..28fcb06 100644
--- a/src/api/ysjl.js
+++ b/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 }),
diff --git a/src/components/Crud/index.vue b/src/components/Crud/index.vue
index f6b888b..955cdab 100644
--- a/src/components/Crud/index.vue
+++ b/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.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0
+      this.allColumnsSelected = selectedCount === total
+      this.allColumnsSelectedIndeterminate = selectedCount !== total && selectedCount !== 0
     },
     toggleSearch() {
       this.crud.props.searchToggle = !this.crud.props.searchToggle
diff --git a/src/components/Notice/message.vue b/src/components/Notice/message.vue
index b8cb5cf..5141c3c 100644
--- a/src/components/Notice/message.vue
+++ b/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
diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index b6a0964..a55b733 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -356,8 +356,8 @@
                 </el-table>
                 <div class="bottomPage">
                   <pagination
-                    v-show="totalCount > 0"
-                    :total="totalCount"
+                    v-show="total > 0"
+                    :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"
-                    :total="totalCount1"
+                    v-show="total1 > 0"
+                    :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) {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index c7a19c8..ad50e78 100644
--- a/src/layout/components/AppMain.vue
+++ b/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: {
diff --git a/src/permission.js b/src/permission.js
index 626a9dd..3ec0733 100644
--- a/src/permission.js
+++ b/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
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 523cae4..89bea35 100644
--- a/src/store/modules/user.js
+++ b/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
               })
             })
           }
diff --git a/src/views/allot/components/chengya_list.vue b/src/views/allot/components/chengya_list.vue
index ced7838..8409d42 100644
--- a/src/views/allot/components/chengya_list.vue
+++ b/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
       })
     },
diff --git a/src/views/allot/components/jidian_list.vue b/src/views/allot/components/jidian_list.vue
index bb3b307..c04dada 100644
--- a/src/views/allot/components/jidian_list.vue
+++ b/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
       })
     },
diff --git a/src/views/allot/hasAllot.vue b/src/views/allot/hasAllot.vue
index 055cc1f..2cc02ff 100644
--- a/src/views/allot/hasAllot.vue
+++ b/src/views/allot/hasAllot.vue
@@ -260,13 +260,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>
 
@@ -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
       })
     },
diff --git a/src/views/allot/project.vue b/src/views/allot/project.vue
index fbeea66..5602d20 100644
--- a/src/views/allot/project.vue
+++ b/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,
-      totalCountBase: 0,
+      total: 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) {
diff --git a/src/views/allot/rwd_list.vue b/src/views/allot/rwd_list.vue
index 64d1a21..eb839d6 100644
--- a/src/views/allot/rwd_list.vue
+++ b/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
       })
     },
diff --git a/src/views/allot/team_list.vue b/src/views/allot/team_list.vue
index cb23d36..8c0e311 100644
--- a/src/views/allot/team_list.vue
+++ b/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
       })
     },
diff --git a/src/views/allot/tuihui_list.vue b/src/views/allot/tuihui_list.vue
index 34c987c..3d05402 100644
--- a/src/views/allot/tuihui_list.vue
+++ b/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">
-        <template slot-scope="scope">
+      <el-table-column align="center" label="序号" width="60" type="index">
+        <!-- <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
diff --git a/src/views/archive/list.vue b/src/views/archive/list.vue
index d4a7e85..678e803 100644
--- a/src/views/archive/list.vue
+++ b/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
       })
     },
     // 获取设备种类列表方法
diff --git a/src/views/assign/hasAssign.vue b/src/views/assign/hasAssign.vue
index 6fb83e9..d6f5631 100644
--- a/src/views/assign/hasAssign.vue
+++ b/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
       })
     },
diff --git a/src/views/assign/list.vue b/src/views/assign/list.vue
index 9d58dbc..3c7ca0e 100644
--- a/src/views/assign/list.vue
+++ b/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
       })
     },
diff --git a/src/views/assign/missionList.vue b/src/views/assign/missionList.vue
index d1618fa..60637ae 100644
--- a/src/views/assign/missionList.vue
+++ b/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) {
diff --git a/src/views/assign/old_list.vue b/src/views/assign/old_list.vue
index 350b411..dd60edf 100644
--- a/src/views/assign/old_list.vue
+++ b/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
       })
     },
diff --git a/src/views/audit/list.vue b/src/views/audit/list.vue
index 38a71d4..e8f34bd 100644
--- a/src/views/audit/list.vue
+++ b/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)
       })
     },
diff --git a/src/views/bggl/banjie_list.vue b/src/views/bggl/banjie_list.vue
index f5ebda6..778231b 100644
--- a/src/views/bggl/banjie_list.vue
+++ b/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"
-      :total="totalCount"
+      v-show="total>0"
+      :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', // 排序字段
-        sort: 'desc', // 排序方式
-        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
-        hasChild: true,
-        hasFinish: true
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
+        hasChild: true
       },
       multipleSelection: [],
       dialogQueryVisible: false,
@@ -564,15 +552,13 @@ export default {
       listQueryExport: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'shenpiriqi desc,id', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
         searchYsjl: {
           createBy: this.$store.getters.userId
         },
-        hasChild: false,
-        hasFinish: true
+        hasChild: false
       },
-      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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -902,11 +887,8 @@ export default {
       this.listQuery = {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'shenpiriqi desc,id', // 排序字段
-        sort: 'desc', // 排序方式
-        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
-        hasChild: true,
-        hasFinish: true
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
+        hasChild: true
       }
       this.getList()
     },
diff --git a/src/views/bggl/components/boiler_db_list.vue b/src/views/bggl/components/boiler_db_list.vue
deleted file mode 100644
index 564abea..0000000
--- a/src/views/bggl/components/boiler_db_list.vue
+++ /dev/null
@@ -1,1213 +0,0 @@
-<!--锅炉科室报告录入-->
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <sticky style="margin-bottom: 10px;">
-        <div class="sub-navbar">
-          <el-button type="success" @click="batchSend">
-            <svg-icon icon-class="send" /> 批量发送
-          </el-button>
-          <el-button type="primary" @click="batchSign">
-            <svg-icon icon-class="sign" /> 批量签名
-          </el-button>
-          <el-button type="warning" @click="clearSignName">
-            <svg-icon icon-class="clear" /> 清空签名
-          </el-button>
-          <el-button type="danger" icon="el-icon-delete" @click="delReport">
-            退回到记录
-          </el-button>
-          <!--<el-button type="primary" @click="createNewReport">新建安全阀</el-button>-->
-        </div>
-      </sticky>
-      <el-form class="el-form" label-position="right" label-width="100px">
-        <el-row :gutter="10">
-          <el-col :span="5">
-            <el-form-item label="报告编号:" prop="baogaobianhao">
-              <el-input v-model="listQuery.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="使用单位:" prop="shiyongdanwei">
-              <el-input v-model="listQuery.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="设备种类:" prop="shebeizhonglei">
-              <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="sbzlChange">
-                <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="5">
-            <el-form-item label="注册代码:" prop="zhucedaima">
-              <el-input v-model="listQuery.zhucedaima" clearable @keyup.enter.native="handleFilter" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="产品编号:" prop="chanpinbianhao">
-              <el-input v-model="listQuery.chanpinbianhao" clearable @keyup.enter.native="handleFilter" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="设备品种:" prop="shebeipinzhongdaima">
-              <el-select v-model="listQuery.shebeipinzhongdaima" placeholder="请选择设备品种" clearable>
-                <el-option v-for="item in sbpzs" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-          <el-button type="primary" size="small" icon="el-icon-search" @click="highQuery">
-            高级查询
-          </el-button>
-          <el-button type="info" size="small" icon="el-icon-close" @click="clearQuery">
-            清空条件
-          </el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <el-table
-      ref="list"
-      v-adaptive="{bottomOffset: 50}"
-      height="0"
-      :data="list"
-      :default-sort="{prop:'update_time', order:'ascending'}"
-      :row-class-name="tableRowClassName"
-      border
-      fit
-      highlight-current-row
-      stripe
-      size="small"
-      width="100%"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" width="40" />
-      <el-table-column fixed="left" align="center" label="序号" width="50">
-        <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="报告编号" prop="baogaobianhao" width="160" sortable="custom" />
-      <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="80" />
-      <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="150" sortable="custom" />
-      <el-table-column align="center" label="设备(注册)代码" prop="zhucedaima" width="180" sortable="custom">
-        <template slot-scope="scope">
-          <span v-if="scope.row.zhucedaima">
-            <span v-if="scope.row.zhucedaima.length > 6">
-              {{ scope.row.zhucedaima }}
-            </span>
-            <span v-else>
-              {{ scope.row.shebeidaima }}
-            </span>
-          </span>
-          <span v-else>
-            {{ scope.row.shebeidaima }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="200" />
-      <el-table-column align="center" label="产品名称/设备名称" prop="shebeimingcheng" width="130" />
-      <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="130" />
-      <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="100" />
-      <el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="100" sortable="custom" />
-      <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" sortable="custom" />
-      <el-table-column align="center" label="检验结论" prop="jianyanjielun" :show-overflow-tooltip="true" width="95" />
-      <el-table-column fixed="right" align="center" label="操作" prop="" width="153">
-        <template slot-scope="scope">
-          <el-button v-show="scope.row.flowstatus === 1 && !(scope.row.jilubianhao)" size="mini" type="success" icon="el-icon-edit" title="编辑" circle @click="editYsjl(scope.$index)" />
-          <el-button v-show="scope.row.shebeizhongleidaima === '2000' && scope.row.neibuleibie !== 'ZZ'" type="info" size="mini" circle icon="el-icon-view" title="预览 原始资料" @click="common.viewRawRecords(scope.row.renwuId)" />
-          <el-button v-if="scope.row.shebeizhongleidaima === '2000' && scope.row.neibuleibie === 'ZZ'" v-show="scope.row.jilubianhao" type="success" size="mini" icon="el-icon-view" title="预览 原始记录" circle @click="common.viewYsjl(scope.row.id, 'IMPORT')" />
-          <el-button v-else v-show="scope.row.jilubianhao" type="success" size="mini" icon="el-icon-view" title="预览 原始记录" circle @click="common.viewYsjl(scope.row.id, 'YSJL')" />
-          <el-button type="primary" size="mini" icon="el-icon-view" title="预览 报告" circle @click="common.viewYsjl(scope.row.id, 'JYBG')" />
-          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
-          <el-button v-if="scope.row.shebeizhongleidaima === '1000'" type="waring" size="mini" circle icon="el-icon-info" title="查看当前报告收费信息" @click="showSfInfo(scope.row)" />
-        </template>
-      </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" />
-      <div style="float: right;margin-top:8px;">
-        <div style="width: 80px;float:left;margin-left: 50px;">
-          重启流程：
-        </div>
-        <div class="identification" style="background-color:red;" />
-        <div style="width: 50px;float:left;margin-left: 20px;">
-          驳回：
-        </div>
-        <div class="identification" style="background-color: orange;" />
-        <div style="width: 50px;float:left;margin-left: 20px;">
-          复制：
-        </div>
-        <div class="identification" style="background-color:#690cff;" />
-      </div>
-    </div>
-    <!-- 打开发送选择人员窗口 -->
-    <el-dialog :visible.sync="dialogZZJJFormVisible" @close="closeDialog">
-      <el-row style="margin-bottom: 15px;">
-        <el-select v-model="sbzldm" placeholder="设备种类" style="width: 180px" @change="getSblbList">
-          <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select v-model="sblbdm" placeholder="设备类别" style="width: 210px" @change="getSbpzList">
-          <el-option v-for="item in sblbList" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-        <el-select v-model="sbpzdm" placeholder="设备品种" style="width: 220px" @change="getModelList">
-          <el-option v-for="item in sbpzList" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-row>
-      <el-row>
-        <el-select v-model="modelId" placeholder="模板名称" style="width: 620px">
-          <el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-row>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogZZJJFormVisible = false">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="initYsjl">
-          确 定
-        </el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible" title="下一环节处理人" @close="closeDialog">
-      <el-table ref="flowUserList" :data="flowUserList" border fit highlight-current-row @row-click="onRowClickLink" @selection-change="handleSelectionChangeLink">
-        <el-table-column type="selection" width="40" />
-        <el-table-column align="center" label="序号" width="60">
-          <template slot-scope="scope">
-            <span v-text="getIndex(scope.$index)" />
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="处理人" prop="nickname" min-width="40" />
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">
-          取 消
-        </el-button>
-        <el-button type="success" @click="confirmSend">
-          确认
-        </el-button>
-      </div>
-    </el-dialog>
-    <!-- 高级查询窗口 -->
-    <el-dialog :visible.sync="dialogQueryVisible" title="高级查询" width="60%">
-      <el-container>
-        <el-form :inline="true">
-          <el-form-item label="检验类别:" style="width: 240px;">
-            <el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
-              <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="设备种类:" style="width: 240px;">
-            <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
-              <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="当前环节:" style="width: 240px;">
-            <el-select v-model="listQuery.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
-              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="检验人员:" style="width: 240px;">
-            <el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
-              <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="审核人员:" style="width: 240px;">
-            <el-select v-model="listQuery.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
-              <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="审批人员:" style="width: 240px;">
-            <el-select v-model="listQuery.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
-              <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="检验日期:" style="width: 240px;">
-            <el-date-picker v-model="listQuery.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
-          </el-form-item>
-          <el-form-item label="审核日期:" style="width: 240px;">
-            <el-date-picker v-model="listQuery.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
-          </el-form-item>
-          <el-form-item label="审批日期:" style="width: 240px;">
-            <el-date-picker v-model="listQuery.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
-          </el-form-item>
-          <el-form-item label="设备/产品名称:" style="width: 290px;">
-            <el-input v-model="listQuery.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
-          </el-form-item>
-          <el-form-item label="内部编号:" style="width: 240px;">
-            <el-input v-model="listQuery.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
-          </el-form-item>
-          <el-form-item label="下次检验日期:" style="width: 280px;">
-            <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
-          </el-form-item>
-          <el-form-item label="制造单位:" style="width: 400px;">
-            <el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
-          </el-form-item>
-          <el-form-item label="产品/出厂编号:" style="width: 290px;">
-            <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
-          </el-form-item>
-          <el-form-item label="使用登记证编号:" style="width: 320px;">
-            <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
-          </el-form-item>
-        </el-form>
-      </el-container>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogQueryVisible = false">
-          取 消
-        </el-button>
-        <el-button type="success" @click="handleFilter">
-          查 询
-        </el-button>
-      </div>
-    </el-dialog>
-    <!-- 签名窗口 -->
-    <el-dialog :visible.sync="dialogSignVisible" title="签名" width="500px">
-      <el-form ref="passForm" :model="passForm" class="small-space" label-position="left" label-width="120px" style="width: 340px; margin-left:50px;">
-        <el-form-item label="签名密码" required>
-          <el-input v-model="passForm.password" type="password" />
-        </el-form-item>
-        <el-form-item label="签名日期" required>
-          <el-date-picker v-model="passForm.signDate" type="date" value-format="yyyy-MM-dd" placeholder="选择签名日期" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogSignVisible = false">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="qianming">
-          确 认
-        </el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 驳回窗口 -->
-    <el-dialog :visible.sync="dialogBohuiVisible" title="驳回报告《必须填写意见才可驳回》" width="35%">
-      <el-form ref="bohuiForm" :model="bohuiForm" class="small-space" label-position="left" label-width="120px" style="width: 340px; margin-left:50px;">
-        <el-form-item label="驳回意见：" required label-width="100px">
-          <el-input v-model="bohuiForm.infoNotes" :rows="5" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogBohuiVisible = false">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="bohui">
-          确 认
-        </el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 驳回意见 -->
-    <el-dialog :visible.sync="dialogBohuiyijianVisible" title="驳回意见" width="50%">
-      <el-table :data="infoNotes">
-        <el-table-column align="center" label="驳回人" prop="infoSend" />
-        <el-table-column align="center" label="驳回意见" prop="infoNotes" />
-        <el-table-column align="center" label="驳回时间" prop="createTime" />
-      </el-table>
-    </el-dialog>
-
-    <!--查看当前报告收费-->
-    <el-dialog title="查看当前报告收费" :modal-append-to-body="false" :visible.sync="sfInfoDialogVisible">
-      <el-form ref="sfInfo" :model="sfInfo" class="el-form" label-position="left" label-width="160px">
-        <el-form-item label="记录编号">
-          <el-input v-model="sfInfo.jilubianhao" disabled />
-        </el-form-item>
-        <el-form-item label="出厂编号">
-          <el-input v-model="sfInfo.chanpinbianhao" disabled />
-        </el-form-item>
-        <el-form-item label="受检设备（产品）型号">
-          <el-input v-model="sfInfo.guigexinghao" disabled />
-        </el-form-item>
-        <el-form-item label="检验项目">
-          <el-input v-model="sfInfo.neibuleibie" disabled />
-        </el-form-item>
-        <el-form-item label="应收检验费金额">
-          <el-input v-model="sfInfo.jianyanheding" disabled />
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Sticky from '@/components/Sticky'
-import Pagination from '@/components/Pagination'
-import Utils from '../../../utils/contact.js'
-import qs from 'qs'
-
-export default {
-  components: { Sticky, Pagination },
-  data() {
-    return {
-      totalCount: 0,
-      list: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        order: 'update_time', // 排序字段
-        sort: 'asc', // 排序方式
-        flowStatus: 1,
-        hasChild: true,
-        hasFinish: false
-      },
-      listWithDrawQuery: {
-        pageNum: 1, // 页码
-        pageSize: 10, // 每页条数
-        order: 'update_time', // 排序字段
-        sort: 'ascending', // 排序方式
-        createBy: this.$store.getters.userId
-      },
-      flowUserList: [],
-      isQm: true,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      multipleSelectionLink: [],
-      dialogQueryVisible: false,
-      dialogBohuiVisible: false,
-      sbzlList: [],
-      sblbList: [],
-      sbpzList: [],
-      modelList: [],
-      sbzldm: '',
-      sblbdm: '',
-      sbpzdm: '',
-      modelId: '',
-      dialogZZJJFormVisible: false,
-      jylbList: [],
-      statusList: [
-        {
-          value: 1,
-          label: '起草报告'
-        }, {
-          value: 2,
-          label: '审核报告'
-        }, {
-          value: 3,
-          label: '审批报告'
-        }
-      ],
-      bohuiForm: {
-        infoNotes: '',
-        fileName: ''
-      },
-      userList: [],
-      ysjlId: '',
-      dialogSignVisible: false,
-      passForm: {
-        password: '',
-        signDate: new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate()
-      },
-      isBatchSign: false, // 标记是否为批量签名
-      listCopy: [],
-      dialogFormCopyNewReportVisible: false,
-      listQueryCopy: {
-        pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        searchYsjl: {}
-      },
-      totalCountCopy: 0,
-      copyNum: 1, // 复制份数
-      manufacturParam: {},
-      bzrQianming: false,
-      // 驳回原因查询数据
-      infoNotes: [],
-      dialogBohuiyijianVisible: false,
-      sbpzs: [],
-      sfInfoDialogVisible: false,
-      sfInfo: {}
-    }
-  },
-  created() {
-    this.getList()
-    this.getSbzlList()
-    this.jylbList = this.$store.getters.allCategory
-    this.userList = this.$store.getters.allUser
-  },
-  mounted() {
-    const that = this
-    this.common.$on('bggl-daiban-list', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    getList() {
-      this.api({
-        url: '/ysjl/getList',
-        method: 'get',
-        params: this.listQuery
-      }).then(data => {
-        this.list = data.list
-        this.totalCount = data.totalCount
-        this.common.switchInspection(this.list)
-      })
-    },
-    sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
-      this.getList()
-    },
-    getIndex($index) {
-      // 表格序号
-      return (this.listQuery.pageNum - 1) * this.listQuery.pageRow + $index + 1
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.dialogQueryVisible = false
-      this.getList()
-    },
-    onRowClick(row) {
-      this.$refs.list.toggleRowSelection(row)
-    },
-    handleSelectionChange: function(val) {
-      this.multipleSelection = val
-    },
-    onRowClickLink(row) {
-      this.$refs.flowUserList.toggleRowSelection(row)
-    },
-    handleSelectionChangeLink: function(val) {
-      this.multipleSelectionLink = val
-    },
-    getSbzlList() {
-      this.api({
-        url: '/sedirectory/getList',
-        method: 'get',
-        params: {
-          sbzl: undefined,
-          level: '1'
-        }
-      }).then(data => {
-        this.sbzlList = data
-      })
-    },
-    delReport() {
-      // 批量删除
-      this.ysjlId = ''
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要删除的数据。')
-        return false
-      }
-      let linkname = ''
-      let revertRenwuByYsjlIds = ''
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (i === 0 && this.multipleSelection[i].flowstatus === 1) {
-          linkname = this.multipleSelection[i].flowstatus
-        }
-        if (linkname !== this.multipleSelection[i].flowstatus) {
-          this.$message('只允许起草环节删除报告。')
-          return false
-        }
-        if (this.multipleSelection[i].shebeileibiedaima === '2100' && this.multipleSelection[i].jianyanleibie === 'DJ') {
-          revertRenwuByYsjlIds = this.multipleSelection[i].id + ',' + revertRenwuByYsjlIds
-        }
-        this.ysjlId = this.multipleSelection[i].id + ',' + this.ysjlId
-        if (i + 1 === this.multipleSelection.length) {
-          this.ysjlId = this.ysjlId.substring(0, this.ysjlId.length - 1)
-        }
-      }
-      this.$confirm('确定删除当前选中报告?', '提示', {
-        confirmButtonText: '确定',
-        showCancelButton: false,
-        type: 'warning'
-      }).then(() => {
-        this.api({
-          url: '/ysjl/delReport',
-          method: 'post',
-          params: {
-            ids: this.ysjlId
-          }
-        }).then(() => {
-          this.$message({
-            message: '已成功退回到记录',
-            type: 'success',
-            duration: 1000,
-            onClose: () => {
-              // 修改16版任务状态
-              if (revertRenwuByYsjlIds) {
-                this.common.updRenwuState(revertRenwuByYsjlIds, 0, false)
-              }
-              this.getList()
-              // 刷新原始记录待办，原始记录已办列表，任务列表
-              Utils.$emit('task-list')
-              Utils.$emit('ysjl-list')
-              Utils.$emit('ysjl-yb-list')
-              Utils.$emit('bggl-yiban-list')
-              Utils.$emit('manufacture-list')
-              Utils.$emit('manufacture-done-list')
-            }
-          })
-        })
-      })
-    },
-    bohui() {
-      this.$confirm('确定要驳回吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$refs['bohuiForm'].validate(valid => {
-          if (valid) {
-            this.api({
-              url: '/flow/bohui',
-              method: 'post',
-              params: {
-                ids: this.ysjlId,
-                infonotes: this.bohuiForm.infoNotes,
-                fileName: this.bohuiForm.fileName
-              }
-            }).then(data => {
-              // 根据结果反馈信息
-              this.$message({
-                message: '驳回成功',
-                type: 'success',
-                duration: 1000,
-                onClose: () => {
-                  this.dialogBohuiVisible = false
-                  this.bohuiForm.infoNotes = ''
-                  this.bohuiForm.fileName = ''
-                  this.getList()
-                }
-              })
-            })
-          }
-        })
-      })
-    },
-    batchSend() {
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要发送的数据。')
-        return false
-      }
-      const idStr = this.multipleSelection[0].id
-      let existRecordNum = true // 是否存在记录编号
-      let sendFlag = true // 发送标记
-      let linkname = ''
-      let isQianming = false
-      let parentIds = '' // 主报告id
-      const nblb = this.multipleSelection[0].neibuleibie
-      const sbzldm = this.multipleSelection[0].shebeizhongleidaima
-      const bglx = this.multipleSelection[0].bglx
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (i === 0) {
-          linkname = this.multipleSelection[i].flowstatus
-          this.ysjlId = this.multipleSelection[i].id
-          if (this.multipleSelection[i].bglx === 1) {
-            parentIds = this.multipleSelection[i].id
-          }
-        } else {
-          this.ysjlId = this.ysjlId + ',' + this.multipleSelection[i].id
-          if (this.multipleSelection[i].bglx === 1) {
-            parentIds = parentIds + ',' + this.multipleSelection[i].id
-          }
-        }
-        if (linkname !== this.multipleSelection[i].flowstatus) {
-          this.$message('请选择同环节进行发送。')
-          return false
-        }
-        if (bglx !== this.multipleSelection[i].bglx) {
-          this.$message('请选择同类型报告进行发送。')
-          return false
-        }
-        if (this.multipleSelection[i].shebeizhongleidaima !== '1000') {
-          if (this.multipleSelection[i].neibuleibie.indexOf(nblb) < 0 && nblb.indexOf(this.multipleSelection[i].neibuleibie) < 0) {
-            this.$message('请选择同检验类别的报告进行发送。')
-            return false
-          }
-        }
-        if (sbzldm !== this.multipleSelection[i].shebeizhongleidaima) {
-          this.$message('请选择同设备种类的报告进行发送。')
-          return false
-        }
-        if (this.multipleSelection[i].jilubianhao !== '') {
-          existRecordNum = false
-        }
-        if (this.isQm) {
-          switch (this.multipleSelection[i].flowstatus) {
-            case 1 :
-              if (!this.multipleSelection[i].jianyanrenyuan) {
-                this.$message('请检验人员先签名再发送审核!')
-                return false
-              }
-              if (!this.multipleSelection[i].bianzhiren && this.multipleSelection[i].bglx === 1) {
-                isQianming = true
-              }
-              break
-            case 2 :
-              if (!this.multipleSelection[i].shenheren) {
-                isQianming = true
-              }
-              break
-            case 3 :
-              if (!this.multipleSelection[i].shenpiren) {
-                isQianming = true
-              }
-              break
-          }
-        }
-      }
-      if (existRecordNum) {
-        // 发送之前判断子报告是否已经办结
-        this.api({
-          url: '/ysjl/judgeState',
-          method: 'get',
-          params: {
-            ysjlIds: parentIds,
-            bglx: '2,3'
-          }
-        }).then(data => {
-          if (data === 0) {
-            sendFlag = false
-            this.$message.error('请先办结子报告再发送！')
-            return false
-          }
-        })
-      }
-      if (sendFlag) {
-        if (isQianming) {
-          this.dialogSignVisible = true
-          this.flowstatus = linkname
-          return false
-        }
-        // 获取下一环节人员之前先确认是否已经签名
-        if (this.multipleSelection[0].flowstatus === 2 && (this.multipleSelection[0].shebeizhongleidaima === 'F000' || this.multipleSelection[0].bglx === 2)) {
-          this.end(this.ysjlId, this.multipleSelection, false) // 验证是否属于办结操作，是直接办结。
-          return false
-        } else if (this.multipleSelection[0].flowstatus === 3) {
-          this.end(this.ysjlId, this.multipleSelection, true) // 验证是否属于办结操作，是直接办结。
-          return false
-        }
-        this.api({
-          url: '/flow/getUser',
-          method: 'get',
-          params: {
-            id: idStr,
-            flowstatus: linkname
-          }
-        }).then(data => {
-          this.flowUserList = data
-          this.dialogFormVisible = true
-        }).catch(() => {
-          this.dialogSignVisible = false
-          this.$confirm('列表可能长时间未刷新，是否刷新列表?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.handleFilter()
-          }).catch(() => {
-            this.dialogSignVisible = false
-            this.$message({
-              type: 'info',
-              message: '已取消刷新'
-            })
-          })
-        })
-      }
-    },
-    confirmSend() {
-      if (this.multipleSelectionLink.length !== 1) {
-        this.$message('只能选择单人处理下一环节。')
-        return false
-      }
-      let linkname = ''
-      for (let i = 0; i < this.multipleSelectionLink.length; i++) {
-        if (i === 0) {
-          linkname = this.multipleSelectionLink[i].flowstatus
-        }
-        if (linkname !== this.multipleSelectionLink[i].flowstatus) {
-          this.$message('请选择同环节进行发送。')
-          return false
-        }
-      }
-      this.multipleSelectionLink[0].ysjlId = this.ysjlId
-      const _vue = this
-      this.api({
-        url: '/flow/send',
-        method: 'post',
-        data: this.multipleSelectionLink[0]
-      }).then(() => {
-        this.dialogFormVisible = false
-        this.$message({
-          message: '发送成功！',
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            _vue.getList()
-            Utils.$emit('bggl-yiban-list')
-          }
-        })
-      })
-    },
-    end(ysjlId, ysjls, generatePDF) {
-      this.$confirm('确定办结当前选中报告?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.api({
-          url: '/flow/end',
-          method: 'post',
-          params: {
-            ids: ysjlId
-          }
-        }).then(() => {
-          this.$message({
-            message: '办结成功',
-            type: 'success',
-            duration: 1000,
-            onClose: () => {
-              this.delRawRecords(ysjls)
-              this.getList()
-              Utils.$emit('bggl-yiban-list')
-              // 发起生成PDF请求
-              if (generatePDF) {
-                this.preview({
-                  url: '/print/batchGeneratePDF',
-                  method: 'post',
-                  data: {
-                    ids: ysjlId,
-                    generateType: 'END'
-                  }
-                })
-                // 发起消红请求
-                this.cleanRed(ysjls)
-              }
-            }
-          })
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消办结'
-        })
-      })
-      this.isQm = true
-    },
-    /**
-       * 办结时删除原始资料
-       * @param ysjls
-       */
-    delRawRecords(ysjls) {
-      const renwuIds = []
-      ysjls.forEach((ysjl) => {
-        if (ysjl.bglx === 1 && ysjl.shebeizhongleidaima === '2000' && ysjl.jianyanleibie === 'DJ') {
-          renwuIds.push(ysjl.renwuId)
-        }
-      })
-      if (renwuIds.length) {
-        this.preview({
-          url: '/upload/delRawRecords',
-          method: 'get',
-          params: {
-            renwuIds: renwuIds.join(',')
-          }
-        })
-      }
-    },
-    cleanRed(ysjls) {
-      if (ysjls != null && ysjls.length > 0) {
-        this.api({
-          url: '/template/getById',
-          method: 'get',
-          params: {
-            id: ysjls[0].modelId
-          }
-        }).then(data => {
-          if (data.cleanState) {
-            const cleanData = []
-            ysjls.forEach(ysjl => {
-              // 排除使用单位标注了测试的报告
-              if (ysjl.shiyongdanwei.indexOf('测试') === -1) {
-                const data = {}
-                data.shiyongdanwei = ysjl.shiyongdanwei
-                data.shebeizhonglei = ysjl.shebeizhongleidaima
-                // 获取内部类别对应中文名称
-                data.jianyanleibie = this.formatter.formatterCategory(null, null, ysjl.neibuleibie)
-                data.zhucedaima = ysjl.zhucedaima
-                data.shiyongdengjibianhao = ysjl.shiyongdengjibianhao
-                data.jianyanriqi = ysjl.jianyanjieshuriqi
-                data.xiacijianyanriqi = ysjl.xiacijianyanriqi
-                data.jianyanjielun = ysjl.jianyanjielun
-                data.baogaobianhao = ysjl.baogaobianhao
-                data.quxian = ysjl.quhuamingcheng
-                data.jianyanjigou = '济南市特种设备检验研究院'
-                data.shi = '济南市'
-                cleanData.push(data)
-              }
-            })
-            if (cleanData.length > 0) {
-              this.apisjse({
-                url: '/baseInfo/chaoqijiekoupi',
-                method: 'post',
-                headers: { 'content-type': 'application/x-www-form-urlencoded' },
-                data: qs.stringify({
-                  loginname: 'jntjysjgx',
-                  password: '123',
-                  jiekous: JSON.stringify(cleanData)
-                })
-              })
-            }
-          }
-        })
-      }
-    },
-    qianming() {
-      this.api({
-        url: '/user/validationPwd',
-        method: 'post',
-        data: {
-          id: this.$store.getters.userId,
-          signPassword: this.passForm.password
-        }
-      }).then(() => {
-        this.api({
-          url: '/flow/qianming',
-          method: 'get',
-          params: {
-            ids: this.ysjlId,
-            riqi: this.passForm.signDate,
-            flowstatus: this.flowstatus
-          }
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '签名成功!'
-          })
-          this.isQm = false
-          if (!this.isBatchSign) {
-            this.batchSend()
-          }
-          this.handleFilter()
-          this.dialogSignVisible = false
-          this.isBatchSign = false
-        }).catch(() => {
-          this.$confirm('列表可能长时间未刷新，是否刷新列表?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.handleFilter()
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消刷新'
-            })
-          })
-        })
-      })
-    },
-    formatterHuanjie(row) {
-      switch (row.flowstatus) {
-        case 1:
-          return '起草'
-        case 2:
-          return '审核'
-        case 3:
-          return '审批'
-        default:
-          return '未知'
-      }
-    },
-    editYsjl($index) {
-      const ysjl = this.list[$index]
-      if (ysjl.shebeizhongleidaima === '8000') {
-        this.api({
-          url: '/template/getById',
-          method: 'get',
-          params: {
-            id: ysjl.modelId
-          }
-        }).then(data => {
-          const queryParam = {
-            id: ysjl.id,
-            jyxm: this.list[$index].jianyanxiangmu,
-            departmentId: this.$store.getters.departmentId,
-            jianyanrenyuan: ysjl.jianyanrenyuan,
-            state: 'update',
-            renwuId: ysjl.renwuId,
-            modelId: ysjl.modelId,
-            jylb: ysjl.jianyanleibie,
-            neibuleibie: ysjl.neibuleibie,
-            sbzldm: ysjl.shebeizhongleidaima,
-            sblbdm: ysjl.shebeileibiedaima,
-            sbpzdm: ysjl.shebeipinzhongdaima,
-            sfdId: ysjl.sfdId
-          }
-          if (ysjl.bglx === 1) {
-            this.$router.push({ path: data.tempPath + '/' + ysjl.id, query: queryParam })
-          } else {
-            this.$router.push({ path: data.tempPath, query: queryParam })
-          }
-          this.dialogZZJJFormVisible = false
-        })
-      } else {
-        let nblb = ''
-        if (ysjl.neibuleibie === 'DQ' || ysjl.neibuleibie === 'SCDQ' || ysjl.neibuleibie === 'QM') {
-          nblb = 'dj/'
-        } else if (ysjl.neibuleibie === 'JD') {
-          nblb = 'jj/'
-        } else {
-          nblb = ysjl.neibuleibie.toLowerCase() + '/'
-        }
-        if (this.list[$index].bglx === 1) {
-          if (ysjl.shebeizhongleidaima === '2000') {
-            this.$router.push({ path: '/bggl/' + ysjl.shebeizhongleidaima + '/' + nblb + this.list[$index].jianyanxiangmu + '/' + ysjl.id, query: { id: ysjl.id, jyxm: this.list[$index].jianyanxiangmu, departmentId: this.$store.getters.departmentId, ysjl: ysjl, state: 'update' }})
-          } else {
-            this.$router.push({ path: '/bggl/' + ysjl.shebeizhongleidaima + '/' + nblb + 'edit/' + ysjl.id + '/update', query: { ysjl: ysjl }})
-          }
-        } else {
-          if (ysjl.shebeizhongleidaima === '2000') {
-            nblb = ''
-          }
-          this.$router.push({ path: '/bggl/' + ysjl.shebeizhongleidaima + '/' + nblb + this.list[$index].jianyanxiangmu, query: { id: ysjl.id, jyxm: this.list[$index].jianyanxiangmu, departmentId: this.$store.getters.departmentId }})
-        }
-      }
-    },
-    highQuery() {
-      this.dialogQueryVisible = true
-    },
-    clearQuery() {
-      this.listQuery = {
-        order: 'update_time', // 排序字段
-        sort: 'asc', // 排序方式
-        flowStatus: 1,
-        hasChild: true,
-        hasFinish: false
-      }
-      this.getList()
-    },
-    clearCopyQuery() {
-      this.$set(this.listQueryCopy, 'searchYsjl', {
-        bglx: 1
-      })
-      this.handleFilterCopy()
-    },
-    closeDialog() {
-      this.isQm = true
-    },
-    batchSign() {
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要签名的数据。')
-        return false
-      }
-      let idStr = this.multipleSelection[0].id
-      const linkname = this.multipleSelection[0].flowstatus
-      for (let i = 1; i < this.multipleSelection.length; i++) {
-        idStr = idStr + ',' + this.multipleSelection[i].id
-        if (linkname !== this.multipleSelection[i].flowstatus) {
-          this.$message('请选择同环节签名！')
-          return false
-        }
-      }
-      this.ysjlId = idStr
-      this.isBatchSign = true
-      this.flowstatus = linkname
-      this.dialogSignVisible = true
-    },
-    clearSignName() {
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要清空签名的数据。')
-        return false
-      }
-      let idStr = this.multipleSelection[0].id
-      const linkname = this.multipleSelection[0].flowstatus
-      for (let i = 1; i < this.multipleSelection.length; i++) {
-        idStr = idStr + ',' + this.multipleSelection[i].id
-        if (linkname !== this.multipleSelection[i].flowstatus) {
-          this.$message('请选择同环节清除签名！')
-          return false
-        }
-      }
-      // 清除签名
-      this.api({
-        url: '/ysjl/clearSignName',
-        method: 'get',
-        params: {
-          ysjlIds: idStr,
-          flowStatus: linkname
-        }
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '清除签名成功!'
-        })
-        this.handleFilter()
-        this.isQm = true
-      })
-    },
-    getSblbList(val) {
-      this.sblbdm = ''
-      this.sbpzList = []
-      this.sbpzdm = ''
-      this.modelList = []
-      this.modelId = ''
-      this.getSbList(val, undefined, 2)
-    },
-    getSbpzList(val) {
-      this.modelList = []
-      this.modelId = ''
-      this.sbpzdm = ''
-      this.getSbList(this.sbzldm, val, 3)
-    },
-    getModelList(val) {
-      let tempJylb = '制造监检'
-      let category = 'JYBG'
-      if (val === '7310') {
-        tempJylb = '定期检验'
-        category = 'YSJL'
-      }
-      this.api({
-        url: '/template/getTemplateBySbpz',
-        method: 'post',
-        data: {
-          sbpz: val,
-          jianyanleibie: tempJylb,
-          category: category
-        }
-      }).then(data => {
-        this.modelList = data
-        this.modelId = data[0].value
-      })
-    },
-    getSbList(sbzl, sblb, level) {
-      this.api({
-        url: '/sedirectory/getList',
-        method: 'get',
-        params: {
-          sbzl: sbzl,
-          sblb: sblb,
-          level: level
-        }
-      }).then(data => {
-        switch (level) {
-          case 2:
-            this.sblbList = data
-            return ''
-          case 3:
-            this.sbpzList = data
-            return ''
-          default:
-            this.sbzlList = data
-            return ''
-        }
-      })
-    },
-    createNewReport() {
-      this.sbpzdm = ''
-      this.dialogZZJJFormVisible = true
-    },
-    getListCopy() {
-      this.listQueryCopy.searchYsjl.bglx = '1'
-      this.api({
-        url: '/ysjl/gainNewReportList',
-        method: 'get',
-        params: this.listQueryCopy
-      }).then(data => {
-        this.listCopy = data.list
-        this.totalCountCopy = data.totalCount
-      })
-    },
-    handleFilterCopy() {
-      // 查询事件
-      this.listQueryCopy.pageNum = 1
-      this.getListCopy()
-    },
-    initYsjl() {
-      this.api({
-        url: '/ysjl/initYsjl',
-        method: 'post',
-        data: {
-          templateId: this.templateId
-        }
-      }).then(data => {
-        this.$router.push({ path: data.path + '/' + data.ysjl.id + '/create', query: { ysjl: data.ysjl, param: data.param }})
-        this.dialogZZJJFormVisible = false
-      })
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (row.retreatState === 1) {
-        return 'reject-row'
-      } else if (row.retreatState === 2) {
-        return 'restart-row'
-      } else if (row.copyState === true) {
-        return 'copy-row'
-      }
-      return ''
-    },
-    /**
-       * 根据报告ID查看驳回原因
-       * @param ysjlId
-       */
-    viewAllRejection(ysjlId) {
-      this.api({
-        url: '/taskinfo/viewAllRejection',
-        method: 'get',
-        params: {
-          ysjlId: ysjlId
-        }
-      }).then(data => {
-        this.infoNotes = data
-        if (!this.infoNotes.length) {
-          this.$alert('暂无驳回意见！', '驳回意见', {
-            confirmButtonText: '关闭'
-          })
-        } else {
-          this.dialogBohuiyijianVisible = true
-        }
-      })
-    },
-    sbzlChange(val) {
-      // 根据设备种类代码，查询设备品种列表
-      this.api({
-        url: '/sedirectory/getList',
-        method: 'get',
-        params: {
-          sbzl: val,
-          level: 4
-        }
-      }).then(data => {
-        this.sbpzs = data
-      })
-    },
-    showSfInfo(ysjl) {
-      this.sfInfo = {
-        jilubianhao: ysjl.jilubianhao,
-        chanpinbianhao: ysjl.chanpinbianhao,
-        guigexinghao: ysjl.guigexinghao,
-        neibuleibie: this.formatter.formatterCategory(undefined, undefined, ysjl.neibuleibie),
-        jianyanheding: ysjl.jianyanheding
-      }
-      this.sfInfoDialogVisible = true
-    }
-  }
-}
-</script>
-
-<style>
-  .el-table .reject-row {
-    color: orange;
-  }
-  .el-table .restart-row {
-    color: red;
-  }
-  .el-table .copy-row {
-    color: #690cff;
-  }
-  .identification{
-    width: 30px;
-    height:15px;
-    display: inline-block;
-    border:gray 1px solid;
-    border-radius:15px;
-    float: left;
-  }
-  button.el-button.el-button--mini.is-circle{
-    margin: 1px;
-  }
-</style>
diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue
index 8b9a191..7749288 100644
--- a/src/views/bggl/components/original_db_list.vue
+++ b/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() {
diff --git a/src/views/bggl/daiban_list.vue b/src/views/bggl/daiban_list.vue
index a31780c..073d67a 100644
--- a/src/views/bggl/daiban_list.vue
+++ b/src/views/bggl/daiban_list.vue
@@ -1,17 +1,11 @@
 <template>
-  <boiler-db-list v-if="ifBoiler" />
-  <original-db-list v-else />
+  <original-db-list />
 </template>
 <script>
 import originalDbList from './components/original_db_list'
-import boilerDbList from './components/boiler_db_list'
+
 export default {
   name: 'TODOReport',
-  components: { originalDbList, boilerDbList },
-  data() {
-    return {
-      ifBoiler: this.$store.getters.departmentId === 75
-    }
-  }
+  components: { originalDbList }
 }
 </script>
diff --git a/src/views/bggl/daishen_list.vue b/src/views/bggl/daishen_list.vue
index fb49c3a..3ce72ce 100644
--- a/src/views/bggl/daishen_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/bggl/eliminatingred_list.vue b/src/views/bggl/eliminatingred_list.vue
index 7580637..806c5ae 100644
--- a/src/views/bggl/eliminatingred_list.vue
+++ b/src/views/bggl/eliminatingred_list.vue
@@ -137,8 +137,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
-      :total="totalCount"
+      v-show="total>0"
+      :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()
         })
diff --git a/src/views/bggl/sign_list.vue b/src/views/bggl/sign_list.vue
index c75a86d..d203a87 100644
--- a/src/views/bggl/sign_list.vue
+++ b/src/views/bggl/sign_list.vue
@@ -93,8 +93,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
-      :total="totalCount"
+      v-show="total>0"
+      :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)
       })
     },
diff --git a/src/views/bggl/yiban_list.vue b/src/views/bggl/yiban_list.vue
index 9749ca8..aa2eb02 100644
--- a/src/views/bggl/yiban_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/bjd/dj_create.vue b/src/views/bjd/dj_create.vue
index ee88eb0..ea7eb45 100644
--- a/src/views/bjd/dj_create.vue
+++ b/src/views/bjd/dj_create.vue
@@ -317,8 +317,8 @@
     </el-table>
     <div class="uFlex mt-10">
       <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
+        v-show="total > 0"
+        :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
         }
       })
     },
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index c70c226..1b2316b 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -1441,8 +1441,8 @@
           </el-table-column>
         </el-table>
         <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
+          v-show="total > 0"
+          :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() {
diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue
index bb690ed..5537648 100644
--- a/src/views/bjd/dj_list.vue
+++ b/src/views/bjd/dj_list.vue
@@ -290,21 +290,8 @@
         </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"
-    />
-    <iframe
-      :src="printbutton"
-      frameborder="0"
-      scrolling="no"
-      height="0px"
-      aria-disabled="true"
-    />
+    <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>
 
@@ -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() {
diff --git a/src/views/bjd/dt_list.vue b/src/views/bjd/dt_list.vue
index 671548c..5e28a41 100644
--- a/src/views/bjd/dt_list.vue
+++ b/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() {
diff --git a/src/views/bjd/jj_create.vue b/src/views/bjd/jj_create.vue
index fa0695b..040bc9c 100644
--- a/src/views/bjd/jj_create.vue
+++ b/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() {
diff --git a/src/views/bjd/jj_input.vue b/src/views/bjd/jj_input.vue
index 7e10c83..655ca2a 100644
--- a/src/views/bjd/jj_input.vue
+++ b/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) {
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index 87770ea..2042837 100644
--- a/src/views/bjd/jj_list.vue
+++ b/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() {
diff --git a/src/views/bjd/qy_list.vue b/src/views/bjd/qy_list.vue
index 8fddd91..b05da1c 100644
--- a/src/views/bjd/qy_list.vue
+++ b/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() {
diff --git a/src/views/bjd/zf_list.vue b/src/views/bjd/zf_list.vue
index fcb5c84..7714fef 100644
--- a/src/views/bjd/zf_list.vue
+++ b/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() {
diff --git a/src/views/chargeBill/JD/create.vue b/src/views/chargeBill/JD/create.vue
index 81a1664..1e4f562 100644
--- a/src/views/chargeBill/JD/create.vue
+++ b/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
       })
     },
     /**
diff --git a/src/views/chargeBill/ZJ/create.vue b/src/views/chargeBill/ZJ/create.vue
index 82ec349..816b3fa 100644
--- a/src/views/chargeBill/ZJ/create.vue
+++ b/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
       })
     },
     // 表格单击选中行
diff --git a/src/views/chargeBill/index.vue b/src/views/chargeBill/index.vue
index d7623e3..0992c5f 100644
--- a/src/views/chargeBill/index.vue
+++ b/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
       })
     },
     /**
diff --git a/src/views/chargeBill/other/create.vue b/src/views/chargeBill/other/create.vue
index 3584304..2384039 100644
--- a/src/views/chargeBill/other/create.vue
+++ b/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
       })
     },
     /**
diff --git a/src/views/chargeBill/statistic.vue b/src/views/chargeBill/statistic.vue
index 067d05e..d4b7968 100644
--- a/src/views/chargeBill/statistic.vue
+++ b/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防止表头错位
diff --git a/src/views/chargeBill/task.vue b/src/views/chargeBill/task.vue
index 40e624d..95ac74d 100644
--- a/src/views/chargeBill/task.vue
+++ b/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
       })
     },
     /**
diff --git a/src/views/chargeTask/db_list.vue b/src/views/chargeTask/db_list.vue
index aadd1a0..739b25c 100644
--- a/src/views/chargeTask/db_list.vue
+++ b/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() {
diff --git a/src/views/chargeTask/yb_list.vue b/src/views/chargeTask/yb_list.vue
index 21f6b2c..9d1232c 100644
--- a/src/views/chargeTask/yb_list.vue
+++ b/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() {
diff --git a/src/views/dashboard/components/SubmoduleTable.vue b/src/views/dashboard/components/SubmoduleTable.vue
index 1be427b..c535f51 100644
--- a/src/views/dashboard/components/SubmoduleTable.vue
+++ b/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
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 3cd4d12..8754326 100644
--- a/src/views/dashboard/index.vue
+++ b/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
diff --git a/src/views/dic/category.vue b/src/views/dic/category.vue
index 9e08990..bb088df 100644
--- a/src/views/dic/category.vue
+++ b/src/views/dic/category.vue
@@ -93,8 +93,8 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="totalCount > 0"
-            :total="totalCount"
+            v-show="total > 0"
+            :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() {
diff --git a/src/views/dic/dic_data.vue b/src/views/dic/dic_data.vue
index 3cebfc0..fa21eee 100644
--- a/src/views/dic/dic_data.vue
+++ b/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)
       })
diff --git a/src/views/dic/dic_type.vue b/src/views/dic/dic_type.vue
index 2ff889b..524e386 100644
--- a/src/views/dic/dic_type.vue
+++ b/src/views/dic/dic_type.vue
@@ -106,8 +106,8 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="totalCount > 0"
-            :total="totalCount"
+            v-show="total > 0"
+            :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)
       })
diff --git a/src/views/dic/dic_xinghao.vue b/src/views/dic/dic_xinghao.vue
index 5bdeb45..8f95cb9 100644
--- a/src/views/dic/dic_xinghao.vue
+++ b/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) {
diff --git a/src/views/dwxx/examine.vue b/src/views/dwxx/examine.vue
index 7936415..27b5bdf 100644
--- a/src/views/dwxx/examine.vue
+++ b/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() {
diff --git a/src/views/dwxx/list.vue b/src/views/dwxx/list.vue
index da155d2..60a2cd9 100644
--- a/src/views/dwxx/list.vue
+++ b/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() {
diff --git a/src/views/dwxx/reviewed.vue b/src/views/dwxx/reviewed.vue
index e9ba8e1..990c74a 100644
--- a/src/views/dwxx/reviewed.vue
+++ b/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() {
diff --git a/src/views/finance/djList.vue b/src/views/finance/djList.vue
index 7b63782..a5f6b73 100644
--- a/src/views/finance/djList.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/jfjd_list.vue b/src/views/finance/jfjd_list.vue
index 999004d..fe6f0e1 100644
--- a/src/views/finance/jfjd_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/jjList.vue b/src/views/finance/jjList.vue
index 0b2d51b..67143df 100644
--- a/src/views/finance/jjList.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/web_jfdqr_list.vue b/src/views/finance/web_jfdqr_list.vue
index 53c7897..76188ac 100644
--- a/src/views/finance/web_jfdqr_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/web_sfdsf_list.vue b/src/views/finance/web_sfdsf_list.vue
index ad03f77..500b190 100644
--- a/src/views/finance/web_sfdsf_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/web_xxsfd_list.vue b/src/views/finance/web_xxsfd_list.vue
index a069eb4..7e8bd89 100644
--- a/src/views/finance/web_xxsfd_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/wsf_list.vue b/src/views/finance/wsf_list.vue
index a7fec5c..b103a96 100644
--- a/src/views/finance/wsf_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/ycdw_list.vue b/src/views/finance/ycdw_list.vue
index 6aae915..609d304 100644
--- a/src/views/finance/ycdw_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/ysf_list.vue b/src/views/finance/ysf_list.vue
index 2d00d23..335b4e5 100644
--- a/src/views/finance/ysf_list.vue
+++ b/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)
       })
     },
diff --git a/src/views/finance/zzList.vue b/src/views/finance/zzList.vue
index d4b400a..3cd1219 100644
--- a/src/views/finance/zzList.vue
+++ b/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)
       })
     },
diff --git a/src/views/flow/definition.vue b/src/views/flow/definition.vue
index 2f5959a..03246b3 100644
--- a/src/views/flow/definition.vue
+++ b/src/views/flow/definition.vue
@@ -123,8 +123,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
-      :total="totalCount"
+      v-show="total > 0"
+      :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)
       })
diff --git a/src/views/flow/detail.vue b/src/views/flow/detail.vue
index 43fc966..11ddad4 100644
--- a/src/views/flow/detail.vue
+++ b/src/views/flow/detail.vue
@@ -137,8 +137,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
-      :total="totalCount"
+      v-show="total > 0"
+      :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() {
diff --git a/src/views/flow/link.vue b/src/views/flow/link.vue
index 5174d23..580acf7 100644
--- a/src/views/flow/link.vue
+++ b/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() {
diff --git a/src/views/flow/message.vue b/src/views/flow/message.vue
index f91f7b9..85525d9 100644
--- a/src/views/flow/message.vue
+++ b/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) {
diff --git a/src/views/flow/restart.vue b/src/views/flow/restart.vue
index 26fbaa0..05f9a5c 100644
--- a/src/views/flow/restart.vue
+++ b/src/views/flow/restart.vue
@@ -125,8 +125,8 @@
     </el-table>
 
     <pagination
-      v-show="totalCount>0"
-      :total="totalCount"
+      v-show="total>0"
+      :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) {
diff --git a/src/views/flow/template.vue b/src/views/flow/template.vue
index 8d02bb9..a464fa7 100644
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@@ -199,8 +199,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
-      :total="totalCount"
+      v-show="total > 0"
+      :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) {
diff --git a/src/views/invoice/list.vue b/src/views/invoice/list.vue
index 9a8d0d5..b344307 100644
--- a/src/views/invoice/list.vue
+++ b/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) {
diff --git a/src/views/invoice/toBeInvoiced.vue b/src/views/invoice/toBeInvoiced.vue
index e27b9fd..fddb3a0 100644
--- a/src/views/invoice/toBeInvoiced.vue
+++ b/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) {
diff --git a/src/views/liaison/list.vue b/src/views/liaison/list.vue
index 4c33b6f..83be517 100644
--- a/src/views/liaison/list.vue
+++ b/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
       })
     },
     /**
diff --git a/src/views/monitor/log_error.vue b/src/views/monitor/log_error.vue
index 56243a1..ce97a51 100644
--- a/src/views/monitor/log_error.vue
+++ b/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() {
diff --git a/src/views/monitor/log_info.vue b/src/views/monitor/log_info.vue
index 93fc0c7..9e36ce0 100644
--- a/src/views/monitor/log_info.vue
+++ b/src/views/monitor/log_info.vue
@@ -100,8 +100,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount > 0"
-      :total="totalCount"
+      v-show="total > 0"
+      :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) {
diff --git a/src/views/monitor/online.vue b/src/views/monitor/online.vue
index 1449dd5..f972144 100644
--- a/src/views/monitor/online.vue
+++ b/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() {
diff --git a/src/views/monitor/redis.vue b/src/views/monitor/redis.vue
index 86c3f75..95ba2da 100644
--- a/src/views/monitor/redis.vue
+++ b/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() {
diff --git a/src/views/print/1000/grant_create.vue b/src/views/print/1000/grant_create.vue
index 31e9f46..607f4ea 100644
--- a/src/views/print/1000/grant_create.vue
+++ b/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', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'id 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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + 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: '该单位名下存在未收费的检验项，请确认后在进行操作！'
diff --git a/src/views/print/1000/grant_list_yff.vue b/src/views/print/1000/grant_list_yff.vue
index 25d76b2..6fc7380 100644
--- a/src/views/print/1000/grant_list_yff.vue
+++ b/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', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'id 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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -168,8 +166,7 @@ export default {
     },
     clearQuery() {
       this.listQuery = {
-        order: 'id', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'id desc', // 排序字段
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
diff --git a/src/views/print/1000/print_list.vue b/src/views/print/1000/print_list.vue
index 35fba27..40219e3 100644
--- a/src/views/print/1000/print_list.vue
+++ b/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.searchYsjl.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.searchYsjl.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.serialNumber" 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.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: 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.searchYsjl.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-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="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', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'id desc', // 排序字段
         hasChild: false,
-        hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
-          shebeizhongleidaima: '1000',
-          fafangState: 0
-        }
+        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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + 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,62 +274,44 @@ export default {
           return false
         }
       }
-      this.api({ // 记录打印详细，不做打印状态改变。
-        url: '/ysjl/getListBanjie',
-        method: 'get',
+      this.preview({
+        url: '/print/createXml',
+        method: 'post',
         params: {
-          pageNum: 1,
-          pageRow: 20,
-          searchYsjl: {
-            baogaobianhao: '(' + new Date().getFullYear() + ')',
-            shiyongdanwei: ysjl.shiyongdanwei,
-            jfState: false,
-            shebeizhongleidaima: '1000'
-          }
+          ids: ids,
+          type: type
         }
       }).then(data => {
-        if (data.totalCount !== 0) {
-          this.$message({
-            type: 'warning',
-            message: '该单位名下存在未收费的检验项，请确认后在进行操作！'
-          })
-          return false
-        } else {
-          this.preview({
-            url: '/print/createXml',
-            method: 'post',
+        this.printbutton = 'ReportPrintApp://' + data
+        this.api({ // 记录打印详细，不做打印状态改变。
+          url: '/ysjl/batchRecordPrintState',
+          method: 'get',
+          params: {
+            ids: ids,
+            type: type
+          }
+        })
+        if (type === 'JYBG') {
+          this.api({ // 标记为打印状态。
+            url: '/ysjl/batchUpdPrintState',
+            method: 'get',
             params: {
               ids: ids,
               type: type
             }
-          }).then(data => {
-            this.printbutton = 'ReportPrintApp://' + data
-            this.api({ // 记录打印详细，不做打印状态改变。
-              url: '/ysjl/batchRecordPrintState',
-              method: 'get',
-              params: {
-                ids: ids,
-                type: type
-              }
-            })
-            if (type === 'JYBG') {
-              this.api({ // 标记为打印状态。
-                url: '/ysjl/batchUpdPrintState',
-                method: 'get',
-                params: {
-                  ids: ids,
-                  type: type
-                }
-              })
-            }
           })
         }
       })
     },
     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()
     },
diff --git a/src/views/print/2000/print_list.vue b/src/views/print/2000/print_list.vue
index 555832e..c67d769 100644
--- a/src/views/print/2000/print_list.vue
+++ b/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.searchYsjl.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.searchYsjl.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.serialNumber" 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.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: 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.searchYsjl.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-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @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.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', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'id desc', // 排序字段
         hasChild: false,
-        hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
-          shebeizhongleidaima: '2000',
-          jianyanleibie: 'DJ',
-          fafangState: 0
-        }
+        shebeizhongleidaima: '2000',
+        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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + 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()
     },
diff --git a/src/views/print/3000/print_list.vue b/src/views/print/3000/print_list.vue
index 51c68a5..74dcb08 100644
--- a/src/views/print/3000/print_list.vue
+++ b/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.searchYsjl.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.searchYsjl.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.serialNumber" 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.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" 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.searchYsjl.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-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-input v-model="listQuery.baogaobianhao" 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.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="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', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
-          shebeizhongleidaima: '3000',
-          printState: 0
-        }
+        orderBy: 'id desc', // 排序字段
+        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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + 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
       })
diff --git a/src/views/print/4000/print_list.vue b/src/views/print/4000/print_list.vue
index 92de01a..798f94d 100644
--- a/src/views/print/4000/print_list.vue
+++ b/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.searchYsjl.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.searchYsjl.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.serialNumber" 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.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: 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.searchYsjl.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-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="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', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
-          shebeizhongleidaima: '4000',
-          printState: 0
-        }
+        orderBy: 'id desc', // 排序字段
+        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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + 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
       })
diff --git a/src/views/print/5000/print_list.vue b/src/views/print/5000/print_list.vue
index 054165a..a47a0a5 100644
--- a/src/views/print/5000/print_list.vue
+++ b/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.searchYsjl.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.searchYsjl.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.serialNumber" 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.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: 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.searchYsjl.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-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="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', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
-          shebeizhongleidaima: '5000',
-          printState: 0
-        }
+        orderBy: 'id desc', // 排序字段
+        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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + 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
       })
diff --git a/src/views/print/8000/print_list.vue b/src/views/print/8000/print_list.vue
index 8e5f681..2b73a16 100644
--- a/src/views/print/8000/print_list.vue
+++ b/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', // 排序字段
-        sort: 'desc', // 排序方式
+        orderBy: 'id 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.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -298,13 +296,14 @@ export default {
     },
     clearQuery() {
       this.listQuery = {
-        shebeizhongleidaima: '8000',
-        printState: 0,
-        order: 'id', // 排序字段
-        sort: 'desc', // 排序方式
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        orderBy: 'id desc', // 排序字段
         hasChild: false,
         hasFinish: true,
-        flowstatus: undefined
+        flowstatus: undefined,
+        shebeizhongleidaima: '8000',
+        fafangState: 0
       }
       this.getList()
     },
diff --git a/src/views/print/grant/grant_list_chengya.vue b/src/views/print/grant/grant_list_chengya.vue
index 5cc0f0e..af66a7b 100644
--- a/src/views/print/grant/grant_list_chengya.vue
+++ b/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', // 排序字段
-        sort: 'desc' // 排序方式
+        orderBy: 'create_time 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() {
diff --git a/src/views/print/grant/grant_list_jidian.vue b/src/views/print/grant/grant_list_jidian.vue
index 527206c..4b9133c 100644
--- a/src/views/print/grant/grant_list_jidian.vue
+++ b/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', // 排序字段
-        sort: 'desc' // 排序方式
+        orderBy: 'create_time 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)
       })
diff --git a/src/views/print/grant_list.vue b/src/views/print/grant_list.vue
index e7575bf..59fe11e 100644
--- a/src/views/print/grant_list.vue
+++ b/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', // 排序字段
-        sort: 'desc' // 排序方式
+        orderBy: 'create_time 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)
       })
diff --git a/src/views/search/list.vue b/src/views/search/list.vue
index c7e03d7..3c71925 100644
--- a/src/views/search/list.vue
+++ b/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() {
diff --git a/src/views/statistics/filing.vue b/src/views/statistics/filing.vue
index 56329c3..4fe0b48 100644
--- a/src/views/statistics/filing.vue
+++ b/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() {
diff --git a/src/views/statistics/gldj.vue b/src/views/statistics/gldj.vue
index def2b85..a9ae784 100644
--- a/src/views/statistics/gldj.vue
+++ b/src/views/statistics/gldj.vue
@@ -104,8 +104,8 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="totalCount>0"
-      :total="totalCount"
+      v-show="total>0"
+      :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)
       })
     },
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 549dae6..3ea58b2 100644
--- a/src/views/task/list.vue
+++ b/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) {
diff --git a/src/views/tool/quartz.vue b/src/views/tool/quartz.vue
index a739474..5f5e75c 100644
--- a/src/views/tool/quartz.vue
+++ b/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() {
diff --git a/src/views/tool/quartz_log.vue b/src/views/tool/quartz_log.vue
index b0bf10b..a53fb25 100644
--- a/src/views/tool/quartz_log.vue
+++ b/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) {
diff --git a/src/views/user/department.vue b/src/views/user/department.vue
index a5b2209..0a5f5d9 100644
--- a/src/views/user/department.vue
+++ b/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: {
diff --git a/src/views/user/user.vue b/src/views/user/user.vue
index 83e041c..2ff476f 100644
--- a/src/views/user/user.vue
+++ b/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) {
diff --git a/src/views/user/version.vue b/src/views/user/version.vue
index 7b3d3a6..59ce18e 100644
--- a/src/views/user/version.vue
+++ b/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() {
diff --git a/src/views/ysjl/2000/sfqk.vue b/src/views/ysjl/2000/sfqk.vue
index a09e97f..8187756 100644
--- a/src/views/ysjl/2000/sfqk.vue
+++ b/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
       })
     },
     /**
diff --git a/src/views/ysjl/4000/dj/common/index.vue b/src/views/ysjl/4000/dj/common/index.vue
index 6c0cf0c..627e08b 100644
--- a/src/views/ysjl/4000/dj/common/index.vue
+++ b/src/views/ysjl/4000/dj/common/index.vue
@@ -53,42 +53,19 @@
           <fieldset>
             <legend>基本信息</legend>
             <el-row :gutter="25">
-              <el-col
-                v-if="
-                  state === 'create' ||
-                    ysjl.jilubianhao === null ||
-                    ysjl.jilubianhao === ''
-                "
-                :span="14"
-              >
+              <el-col v-if="state === 'create' || !ysjl.jilubianhao" :span="10">
                 <el-form-item label="记录编号">
                   <el-input v-model="jlbh1" style="width: 80px" disabled />
                   <el-input v-model="jlbh2" style="width: 80px" disabled />-
-                  <el-input
-                    v-model="jlbh3"
-                    style="width: 85px"
-                    @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id)"
-                  />
+                  <el-input v-model="jlbh3" style="width: 85px" />
                 </el-form-item>
               </el-col>
               <el-col v-else :span="9">
                 <el-form-item label="记录编号" prop="jilubianhao">
-                  <el-input
-                    v-if="state !== 'create'"
-                    v-model="ysjl.jilubianhao"
-                    :disabled="edit"
-                  />
+                  <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" />
                 </el-form-item>
               </el-col>
-              <el-col
-                v-if="isRepeat"
-                :span="2"
-                style="
-                  vertical-align: middle;
-                  padding-top: 3px;
-                  font-size: 15px;
-                "
-              >
+              <el-col v-if="isRepeat" :span="2" style="font-size: 15px;">
                 <span style="color: red">编号重复</span>
               </el-col>
             </el-row>
@@ -847,7 +824,7 @@
           <el-table-column align="center" prop="D1" label="检验结果">
             <template slot-scope="scope">
               <el-select
-                v-model="scope.row.D1"
+                v-model="scope.row.jianyanjieguo"
                 :disabled="edit"
                 type="text"
                 placeholder="请选择"
@@ -934,13 +911,13 @@ export default {
   },
   computed: {},
   watch: {
-    // jlbh3: function(val) {
-    //   this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
-    //   this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
-    // },
-    // jilubianhao: function(newValue) {
-    //   this.judgeRepeat(newValue, this.ysjl.id)
-    // }
+    jlbh3: function(val) {
+      this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
+      this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
+    },
+    jilubianhao: function(newValue) {
+      this.judgeRepeat(newValue, this.ysjl.id)
+    }
   },
   // 添加F5刷新监听事件
   mounted() {
@@ -1128,10 +1105,11 @@ export default {
       this.sybjSData.forEach((row) => {
         tableData.push({
           ysjlId: this.ysjlId,
+          id: row.id,
           beizhu: row.beizhu,
           dicJyxmId: row.dicJyxmId,
-          jianyanjieguo: row.jianyanjieguo ? row.jianyanjieguo : '',
-          jianyanjielun: row.jianyanjielun ? row.jianyanjielun : '',
+          jianyanjieguo: row.jianyanjieguo || '',
+          jianyanjielun: row.jianyanjielun || '',
           jyxmMode: 0,
           sort: row.sort,
           orders: row.orders,
diff --git a/src/views/ysjl/components/gascylinder_db_list.vue b/src/views/ysjl/components/gascylinder_db_list.vue
deleted file mode 100644
index f5069c1..0000000
--- a/src/views/ysjl/components/gascylinder_db_list.vue
+++ /dev/null
@@ -1,368 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <sticky style="margin-bottom: 10px;">
-        <div class="sub-navbar">
-          <el-button type="danger" icon="el-icon-delete" @click="delYsjl">
-            删除记录
-          </el-button>
-        </div>
-      </sticky>
-      <el-form>
-        <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.jilubianhao" placeholder="记录编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shigongdanwei" placeholder="安装单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
-          <el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-          <el-button size="small" type="info" icon="el-icon-close" @click="clearQuery">
-            清空条件
-          </el-button>
-          <br>
-          <el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="制造单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="出厂编号" clearable style="width: 240px" @keyup.enter.native="handleFilter" />
-          <span class="radio-group-label">编辑类型：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
-            <el-radio :label="$store.getters.userId">
-              只看创建人
-            </el-radio>
-            <el-radio :label="undefined">
-              全部
-            </el-radio>
-          </el-radio-group>&nbsp;&nbsp;&nbsp;&nbsp;
-        </el-form-item>
-      </el-form>
-    </div>
-    <el-table
-      ref="list"
-      v-adaptive="{bottomOffset: 50}"
-      height="0"
-      :data="list"
-      :default-sort="{prop:'jilubianhao', order:'descending'}"
-      :row-class-name="tableRowClassName"
-      element-loading-text="拼命加载中"
-      border
-      fit
-      highlight-current-row
-      stripe
-      width="100%"
-      size="small"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" width="40" />
-      <el-table-column fixed="left" align="center" label="序号" width="60">
-        <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" />
-      <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
-      <el-table-column align="center" label="安装单位" prop="shigongdanwei" width="240" />
-      <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
-      <el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
-      <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" />
-      <el-table-column align="center" label="设备代码" prop="shebeidaima" width="140" />
-      <el-table-column fixed="right" align="center" label="操作" prop="" width="200">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editYsjl(scope.$index)" />
-          <el-button type="success" size="mini" circle icon="el-icon-view" title="预览" @click="common.viewYsjl(scope.row.id, 'JYBG')" />
-          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
-        </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" />
-    <div style="float: right;margin-top:8px;">
-      <div style="width: 80px;float:left;margin-left: 50px;">
-        重启流程：
-      </div>
-      <div class="identification" style="background-color:red;" />
-      <div style="width: 50px;float:left;margin-left: 20px;">
-        驳回：
-      </div>
-      <div class="identification" style="background-color: orange;" />
-      <div style="width: 50px;float:left;margin-left: 20px;">
-        复制：
-      </div>
-      <div class="identification" style="background-color:#690cff;" />
-    </div>
-
-    <!-- 驳回意见 -->
-    <el-dialog :visible.sync="dialogBohuiyijianVisible" title="驳回意见" width="50%">
-      <el-table :data="infoNotes">
-        <el-table-column align="center" label="驳回人" prop="infoSend" />
-        <el-table-column align="center" label="驳回意见" prop="infoNotes" />
-        <el-table-column align="center" label="驳回时间" prop="createTime" />
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Sticky from '@/components/Sticky'
-import Pagination from '@/components/Pagination'
-import { getNeedRecordList } from '@/api/ysjl'
-import Utils from '@/utils/contact'
-export default {
-  components: { Sticky, Pagination },
-  data() {
-    return {
-      totalCount: 0,
-      list: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        order: undefined, // 排序字段
-        sort: undefined, // 排序方式
-        searchYsjl: {
-          createBy: this.$store.getters.userId
-        },
-        hasChild: true
-      },
-      multipleSelection: [],
-      ysjlId: '',
-      sbzlList: [],
-      sblbList: [],
-      sbpzList: [],
-      modelList: [],
-      sbzldm: '',
-      sblbdm: '',
-      sbpzdm: '',
-      modelId: '',
-      isQm: true,
-      infoNotes: '',
-      dialogBohuiyijianVisible: false
-    }
-  },
-  created() {
-    this.getList()
-  },
-  mounted() {
-    const that = this
-    this.common.$on('ysjl-list', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    getList() {
-      this.listQuery.searchYsjl.cjState = 'ysjl'
-      getNeedRecordList(this.listQuery).then(data => {
-        this.list = data.list
-        this.totalCount = data.totalCount
-        this.common.switchInspection(this.list)
-      })
-    },
-    sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
-      this.getList()
-    },
-    getIndex($index) {
-      // 表格序号
-      return (this.listQuery.pageNum - 1) * this.listQuery.pageRow + $index + 1
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    onRowClick(row) {
-      this.$refs.list.toggleRowSelection(row)
-    },
-    handleSelectionChange: function(val) {
-      this.multipleSelection = val
-    },
-    delYsjl() {
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (this.multipleSelection[i].bglx !== 1) {
-          this.$message({
-            message: '请选择主原始记录进行删除！',
-            type: 'warning'
-          })
-          return false
-        }
-      }
-      this.ysjlId = ''
-      let oldRwIds = '' // 16版任务主键
-      let newRwIds = '' // 18版任务主键
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        this.ysjlId = this.multipleSelection[i].id + ',' + this.ysjlId
-        // 锅炉需要修改16版任务状态
-        if (this.multipleSelection[i].shebeizhongleidaima === '1000') {
-          if (this.multipleSelection[i].source === 'pad') {
-            oldRwIds += this.multipleSelection[i].renwuId + ','
-          } else {
-            newRwIds += this.multipleSelection[i].renwuId + ','
-          }
-        }
-        if (i + 1 === this.multipleSelection.length) {
-          this.ysjlId = this.ysjlId.substring(0, this.ysjlId.length - 1)
-        }
-      }
-      // 查询是否有无损原始记录生成报告
-      this.api({
-        url: '/ysjl/judgeState',
-        method: 'get',
-        params: {
-          ysjlIds: this.ysjlId,
-          bglx: '2',
-          isDel: true
-        }
-      }).then(data => {
-        if (data === 0) {
-          this.$confirm('已有无损原始记录生成报告, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.del(this.ysjlId, oldRwIds, newRwIds)
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            })
-            return false
-          })
-        } else {
-          this.$confirm('确定删除当前选中记录?', '提示', {
-            confirmButtonText: '确定',
-            type: 'warning'
-          }).then(() => {
-            this.del(this.ysjlId, oldRwIds, newRwIds)
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            })
-            return false
-          })
-        }
-      })
-    },
-    del(ids, oldRwIds, newRwIds) {
-      this.api({
-        url: '/ysjl',
-        method: 'delete',
-        params: {
-          ids: ids
-        }
-      }).then(() => {
-        this.$message({
-          message: '删除成功',
-          type: 'success',
-          duration: 1000,
-          onClose: () => {
-            this.getList()
-            Utils.$emit('task-list')
-          }
-        })
-      })
-    },
-    editYsjl($index) {
-      const ysjl = this.list[$index]
-      this.api({
-        url: '/template/getById',
-        method: 'get',
-        params: {
-          id: ysjl.modelId
-        }
-      }).then(data => {
-        const queryParam = this.common.buildEditYsjlRouterParam(ysjl)
-        if (ysjl.bglx === 1) {
-          this.$router.push({ path: data.tempPath + '/' + ysjl.id, query: queryParam })
-        } else {
-          this.$router.push({ path: data.tempPath, query: queryParam })
-        }
-      })
-    },
-    clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        bglx: 1,
-        createBy: this.$store.getters.userId
-      })
-      this.getList()
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (row.retreatState === 1) {
-        return 'reject-row'
-      } else if (row.retreatState === 2) {
-        return 'restart-row'
-      } else if (row.copyState === true) {
-        return 'copy-row'
-      }
-      return ''
-    },
-    closeDialog() {
-      this.isQm = true
-    },
-    getModelList(val) {
-      let tempJylb = ''
-      let category = ''
-      let nbleibie = ''
-      if (val === '7310') {
-        tempJylb = 'DJ'
-        category = 'YSJL'
-        nbleibie = 'DQ'
-      }
-      this.api({
-        url: '/template/getTemplateBySbpz',
-        method: 'get',
-        params: {
-          sbpz: val,
-          jianyanleibie: tempJylb,
-          category: category,
-          neibuleibie: nbleibie
-        }
-      }).then(data => {
-        this.modelList = data
-        this.modelId = data[0].value
-      })
-    },
-    /**
-     * 根据报告ID查看驳回原因
-     * @param ysjlId
-     */
-    viewAllRejection(ysjlId) {
-      this.api({
-        url: '/taskinfo/viewAllRejection',
-        method: 'get',
-        params: {
-          ysjlId: ysjlId
-        }
-      }).then(data => {
-        this.infoNotes = data
-        if (!this.infoNotes.length) {
-          this.$alert('暂无驳回意见！', '驳回意见', {
-            confirmButtonText: '关闭'
-          })
-        } else {
-          this.dialogBohuiyijianVisible = true
-        }
-      })
-    }
-  }
-}
-</script>
-<style>
-  .el-table .reject-row {
-    color: orange;
-  }
-  .el-table .restart-row {
-    color: red;
-  }
-  .el-table .copy-row {
-    color: #690cff;
-  }
-  .identification{
-    width: 30px;
-    height:15px;
-    display: inline-block;
-    border:gray 1px solid;
-    border-radius:15px;
-    float: left;
-  }
-  button.el-button.el-button--mini.is-circle{
-    margin: 1px;
-  }
-</style>
diff --git a/src/views/ysjl/components/gascylinder_yb_list.vue b/src/views/ysjl/components/gascylinder_yb_list.vue
deleted file mode 100644
index a073c6b..0000000
--- a/src/views/ysjl/components/gascylinder_yb_list.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-form>
-        <el-form-item>
-          <el-input v-model="listQuery.jilubianhao" placeholder="记录编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.shigongdanwei" placeholder="安装单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
-          <el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-          <el-button size="small" type="info" icon="el-icon-close" @click="clearQuery">
-            清空条件
-          </el-button>
-          <br>
-          <el-input v-model="listQuery.zhizaodanwei" placeholder="制造单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.chanpinbianhao" placeholder="出厂编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <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>
-    <el-table
-      ref="list"
-      v-adaptive="{bottomOffset: 50}"
-      height="0"
-      :data="list"
-      :default-sort="{prop:'jilubianhao', order:'descending'}"
-      element-loading-text="拼命加载中"
-      border
-      fit
-      highlight-current-row
-      stripe
-      width="100%"
-      size="small"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" width="40" />
-      <el-table-column fixed="left" align="center" label="序号" width="60">
-        <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" />
-      <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
-      <el-table-column align="center" label="安装单位" prop="shigongdanwei" width="240" />
-      <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
-      <el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
-      <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" />
-      <el-table-column align="center" label="设备代码" prop="shebeidaima" width="140" />
-      <el-table-column align="center" label="操作" prop="" width="120">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.id, 'JYBG')" />
-        </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" />
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination'
-export default {
-  components: { Pagination },
-  data() {
-    return {
-      totalCount: 0,
-      list: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        order: undefined, // 排序字段
-        sort: undefined, // 排序方式
-        createBy: this.$store.getters.userId,
-        hasChild: true,
-        link: 2
-      },
-      multipleSelection: [],
-      bglxOptions: [{
-        value: '1',
-        label: '主报告'
-      }, {
-        value: '2',
-        label: '无损报告'
-      }]
-    }
-  },
-  created() {
-    this.getList()
-  },
-  mounted() {
-    const that = this
-    this.common.$on('ysjl-yb-list', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    getList() {
-      this.listQuery.cjState = 'bggl'
-      this.api({
-        url: '/ysjl/getList',
-        method: 'get',
-        params: this.listQuery
-      }).then(data => {
-        this.list = data.list
-        this.totalCount = data.totalCount
-        this.common.switchInspection(this.list)
-      })
-    },
-    sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
-      this.getList()
-    },
-    getIndex($index) {
-      // 表格序号
-      return (this.listQuery.pageNum - 1) * this.listQuery.pageRow + $index + 1
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    onRowClick(row) {
-      this.$refs.list.toggleRowSelection(row)
-    },
-    handleSelectionChange: function(val) {
-      this.multipleSelection = val
-    },
-    clearQuery() {
-      this.listQuery = {
-        order: undefined, // 排序字段
-        sort: undefined, // 排序方式
-        createBy: this.$store.getters.userId,
-        hasChild: true
-      }
-      this.getList()
-    }
-  }
-}
-</script>
diff --git a/src/views/ysjl/components/manufacture_db_list.vue b/src/views/ysjl/components/manufacture_db_list.vue
deleted file mode 100644
index 4f38b00..0000000
--- a/src/views/ysjl/components/manufacture_db_list.vue
+++ /dev/null
@@ -1,1010 +0,0 @@
-<template xmlns:el-row="http://www.w3.org/1999/html">
-  <div class="app-container">
-    <div class="filter-container">
-      <sticky v-show="ifCorrectionsCost" style="margin-bottom: 10px;">
-        <div class="sub-navbar">
-          <el-button type="primary" icon="el-icon-circle-check" @click="approved">
-            生成报告
-          </el-button>
-          <el-button type="danger" icon="el-icon-delete" @click="taskInvalidation">
-            任务作废
-          </el-button>
-        </div>
-      </sticky>
-      <el-form>
-        <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.jilubianhao" placeholder="记录编号" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="单位名称" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="产品编号" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shebeipinzhong" placeholder="设备种类" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <el-table
-      ref="list"
-      v-adaptive="{bottomOffset: 50}"
-      height="0"
-      :data="list"
-      :row-class-name="tableRowClassName"
-      border
-      fit
-      highlight-current-row
-      stripe
-      size="mini"
-      width="100%"
-      :cell-style="cellStyle"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" fixed="left" width="40px" />
-      <el-table-column type="index" align="center" fixed="left" label="序号" width="60px" />
-      <el-table-column align="center" label="记录编号" fixed="left" prop="jilubianhao" width="140px" sortable="custom" />
-      <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="jianyanleibie" width="80px" />
-      <el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="80px" />
-      <el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="110px" />
-      <el-table-column align="center" label="单位名称" prop="zhizaodanwei" width="250px" />
-      <el-table-column align="center" label="产品编号" prop="chanpinbianhao" width="120px" />
-      <el-table-column align="center" label="产品名称" prop="shebeimingcheng" width="120px" />
-      <el-table-column align="center" label="设备型号" prop="guigexinghao" width="110px" />
-      <el-table-column :formatter="getProductionName" align="center" label="生产形式" prop="shengchanxingshi" width="110px" />
-      <el-table-column align="center" label="设计日期" prop="shejiriqi" width="120px" />
-      <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="100px" />
-      <el-table-column align="center" label="编辑" fixed="right" width="150px">
-        <template slot-scope="{row}">
-          <el-dropdown trigger="click">
-            <el-button type="text" round plain class="el-dropdown-link" style="color: #13ce66">
-              功能列表<i class="el-icon-arrow-down el-icon--right" />
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-upload
-                  class="upload inline-block margin-right-10"
-                  action=""
-                  accept="application/vnd.ms-excel"
-                  :http-request="handleUploadYsjl"
-                  :show-file-list="false"
-                >
-                  <el-button type="text">
-                    {{ row.shebeileibiedaima === '2100' && row.shengchanxingshi === '5' ? '上传批量原始记录' : '上传原始记录' }}
-                  </el-button>
-                </el-upload>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="row.shebeileibiedaima === '2100' && row.shengchanxingshi === '8'">
-                <router-link :to="{ path: '2000/2100/zjqg/' + row.id + '/edit'}" class="link-type">
-                  <el-button type="text" icon="edit">
-                    编辑项目表
-                  </el-button>
-                </router-link>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="row.shebeileibiedaima === '2100' || row.shebeileibiedaima === '2200'">
-                <el-upload
-                  action=""
-                  accept="application/vnd.ms-excel"
-                  :http-request="handleUploadParam"
-                  :show-file-list="false"
-                >
-                  <el-button type="text">
-                    上传数据表
-                  </el-button>
-                </el-upload>
-              </el-dropdown-item>
-              <el-dropdown-item v-else>
-                <template v-if="row.shebeipinzhongdaima === '2310'">
-                  <el-upload
-                    action=""
-                    accept="application/vnd.ms-excel"
-                    :http-request="handleUploadProof"
-                    :show-file-list="false"
-                  >
-                    <el-button type="text">
-                      上传批量数据
-                    </el-button>
-                  </el-upload>
-                </template>
-                <template v-else>
-                  <el-button type="text" @click="showVerificationProof(row.id)">
-                    上传批量数据
-                  </el-button>
-                </template>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="row.shebeileibiedaima === '2100' && (row.shengchanxingshi === '5' || row.shengchanxingshi === '6')">
-                <el-button type="text" @click="fillInVacancy(row)">
-                  手动补填
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button type="text" @click="showVerification(row.renwuId,true)">
-                  上传相关鉴证
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button type="text" @click="showUpdateReportNotes(row)">
-                  报告备注
-                </el-button>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="查看" fixed="right" width="150px">
-        <template slot-scope="{row}">
-          <el-dropdown trigger="click">
-            <el-button type="text" round plain class="el-dropdown-link" style="color: #13ce66">
-              功能列表<i class="el-icon-arrow-down el-icon--right" />
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button type="text" @click="common.viewYsjl(row.id, 'YSJL')">
-                  {{ row.shebeileibiedaima === '2100' && row.shengchanxingshi === '5' ? '预览批量原始记录' : '预览原始记录' }}
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="row.shebeileibiedaima === '2100' && row.shengchanxingshi === '8'">
-                <router-link :to="{ path: '2000/2100/zjqg/' + row.id + '/view'}" class="link-type">
-                  <el-button type="text" icon="edit">
-                    查看项目表
-                  </el-button>
-                </router-link>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button type="text" @click="common.viewYsjl(row.id, 'OTHER')">
-                  {{ row.shebeileibiedaima === '2300' ? '预览批量证明' : '预览数据表' }}
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button type="text" @click="showDataComparison(row)">
-                  数据对比
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button type="text" @click="showVerification(row.renwuId,false)">
-                  查看相关鉴证
-                </el-button>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </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" />
-      <div style="float: right;margin-top:8px;;margin-right: 30px;">
-        <div style="float:left;margin-left: 20px;">
-          上传记录数据有空值：
-        </div>
-        <div class="identification" style="background-color:red;" />
-      </div>
-    </div>
-    <el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogFormVisible">
-      <enclosure :relation-id.sync="currentRenwuId" :if-liaison.sync="ifLiaison" :view-button.sync="viewButton" />
-    </el-dialog>
-    <!--打开焊接气瓶批量上传框-->
-    <el-dialog title="焊接气瓶批量证明上传" :visible.sync="dialogFormVisibleProof" @close="closeDialog">
-      <el-form>
-        <el-form-item>
-          <el-col>
-            <el-upload
-              class="upload inline-block margin-right-10"
-              action=""
-              accept="application/vnd.ms-excel"
-              :http-request="handleUploadProof"
-              :show-file-list="false"
-            >
-              <el-button type="primary" size="small">
-                上传证明数据表<i class="el-icon-upload el-icon--right" />
-              </el-button>
-            </el-upload>
-          </el-col>
-          <fieldset style="width: 100%">
-            <legend>附图照片</legend>
-            <el-form-item>
-              <el-upload
-                action="123"
-                list-type="picture-card"
-                :before-upload="handleUploadDrawings"
-                :on-remove="handleRemove"
-                :file-list="fileListDrawings"
-                :disabled="false"
-                accept="image/png,image/gif,image/jpg,image/jpeg"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-            </el-form-item>
-          </fieldset>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-    <!--打开任务单与原始记录上传对比-->
-    <el-dialog title="数据对比" :visible.sync="dialogFormComparison" @close="closeComparison">
-      <el-form class="small-space" label-position="left" label-width="140px">
-        <fieldset style="width: 100%;">
-          <legend>原始记录数据</legend>
-          <el-row :gutter="9">
-            <el-col :span="12">
-              <el-form-item label="产品名称:">
-                <span :style="{'color':color_1}">{{ selection.shebeimingcheng }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="产品编号:">
-                <span :style="{'color':color_2}">{{ selection.chanpinbianhao }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="设计图号:">
-                <span :style="{'color':color_3}">{{ ysjlParam.rongqituhao }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="容器类别:">
-                <span :style="{'color':color_4}">{{ ysjlParam.rongqileibie }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="设备型号:">
-                <span :style="{'color':color_5}">{{ selection.guigexinghao }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </fieldset>
-        <fieldset style="width: 100%;">
-          <legend>任务单数据</legend>
-          <el-row :gutter="9">
-            <el-col :span="12">
-              <el-form-item label="产品名称:">
-                <span>{{ renwu.shebeimingcheng }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="产品编号:">
-                <span>{{ renwu.chanpinbianhao }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="设计图号:">
-                <span>{{ renwu.s29 }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="容器类别:">
-                <span>{{ renwu.s27 }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="设备型号:">
-                <span>{{ renwu.guigexinghao }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="生产形式:">
-                <span>{{ renwu.s107 }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </fieldset>
-      </el-form>
-    </el-dialog>
-    <!--手动补填缺失（固定式压力容器批量证明、固定式压力容器承压部件证明）-->
-    <el-dialog title="补填缺失内容" :visible.sync="dialogFillInVacancyVisible" style="margin-top: -7vh;" @close="closeDialog">
-      <el-form class="small-space" label-position="left" label-width="100px" style="height: 300px;">
-        <fieldset style="width: 100%;">
-          <legend>补填内容</legend>
-          <el-row v-if="showWhis" :gutter="9">
-            <el-col :span="12">
-              <el-form-item label="型式规格" prop="xingshiguige">
-                <el-input v-model="beizhu.xingshiguige" type="text" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="材料" prop="cailiao">
-                <el-input v-model="beizhu.cailiao" type="text" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row v-if="showWhis" :gutter="9">
-            <el-col :span="12">
-              <el-form-item label="数量" prop="shuliang">
-                <el-input v-model="beizhu.shuliang" type="text" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否来料加工" prop="jiagongxingshi">
-                <el-radio v-model="beizhu.jiagongxingshi" label="是">
-                  是
-                </el-radio>
-                <el-radio v-model="beizhu.jiagongxingshi" label="否">
-                  否
-                </el-radio>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row v-else :gutter="9">
-            <el-col :span="12">
-              <el-form-item label="适用编号" prop="shiyongbianhao">
-                <el-input v-model="beizhu.shiyongbianhao" type="text" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </fieldset>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFillInVacancyVisible = false">
-          取 消
-        </el-button>
-        <el-button v-if="dialogStatus==='create'" type="success" @click="createOrUpdateBeizhu">
-          保 存
-        </el-button>
-        <el-button v-else type="primary" @click="createOrUpdateBeizhu">
-          修 改
-        </el-button>
-      </div>
-    </el-dialog>
-    <!--备注填写-->
-    <el-dialog title="备注填写" :visible.sync="dialogShowUpdateReportNotesVisible" width="40%">
-      <el-form class="small-space" label-width="6%" style="height: 200px;">
-        <fieldset style="width: 100%;height: 90%">
-          <legend>备注填写</legend>
-          <el-form-item label="备注">
-            <el-input v-model="ysjlParam.reportNotesNeirong" type="textarea" :autosize="{ minRows: 5, maxRows: 5}" />
-          </el-form-item>
-        </fieldset>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogShowUpdateReportNotesVisible = false">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="updateYjslParam">
-          更 改
-        </el-button>
-      </div>
-    </el-dialog>
-    <!--生成报告前的检验核定窗口-->
-    <el-dialog title="检验核定费用" :visible.sync="dialogInspectionVisible" width="80%">
-      <div class="filter-container">
-        <sticky style="margin-bottom: 10px;">
-          <div class="sub-navbar">
-            <el-button type="primary" icon="el-icon-circle-check" @click="batchGenerate">
-              确   定
-            </el-button>
-            <el-button @click="dialogInspectionVisible = false">
-              取   消
-            </el-button>
-          </div>
-        </sticky>
-      </div>
-      <el-table
-        ref="listInspection"
-        :data="listInspection"
-        fit
-        size="mini"
-        width="100%"
-      >
-        <el-table-column type="index" align="center" label="序号" />
-        <el-table-column align="center" label="记录编号" prop="jilubianhao" />
-        <el-table-column align="center" label="产品名称" prop="shebeimingcheng" />
-        <el-table-column align="center" label="产品编号" prop="chanpinbianhao" :show-overflow-tooltip="true" />
-        <el-table-column align="center" label="合同编号" prop="hetongbianhao" />
-        <el-table-column align="center" label="材质/重量收费" prop="caizhihuozhongliang" />
-        <el-table-column align="center" label="造价" prop="zaojiao" />
-        <el-table-column align="center" label="收费比例（%）" prop="shoufeibili" />
-        <el-table-column align="center" label="系统核算" prop="xitongheding" />
-        <el-table-column align="center" label="费用更改" prop="datingheding" />
-        <el-table-column align="center" label="检验核算" prop="jianyanheding">
-          <template slot-scope="{row}">
-            <el-input v-model="row.jianyanheding" :disabled="row.retreatState === 2 && row.jfState !== null && row.jfState" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Sticky from '@/components/Sticky'
-import Pagination from '@/components/Pagination'
-import Enclosure from '@/views/common/Enclosure'
-import Utils from '../../../utils/contact.js'
-import { getNeedRecordList } from '@/api/ysjl'
-import qs from 'qs'
-
-export default {
-  components: { Sticky, Pagination, Enclosure },
-  data() {
-    return {
-      totalCount: 0,
-      list: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        order: 'update_time', // 排序字段
-        sort: 'desc', // 排序方式
-        searchYsjl: {
-          shebeizhongleidaima: '2000',
-          jianyanleibie: 'ZJ'
-        }
-      },
-      multipleSelection: [],
-      multipleProveSelection: [],
-      listInspection: [],
-      selection: {
-        jianyanheding: ''
-      },
-      beizhu: {
-        shiyongbianhao: '',
-        xingshiguige: '',
-        cailiao: '',
-        shuliang: '',
-        jiagongxingshi: '是'
-      },
-      dialogStatus: 'create',
-      dialogFormVisible: false,
-      dialogFormVisibleProof: false,
-      dialogFormComparison: false,
-      dialogFillInVacancyVisible: false,
-      dialogShowUpdateReportNotesVisible: false,
-      dialogInspectionVisible: false,
-      showWhis: true,
-      viewButton: true,
-      ifLiaison: false,
-      fileList: [],
-      fileListDrawings: [],
-      currentRenwuId: 0,
-      renwu: {},
-      ysjlParam: {
-        rongqituhao: '',
-        rongqileibie: '',
-        reportNotesNeirong: ''
-      },
-      productions: [], // 生产形式
-      typeCode: 'PRODUCTION_FORM', // 生产形式代码
-      color_1: 'black',
-      color_2: 'black',
-      color_3: 'black',
-      color_4: 'black',
-      color_5: 'black',
-      ifCorrectionsCost: this.$store.getters.clientType === 'System',
-      biliOptions: ['0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9', '1', '1.1', '1.2']
-    }
-  },
-  created() {
-    this.getList()
-    this.getProductions()
-  },
-  mounted() {
-    const that = this
-    this.common.$on('manufacture-list', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    /**
-     * 进入球罐项目表编辑页
-     */
-    editCategory(row) {
-
-    },
-    /**
-     *  上传原始记录有空标红
-     */
-    tableRowClassName({ row }) {
-      if (row.highlight === 1) {
-        return 'restartdw-row'
-      } else {
-        return ''
-      }
-    },
-    // 原始记录作废
-    taskInvalidation() {
-      if (this.multipleSelection.length === 0) {
-        this.$message({
-          type: 'error',
-          message: '请选择需要删除的数据！'
-        })
-        return false
-      } else {
-        this.$confirm('确定作废当前选中记录?', '提示', {
-          confirmButtonText: '确定',
-          showCancelButton: true,
-          type: 'warning'
-        }).then(() => {
-          const ids = []
-          const qs = require('qs')
-          this.multipleSelection.forEach(data => {
-            ids.push(data.id)
-          })
-          this.api({
-            url: '/ysjl/zfYsjl',
-            method: 'get',
-            params: { ids: ids },
-            paramsSerializer: function(params) {
-              return qs.stringify(params, { indices: false })
-            }
-          }).then(() => {
-            this.$message.success('作废成功！')
-            this.getList()
-          })
-        })
-      }
-    },
-    getProductions() {
-      this.api({
-        url: '/dicData/getDicDataByTypeCode',
-        method: 'get',
-        params: {
-          typeCode: this.typeCode
-        }
-      }).then(data => {
-        this.productions = data
-        this.productions.forEach(item => { item.value = item.value + '' })
-      })
-    },
-    getList() {
-      this.listQuery.searchYsjl.cjState = 'ysjl'
-      getNeedRecordList(this.listQuery).then(data => {
-        this.list = data.list
-        this.totalCount = data.totalCount
-      })
-    },
-    sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
-      this.getList()
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    onRowClick(row) {
-      this.selection = row
-      this.$refs.list.toggleRowSelection(row)
-    },
-    handleSelectionChange: function(val) {
-      this.multipleSelection = val
-    },
-    onProveRowClick(row) {
-      this.$refs.fileList.toggleRowSelection(row)
-    },
-    proveSelectionChange: function(val) {
-      this.multipleProveSelection = val
-    },
-    handleUploadYsjl(back) {
-      const fd = new FormData()
-      fd.append('file', back.file)
-      fd.append('ysjlId', this.selection.id)
-      this.preview({
-        method: 'post',
-        url: '/upload/uploadZzRqYsjl',
-        data: fd
-      }).then(() => {
-        this.getYsjlBianhao()
-      })
-    },
-    handleUploadParam(back) {
-      const fd = new FormData()
-      fd.append('file', back.file)
-      fd.append('ysjlId', this.selection.id)
-      this.preview({
-        method: 'post',
-        url: '/upload/uploadZzRqParam',
-        data: fd
-      }).then(() => {
-        this.getList()
-        this.$message({
-          message: '上传成功！',
-          type: 'success'
-        })
-      })
-    },
-    handleUploadProof(back) {
-      const fd = new FormData()
-      fd.append('file', back.file)
-      fd.append('ysjlId', this.selection.id)
-      this.preview({
-        method: 'post',
-        url: '/upload/uploadZzRqProof',
-        data: fd
-      }).then(() => {
-        if (this.selection.shebeileibiedaima === '2100' && this.selection.shengchanxingshi === '5') {
-          this.getYsjlBianhao()
-        } else {
-          this.getList()
-          this.$message({
-            message: '上传成功！',
-            type: 'success'
-          })
-        }
-      })
-    },
-    handleUploadDrawings(file) {
-      const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
-      if (!isJPG) {
-        this.$message.error('只能上传jpg/png格式的图片')
-        return false
-      }
-      const fd = new FormData()
-      fd.append('file', file)
-      fd.append('ysjlId', this.selection.id)
-      this.api({
-        url: '/upload/uploadZzQpplDrawings',
-        method: 'post',
-        data: fd
-      }).then(data => {
-        if (data !== null && data !== undefined) {
-          this.fileListDrawings.push(this.getAryDate('url', JSON.parse(data).name))
-        }
-      })
-    },
-    getAryDate(key, value) {
-      const arr = {}
-      this.$set(arr, key, process.env.VUE_APP_BASE_API + 'showImage/2000/weldingDrawings/' + value)
-      return arr
-    },
-    handleRemove(file) {
-      const fileDetails = file.url.split('/')
-      const fileName = fileDetails[fileDetails.length - 1]
-      this.api({
-        url: '/ysjl/deleteParamImg',
-        method: 'get',
-        params: { fileName: fileName, ysjlId: this.selection.id }
-      }).then(() => {
-        const afl = []
-        this.fileListDrawings.forEach(v => {
-          if (v.url !== this.getAryDate('url', fileName).url) {
-            afl.push(v)
-          }
-        })
-        this.fileListDrawings = afl
-      })
-    },
-    closeDialog() {
-      this.fileListDrawings = []
-    },
-    closeComparison() {
-      this.color_1 = 'black'
-      this.color_2 = 'black'
-      this.color_3 = 'black'
-      this.color_4 = 'black'
-      this.color_5 = 'black'
-    },
-    handleUploadProve(back) {
-      const fd = new FormData()
-      fd.append('file', back.file)
-      fd.append('ysjlId', this.selection.id)
-      fd.append('userId', this.$store.getters.userId)
-      this.preview({
-        method: 'post',
-        url: '/upload/uploadProve',
-        data: fd
-      }).then(() => {
-        this.getProveList(this.selection.id)
-      })
-    },
-    async showDataComparison(row) {
-      this.api({
-        url: '/ysjl',
-        method: 'get',
-        params: {
-          ysjlId: row.id
-        }
-      }).then(async data => {
-        this.selection = data
-        await this.getParamByYsjlId(this.selection.id, this.selection.shebeizhongleidaima)
-        this.api({
-          url: '/renwu/get',
-          method: 'get',
-          params: {
-            renwuId: this.selection.renwuId
-          }
-        }).then(data => {
-          this.renwu = data
-          this.setSpanTextColor(this.renwu, this.selection, this.ysjlParam)
-          this.productions.forEach(item => {
-            if (item.value === this.renwu.s107) {
-              this.renwu.s107 = item.name
-            }
-          })
-        })
-        this.dialogFormComparison = true
-      })
-    },
-    setSpanTextColor(renwu, ysjl, ysjlParam) {
-      if (renwu.shebeimingcheng !== ysjl.shebeimingcheng) {
-        this.color_1 = 'red'
-      }
-      if (renwu.chanpinbianhao !== ysjl.chanpinbianhao) {
-        this.color_2 = 'red'
-      }
-      if (renwu.s29 !== ysjlParam.rongqituhao) {
-        this.color_3 = 'red'
-      }
-      if (renwu.s27 !== ysjlParam.rongqileibie) {
-        this.color_4 = 'red'
-      }
-      if (renwu.guigexinghao !== ysjl.guigexinghao) {
-        this.color_5 = 'red'
-      }
-    },
-    showVerification(renwuId, viewButton) {
-      this.currentRenwuId = renwuId
-      this.viewButton = viewButton
-      this.dialogFormVisible = true
-    },
-    showVerificationProof(ysjlId) {
-      this.getProveListDrawings(ysjlId)
-      this.dialogFormVisibleProof = true
-    },
-    getProveList(ysjlId) {
-      this.preview({
-        method: 'get',
-        url: '/download/getProveListByYsjlId',
-        params: {
-          ysjlId: ysjlId
-        }
-      }).then(data => {
-        this.fileList = data
-      })
-    },
-    getParamByYsjlId: async function(ysjlId, sbzldm) {
-      await this.api({
-        method: 'get',
-        url: '/ysjl/getParamByYsjlId',
-        params: {
-          ysjlId: ysjlId,
-          sbzldm: sbzldm
-        }
-      }).then(data => {
-        this.ysjlParam = data
-      })
-    },
-    getProveListDrawings(ysjlId) {
-      this.getParamByYsjlId(ysjlId, '2000')
-      if (this.ysjlParam !== null && this.ysjlParam.img1 !== null && this.ysjlParam.img1 !== undefined) {
-        const alf = JSON.parse(this.ysjlParam.img1)
-        alf.forEach(v => {
-          this.fileListDrawings.push(this.getAryDate('url', v.name))
-        })
-      }
-    },
-    deleteProve() {
-      if (this.multipleProveSelection.length === 0) {
-        this.$message({
-          type: 'error',
-          message: '请选中需要删除的数据！'
-        })
-        return false
-      } else {
-        this.$confirm('确定删除当前选中记录?', '提示', {
-          confirmButtonText: '确定',
-          showCancelButton: true,
-          type: 'warning'
-        }).then(() => {
-          const pks = []
-          this.multipleProveSelection.forEach(prove => {
-            pks.push(prove.id)
-          })
-          this.preview({
-            url: '/upload/deleteProve',
-            method: 'delete',
-            params: {
-              pks: pks
-            },
-            paramsSerializer: function(params) {
-              return qs.stringify(params, { indices: false })
-            }
-          }).then(() => {
-            this.$message({ message: '删除成功。', type: 'success' })
-            this.getProveList(this.selection.id)
-          })
-        })
-      }
-    },
-    //  检验员核算费用弹窗
-    approved() {
-      if (this.multipleSelection.length === 0) {
-        this.$message({
-          type: 'error',
-          message: '请在列表选择要生成报告的数据！'
-        })
-        return false
-      } else {
-        const pks = []
-        let ifRun = true
-        let ifParam = true
-        this.multipleSelection.forEach(ysjl => {
-          if (!ysjl.jilubianhao || ysjl.jilubianhao === '') {
-            ifRun = false
-          }
-          if (!ysjl.zhizaoriqi || ysjl.zhizaoriqi === '' || !ysjl.bianzhiriqi || ysjl.bianzhiriqi === '') {
-            ifParam = false
-          }
-          pks.push(ysjl.id)
-        })
-        if (ifRun && ifParam) {
-          this.api({
-            url: '/ysjl/inspectionApproved',
-            method: 'POST',
-            params: { pks: pks },
-            paramsSerializer: function(params) {
-              return qs.stringify(params, { indices: false })
-            }
-          }).then((data) => {
-            this.listInspection = data
-            this.dialogInspectionVisible = true
-          })
-        } else {
-          const message = !ifRun ? '存在未上传原始记录数据！' : '存在未上传数据表或批量证明数据！'
-          this.$message({ type: 'error', message: message })
-        }
-      }
-    },
-    //  生成报告
-    batchGenerate() {
-      //  检验员核算保存
-      this.api({
-        url: '/ysjl/inspectionApprovedSave',
-        method: 'POST',
-        data: this.listInspection
-      }).then(() => {
-        const pks = []
-        this.multipleSelection.forEach(ysjl => {
-          pks.push(ysjl.id)
-        })
-        this.api({
-          url: '/ysjl/batchGenerateReport',
-          method: 'POST',
-          params: { pks: pks },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then(() => {
-          this.dialogInspectionVisible = false
-          this.$message({ message: '生成报告成功。', type: 'success' })
-          this.getList()
-          Utils.$emit('bggl-daiban-list')
-          Utils.$emit('manufacture-done-list')
-        })
-      })
-    },
-    fillInVacancy(ysjl) {
-      if (ysjl) {
-        // 固定式承压部件
-        this.showWhis = ysjl.shengchanxingshi === '6'
-        if (ysjl.beizhu !== null && ysjl.beizhu !== '') {
-          this.beizhu = JSON.parse(ysjl.beizhu)
-          this.dialogStatus = 'update'
-        }
-      }
-      this.dialogFillInVacancyVisible = true
-    },
-    /**
-     * 填写报告备注
-     */
-    async showUpdateReportNotes(ysjl) {
-      await this.getParamByYsjlId(ysjl.id, ysjl.shebeizhongleidaima)
-      this.ysjlParam.ysjlId = ysjl.id
-      this.dialogShowUpdateReportNotesVisible = true
-    },
-    /**
-     *  原始记录参数修改
-     */
-    updateYjslParam() {
-      if (this.ysjlParam) {
-        const param = {}
-        param.ysjlId = this.ysjlParam.ysjlId
-        if (this.ysjlParam.reportNotesNeirong) {
-          param.s110 = '备注：'
-        } else {
-          param.s110 = ''
-        }
-        param.s111 = this.ysjlParam.reportNotesNeirong
-        this.api({
-          url: '/ysjl/updateYsjlSelectiveParam',
-          method: 'post',
-          data: param
-        }).then(() => {
-          this.$message.success('操作成功！')
-          this.dialogShowUpdateReportNotesVisible = false
-          this.getList()
-        })
-      }
-    },
-    cellStyle() {
-      return 'padding: 0'
-    },
-    editYsjl(ysjl) {
-      this.api({
-        url: '/template/getById',
-        method: 'get',
-        params: {
-          id: ysjl.modelId
-        }
-      }).then(data => {
-        const queryParam = {
-          id: ysjl.id,
-          jyxm: ysjl.jianyanxiangmu,
-          departmentId: this.$store.getters.departmentId,
-          jianyanrenyuan: ysjl.jianyanrenyuan,
-          state: 'update',
-          renwuId: ysjl.renwuId,
-          modelId: ysjl.modelId,
-          jylb: ysjl.jianyanleibie,
-          neibuleibie: ysjl.neibuleibie,
-          sbzldm: ysjl.shebeizhongleidaima,
-          sblbdm: ysjl.shebeileibiedaima,
-          sbpzdm: ysjl.shebeipinzhongdaima,
-          chargeId: ysjl.chargeId
-        }
-        if (ysjl.bglx === 1) {
-          this.$router.push({ path: data.tempPath + '/' + ysjl.id, query: queryParam })
-        } else {
-          this.$router.push({ path: data.tempPath, query: queryParam })
-        }
-      })
-    },
-    createOrUpdateBeizhu() {
-      if (this.beizhu) {
-        this.selection.beizhu = JSON.stringify(this.beizhu)
-        this.api({
-          url: '/ysjl/updateYsjlOne',
-          method: 'post',
-          data: this.selection
-        }).then(() => {
-          this.$message.success('编辑成功！')
-          this.dialogFillInVacancyVisible = false
-          this.getList()
-        })
-      }
-    },
-    /**
-     * 生产形式
-     */
-    getProductionName(row, column, cellValue) {
-      const data = this.productions
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].value === cellValue) {
-          return data[i].name
-        }
-      }
-    },
-    /**
-     *  创建原始记录编号
-     */
-    getYsjlBianhao() {
-      this.apibjd({
-        url: '/ysjl/getYsjlBianhao',
-        method: 'get',
-        params: { ysjlId: this.selection.id }
-      }).then(() => {
-        this.getList()
-        this.showDataComparison(this.selection)
-        this.$message({
-          message: '上传成功！',
-          type: 'success'
-        })
-      })
-    }
-  }
-}
-</script>
-<style>
-  .el-table .restartdw-row {
-    color: red;
-  }
-  .identification{
-    width: 30px;
-    height:15px;
-    display: inline-block;
-    border:gray 1px solid;
-    border-radius:15px;
-    float: left;
-  }
-   input::-webkit-outer-spin-button,
-   input::-webkit-inner-spin-button {
-     -webkit-appearance: none !important;
-     margin: 0;
-   }
-</style>
diff --git a/src/views/ysjl/components/manufacture_yb_list.vue b/src/views/ysjl/components/manufacture_yb_list.vue
deleted file mode 100644
index 2e5a6d6..0000000
--- a/src/views/ysjl/components/manufacture_yb_list.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-form>
-        <el-form-item>
-          <el-input v-model="listQuery.jilubianhao" placeholder="记录编号" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.zhizaodanwei" placeholder="单位名称" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.chanpinbianhao" placeholder="产品编号" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <el-table
-      ref="list"
-      v-adaptive="{bottomOffset: 50}"
-      height="0"
-      :data="list"
-      :default-sort="{prop:'jilubianhao', order:'descending'}"
-      border
-      fit
-      highlight-current-row
-      stripe
-      size="mini"
-      width="100%"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" width="40px;" />
-      <el-table-column type="index" align="center" label="序号" width="60px;" />
-      <el-table-column align="center" label="记录编号" prop="jilubianhao" width="180px;" sortable="custom" />
-      <el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="130px;" sortable="custom" />
-      <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="jianyanleibie" width="100px;" />
-      <el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="130px;" sortable="custom" />
-      <el-table-column align="center" label="单位名称" prop="zhizaodanwei" sortable="custom" width="250px;" />
-      <el-table-column align="center" label="产品编号" prop="chanpinbianhao" width="130px;" sortable="custom" />
-      <el-table-column align="center" label="产品名称" prop="shebeimingcheng" width="130px;" />
-      <el-table-column align="center" label="设备型号" prop="guigexinghao" width="130px" />
-      <el-table-column align="center" label="设计日期" prop="shejiriqi" width="140px;" />
-      <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="100px;" />
-      <el-table-column align="center" label="操作" fixed="right" width="150px;">
-        <template slot-scope="{row}">
-          <el-dropdown trigger="click">
-            <el-button type="text" round plain class="el-dropdown-link" style="color: #13ce66">
-              下拉操作<i class="el-icon-arrow-down el-icon--right" />
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button type="text" @click="common.viewYsjl(row.id, 'YSJL')">
-                  {{ row.shebeileibiedaima === '2100' && row.shengchanxingshi === '5' ? '预览批量原始记录' : '预览原始记录' }}
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="row.shebeileibiedaima === '2300'">
-                <el-button type="text" @click="common.viewYsjl(row.id, 'OTHER')">
-                  预览批量证明
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="row.shebeileibiedaima === '2100'">
-                <el-button type="text" @click="common.viewYsjl(row.id, 'OTHER')">
-                  预览数据表
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button type="text" @click="showVerification(row.renwuId)">
-                  查看相关鉴证
-                </el-button>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </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" />
-    <el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogFormVisible">
-      <enclosure :relation-id.sync="currentRenwuId" :if-liaison.sync="ifLiaison" :view-button.sync="viewButton" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination'
-import Enclosure from '@/views/common/Enclosure'
-export default {
-  components: { Pagination, Enclosure },
-  data() {
-    return {
-      totalCount: 0,
-      list: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        order: undefined, // 排序字段
-        sort: undefined, // 排序方式
-        shebeizhongleidaima: '2000',
-        jianyanleibie: 'ZJ',
-        hasLook: 2
-
-      },
-      multipleSelection: [],
-      dialogFormVisible: false,
-      fileList: [],
-      currentRenwuId: 0,
-      viewButton: false,
-      ifLiaison: false
-    }
-  },
-  created() {
-    this.getList()
-  },
-  mounted() {
-    const that = this
-    this.common.$on('manufacture-done-list', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    getList() {
-      this.listQuery.cjState = 'bggl'
-      this.api({
-        url: '/ysjl/getList',
-        method: 'get',
-        params: this.listQuery
-      }).then(data => {
-        this.list = data.list
-        this.totalCount = data.totalCount
-      })
-    },
-    sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
-      this.getList()
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    onRowClick(row) {
-      this.selection = row
-      this.$refs.list.toggleRowSelection(row)
-    },
-    handleSelectionChange: function(val) {
-      this.multipleSelection = val
-    },
-    showVerification(renwuId) {
-      this.dialogFormVisible = true
-      this.currentRenwuId = renwuId
-    }
-  }
-}
-</script>
diff --git a/src/views/ysjl/components/original_db_list.vue b/src/views/ysjl/components/original_db_list.vue
index 11d5c0d..8eb4e80 100644
--- a/src/views/ysjl/components/original_db_list.vue
+++ b/src/views/ysjl/components/original_db_list.vue
@@ -3,12 +3,6 @@
     <div class="filter-container">
       <sticky style="margin-bottom: 10px;">
         <div class="sub-navbar">
-          <el-button v-if="hasRole('GLQYD')" type="primary" icon="el-icon-check" @click="dialogRoleVisible = true">
-            提交
-          </el-button>
-          <el-button v-if="hasRole('GLZZJYY') || hasRole('GLZZKZ')" type="warning" icon="el-icon-back" @click="backToZzdw">
-            退回到企业
-          </el-button>
           <el-button type="danger" icon="el-icon-delete" @click="delYsjl">
             删除记录
           </el-button>
@@ -23,15 +17,6 @@
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 240px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 400px" @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>&nbsp;&nbsp;&nbsp;&nbsp;
           <el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -67,27 +52,14 @@
       </el-table-column>
       <el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" />
       <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
-      <template v-if="$store.getters.departmentId === 69">
-        <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
-        <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
-        <el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
-      </template>
-      <template v-else-if="$store.getters.departmentId === 74">
-        <el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="200" />
-        <el-table-column align="center" label="设备代码" prop="shebeidaima" width="200" />
-        <el-table-column align="center" label="锅炉型号" prop="guigexinghao" width="200" />
-        <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="130" />
-      </template>
-      <template v-else>
-        <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
-        <el-table-column align="center" label="锅炉型号" prop="guigexinghao" width="180" sortable="custom" />
-        <!--        <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />-->
-        <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
-        <!--        <el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="220" />-->
-        <el-table-column align="center" label="设备名称" prop="shebeimingcheng" width="220" />
-        <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
-        <el-table-column align="center" label="单位内编号" prop="danweineibubianhao" width="150" sortable="custom" />
-      </template>
+      <el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="220" />
+      <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
+      <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
+      <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
+      <el-table-column align="center" label="设备名称" prop="shebeimingcheng" width="220" />
+      <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
+      <el-table-column align="center" label="规格型号" prop="guigexinghao" width="180" sortable="custom" />
+      <el-table-column align="center" label="单位内编号" prop="danweineibubianhao" width="150" sortable="custom" />
       <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" />
       <el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="110" sortable="custom" />
       <el-table-column v-if="$store.getters.departmentId !== 74" align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
@@ -105,22 +77,12 @@
       <el-table-column fixed="right" align="center" label="操作" prop="" width="200">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editYsjl(scope.$index)" />
-          <el-button
-            v-show="scope.row.shebeizhongleidaima === '2000' || scope.row.shebeizhongleidaima === '7000'"
-            type="info"
-            size="mini"
-            circle
-            icon="el-icon-view"
-            :title="'预览' + (scope.row.shebeizhongleidaima === '2000' ? '原始资料' : '附件')"
-            @click="common.viewRawRecords(scope.row.renwuId)"
-          />
-          <el-button v-if="scope.row.bglx === 1" type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.id, 'YSJL')" />
-          <el-button v-else type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.parentId, 'YSJL')" />
-          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
+          <el-button type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.bglx === 1 ? scope.row.id : scope.row.parentId, 'YSJL')" />
+          <el-button type="info" size="mini" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
         </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" />
     <div style="float: right;margin-top:8px;">
       <div style="width: 80px;float:left;margin-left: 50px;">
         重启流程：
@@ -144,38 +106,24 @@
         <el-table-column align="center" label="驳回时间" prop="createTime" />
       </el-table>
     </el-dialog>
-
-    <el-dialog title="提交" :visible.sync="dialogRoleVisible">
-      <template>
-        <el-select v-model="receiver" multiple :multiple-limit="1" collapse-tags>
-          <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
-        </el-select>
-      </template>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogRoleVisible = false">取 消</el-button>
-        <el-button type="primary" @click="transferYsjl">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import Sticky from '@/components/Sticky'
 import Pagination from '@/components/Pagination'
-import { getNeedRecordList } from '@/api/ysjl'
+import { getListUnDoneYsjl } from '@/api/ysjl'
 import Utils from '../../../utils/contact.js'
 export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: undefined, // 排序字段
-        sort: undefined, // 排序方式
-        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
+        orderBy: undefined, // 排序字段
         hasChild: true
       },
       multipleSelection: [],
@@ -190,16 +138,12 @@ export default {
       modelId: '',
       isQm: true,
       infoNotes: '',
-      dialogBohuiyijianVisible: false,
-      dialogRoleVisible: false,
-      userList: [],
-      receiver: null
+      dialogBohuiyijianVisible: false
     }
   },
   created() {
     this.getList()
     this.getSbzlList()
-    this.userList = this.$store.getters.allUser.filter(user => user.departmentId === this.$store.getters.departmentId && user.clientType === 'System')
   },
   mounted() {
     const that = this
@@ -210,15 +154,14 @@ export default {
   methods: {
     getList() {
       this.listQuery.cjState = 'ysjl'
-      getNeedRecordList(this.listQuery).then(data => {
+      getListUnDoneYsjl(this.listQuery).then(data => {
         this.list = data.list
-        this.totalCount = data.total
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -445,62 +388,6 @@ export default {
           this.dialogBohuiyijianVisible = true
         }
       })
-    },
-    transferYsjl() {
-      if (!this.$refs.list.selection.length) {
-        this.$message.warning('请至少选择一条原始记录进行提交操作！')
-        return false
-      }
-      const qs = require('qs')
-      this.api({
-        url: '/ysjl/modifyRlr',
-        method: 'post',
-        data: {
-          ids: this.$refs.list.selection.map(row => row.id),
-          renlingren: this.receiver.join(',')
-        },
-        paramsSerializer: function(params) {
-          return qs.stringify(params, { indices: false })
-        }
-      }).then(() => {
-        this.$message.success('提交成功')
-        this.dialogRoleVisible = false
-        this.getList()
-      })
-    },
-    /**
-     * 退回到制造单位
-     */
-    backToZzdw() {
-      if (!this.$refs.list.selection.length) {
-        this.$message.warning('请至少选择一条原始记录进行退回操作！')
-        return false
-      }
-      if (this.$refs.list.selection.filter(ysjl => ysjl.zzdwId !== this.$refs.list.selection[0].zzdwId).length) {
-        this.$message.warning('请选择同一制造单位的原始记录进行退回操作！')
-        return false
-      }
-      const qs = require('qs')
-      this.api({
-        url: '/dwxx/getById',
-        method: 'get',
-        params: { id: this.$refs.list.selection[0].zzdwId }
-      }).then(data => {
-        this.api({
-          url: '/ysjl/modifyRlr',
-          method: 'post',
-          data: {
-            ids: this.$refs.list.selection.map(row => row.id),
-            renlingren: data.userId
-          },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then(() => {
-          this.$message.success('退回成功')
-          this.getList()
-        })
-      })
     }
   }
 }
diff --git a/src/views/ysjl/components/original_yb_list.vue b/src/views/ysjl/components/original_yb_list.vue
index 194b2f5..94b8d23 100644
--- a/src/views/ysjl/components/original_yb_list.vue
+++ b/src/views/ysjl/components/original_yb_list.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <sticky v-show="hasPerm('ysjl:regenerate')" style="margin-bottom: 10px;">
+      <sticky v-show="hasPerm('ysjl:done-ysjl:regenerate')" style="margin-bottom: 10px;">
         <div class="sub-navbar">
-          <el-button v-if="hasPerm('ysjl:regenerate')" type="warning" icon="el-icon-view" @click="generatePdf('YSJL')">
+          <el-button v-if="hasPerm('ysjl:done-ysjl:regenerate')" type="warning" icon="el-icon-view" @click="generatePdf('YSJL')">
             重新生成记录预览
           </el-button>
         </div>
@@ -22,15 +22,6 @@
             />
           </el-select>
           <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>
@@ -112,7 +103,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>
 
@@ -123,17 +114,13 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: undefined, // 排序字段
-        sort: undefined, // 排序方式
-        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
-        hasChild: true,
-        copyPage: false,
-        link: 2
+        orderBy: undefined, // 排序字段
+        hasChild: true
       },
       multipleSelection: [],
       bglxOptions: [{
@@ -158,18 +145,17 @@ export default {
     getList() {
       this.listQuery.cjState = 'bggl'
       this.api({
-        url: '/ysjl/getList',
+        url: '/ysjl/getListDoneYsjl',
         method: 'get',
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
         this.common.switchInspection(this.list)
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
diff --git a/src/views/ysjl/db_list.vue b/src/views/ysjl/db_list.vue
index f95ed73..6b24b36 100644
--- a/src/views/ysjl/db_list.vue
+++ b/src/views/ysjl/db_list.vue
@@ -1,21 +1,11 @@
 <template>
-  <manufacture-db-list v-if="ifManufacture" />
-  <gascylinder-db-list v-else-if="ifGasCylinder" />
-  <original-db-list v-else />
+  <original-db-list />
 </template>
 <script>
-import manufactureDbList from './components/manufacture_db_list' // 容器制造
 import originalDbList from './components/original_db_list' // 原始记录
-import gascylinderDbList from './components/gascylinder_db_list' // 车用气瓶
 
 export default {
   name: 'TODOYsjl',
-  components: { originalDbList, manufactureDbList, gascylinderDbList },
-  data() {
-    return {
-      ifManufacture: this.$store.getters.departmentId === 84 || this.hasRole('WZHM'),
-      ifGasCylinder: this.$store.getters.departmentId === 86
-    }
-  }
+  components: { originalDbList }
 }
 </script>
diff --git a/src/views/ysjl/yb_list.vue b/src/views/ysjl/yb_list.vue
index 5618f0e..54d60f4 100644
--- a/src/views/ysjl/yb_list.vue
+++ b/src/views/ysjl/yb_list.vue
@@ -1,22 +1,13 @@
 <template>
-  <manufacture-yb-list v-if="ifManufacture" />
-  <gascylinder-yb-list v-else-if="ifGasCylinder" />
-  <original-yb-list v-else />
+  <original-yb-list />
 </template>
 
 <script>
 import originalYbList from './components/original_yb_list'
-import manufactureYbList from './components/manufacture_yb_list'
-import gascylinderYbList from './components/gascylinder_yb_list' // 车用气瓶
+
 export default {
   name: 'HasDoneYsjl',
-  components: { originalYbList, manufactureYbList, gascylinderYbList },
-  data() {
-    return {
-      ifManufacture: this.$store.getters.departmentId === 84,
-      ifGasCylinder: this.$store.getters.departmentId === 86
-    }
-  }
+  components: { originalYbList }
 }
 </script>
 
diff --git a/src/views/zjd/zjbg_list.vue b/src/views/zjd/zjbg_list.vue
index 0d21e1d..6468fbd 100644
--- a/src/views/zjd/zjbg_list.vue
+++ b/src/views/zjd/zjbg_list.vue
@@ -108,7 +108,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="zhuanjiaoVisible" width="30%">
       <el-form ref="zhuanjiao" :model="zhuanjiao" :rules="rules" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="20">
@@ -174,7 +174,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       listQuery: {
         pageNum: 1, // 页码
@@ -250,7 +250,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
diff --git a/src/views/zjd/zjd_list.vue b/src/views/zjd/zjd_list.vue
index 9ce208f..f30897c 100644
--- a/src/views/zjd/zjd_list.vue
+++ b/src/views/zjd/zjd_list.vue
@@ -63,7 +63,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="zhuanjiaoVisible" width="30%">
       <el-form ref="zhuanjiao" :model="zhuanjiao" :rules="rules" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="20">
@@ -119,7 +119,7 @@ export default {
   components: { Sticky, Pagination },
   data() {
     return {
-      totalCount: 0,
+      total: 0,
       list: [],
       zjdList: [],
       listQuery: {
@@ -175,7 +175,7 @@ export default {
         params: this.listQuery
       }).then(data => {
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.total = data.total
       })
     },
     sortChange(column) {
diff --git a/vue.config.js b/vue.config.js
index 0ed2f6b..c9c0fcf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,13 +7,14 @@ function resolve(dir) {
 }
 
 const name = pkg.name || 'sdma-front' // page title
-const port = process.env.NODE_ENV === 'development' ? 9527 : 8090
-console.log(process.env.NODE_ENV === 'development')
+const isDev = process.env.NODE_ENV === 'development'
+const port = isDev ? 9527 : 8090
+console.log(isDev)
 module.exports = {
-  publicPath: process.env.NODE_ENV === 'test' ? '/sdmaFront' : './',
+  publicPath: isDev ? './' : '/sdmaFront',
   outputDir: 'sdmaFront',
   assetsDir: 'static',
-  lintOnSave: process.env.NODE_ENV === 'development' ? 'error' : false,
+  lintOnSave: isDev ? 'error' : false,
   productionSourceMap: false,
   runtimeCompiler: true,
   devServer: {