From 008a9f9c3f66f93b81ed7bd7757c7930d729cac0 Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Fri, 6 Aug 2021 18:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ysjl,=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=B5=E6=A2=AF=E6=A8=A1=E6=9D=BF=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawerDialog/index.vue         |  49 +-
 src/views/assign/missionList.vue              |  18 +-
 src/views/audit/list.vue                      |  18 +-
 src/views/bggl/banjie_list.vue                |  50 +-
 src/views/bggl/components/boiler_db_list.vue  |  54 +-
 .../bggl/components/original_db_list.vue      |  49 +-
 src/views/bggl/daishen_list.vue               |  18 +-
 src/views/bggl/eliminatingred_list.vue        |  57 +-
 src/views/bggl/sign_list.vue                  |  35 +-
 src/views/bggl/yiban_list.vue                 |  27 +-
 src/views/document/index.vue                  |  38 +-
 src/views/flow/template.vue                   |   7 +-
 src/views/print/1000/grant_create.vue         |  32 +-
 src/views/print/1000/grant_list_yff.vue       |  41 +-
 src/views/print/8000/print_list.vue           |  35 +-
 src/views/statistics/gldj.vue                 |  32 +-
 src/views/task/list.vue                       |   2 +-
 .../ysjl/components/gascylinder_yb_list.vue   |  26 +-
 src/views/ysjl/elevator/common/index.vue      | 864 ++++++++++++++----
 src/views/ysjl/elevator/yeyin/index.vue       |  54 ++
 20 files changed, 1062 insertions(+), 444 deletions(-)

diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index c660d8b..9c1826c 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -27,7 +27,7 @@
               style="margin-left: 50px"
             >
               <el-form-item label="模板名称" prop="tempName" required>
-                <el-input v-model="formTemplate.tempName" type="text" />
+                <el-input v-model="formTemplate.tempName" type="text" style="width:400px" />
               </el-form-item>
               <el-form-item label="模板类型" prop="tempCategory" required>
                 <el-select
@@ -142,10 +142,10 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="模板路径" prop="tempPath">
-                <el-input v-model="formTemplate.tempPath" type="text" />
+                <el-input v-model="formTemplate.tempPath" type="text" style="width:400px" />
               </el-form-item>
               <el-form-item label="检验依据" prop="jianyanyiju">
-                <el-input v-model="formTemplate.jianyanyiju" type="text" />
+                <el-input v-model="formTemplate.jianyanyiju" type="text" style="width:400px" />
               </el-form-item>
               <el-form-item label="对应字典" prop="withDicCode">
                 <el-select
@@ -752,7 +752,8 @@ export default {
       totalCount: 0,
       listQuery: {
         pageNum: 1, // 页码
-        pageRow: 20 // 每页条数
+        pageRow: 20, // 每页条数
+        templateId: null
       },
       list: [],
       gridData: [],
@@ -828,13 +829,30 @@ export default {
       this.$refs.templateJyxmForm.resetFields()
     },
     open() {
-      console.log(this.id, 'hahahh')
       this.listQuery.templateId = this.id
       this.form.templateId = this.id
       this.formLabelAlign.templateId = this.id
       this.getList()
       if (this.id) {
         this.loadFormData(this.index)
+      } else {
+        this.$refs['formTemplate'].resetFields()
+        this.formTemplate = {
+          tempName: '',
+          tempCategory: '',
+          bglx: null,
+          jianyanleibie: '',
+          shebeizhongleidaima: '',
+          shebeileibiedaima: '',
+          tempPath: '',
+          jianyanyiju: '',
+          withDicCode: '',
+          parentId: '',
+          version: '',
+          sort: null,
+          cleanState: false,
+          showPageStatus: true
+        }
       }
       this.getSbList(undefined, undefined, 1)
       this.getBglxList()
@@ -855,6 +873,7 @@ export default {
       this.dialogVisible = true
     },
     getList() {
+      this.listQuery.templateId = this.id
       // 查询列表
       this.api({
         url: '/templateSetting/list',
@@ -1121,7 +1140,7 @@ export default {
     update() {
       let methods = ''
       if (this.id) {
-        if (this.type === 1) {
+        if (this.type === 1 || this.type === 2) {
           delete this.formTemplate.id
           methods = 'post'
         } else {
@@ -1139,7 +1158,6 @@ export default {
       })
     },
     rowClick(row) {
-      console.log(row, '选择')
       if (!row) {
         return false
       }
@@ -1150,6 +1168,23 @@ export default {
     beforeClose(done) {
       this.list.length = 0
       this.gridData.length = 0
+      this.formTemplate = Object.assign({
+        tempName: '',
+        tempCategory: '',
+        bglx: 1,
+        jianyanleibie: '',
+        shebeizhongleidaima: '',
+        shebeileibiedaima: '',
+        tempPath: '',
+        jianyanyiju: '',
+        withDicCode: '',
+        parentId: '',
+        version: '',
+        sort: 0,
+        cleanState: false,
+        showPageStatus: true
+      }, this.formTemplate)
+      this.$refs['formTemplate'].resetFields()
       this.$emit('closeTemplateDrawer')
     }
   }
diff --git a/src/views/assign/missionList.vue b/src/views/assign/missionList.vue
index 3373cd3..d1618fa 100644
--- a/src/views/assign/missionList.vue
+++ b/src/views/assign/missionList.vue
@@ -26,13 +26,13 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-select v-model="listQuery.searchOwnRw.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
+          <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
             <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
-          <el-input v-model="listQuery.searchOwnRw.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchOwnRw.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchOwnRw.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <!--<el-input v-model="listQuery.searchOwnRw.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />-->
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <!--<el-input v-model="listQuery.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />-->
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -196,8 +196,7 @@ export default {
       modelList: [],
       listQuery: {
         pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        searchOwnRw: {}
+        pageRow: 20 // 每页条数
       },
       listQueryCopy: {
         pageNum: 1, // 页码
@@ -569,7 +568,10 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchOwnRw', {})
+      this.listQuery = {
+        pageNum: 1, // 页码
+        pageRow: 20
+      }
       this.getList()
     },
     clearCopyQuery() {
diff --git a/src/views/audit/list.vue b/src/views/audit/list.vue
index 0a9ff01..38a71d4 100644
--- a/src/views/audit/list.vue
+++ b/src/views/audit/list.vue
@@ -20,8 +20,8 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @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.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -165,9 +165,7 @@ export default {
         sort: 'asc', // 排序方式
         link: 8,
         hasChild: true,
-        hasLook: 3,
-        searchYsjl: {
-        }
+        hasLook: 3
       },
       flowUserList: [],
       isQm: true,
@@ -637,7 +635,15 @@ export default {
       }
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {})
+      this.listQuery = {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        order: 'update_time', // 排序字段
+        sort: 'asc', // 排序方式
+        link: 8,
+        hasChild: true,
+        hasLook: 3
+      }
       this.getList()
     },
     closeDialog() {
diff --git a/src/views/bggl/banjie_list.vue b/src/views/bggl/banjie_list.vue
index 199246d..e06cce5 100644
--- a/src/views/bggl/banjie_list.vue
+++ b/src/views/bggl/banjie_list.vue
@@ -41,21 +41,21 @@
       <el-form style="margin-top: 10px;">
         <el-form-item>
           <el-input
-            v-model="listQuery.searchYsjl.baogaobianhao"
+            v-model="listQuery.baogaobianhao"
             placeholder="报告编号"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleFilter"
           />
           <el-input
-            v-model="listQuery.searchYsjl.zhucedaima"
+            v-model="listQuery.zhucedaima"
             placeholder="注册代码"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleFilter"
           />
           <el-input
-            v-model="listQuery.searchYsjl.shiyongdanwei"
+            v-model="listQuery.shiyongdanwei"
             placeholder="使用单位"
             clearable
             style="width: 350px"
@@ -63,7 +63,7 @@
           />
           <br>
           <span class="radio-group-label">查看类型：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
+          <el-radio-group v-model="listQuery.createBy" @change="handleFilter">
             <el-radio :label="$store.getters.userId">
               只看创建人
             </el-radio>
@@ -189,7 +189,7 @@
         <el-form :inline="true">
           <el-form-item label="检验类别:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.neibuleibie"
+              v-model="listQuery.neibuleibie"
               placeholder="请选择检验类别"
               style="width: 165px"
               clearable
@@ -200,7 +200,7 @@
           </el-form-item>
           <el-form-item label="设备种类:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.shebeizhongleidaima"
+              v-model="listQuery.shebeizhongleidaima"
               placeholder="请选择设备种类"
               style="width: 165px"
               clearable
@@ -211,7 +211,7 @@
           </el-form-item>
           <el-form-item label="检验人员:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.jianyanrenyuan"
+              v-model="listQuery.jianyanrenyuan"
               placeholder="请选择检验人员"
               style="width: 165px"
               filterable
@@ -221,18 +221,18 @@
             </el-select>
           </el-form-item>
           <el-form-item label="审核人员:" style="width: 240px;">
-            <el-select v-model="listQuery.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.jianyanjieshuriqi"
+              v-model="listQuery.jianyanjieshuriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择检验日期"
@@ -241,7 +241,7 @@
           </el-form-item>
           <el-form-item label="审核日期:" style="width: 240px;">
             <el-date-picker
-              v-model="listQuery.searchYsjl.shenheriqi"
+              v-model="listQuery.shenheriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择审核日期"
@@ -250,7 +250,7 @@
           </el-form-item>
           <el-form-item label="审批日期:" style="width: 240px;">
             <el-date-picker
-              v-model="listQuery.searchYsjl.shenpiriqi"
+              v-model="listQuery.shenpiriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择审批日期"
@@ -259,7 +259,7 @@
           </el-form-item>
           <el-form-item label="下次检验日期:" style="width: 250px;">
             <el-date-picker
-              v-model="listQuery.searchYsjl.xiacijianyanriqi"
+              v-model="listQuery.xiacijianyanriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="请输入日期"
@@ -268,25 +268,25 @@
           </el-form-item>
           <el-form-item label="设备/产品名称:" style="width: 290px;">
             <el-input
-              v-model="listQuery.searchYsjl.shebeimingcheng"
+              v-model="listQuery.shebeimingcheng"
               placeholder="请输入设备/产品名称"
               clearable
               style="width: 185px"
             />
           </el-form-item>
           <el-form-item label="制造单位:" style="width: 450px;">
-            <el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
+            <el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
           </el-form-item>
           <el-form-item label="使用登记证编号:" style="width: 350px;">
             <el-input
-              v-model="listQuery.searchYsjl.shiyongdengjibianhao"
+              v-model="listQuery.shiyongdengjibianhao"
               placeholder="请输入使用登记证编号"
               clearable
               style="width: 200px"
             />
           </el-form-item>
           <el-form-item label="产品/出厂编号:" style="width: 290px;">
-            <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
+            <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
           </el-form-item>
         </el-form>
       </el-container>
@@ -544,9 +544,7 @@ export default {
         pageRow: 20, // 每页条数
         order: 'shenpiriqi desc,id', // 排序字段
         sort: 'desc', // 排序方式
-        searchYsjl: {
-          createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined
-        },
+        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
         hasChild: true,
         hasFinish: true
       },
@@ -913,9 +911,15 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        createBy: this.$store.getters.userId
-      })
+      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
+      }
       this.getList()
     },
     clearExportReportQuery() {
diff --git a/src/views/bggl/components/boiler_db_list.vue b/src/views/bggl/components/boiler_db_list.vue
index e88d14f..35eb061 100644
--- a/src/views/bggl/components/boiler_db_list.vue
+++ b/src/views/bggl/components/boiler_db_list.vue
@@ -23,17 +23,17 @@
         <el-row :gutter="10">
           <el-col :span="5">
             <el-form-item label="报告编号:" prop="baogaobianhao">
-              <el-input v-model="listQuery.searchYsjl.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
+              <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.searchYsjl.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
+              <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.searchYsjl.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="sbzlChange">
+              <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>
@@ -42,17 +42,17 @@
         <el-row :gutter="10">
           <el-col :span="5">
             <el-form-item label="注册代码:" prop="zhucedaima">
-              <el-input v-model="listQuery.searchYsjl.zhucedaima" clearable @keyup.enter.native="handleFilter" />
+              <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.searchYsjl.chanpinbianhao" clearable @keyup.enter.native="handleFilter" />
+              <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.searchYsjl.shebeipinzhongdaima" placeholder="请选择设备品种" clearable>
+              <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>
@@ -199,61 +199,61 @@
       <el-container>
         <el-form :inline="true">
           <el-form-item label="检验类别:" style="width: 240px;">
-            <el-select v-model="listQuery.searchYsjl.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
+            <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.searchYsjl.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
+            <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.searchYsjl.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
+            <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.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
+            <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.searchYsjl.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
+            <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.searchYsjl.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
+            <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.searchYsjl.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
+            <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.searchYsjl.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
+            <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.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
+            <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.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
+            <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.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
+            <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.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
+            <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
           </el-form-item>
         </el-form>
       </el-container>
@@ -352,9 +352,7 @@ export default {
         pageRow: 20, // 每页条数
         order: 'update_time', // 排序字段
         sort: 'asc', // 排序方式
-        searchYsjl: {
-          flowStatus: 1
-        },
+        flowStatus: 1,
         hasChild: true,
         hasFinish: false
       },
@@ -982,7 +980,13 @@ export default {
       this.dialogQueryVisible = true
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {})
+      this.listQuery = {
+        order: 'update_time', // 排序字段
+        sort: 'asc', // 排序方式
+        flowStatus: 1,
+        hasChild: true,
+        hasFinish: false
+      }
       this.getList()
     },
     clearCopyQuery() {
diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue
index d295fca..aa0a400 100644
--- a/src/views/bggl/components/original_db_list.vue
+++ b/src/views/bggl/components/original_db_list.vue
@@ -25,10 +25,10 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <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-select v-model="listQuery.searchYsjl.bglx" placeholder="报告类型" style="width: 160px">
+          <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-select v-model="listQuery.bglx" placeholder="报告类型" style="width: 160px">
             <el-option
               v-for="item in bglxOptions"
               :key="item.value"
@@ -37,7 +37,7 @@
             />
           </el-select><br>
           <span class="radio-group-label">当前环节：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.flowstatus" @change="handleFilter">
+          <el-radio-group v-model="listQuery.flowstatus" @change="handleFilter">
             <el-radio :label="undefined">
               全部
             </el-radio>
@@ -192,61 +192,61 @@
       <el-container>
         <el-form :inline="true">
           <el-form-item label="检验类别:" style="width: 240px;">
-            <el-select v-model="listQuery.searchYsjl.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
+            <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.searchYsjl.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
+            <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.searchYsjl.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
+            <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.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
+            <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.searchYsjl.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
+            <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.searchYsjl.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
+            <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.searchYsjl.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
+            <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.searchYsjl.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
+            <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.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
+            <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.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
+            <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.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
+            <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.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
+            <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
           </el-form-item>
         </el-form>
       </el-container>
@@ -420,7 +420,6 @@ export default {
         pageRow: 20, // 每页条数
         order: 'update_time', // 排序字段
         sort: 'asc', // 排序方式
-        searchYsjl: {},
         hasChild: true,
         hasFinish: false
       },
@@ -1181,13 +1180,19 @@ export default {
       this.dialogQueryVisible = true
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {})
+      this.listQuery = {
+        order: 'update_time', // 排序字段
+        sort: 'asc', // 排序方式
+        hasChild: true,
+        hasFinish: false
+      }
       this.getList()
     },
     clearCopyQuery() {
       this.$set(this.listQueryCopy, 'searchYsjl', {
         bglx: 1
       })
+
       this.handleFilterCopy()
     },
     closeDialog() {
diff --git a/src/views/bggl/daishen_list.vue b/src/views/bggl/daishen_list.vue
index fd756b6..44168e4 100644
--- a/src/views/bggl/daishen_list.vue
+++ b/src/views/bggl/daishen_list.vue
@@ -21,12 +21,12 @@
         <el-row :gutter="10">
           <el-col :span="5">
             <el-form-item label="报告编号:" prop="baogaobianhao">
-              <el-input v-model="listQuery.searchYsjl.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
+              <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.searchYsjl.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
+              <el-input v-model="listQuery.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
             </el-form-item>
           </el-col>
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@@ -178,9 +178,7 @@ export default {
         pageRow: 20, // 每页条数
         order: 'update_time', // 排序字段
         sort: 'asc', // 排序方式
-        searchYsjl: {
-          hasTrial: true
-        },
+        hasTrial: true,
         hasChild: true,
         hasFinish: false
       },
@@ -673,7 +671,15 @@ export default {
       }
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {})
+      this.listQuery = {
+        pageNum: 1, // 页码
+        pageRow: 20, // 每页条数
+        order: 'update_time', // 排序字段
+        sort: 'asc', // 排序方式
+        hasTrial: true,
+        hasChild: true,
+        hasFinish: false
+      }
       this.getList()
     },
     closeDialog() {
diff --git a/src/views/bggl/eliminatingred_list.vue b/src/views/bggl/eliminatingred_list.vue
index 9c3f5b3..7580637 100644
--- a/src/views/bggl/eliminatingred_list.vue
+++ b/src/views/bggl/eliminatingred_list.vue
@@ -11,7 +11,7 @@
       <el-form style="margin-top: 10px;">
         <el-form-item>
           <el-select
-            v-model="listQuery.searchYsjl.modelId"
+            v-model="listQuery.modelId"
             placeholder="模板"
             filterable
             clearable
@@ -21,21 +21,21 @@
             <el-option v-for="item in templates" :key="item.id" :label="item.tempName" :value="item.id" />
           </el-select>
           <el-input
-            v-model="listQuery.searchYsjl.baogaobianhao"
+            v-model="listQuery.baogaobianhao"
             placeholder="报告编号"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleFilter"
           />
           <el-input
-            v-model="listQuery.searchYsjl.zhucedaima"
+            v-model="listQuery.zhucedaima"
             placeholder="注册代码"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleFilter"
           />
           <el-input
-            v-model="listQuery.searchYsjl.shiyongdengjibianhao"
+            v-model="listQuery.shiyongdengjibianhao"
             placeholder="使用登记证编号"
             clearable
             style="width: 350px"
@@ -43,7 +43,7 @@
           />
           <br>
           <span class="radio-group-label">消红状态：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.updateState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.updateState" @change="handleFilter">
             <el-radio :label="0">
               未消红
             </el-radio>
@@ -99,7 +99,7 @@
       <el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="110" />
       <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" />
       <el-table-column align="center" label="检验结论" prop="jianyanjielun" width="120" />
-      <el-table-column v-if="listQuery.searchYsjl.updateState === undefined" fixed="right" align="center" label="消红状态" prop="updateState" width="120">
+      <el-table-column v-if="listQuery.updateState === undefined" fixed="right" align="center" label="消红状态" prop="updateState" width="120">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.updateState === -1" type="info">
             不可消红
@@ -149,7 +149,7 @@
         <el-form :inline="true">
           <el-form-item label="检验类别:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.neibuleibie"
+              v-model="listQuery.neibuleibie"
               placeholder="请选择检验类别"
               style="width: 165px"
               clearable
@@ -160,7 +160,7 @@
           </el-form-item>
           <el-form-item label="设备种类:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.shebeizhongleidaima"
+              v-model="listQuery.shebeizhongleidaima"
               placeholder="请选择设备种类"
               style="width: 165px"
               clearable
@@ -171,7 +171,7 @@
           </el-form-item>
           <el-form-item label="检验人员:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.jianyanrenyuan"
+              v-model="listQuery.jianyanrenyuan"
               placeholder="请选择检验人员"
               style="width: 165px"
               filterable
@@ -181,18 +181,18 @@
             </el-select>
           </el-form-item>
           <el-form-item label="审核人员:" style="width: 240px;">
-            <el-select v-model="listQuery.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
+            <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.searchYsjl.jianyanjieshuriqi"
+              v-model="listQuery.jianyanjieshuriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择检验日期"
@@ -201,7 +201,7 @@
           </el-form-item>
           <el-form-item label="审核日期:" style="width: 240px;">
             <el-date-picker
-              v-model="listQuery.searchYsjl.shenheriqi"
+              v-model="listQuery.shenheriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择审核日期"
@@ -210,7 +210,7 @@
           </el-form-item>
           <el-form-item label="审批日期:" style="width: 240px;">
             <el-date-picker
-              v-model="listQuery.searchYsjl.shenpiriqi"
+              v-model="listQuery.shenpiriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择审批日期"
@@ -219,7 +219,7 @@
           </el-form-item>
           <el-form-item label="下次检验日期:" style="width: 250px;">
             <el-date-picker
-              v-model="listQuery.searchYsjl.xiacijianyanriqi"
+              v-model="listQuery.xiacijianyanriqi"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="请输入日期"
@@ -228,25 +228,25 @@
           </el-form-item>
           <el-form-item label="设备/产品名称:" style="width: 290px;">
             <el-input
-              v-model="listQuery.searchYsjl.shebeimingcheng"
+              v-model="listQuery.shebeimingcheng"
               placeholder="请输入设备/产品名称"
               clearable
               style="width: 185px"
             />
           </el-form-item>
           <el-form-item label="制造单位:" style="width: 450px;">
-            <el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
+            <el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
           </el-form-item>
           <el-form-item label="使用登记证编号:" style="width: 350px;">
             <el-input
-              v-model="listQuery.searchYsjl.shiyongdengjibianhao"
+              v-model="listQuery.shiyongdengjibianhao"
               placeholder="请输入使用登记证编号"
               clearable
               style="width: 200px"
             />
           </el-form-item>
           <el-form-item label="产品/出厂编号:" style="width: 290px;">
-            <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
+            <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
           </el-form-item>
         </el-form>
       </el-container>
@@ -308,9 +308,8 @@ export default {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
         orderBy: 'shenpiriqi desc,id desc', // 排序字段
-        searchYsjl: {
-          updateState: 0
-        }
+        updateState: 0
+
       },
       multipleSelection: [],
       dialogQueryVisible: false,
@@ -324,7 +323,7 @@ export default {
     }
   },
   watch: {
-    'listQuery.searchYsjl.updateState': function(val) {
+    'listQuery.updateState': function(val) {
       this.showUpdateState = val === undefined || val === 3
     }
   },
@@ -434,11 +433,13 @@ export default {
       this.dialogQueryVisible = true
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        createBy: this.$store.getters.userId,
-        updateState: 2,
-        bglx: 1
-      })
+      this.listQuery = {
+        bglx: 1,
+        pageNum: 1, // 页码
+        pageSize: 20, // 每页条数
+        orderBy: 'shenpiriqi desc,id desc', // 排序字段
+        updateState: 0
+      }
       this.getList()
     },
     cleanRed() {
diff --git a/src/views/bggl/sign_list.vue b/src/views/bggl/sign_list.vue
index fe4af7d..c75a86d 100644
--- a/src/views/bggl/sign_list.vue
+++ b/src/views/bggl/sign_list.vue
@@ -4,21 +4,21 @@
       <el-form style="margin-top: 10px;">
         <el-form-item>
           <el-input
-            v-model="listQuery.searchYsjl.baogaobianhao"
+            v-model="listQuery.baogaobianhao"
             placeholder="报告编号"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleFilter"
           />
           <el-input
-            v-model="listQuery.searchYsjl.zhucedaima"
+            v-model="listQuery.zhucedaima"
             placeholder="注册代码"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleFilter"
           />
           <el-input
-            v-model="listQuery.searchYsjl.shiyongdanwei"
+            v-model="listQuery.shiyongdanwei"
             placeholder="使用单位"
             clearable
             style="width: 350px"
@@ -105,7 +105,7 @@
         <el-form :inline="true">
           <el-form-item label="检验类别:" style="width: 240px;">
             <el-select
-              v-model="listQuery.searchYsjl.neibuleibie"
+              v-model="listQuery.neibuleibie"
               placeholder="请选择检验类别"
               style="width: 165px"
               clearable
@@ -116,25 +116,25 @@
           </el-form-item>
           <el-form-item label="设备/产品名称:" style="width: 290px;">
             <el-input
-              v-model="listQuery.searchYsjl.shebeimingcheng"
+              v-model="listQuery.shebeimingcheng"
               placeholder="请输入设备/产品名称"
               clearable
               style="width: 185px"
             />
           </el-form-item>
           <el-form-item label="制造单位:" style="width: 450px;">
-            <el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
+            <el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
           </el-form-item>
           <el-form-item label="使用登记证编号:" style="width: 350px;">
             <el-input
-              v-model="listQuery.searchYsjl.shiyongdengjibianhao"
+              v-model="listQuery.shiyongdengjibianhao"
               placeholder="请输入使用登记证编号"
               clearable
               style="width: 200px"
             />
           </el-form-item>
           <el-form-item label="产品/出厂编号:" style="width: 290px;">
-            <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
+            <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
           </el-form-item>
         </el-form>
       </el-container>
@@ -164,10 +164,8 @@ export default {
         pageRow: 20, // 每页条数
         order: 'jianyanjieshuriqi desc,id', // 排序字段
         sort: 'desc', // 排序方式
-        searchYsjl: {
-          bglx: 2, // 无损报告
-          jianyanrenyuan: this.$store.getters.userId
-        },
+        bglx: 2, // 无损报告
+        jianyanrenyuan: this.$store.getters.userId,
         hasFinish: null,
         hasLook: 1, // 科室数据
         ownRoles: 1 // 检验员包括自己的
@@ -218,10 +216,15 @@ export default {
       this.dialogQueryVisible = true
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        bglx: 2,
-        jianyanrenyuan: this.$store.getters.userId
-      })
+      this.listQuery = {
+        order: 'jianyanjieshuriqi desc,id', // 排序字段
+        sort: 'desc', // 排序方式
+        bglx: 2, // 无损报告
+        jianyanrenyuan: this.$store.getters.userId,
+        hasFinish: null,
+        hasLook: 1, // 科室数据
+        ownRoles: 1 // 检验员包括自己的
+      }
       this.getList()
     },
     formatterHuanjie(row) {
diff --git a/src/views/bggl/yiban_list.vue b/src/views/bggl/yiban_list.vue
index 55fb07c..9749ca8 100644
--- a/src/views/bggl/yiban_list.vue
+++ b/src/views/bggl/yiban_list.vue
@@ -10,9 +10,9 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <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: 300px" @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: 300px" @keyup.enter.native="handleFilter" />
           <el-select v-model="listQuery.ownRoles" 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>
@@ -24,7 +24,7 @@
           </el-button>
           <br>
           <span class="radio-group-label">查看类型：</span>
-          <el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
+          <el-radio-group v-model="listQuery.createBy" @change="handleFilter">
             <el-radio :label="$store.getters.userId">
               只看创建人
             </el-radio>
@@ -121,9 +121,7 @@ export default {
         pageRow: 20, // 每页条数
         order: undefined, // 排序字段
         sort: undefined, // 排序方式
-        searchYsjl: {
-          createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined
-        },
+        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
         hasChild: true, // 是否包含无损
         ownRoles: undefined, // 角色
         link: 7 // 已办报告环节
@@ -158,7 +156,7 @@ export default {
   },
   methods: {
     getList() {
-      this.listQuery.searchYsjl.cjState = 'bggl'
+      this.listQuery.cjState = 'bggl'
       this.api({
         url: '/ysjl/getList',
         method: 'get',
@@ -216,9 +214,14 @@ export default {
       }
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        createBy: this.$store.getters.userId
-      })
+      this.listQuery = {
+        order: undefined, // 排序字段
+        sort: undefined, // 排序方式
+        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
+        hasChild: true, // 是否包含无损
+        ownRoles: undefined, // 角色
+        link: 7 // 已办报告环节
+      }
       this.getList()
     },
     createQrcode() {
@@ -274,7 +277,7 @@ export default {
     },
     changeOwnRoles(val) {
       if (val === 2 || val === 3) {
-        this.listQuery.searchYsjl.createBy = undefined
+        this.listQuery.createBy = undefined
       }
     }
   }
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 40ed97c..f355d2d 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -13,21 +13,20 @@
         />
 
         <query :crud="crud" />
-             <el-upload
-        ref="upload"
-        slot="right"
-        class="upload-demo"
-        :show-file-list="false"
-        :before-upload="beforeUpload"
-        accept=".pdf"
-        action=""
-      >
-        <el-button slot="trigger" size="middle" type="primary">
-          上传文件
-        </el-button>
-      </el-upload>
+        <el-upload
+          ref="upload"
+          slot="right"
+          class="upload-demo"
+          :show-file-list="false"
+          :before-upload="beforeUpload"
+          accept=".pdf"
+          action=""
+        >
+          <el-button slot="trigger" size="middle" type="primary">
+            上传文件
+          </el-button>
+        </el-upload>
       </div>
- 
     </div>
     <!--表格内容-->
     <CustomTable
@@ -130,11 +129,12 @@ export default {
         pageSize: 10
       },
       gridData: [],
-      subTotal: 0
-
+      subTotal: 0,
+      url: process.env.VUE_APP_PREVIEW_API + process.env.VUE_APP_PROJECT_NAME
     }
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     handleRemove(file, fileList) {
       console.log(file, fileList)
@@ -178,10 +178,10 @@ export default {
       })
     },
     downLoad(item) {
-      downloadFileUrl('http://test.sdma.mingansei.com/sdma-preview/SJJY/inspectionSystemFile/' + item.id + item.suffix, item.filename, item.suffix)
+      downloadFileUrl(this.url + '/' + item.id + item.suffix, item.filename, item.suffix)
     },
     downLoadFn(item) {
-      download('http://test.sdma.mingansei.com/sdma-preview/SJJY/inspectionSystemFile/' + item.id + item.suffix)
+      download(this.url + '/' + item.id + item.suffix)
     },
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`)
diff --git a/src/views/flow/template.vue b/src/views/flow/template.vue
index 618f763..814c923 100644
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@@ -269,7 +269,7 @@ export default {
       nblbList: [],
       bglxList: [],
       dicCodeList: [],
-      temType: '',
+      temType: null,
       categoryList: [
         {
           value: 'YSJL',
@@ -497,7 +497,9 @@ export default {
         showPageStatus: false,
         hasCheckedPage: false
       }
-      this.templateIndex = ''
+      this.temType = 2
+      this.templateIndex = null
+      this.id = null
       this.dialogStatus = 'create'
       this.drawer = true
     },
@@ -512,6 +514,7 @@ export default {
       console.log(row, $index, '行')
       this.dialogStatus = 'update'
       this.id = row.id
+      this.temType = 0
       this.templateIndex = $index
       this.drawer = true
       console.log(this.drawer, $index, '打开')
diff --git a/src/views/print/1000/grant_create.vue b/src/views/print/1000/grant_create.vue
index 2f6e5d4..cee9c35 100644
--- a/src/views/print/1000/grant_create.vue
+++ b/src/views/print/1000/grant_create.vue
@@ -17,10 +17,10 @@
       </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.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.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>
@@ -28,13 +28,13 @@
             清空
           </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-select v-model="listQuery.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
             <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
         </el-form-item>
@@ -155,12 +155,10 @@ export default {
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
-          shebeizhongleidaima: '1000',
-          printState: 1,
-          fafangState: 0,
-          departmentId: this.$store.getters.departmentId === 75 ? 75 : null
-        }
+        shebeizhongleidaima: '1000',
+        printState: 1,
+        fafangState: 0,
+        departmentId: this.$store.getters.departmentId === 75 ? 75 : null
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -231,11 +229,11 @@ export default {
       this.multipleSelection = val
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.listQuery = {
         shebeizhongleidaima: '1000',
         printState: 1,
         fafangState: 0
-      })
+      }
       this.getList()
     },
     openGrant() {
diff --git a/src/views/print/1000/grant_list_yff.vue b/src/views/print/1000/grant_list_yff.vue
index 41e9e29..4a44361 100644
--- a/src/views/print/1000/grant_list_yff.vue
+++ b/src/views/print/1000/grant_list_yff.vue
@@ -3,10 +3,10 @@
     <div class="filter-container">
       <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.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.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>
@@ -14,13 +14,13 @@
             清空
           </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-select v-model="listQuery.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
+          <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
+          <el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
             <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
         </el-form-item>
@@ -101,12 +101,11 @@ export default {
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
-          shebeizhongleidaima: '1000',
-          printState: 1,
-          fafangState: 1,
-          departmentId: this.$store.getters.departmentId === 77 ? null : this.$store.getters.departmentId
-        }
+        shebeizhongleidaima: '1000',
+        printState: 1,
+        fafangState: 1,
+        departmentId: this.$store.getters.departmentId === 77 ? null : this.$store.getters.departmentId
+
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -175,11 +174,17 @@ export default {
       this.multipleSelection = val
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.listQuery = {
+        order: 'id', // 排序字段
+        sort: 'desc', // 排序方式
+        hasChild: false,
+        hasFinish: true,
+        flowstatus: undefined,
         shebeizhongleidaima: '1000',
         printState: 1,
-        fafangState: 0
-      })
+        fafangState: 1,
+        departmentId: this.$store.getters.departmentId === 77 ? null : this.$store.getters.departmentId
+      }
       this.getList()
     },
     openGrant() {
diff --git a/src/views/print/8000/print_list.vue b/src/views/print/8000/print_list.vue
index a67c279..8e5f681 100644
--- a/src/views/print/8000/print_list.vue
+++ b/src/views/print/8000/print_list.vue
@@ -33,10 +33,10 @@
       </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.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.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>
@@ -44,14 +44,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>
@@ -154,10 +154,8 @@ export default {
         hasChild: false,
         hasFinish: true,
         flowstatus: undefined,
-        searchYsjl: {
-          shebeizhongleidaima: '8000',
-          fafangState: 0
-        }
+        shebeizhongleidaima: '8000',
+        fafangState: 0
       },
       flowUserList: [],
       fafangVisible: false,
@@ -299,10 +297,15 @@ export default {
       })
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
+      this.listQuery = {
         shebeizhongleidaima: '8000',
-        printState: 0
-      })
+        printState: 0,
+        order: 'id', // 排序字段
+        sort: 'desc', // 排序方式
+        hasChild: false,
+        hasFinish: true,
+        flowstatus: undefined
+      }
       this.getList()
     },
     viewBaogao(id, viewType, generateType = false) {
diff --git a/src/views/statistics/gldj.vue b/src/views/statistics/gldj.vue
index fa6456e..def2b85 100644
--- a/src/views/statistics/gldj.vue
+++ b/src/views/statistics/gldj.vue
@@ -4,7 +4,7 @@
       <el-form style="margin-top: 10px;">
         <el-form-item>
           <el-select
-            v-model="listQuery.searchYsjl.neibuleibie"
+            v-model="listQuery.neibuleibie"
             placeholder="请选择检验类别"
             style="width: 165px"
             clearable
@@ -13,7 +13,7 @@
             <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
           <el-select
-            v-model="listQuery.searchYsjl.shebeileibiedaima"
+            v-model="listQuery.shebeileibiedaima"
             placeholder="请选择设备类别"
             style="width: 165px"
             clearable
@@ -22,9 +22,9 @@
           >
             <el-option v-for="item in sblbList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
-          <el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="请输入使用单位" style="width: 165px" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="请输入使用单位" style="width: 165px" />
           <el-select
-            v-model="listQuery.searchYsjl.jianyanrenyuan"
+            v-model="listQuery.jianyanrenyuan"
             placeholder="请选择检验人员"
             style="width: 165px"
             filterable
@@ -33,18 +33,18 @@
             <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
           <el-date-picker
-            v-model="listQuery.searchYsjl.jianjiankaishiriqi"
+            v-model="listQuery.jianjiankaishiriqi"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="开始日期"
           />
           <el-date-picker
-            v-model="listQuery.searchYsjl.jianjianjieshuriqi"
+            v-model="listQuery.jianjianjieshuriqi"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="结束日期"
           />
-          <el-select v-model="listQuery.searchYsjl.quhuadaima" placeholder="请选择" style="width: 240px;" clearable @change="handleFilter">
+          <el-select v-model="listQuery.quhuadaima" placeholder="请选择" style="width: 240px;" clearable @change="handleFilter">
             <el-option v-for="item in areas" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@@ -128,9 +128,7 @@ export default {
         pageRow: 20, // 每页条数
         order: 'shenpiriqi desc,id', // 排序字段
         sort: 'desc', // 排序方式
-        searchYsjl: {
-          createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined
-        },
+        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
         hasChild: true,
         hasFinish: true
       },
@@ -224,9 +222,13 @@ export default {
       this.multipleSelection = val
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        createBy: this.$store.getters.userId
-      })
+      this.listQuery = {
+        order: 'shenpiriqi desc,id', // 排序字段
+        sort: 'desc', // 排序方式
+        createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
+        hasChild: true,
+        hasFinish: true
+      }
       this.getList()
     },
     getArea() { // 查询区划
@@ -263,8 +265,8 @@ export default {
       })
     },
     changeSbpz() {
-      const sblb = this.sblbList.filter(sblb => sblb.value === this.listQuery.searchYsjl.shebeileibiedaima)[0]
-      this.$set(this.listQuery.searchYsjl, 'shebeipinzhongdaima', '')
+      const sblb = this.sblbList.filter(sblb => sblb.value === this.listQuery.shebeileibiedaima)[0]
+      this.$set(this.listQuery, 'shebeipinzhongdaima', '')
       if (sblb) {
         this.sbpzList = sblb.children
       } else {
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 47d18fe..a645bfc 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -568,7 +568,7 @@ export default {
         }
       }
       if (!this.dialogFormCopyVisible) {
-        this.listQueryCopy.searchYsjl.neibuleibie = this.multipleSelection[0].neibuleibie
+        this.listQueryCopy.neibuleibie = this.multipleSelection[0].neibuleibie
         this.handleFilterCopy()
         this.dialogFormCopyVisible = true
       } else {
diff --git a/src/views/ysjl/components/gascylinder_yb_list.vue b/src/views/ysjl/components/gascylinder_yb_list.vue
index 4af38cc..a073c6b 100644
--- a/src/views/ysjl/components/gascylinder_yb_list.vue
+++ b/src/views/ysjl/components/gascylinder_yb_list.vue
@@ -3,8 +3,8 @@
     <div class="filter-container">
       <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-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>
@@ -12,10 +12,10 @@
             清空条件
           </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: 200px" @keyup.enter.native="handleFilter" />
+          <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.searchYsjl.createBy" @change="handleFilter">
+          <el-radio-group v-model="listQuery.createBy" @change="handleFilter">
             <el-radio :label="$store.getters.userId">
               只看创建人
             </el-radio>
@@ -79,9 +79,7 @@ export default {
         pageRow: 20, // 每页条数
         order: undefined, // 排序字段
         sort: undefined, // 排序方式
-        searchYsjl: {
-          createBy: this.$store.getters.userId
-        },
+        createBy: this.$store.getters.userId,
         hasChild: true,
         link: 2
       },
@@ -106,7 +104,7 @@ export default {
   },
   methods: {
     getList() {
-      this.listQuery.searchYsjl.cjState = 'bggl'
+      this.listQuery.cjState = 'bggl'
       this.api({
         url: '/ysjl/getList',
         method: 'get',
@@ -138,10 +136,12 @@ export default {
       this.multipleSelection = val
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        bglx: 1,
-        createBy: this.$store.getters.userId
-      })
+      this.listQuery = {
+        order: undefined, // 排序字段
+        sort: undefined, // 排序方式
+        createBy: this.$store.getters.userId,
+        hasChild: true
+      }
       this.getList()
     }
   }
diff --git a/src/views/ysjl/elevator/common/index.vue b/src/views/ysjl/elevator/common/index.vue
index 68cb415..0eec0e0 100644
--- a/src/views/ysjl/elevator/common/index.vue
+++ b/src/views/ysjl/elevator/common/index.vue
@@ -1,19 +1,41 @@
 <!--锅炉改造和重大修理-->
 <template>
   <div class="app-container">
-    <sticky style="margin-bottom: 10px;">
+    <sticky style="margin-bottom: 10px">
       <div class="sub-navbar">
-        <el-button v-if="state === 'create'" type="success" icon="el-icon-edit" size="medium" @click="saveYsjl('add')">
+        <el-button
+          v-if="state === 'create'"
+          type="success"
+          icon="el-icon-edit"
+          size="medium"
+          @click="saveYsjl('add')"
+        >
           保存
         </el-button>
         <template v-else>
-          <el-button type="primary" icon="el-icon-edit" size="medium" @click="saveYsjl('upd')">
+          <el-button
+            type="primary"
+            icon="el-icon-edit"
+            size="medium"
+            @click="saveYsjl('upd')"
+          >
             更新
           </el-button>
-          <el-button v-if="isSysUser" type="success" icon="el-icon-upload2" size="medium" @click="saveYsjl('build')">
+          <el-button
+            v-if="isSysUser"
+            type="success"
+            icon="el-icon-upload2"
+            size="medium"
+            @click="saveYsjl('build')"
+          >
             生成报告
           </el-button>
-          <el-button type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
+          <el-button
+            type="warning"
+            icon="el-icon-view"
+            size="medium"
+            @click="common.viewYsjl(ysjl.id, 'YSJL')"
+          >
             预览
           </el-button>
         </template>
@@ -22,137 +44,388 @@
             <svg-icon icon-class="sign" />
             检验项目批量签名
           </el-button>
-          <el-button type="danger" icon="el-icon-delete" size="medium" @click="signClear">
+          <el-button
+            type="danger"
+            icon="el-icon-delete"
+            size="medium"
+            @click="signClear"
+          >
             批量清除签名
           </el-button>
-          <el-button type="success" size="medium" icon="el-icon-edit" @click="batchUpdDate">
+          <el-button
+            type="success"
+            size="medium"
+            icon="el-icon-edit"
+            @click="batchUpdDate"
+          >
             批量修改日期
           </el-button>
-          <el-button type="primary" size="medium" icon="el-icon-info" @click="showDialogRoleVisible">
+          <el-button
+            type="primary"
+            size="medium"
+            icon="el-icon-info"
+            @click="showDialogRoleVisible"
+          >
             编辑权限
           </el-button>
         </template>
-        <el-button type="info" size="medium" icon="el-icon-info" @click="dialogEnclosureVisible = true">
+        <el-button
+          type="info"
+          size="medium"
+          icon="el-icon-info"
+          @click="dialogEnclosureVisible = true"
+        >
           相关鉴证
         </el-button>
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
       <el-tab-pane label="基本情况" name="first">
-        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="130px">
+        <el-form
+          ref="ysjl"
+          :model="ysjl"
+          class="el-form"
+          label-position="right"
+          label-width="130px"
+        >
           <fieldset>
             <legend>基本信息</legend>
             <el-row :gutter="20">
-              <el-col v-if="state === 'create' || !ysjl.jilubianhao" :span="13">
-                <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:80px" @blur="ysjlController.judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id).then(data => { isRepeat = data })" />
+              <el-col :span="9">
+                <el-form-item label="设备类别" prop="shebeileibie">
+                  <el-select
+                    v-model="ysjl.shebeileibie"
+                    filterable
+                    allow-create
+                    default-first-option
+                    style="width: 100%"
+                    @change="changXh"
+                  >
+                    <el-option
+                      v-for="item in xinghaoList"
+                      :key="item.id"
+                      :label="item.xinghao"
+                      :value="item.xinghao"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="设备品种" prop="shbeipinzhong">
+                  <el-input
+                    v-model="param.shbeipinzhong"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col v-else :span="9">
-                <el-form-item label="监检编号" prop="jilubianhao">
-                  <el-input v-model="ysjl.jilubianhao" :disabled="edit" @blur="ysjlController.judgeRepeat(ysjl.jilubianhao, ysjl.id).then(data => { isRepeat = data })" />
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="产品编号" prop="chanpinbianhao">
+                  <el-input v-model="ysjl.chanpinbianhao" type="text" />
                 </el-form-item>
               </el-col>
-              <el-col v-show="isRepeat" :span="2">
-                <span style="color:red">编号重复</span>
+              <el-col :span="9">
+                <el-form-item label="制造日期" prop="zhizaoriqi">
+                  <el-date-picker
+                    v-model="ysjl.zhizaoriqi"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
+                </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20" style="height: 110px;">
+            <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="产品名称" prop="shebeimingcheng">
-                  <el-input v-model="ysjl.shebeimingcheng" type="textarea" :rows="4" />
+                <el-form-item label="制造单位名称" prop="zhizaodanweimingcheng">
+                  <el-input
+                    v-model="param.zhizaodanweimingcheng"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20" style="height: 110px;">
+            <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="产品图号" prop="chanpintuhao">
-                  <el-input v-model="param.chanpintuhao" type="textarea" :rows="4" />
+                <el-form-item
+                  label="使用单位名称"
+                  prop="shiyongdanweimingcheng"
+                >
+                  <el-input
+                    v-model="param.shiyongdanweimingcheng"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="产品型号" prop="guigexinghao">
-                  <el-select v-model="ysjl.guigexinghao" filterable allow-create default-first-option style="width: 100%;" @change="changXh">
-                    <el-option v-for="item in xinghaoList" :key="item.id" :label="item.xinghao" :value="item.xinghao" />
-                  </el-select>
+                <el-form-item label="安全管理人员" prop="anquanguanlirenyuan">
+                  <el-input
+                    v-model="param.anquanguanlirenyuan"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="鉴定报告编号" prop="jiandingbaogaobianhao">
-                  <el-input v-model="param.jiandingbaogaobianhao" type="text" :disabled="edit" />
+                <el-form-item label="联系电话" prop="lianxidianhua">
+                  <el-input
+                    v-model="param.lianxidianhua"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="产品编号" prop="chanpinbianhao">
-                  <el-input v-model="ysjl.chanpinbianhao" type="text" />
+                <el-form-item label="使用单位代码" prop="shiyongdanweidaima">
+                  <el-input
+                    v-model="param.shiyongdanweidaima"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item
+                  label="使用登记证编号"
+                  prop="shiyongdegnjizhengbianhao"
+                >
+                  <el-input
+                    v-model="param.shiyongdegnjizhengbianhao"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="18">
+                <el-form-item label="注册代码" prop="zhucedaima">
+                  <el-input
+                    v-model="param.zhucedaima"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="18">
+                <el-form-item label="设备使用地点" prop="shebeishiyongdidian">
+                  <el-input
+                    v-model="param.shebeishiyongdidian"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="单位内编号" prop="danweineibianhao">
+                  <el-input
+                    v-model="param.danweineibianhao"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="改造日期" prop="gaizaoriqi">
+                  <el-date-picker
+                    v-model="ysjl.gaizaoriqi"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="改造单位名称" prop="gaizaodanweimingcheng">
+                  <el-input
+                    v-model="param.gaizaodanweimingcheng"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="设备代码" prop="shebeidaima">
-                  <el-input v-model="ysjl.shebeidaima" type="text" />
+                  <el-date-picker
+                    v-model="param.shebeidaima"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="18">
+                <el-form-item
+                  label="维护保养单位名称"
+                  prop="weihubaoyangdanweimingcheng"
+                >
+                  <el-input
+                    v-model="param.weihubaoyangdanweimingcheng"
+                    type="text"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="制造日期" prop="zhizaoriqi">
-                  <el-date-picker v-model="ysjl.zhizaoriqi" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
+                <el-form-item label="维保电话" prop="weibaodianhua">
+                  <el-input
+                    v-model="param.weibaodianhua"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="型号" prop="xinghao">
+                  <el-date-picker
+                    v-model="param.xinghao"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
           <fieldset>
-            <legend>收费信息</legend>
+            <legend>设备技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="合同编号" prop="hetongbianhao">
-                  <el-input v-model="param.hetongbianhao" type="text" />
+                <el-form-item label="额定载重量" prop="edingzaizhongliang">
+                  <el-input v-model="param.edingzaizhongliang" type="text" />kg
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="合同金额" prop="zaojia">
-                  <el-input v-model="param.zaojia" type="text" disabled @input="beforeHejia" />
+                <el-form-item label="额定速度" prop="edingsudu">
+                  <el-input
+                    v-model="param.edingsudu"
+                    type="text"
+                    disabled
+                    @input="beforeHejia"
+                  />m/s
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="比例" prop="bili">
-                  <el-select v-model="param.bili" allow-create clearable filterable default-first-option style="width: 100%;" disabled @change="beforeHejia">
-                    <el-option v-for="item in biliOptions" :key="item" :label="item" :value="item" />
-                  </el-select>
+                <el-form-item label="层站门数" prop="cnegzhanmenshu">
+                  <el-input
+                    v-model="param.ceng"
+                    type="text"
+                    style="width: 50px"
+                  />层
+                  <el-input
+                    v-model="param.zhan"
+                    type="text"
+                    style="width: 50px"
+                  />站
+                  <el-input
+                    v-model="param.men"
+                    type="text"
+                    style="width: 50px"
+                  />门
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="检验费用" prop="jianyanheding">
-                  <el-input v-model="ysjl.jianyanheding" type="text" disabled />
+                <el-form-item label="控制方式" prop="kongzhifangshi">
+                  <el-input v-model="param.kongzhifangshi" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
           <fieldset>
-            <legend>校验信息</legend>
+            <legend>主要检验仪器和设备</legend>
             <el-row :gutter="20">
-              <el-col :span="20" style="margin-left: 100px;height: 90px;font-size: 16px;">
-                根据<el-input v-model="ysjl.jianyanyiju" style="width: 450px;" />的规定，该产品的制造经我机构监督检验，符合
-                <el-select v-model="param.xiangguanguicheng" style="width: 300px;">
-                  <el-option v-for="item in xggcList" :key="item.id" :label="item.name" :value="item.name" />
-                </el-select>规定的基本安全要求，特发此证书。
+              <el-col :span="20">
+                <el-input
+                  v-model="ysjl.jianyanyiju"
+                  style="width: 450px"
+                />号检验专用工具箱
               </el-col>
             </el-row>
-            <template v-show="type !== 'glbj' && type !== 'fqg'">
-              <el-row style="margin-left: 80px;margin-bottom: 10px;">
-                <el-col :span="18">
-                  <el-alert title="此”说明“在原始记录与监检证书上均体现。" type="info" />
-                </el-col>
-              </el-row>
-              <el-row :gutter="20" style="margin-bottom: 20px;height: 90px;">
+            <el-row :gutter="20">
+              <el-col :span="20">
+                <el-form-item label="检验结论" prop="jianyanjielun">
+                  <el-radio-group v-model="jianyanjielun">
+                    <el-radio :label="合格">
+                      备选项
+                    </el-radio>
+                    <el-radio :label="不合格">
+                      备选项
+                    </el-radio>
+                    <el-radio :label="复检合格">
+                      备选项
+                    </el-radio>
+                    <el-radio :label="复检不合格">
+                      备选项
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="18">
+                <el-form-item label="备注" prop="remark">
+                  <el-input
+                    v-model="param.remark"
+                    type="textarea"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" style="margin: 20px 0">
+              <el-col :span="8">
+                <el-form-item label="现场检验日期" prop="xianchangjianyanriqi">
+                  <el-date-picker
+                    v-model="param.xianchangjianyanriqi"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="检验完成日期" prop="jianyanwanchengriqi">
+                  <el-date-picker
+                    v-model="param.jianyanwanchengriqi"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="下次检验日期" prop="xiacijianyanriq">
+                  <el-date-picker
+                    v-model="param.xiacijianyanriq"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <template>
+              <el-row :gutter="20" style="margin-bottom: 20px; height: 90px">
                 <el-col :span="18">
                   <el-form-item label="说明" prop="beizhu">
                     <el-input v-model="ysjl.beizhu" type="textarea" :rows="4" />
@@ -160,23 +433,54 @@
                 </el-col>
               </el-row>
             </template>
-            <template v-if="isSysUser">
-              <el-row :gutter="20" style="margin-top: 20px;">
-                <el-col :span="9">
-                  <el-form-item label="检验日期" prop="jianyanjieshuriqi">
-                    <el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
+            <template>
+              <el-row :gutter="20" style="margin-top: 20px">
+                <el-col :span="8">
+                  <el-form-item label="校核" prop="jianyanjieshuriqi">
+                    <el-date-picker
+                      v-model="ysjl.jianyanjieshuriqi"
+                      type="date"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择日期"
+                      style="width: 100%"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <sign-name
+                    :jianyanrenyuan="jianyanrenyuan"
+                    :ysjl="ysjl"
+                    :custom-clear-sign="customClearSign"
+                    @setSignValue="signNameValue"
+                  />
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="日期" prop="jianyanrenyuan">
+                    <el-input v-model="jianyanrenyuan" disabled />
+                    <el-input v-show="false" v-model="ysjl.jianyanrenyuan" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="10">
-                <el-col :span="9">
+                <el-col :span="8">
                   <el-form-item label="检验人员" prop="jianyanrenyuan">
                     <el-input v-model="jianyanrenyuan" disabled />
                     <el-input v-show="false" v-model="ysjl.jianyanrenyuan" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="9">
-                  <sign-name :jianyanrenyuan="jianyanrenyuan" :ysjl="ysjl" :custom-clear-sign="customClearSign" @setSignValue="signNameValue" />
+                <el-col :span="8">
+                  <sign-name
+                    :jianyanrenyuan="jianyanrenyuan"
+                    :ysjl="ysjl"
+                    :custom-clear-sign="customClearSign"
+                    @setSignValue="signNameValue"
+                  />
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="日期" prop="jianyanrenyuan">
+                    <el-input v-model="jianyanrenyuan" disabled />
+                    <el-input v-show="false" v-model="ysjl.jianyanrenyuan" />
+                  </el-form-item>
                 </el-col>
               </el-row>
             </template>
@@ -184,86 +488,157 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="检验项目" name="second">
-        <el-form class="el-form" label-position="right" label-width="130px">
-          <el-row :gutter="20">
-            <el-col :span="18" :offset="6">
-              <el-button size="small" type="primary" @click="changeJsl('   由   外协生产，监检证号:    产品编号:  。锅炉范围内管道提供部分锅炉主蒸汽管道、锅炉主给水管道和管件，符合《市场监管总局办公厅关于电站锅炉范围内管道有关问题意见》(市监特设函(2019) -849号) 等文件的相关要求。')">
-                外协
-              </el-button>
-              <el-button size="small" type="warning" @click="changeJsl('无此项.')">
-                无此项
-              </el-button>
-              <el-button size="small" type="primary" @click="changeJsl('部件调台，详见该厂的调台计划.')">
-                调台
-              </el-button>
-              <el-button size="small" type="primary" @click="changeJsl('该锅炉为设计文件鉴定后制造的前三台锅炉。')">
-                前三台
-              </el-button>
-              <el-button size="small" type="danger" @click="changeJsl(undefined)">
-                清空
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-row style="margin-left: 80px;margin-bottom: 10px;">
-            <el-col :span="18">
-              <el-alert title="此”记事栏“只在原始记录上体现。" type="info" />
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" style="height: 100px;">
-            <el-col :span="18">
-              <el-form-item label="记事栏" prop="qita">
-                <el-input v-model="param.qita" type="textarea" :rows="4" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-table ref="bgfyData" :data="bgfyData" :span-method="tableJs.mergeColRows" border stripe style="margin-top: 10px;" @row-click="onRowClick">
+        <el-table
+          ref="bgfyData"
+          :data="bgfyData"
+          :span-method="tableJs.mergeColRows"
+          border
+          stripe
+          style="margin-top: 10px"
+          @row-click="onRowClick"
+        >
           <el-table-column type="selection" width="55" prop="checkbox" />
-          <el-table-column type="index" align="center" width="50" label="序号" />
-          <el-table-column align="center" label="监检项目">
-            <el-table-column align="center" prop="jianyanxiang" label="检验项" width="100" />
-            <el-table-column align="center" prop="jianyanneirong" label="检验内容" width="300" />
-          </el-table-column>
-          <el-table-column align="center" prop="xiangmuleibie" width="100" label="类别">
+          <el-table-column
+            type="index"
+            align="center"
+            width="50"
+            label="序号"
+          />
+          <el-table-column
+            align="center"
+            width="50"
+            label="检验类别"
+            prop="jianyanleibie"
+          />
+          <el-table-column
+            align="center"
+            width="50"
+            label="项目"
+            prop="jianyanleibie"
+          />
+          <el-table-column align="center" label="检验项目" />
+          <el-table-column
+            align="center"
+            prop="xiangmuleibie"
+            width="100"
+            label="类别"
+          >
             <template slot-scope="scope">
-              <el-select v-if="showXmlb(scope.$index)" v-model="scope.row.xiangmuleibie" style="width:60px;">
-                <el-option v-for="xmlb in getXmlbList(scope.$index)" :key="xmlb" :label="xmlb" :value="xmlb" />
+              <el-select
+                v-if="showXmlb(scope.$index)"
+                v-model="scope.row.xiangmuleibie"
+                style="width: 60px"
+              >
+                <el-option
+                  v-for="xmlb in getXmlbList(scope.$index)"
+                  :key="xmlb"
+                  :label="xmlb"
+                  :value="xmlb"
+                />
               </el-select>
               <span v-else>{{ scope.row.xiangmuleibie }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="jianyanjieguo" width="120" label="检查结果">
+          <el-table-column
+            align="center"
+            prop="jianyanjieguo"
+            width="120"
+            label="检查结果"
+          >
             <template slot-scope="scope">
-              <el-select v-model="scope.row.jianyanjieguo" @change="changeJyjg(scope.$index)">
-                <el-option v-for="item in jyjgList" :key="item" :label="item" :value="item" />
+              <el-select
+                v-model="scope.row.jianyanjieguo"
+                @change="changeJyjg(scope.$index)"
+              >
+                <el-option
+                  v-for="item in jyjgList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="gongzuojianzheng" min-width="200" label="工作见证">
+          <el-table-column
+            align="center"
+            prop="gongzuojianzheng"
+            min-width="200"
+            label="工作见证"
+          >
             <template slot-scope="scope">
-              <el-autocomplete v-model="scope.row.gongzuojianzheng" class="inline-input" style="width: 100%;" :fetch-suggestions="((queryString, cb) => { querySearchGzjz(queryString, cb, scope.$index) })" />
+              <el-autocomplete
+                v-model="scope.row.gongzuojianzheng"
+                class="inline-input"
+                style="width: 100%"
+                :fetch-suggestions="
+                  (queryString, cb) => {
+                    querySearchGzjz(queryString, cb, scope.$index);
+                  }
+                "
+              />
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="jianjianyuan" width="200" label="监检员" />
-          <el-table-column align="center" prop="querenriqi" width="160" label="日期">
+          <el-table-column
+            align="center"
+            prop="jianjianyuan"
+            width="200"
+            label="监检员"
+          />
+          <el-table-column
+            align="center"
+            prop="querenriqi"
+            width="160"
+            label="日期"
+          >
             <template slot-scope="scope">
-              <el-date-picker v-model="scope.row.querenriqi" type="date" format="yyyy.MM.dd" value-format="yyyy-MM-dd" :picker-options="pickerOptions" placeholder="选择日期" style="width: 100%;" @change="changeQrrq(scope.$index)" />
+              <el-date-picker
+                v-model="scope.row.querenriqi"
+                type="date"
+                format="yyyy.MM.dd"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
+                placeholder="选择日期"
+                style="width: 100%"
+                @change="changeQrrq(scope.$index)"
+              />
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <el-dialog :visible.sync="jyxmrqShow" title="批量修改日期" width="500px" @close="jyxmrqShow = false">
+    <el-dialog
+      :visible.sync="jyxmrqShow"
+      title="批量修改日期"
+      width="500px"
+      @close="jyxmrqShow = false"
+    >
       <template>
-        <el-date-picker v-model="querenriqi" type="date" format="yyyy.MM.dd" value-format="yyyy-MM-dd" :picker-options="pickerOptions" placeholder="选择日期" style="width: 100%;" />
+        <el-date-picker
+          v-model="querenriqi"
+          type="date"
+          format="yyyy.MM.dd"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+          placeholder="选择日期"
+          style="width: 100%"
+        />
       </template>
       <span slot="footer" class="dialog-footer">
         <el-button @click="jyxmrqShow = false">取 消</el-button>
         <el-button type="primary" @click="batchUpd">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogEnclosureVisible">
-      <enclosure :relation-id="ysjl.renwuId" :if-liaison="false" :view-button="true" :is-show-hetong="isSysUser" />
+    <el-dialog
+      title="查看相关鉴证"
+      :modal-append-to-body="false"
+      :visible.sync="dialogEnclosureVisible"
+    >
+      <enclosure
+        :relation-id="ysjl.renwuId"
+        :if-liaison="false"
+        :view-button="true"
+        :is-show-hetong="isSysUser"
+      />
     </el-dialog>
     <el-dialog title="编辑权限" :visible.sync="dialogRoleVisible">
       <template>
@@ -274,8 +649,18 @@
           </el-tag>
         </div>
         <br>
-        <el-select v-model="renlingren" multiple collapse-tags placeholder="请选择要追加的监检员">
-          <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
+        <el-select
+          v-model="renlingren"
+          multiple
+          collapse-tags
+          placeholder="请选择要追加的监检员"
+        >
+          <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">
@@ -283,7 +668,15 @@
         <el-button type="primary" @click="updateRenlingren">确 定</el-button>
       </span>
     </el-dialog>
-    <sign-name v-show="signShow" ref="qmButton" :ysjl="ysjl" :jianyanrenyuan="xmjianyanrenyuan" field-name="xmqianming" :custom-clear-sign="customClearSign" @setSignValue="signNameValue" />
+    <sign-name
+      v-show="signShow"
+      ref="qmButton"
+      :ysjl="ysjl"
+      :jianyanrenyuan="xmjianyanrenyuan"
+      field-name="xmqianming"
+      :custom-clear-sign="customClearSign"
+      @setSignValue="signNameValue"
+    />
   </div>
 </template>
 <script>
@@ -294,7 +687,7 @@ import merge from 'webpack-merge'
 import Enclosure from '@/views/common/Enclosure'
 
 export default {
-  name: 'GlZjYsjl',
+  name: 'BaseInfo',
   components: { SignName, Sticky, Enclosure },
   props: {
     type: {
@@ -334,7 +727,8 @@ export default {
       cols: [
         {
           name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致
-          getValue(row) { // 该列用于比较的值的获取方法
+          getValue(row) {
+            // 该列用于比较的值的获取方法
             return row.jianyanxiang
           }
         }
@@ -385,11 +779,13 @@ export default {
     this.getDicJyxm(1)
     this.getJyxm(1)
     this.getDicData()
-    this.userList = this.$store.getters.allUser.filter(user => user.departmentId === 74 && user.clientType === 'System')
+    this.userList = this.$store.getters.allUser.filter(
+      (user) => user.departmentId === 74 && user.clientType === 'System'
+    )
   },
   methods: {
     initYsjl() {
-      this.ysjlController.init(this.$route.query).then(data => {
+      this.ysjlController.init(this.$route.query).then((data) => {
         this.ysjl = data.ysjl
         this.param = data.param ? data.param : {}
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
@@ -399,7 +795,8 @@ export default {
         this.ysjl.cjState = 'ysjl'
         this.ysjl.jlprintState = 0
         this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
-        this.ysjl.jianyanyiju = '《中华人民共和国特种设备安全法》《特种设备安全监察条例》'
+        this.ysjl.jianyanyiju =
+          '《中华人民共和国特种设备安全法》《特种设备安全监察条例》'
         this.$set(this.param, 'xiangguanguicheng', '《锅炉安全技术规程》')
         this.beforeHejia()
         this.getZzdw()
@@ -407,35 +804,46 @@ export default {
       })
     },
     getYsjl() {
-      this.ysjlController.getYsjl(this.ysjlId).then(data => {
+      this.ysjlController.getYsjl(this.ysjlId).then((data) => {
         this.ysjl = data.ysjl
         this.ysjl.jianyanjielun = '符合'
-        if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
-          this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
+        if (
+          this.ysjl.jianyanrenyuan !== null &&
+          this.ysjl.jianyanrenyuan.length > 0
+        ) {
+          this.jianyanrenyuan = this.common.convertCnName(
+            this.ysjl.jianyanrenyuan
+          )
         }
-        this.ysjlController.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id).then(data => {
-          this.isRepeat = data
-        })
+        this.ysjlController
+          .judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
+          .then((data) => {
+            this.isRepeat = data
+          })
         this.getXinghao()
       })
     },
     getParam() {
-      this.ysjlController.getParam(this.ysjlId, '1000').then(data => {
+      this.ysjlController.getParam(this.ysjlId, '1000').then((data) => {
         this.param = data
       })
     },
     getJyxm(sort) {
-      this.jyxmController.getJyxm(this.$route.query.templateId, this.ysjlId, sort, this.state).then(data => {
-        this.bgfyData = data
-        this.tableJs.getData(this.cols, this.rows, data)
-      })
+      this.jyxmController
+        .getJyxm(this.$route.query.templateId, this.ysjlId, sort, this.state)
+        .then((data) => {
+          this.bgfyData = data
+          this.tableJs.mergeColRows(this.cols, this.rows, data)
+        })
     },
     getDicJyxm(sort) {
-      this.jyxmController.getCyJyxm(this.$route.query.templateId, sort).then(data => {
-        this.dicGzjz = data.map(row => {
-          return { value: row.gongzuojianzheng }
+      this.jyxmController
+        .getCyJyxm(this.$route.query.templateId, sort)
+        .then((data) => {
+          this.dicGzjz = data.map((row) => {
+            return { value: row.gongzuojianzheng }
+          })
         })
-      })
     },
     getXinghao() {
       this.api({
@@ -444,7 +852,7 @@ export default {
         params: {
           zzdwId: this.zzdwId
         }
-      }).then(data => {
+      }).then((data) => {
         this.xinghaoList = data
         if (this.state === 'create') {
           this.changXh(this.ysjl.guigexinghao)
@@ -458,7 +866,7 @@ export default {
         params: {
           id: this.ysjl.zzdwId
         }
-      }).then(data => {
+      }).then((data) => {
         this.jlbh1 += data.zhizaodanweiCode
         this.ysjl.zhizaoxukezhengjibie = data.zhizaoxukezhengjibie
         this.ysjl.zhizaoxukezhengbianhao = data.zhizaoxukezhengbianhao
@@ -472,7 +880,7 @@ export default {
         params: {
           typeCode: 'GL_ZZ_XGGC'
         }
-      }).then(data => {
+      }).then((data) => {
         this.xggcList = data
       })
     },
@@ -486,11 +894,13 @@ export default {
           aheadPart: aheadPart,
           hinderPart: ''
         }
-      }).then(data => {
+      }).then((data) => {
         this.jlbh3 = data
-        this.ysjlController.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id).then(data => {
-          this.isRepeat = data
-        })
+        this.ysjlController
+          .judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
+          .then((data) => {
+            this.isRepeat = data
+          })
       })
     },
     /**
@@ -500,10 +910,13 @@ export default {
     signNameValue(data) {
       if (data.fieldName === 'xmqianming') {
         for (let i = 0; i < this.$refs.bgfyData.selection.length; i++) {
-          const jianyanrenyuan = this.$refs.bgfyData.selection[i].jianjianyuan ? this.$refs.bgfyData.selection[i].jianjianyuan.split(',') : []
+          const jianyanrenyuan = this.$refs.bgfyData.selection[i].jianjianyuan
+            ? this.$refs.bgfyData.selection[i].jianjianyuan.split(',')
+            : []
           if (!jianyanrenyuan.includes(data.name)) {
             jianyanrenyuan.push(data.name)
-            this.$refs.bgfyData.selection[i].jianjianyuan = jianyanrenyuan.join(',')
+            this.$refs.bgfyData.selection[i].jianjianyuan =
+              jianyanrenyuan.join(',')
           }
         }
       } else {
@@ -513,10 +926,19 @@ export default {
         this.common.signName(this.ysjl.id, this.ysjl.jianyanrenyuan)
         Utils.$emit('manufacture-list')
         // 如果是第一检验员签名的话，需要给所有检验项目的检验人员追加当前检验人员
-        if (isNotHasJyry && this.jianyanrenyuan && this.jianyanrenyuan.split(',').length === 1) {
-          this.bgfyData.forEach(jyxm => {
+        if (
+          isNotHasJyry &&
+          this.jianyanrenyuan &&
+          this.jianyanrenyuan.split(',').length === 1
+        ) {
+          this.bgfyData.forEach((jyxm) => {
             // 如果第一检验人员已在该检验项目签名的话，无需重复签名
-            if (!jyxm.jianjianyuan || !jyxm.jianjianyuan.split(',').filter(jjr => jjr === this.jianyanrenyuan).length) {
+            if (
+              !jyxm.jianjianyuan ||
+              !jyxm.jianjianyuan
+                .split(',')
+                .filter((jjr) => jjr === this.jianyanrenyuan).length
+            ) {
               if (jyxm.jianjianyuan) {
                 const jianjianyuan = jyxm.jianjianyuan.split(',')
                 jianjianyuan.push(this.jianyanrenyuan)
@@ -533,12 +955,31 @@ export default {
       if (fieldName === 'xmqianming') {
         for (let i = 0; i < this.$refs.bgfyData.selection.length; i++) {
           let jyry = this.$refs.bgfyData.selection[i].jianjianyuan || ''
-          jyry = this.common.deleteElement(jyry.split(','), String(this.$store.getters.nickname)).join(',')
+          jyry = this.common
+            .deleteElement(
+              jyry.split(','),
+              String(this.$store.getters.nickname)
+            )
+            .join(',')
         }
       } else {
         const data = {
-          id: this.ysjl.jianyanrenyuan && this.common.deleteElement(this.ysjl.jianyanrenyuan.split(','), String(this.$store.getters.userId)).join(','),
-          name: this.jianyanrenyuan && this.common.deleteElement(this.jianyanrenyuan.split(','), this.$store.getters.nickname).join(','),
+          id:
+            this.ysjl.jianyanrenyuan &&
+            this.common
+              .deleteElement(
+                this.ysjl.jianyanrenyuan.split(','),
+                String(this.$store.getters.userId)
+              )
+              .join(','),
+          name:
+            this.jianyanrenyuan &&
+            this.common
+              .deleteElement(
+                this.jianyanrenyuan.split(','),
+                this.$store.getters.nickname
+              )
+              .join(','),
           fieldName: fieldName
         }
         this.signNameValue(data)
@@ -546,7 +987,7 @@ export default {
     },
     saveYsjl(operation) {
       const tableData = [[]]
-      this.bgfyData.forEach(row => {
+      this.bgfyData.forEach((row) => {
         tableData[0].push({
           id: row.id,
           xiangmuleibie: row.xiangmuleibie ? row.xiangmuleibie : '',
@@ -561,14 +1002,20 @@ export default {
         this.save(operation, 'post', tableData)
       } else if (operation === 'build') {
         this.ysjl.baogaobianhao = this.ysjl.jilubianhao
-        if (this.ysjl.jilubianhao && this.ysjl.jilubianhao.indexOf('COPY') > -1) {
+        if (
+          this.ysjl.jilubianhao &&
+          this.ysjl.jilubianhao.indexOf('COPY') > -1
+        ) {
           this.$message({
             type: 'error',
             message: '请先修改报告编号，不允许携带COPY标志生成报告!'
           })
           return false
         }
-        if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
+        if (
+          this.ysjl.jianyanrenyuan === null ||
+          this.ysjl.jianyanrenyuan === ''
+        ) {
           this.$message({
             type: 'error',
             message: '请先签名再生成报告!'
@@ -577,7 +1024,9 @@ export default {
         }
         for (let i = 0; i < this.bgfyData.length; i++) {
           if (!this.bgfyData[i].jianjianyuan || !this.bgfyData[i].querenriqi) {
-            this.$message.error('请将检验项目中的监检人员及监检日期填写完毕，再生成报告！')
+            this.$message.error(
+              '请将检验项目中的监检人员及监检日期填写完毕，再生成报告！'
+            )
             return false
           }
         }
@@ -589,10 +1038,13 @@ export default {
     save(operation, type, jyxm) {
       // 判断报告编号是否重复
       if (this.isRepeat) {
-        this.$message({ message: '记录编号重复，请先修改记录编号再保存', type: 'error' })
+        this.$message({
+          message: '记录编号重复，请先修改记录编号再保存',
+          type: 'error'
+        })
         return false
       } else {
-        this.$refs['ysjl'].validate(valid => {
+        this.$refs['ysjl'].validate((valid) => {
           if (valid) {
             this.api({
               url: '/ysjl',
@@ -603,7 +1055,7 @@ export default {
                 jyxm: JSON.stringify(jyxm),
                 flag: operation
               }
-            }).then(data => {
+            }).then((data) => {
               Utils.$emit('ysjl-db-list')
               // 刷新任务列表，原始记录待办，原始记录已办，检验报告
               if (operation === 'add') {
@@ -618,7 +1070,9 @@ export default {
                 this.$message({ message: '更新成功', type: 'success' })
                 // 替换路由中的参数
                 this.$router.push({
-                  query: merge(this.$route.query, { 'jianyanrenyuan': this.ysjl.jianyanrenyuan })
+                  query: merge(this.$route.query, {
+                    jianyanrenyuan: this.ysjl.jianyanrenyuan
+                  })
                 })
               } else {
                 // 生成pdf
@@ -643,7 +1097,7 @@ export default {
      */
     formatterJianjianyuan(row) {
       if (row.jianjianyuan) {
-        if (typeof (row.jianjianyuan) === 'number') {
+        if (typeof row.jianjianyuan === 'number') {
           row.jianjianyuan = row.jianjianyuan.toString()
           return this.common.convertCnName(row.jianjianyuan)
         }
@@ -656,7 +1110,7 @@ export default {
      * @returns {number}
      */
     showXmlb($index) {
-      return this.showXmlbIndexListSg.filter(xl => {
+      return this.showXmlbIndexListSg.filter((xl) => {
         return xl.index === $index
       }).length
     },
@@ -668,7 +1122,11 @@ export default {
       for (let i = 0; i < this.showXmlbIndexListSg.length; i++) {
         const xl = this.showXmlbIndexListSg[i]
         if (xl.index === $index) {
-          return xl.xmlb === 'AB' ? this.xmlbListAB : xl.xmlb === 'AC' ? this.xmlbListAC : this.xmlbListBC
+          return xl.xmlb === 'AB'
+            ? this.xmlbListAB
+            : xl.xmlb === 'AC'
+              ? this.xmlbListAC
+              : this.xmlbListBC
         }
       }
     },
@@ -691,7 +1149,7 @@ export default {
         this.$message('请在列表选择要清除签名的数据。')
         return
       }
-      this.$refs.bgfyData.selection.forEach(row => {
+      this.$refs.bgfyData.selection.forEach((row) => {
         row.jianjianyuan = null
       })
     },
@@ -712,7 +1170,11 @@ export default {
       if (val === '无此项.') {
         this.$set(this.param, 'qita', val)
       } else {
-        this.$set(this.param, 'qita', val ? (this.param.qita ? this.param.qita + '\n' : '') + val : '')
+        this.$set(
+          this.param,
+          'qita',
+          val ? (this.param.qita ? this.param.qita + '\n' : '') + val : ''
+        )
       }
     },
     /**
@@ -720,14 +1182,18 @@ export default {
      */
     beforeHejia: function() {
       // 锅炉制造费用四舍五入到个位
-      this.ysjl.jianyanheding = Math.round((!this.param.zaojia || !this.param.bili) ? 0 : this.common.accMul(this.param.zaojia, this.param.bili / 100))
+      this.ysjl.jianyanheding = Math.round(
+        !this.param.zaojia || !this.param.bili
+          ? 0
+          : this.common.accMul(this.param.zaojia, this.param.bili / 100)
+      )
     },
     showDialogRoleVisible: function() {
       // 重置表单所需数据
       this.renlingren.length = 0
       this.defaultRlr = this.ysjl.renlingren.split(',')
       // 在可追加的人员列表中移除认领人中已有的人员
-      this.defaultRlr.forEach(userId => {
+      this.defaultRlr.forEach((userId) => {
         for (let i = 0; i < this.userList.length; i++) {
           if (String(this.userList[i].id) === userId) {
             this.userList.splice(i, 1)
@@ -747,8 +1213,12 @@ export default {
       this.saveYsjl('upd')
     },
     changXh: function(val) {
-      const xinghao = this.xinghaoList.filter(xh => xh.xinghao === val)[0]
-      this.$set(this.param, 'jiandingbaogaobianhao', (xinghao && xinghao.jiandingbaogaobianhao) || '')
+      const xinghao = this.xinghaoList.filter((xh) => xh.xinghao === val)[0]
+      this.$set(
+        this.param,
+        'jiandingbaogaobianhao',
+        (xinghao && xinghao.jiandingbaogaobianhao) || ''
+      )
     },
     /**
      * 修改检验项目关联的检验结果及确认日期为监检日期
@@ -765,23 +1235,28 @@ export default {
         this.bgfyData[$index].gongzuojianzheng = '外协部件监检证书'
       }
       if (isWcx || isWx) {
-        this.bgfyData[$index].querenriqi = this.formatter.dateFormat('YYYY-MM-dd')
+        this.bgfyData[$index].querenriqi =
+          this.formatter.dateFormat('YYYY-MM-dd')
       } else {
         this.bgfyData[$index].gongzuojianzheng = this.dicGzjz[$index].value
         this.bgfyData[$index].querenriqi = this.ysjl.jianyanjieshuriqi
       }
       // 根据索引获取对应关联索引信息
-      const jyxm = this.jyxmRelations.filter(jyxm => jyxm.index === $index)[0]
+      const jyxm = this.jyxmRelations.filter(
+        (jyxm) => jyxm.index === $index
+      )[0]
       // 如果不存在关联信息，不进行任何操作
       if (!jyxm) {
         return
       }
       // 遍历关联索引
       // 检查结果改变时，其子项的序号中的检查结果也及工作见证也要随着进行变化。
-      jyxm.relationIds.forEach(index => {
-        this.bgfyData[index].jianyanjieguo = this.bgfyData[$index].jianyanjieguo
+      jyxm.relationIds.forEach((index) => {
+        this.bgfyData[index].jianyanjieguo =
+          this.bgfyData[$index].jianyanjieguo
         if (isWcx || isWx) {
-          this.bgfyData[index].gongzuojianzheng = this.bgfyData[$index].gongzuojianzheng
+          this.bgfyData[index].gongzuojianzheng =
+            this.bgfyData[$index].gongzuojianzheng
           this.bgfyData[index].querenriqi = this.bgfyData[$index].querenriqi
         } else {
           this.bgfyData[index].gongzuojianzheng = this.dicGzjz[index].value
@@ -799,13 +1274,15 @@ export default {
         return
       }
       // 根据索引获取对应关联索引信息
-      const jyxm = this.jyxmRelations.filter(jyxm => jyxm.index === $index)[0]
+      const jyxm = this.jyxmRelations.filter(
+        (jyxm) => jyxm.index === $index
+      )[0]
       // 如果不存在关联信息，不进行任何操作
       if (!jyxm) {
         return
       }
       // 遍历关联索引
-      jyxm.relationIds.forEach(index => {
+      jyxm.relationIds.forEach((index) => {
         // 如果当前确认日期为空，则将其同步关联的确认日期
         if (!this.bgfyData[index].querenriqi) {
           this.bgfyData[index].querenriqi = this.bgfyData[$index].querenriqi
@@ -824,21 +1301,28 @@ export default {
 }
 
 /* 表格边框样式 */
->>> .el-table td, >>> .el-table th.is-leaf, .el-table--border, .el-table--group {
+>>> .el-table td,
+>>> .el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
   border-color: black;
 }
 
 /* 多级表头样式 */
->>> .el-table--border th,>>> .el-table--border th.gutter:last-of-type {
+>>> .el-table--border th,
+>>> .el-table--border th.gutter:last-of-type {
   border-bottom: 1px solid black;
   border-right: 1px solid black;
 }
 
 /* 表格字体增亮色 */
->>>.el-table--border::after, >>>.el-table--group::after, >>>.el-table::before {
+>>> .el-table--border::after,
+>>> .el-table--group::after,
+>>> .el-table::before {
   background-color: black;
 }
->>> .el-table thead,.el-table {
+>>> .el-table thead,
+.el-table {
   color: black;
 }
 </style>
@@ -848,7 +1332,7 @@ export default {
 }*/
 
 .el-table {
-  /deep/tbody tr:hover>td {
+  /deep/tbody tr:hover > td {
     background-color: oldlace;
   }
 }
diff --git a/src/views/ysjl/elevator/yeyin/index.vue b/src/views/ysjl/elevator/yeyin/index.vue
index e69de29..99ddf70 100644
--- a/src/views/ysjl/elevator/yeyin/index.vue
+++ b/src/views/ysjl/elevator/yeyin/index.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="app-container">
+    <baseInfo />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/elevator/common/index'
+export default {
+  name: 'ElevatorYeyin',
+  components: { baseInfo },
+  data() {
+    return {
+
+    }
+  },
+  computed: {
+
+  },
+  created() {
+
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style>
+  .el-input__inner {
+    border: 1px solid #00000075;
+    border-radius: 4px;
+  }
+  .el-textarea__inner {
+    border: 1px solid #91393975;
+    border-radius: 4px;
+  }
+  .el-form-item__error {
+    padding-top: 0;
+    position: absolute;
+  }
+  .el-input.is-disabled .el-input__inner {
+    color: #606266;
+  }
+  .el-textarea.is-disabled .el-textarea__inner {
+    color: #606266;
+  }
+  .el-dialog__body {
+    padding-top: 10px;
+}
+  .myTable .el-input__inner{
+    padding: 0 5px;
+    text-align: center;
+  }
+</style>