From 9350800e2310423c7108bc4f3722c0cd369cecc5 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Tue, 24 Aug 2021 19:30:10 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=E7=A7=BB=E9=99=A4=EF=BC=9A=E4=B8=8D=E4=BA=88=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E8=A1=A5=E8=AF=81=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bjd/dj_list.vue | 6 ------
 src/views/bjd/dt_list.vue | 6 ------
 src/views/bjd/jj_list.vue | 6 ------
 src/views/bjd/qy_list.vue | 6 ------
 4 files changed, 24 deletions(-)

diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue
index 5537648..c3742a1 100644
--- a/src/views/bjd/dj_list.vue
+++ b/src/views/bjd/dj_list.vue
@@ -98,12 +98,6 @@
             <el-radio :label="2">
               已审核
             </el-radio>
-            <el-radio :label="3">
-              不予受理
-            </el-radio>
-            <el-radio :label="4">
-              补证通知
-            </el-radio>
             <el-radio :label="5">
               异常收回
             </el-radio>
diff --git a/src/views/bjd/dt_list.vue b/src/views/bjd/dt_list.vue
index 5e28a41..ee0ffb9 100644
--- a/src/views/bjd/dt_list.vue
+++ b/src/views/bjd/dt_list.vue
@@ -53,12 +53,6 @@
             <el-radio :label="2">
               已审核
             </el-radio>
-            <el-radio :label="3">
-              不予受理
-            </el-radio>
-            <el-radio :label="4">
-              补证通知
-            </el-radio>
             <el-radio :label="5">
               异常收回
             </el-radio>
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index 2042837..273a471 100644
--- a/src/views/bjd/jj_list.vue
+++ b/src/views/bjd/jj_list.vue
@@ -52,12 +52,6 @@
             <el-radio :label="2">
               已审核
             </el-radio>
-            <el-radio :label="3">
-              不予受理
-            </el-radio>
-            <el-radio :label="4">
-              补证通知
-            </el-radio>
             <el-radio :label="5">
               异常收回
             </el-radio>
diff --git a/src/views/bjd/qy_list.vue b/src/views/bjd/qy_list.vue
index b05da1c..423fae7 100644
--- a/src/views/bjd/qy_list.vue
+++ b/src/views/bjd/qy_list.vue
@@ -47,12 +47,6 @@
             <el-radio :label="2">
               已审核
             </el-radio>
-            <el-radio :label="3">
-              不予受理
-            </el-radio>
-            <el-radio :label="4">
-              补证通知
-            </el-radio>
             <el-radio :label="5">
               异常收回
             </el-radio>

From 1a0839267ac1b05f462e2716149a107504cdb0d8 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Tue, 24 Aug 2021 23:37:23 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=AC=E4=BA=A4?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/zjd/zjbg_list.vue | 111 +++++++++++++++++-------------------
 src/views/zjd/zjd_list.vue  |  26 +++++----
 2 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/src/views/zjd/zjbg_list.vue b/src/views/zjd/zjbg_list.vue
index 6468fbd..a3edb62 100644
--- a/src/views/zjd/zjbg_list.vue
+++ b/src/views/zjd/zjbg_list.vue
@@ -6,7 +6,7 @@
           <el-button type="primary" icon="el-icon-printer" @click="createZjdShow">
             生成转交单
           </el-button>
-          <div style="float:right;">
+          <!--          <div style="float:right;">
             <el-badge :value="shoppingSize" :max="99" class="item">
               <el-popover placement="bottom" width="800" trigger="click">
                 <div class="filter-container" style="padding-bottom: 3px;">
@@ -34,14 +34,14 @@
                 </el-button>
               </el-popover>
             </el-badge>
-          </div>
+          </div>-->
         </div>
       </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.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.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>
@@ -49,13 +49,13 @@
             清空
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
-            <el-option v-for="item in jylbList" :key="item.code" :label="item.name" :value="item.code" />
+          <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
+          <el-select v-model="listQuery.neibuleibie" 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" />
           <el-date-picker
             v-model="jianyanriqi"
             type="daterange"
@@ -88,7 +88,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="报告编号" prop="baogaobianhao" width="120" sortable="custom" />
-      <el-table-column align="center" label="检验类别" prop="jianyanleibie" width="90" />
+      <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="jianyanleibie" width="90" />
       <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="140" sortable="custom" />
       <el-table-column align="center" label="注册代码" prop="zhucedaima" width="160" sortable="custom" />
       <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
@@ -100,28 +100,28 @@
       <el-table-column align="center" label="监检结束日期" prop="jianyanjieshuriqi" width="130" sortable="custom" />
       <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
       <el-table-column align="center" label="检验结论" prop="jianyanjielun" width="80" />
-      <el-table-column fixed="right" align="center" label="操作" min-width="80">
+      <!--      <el-table-column fixed="right" align="center" label="操作" min-width="80">
         <template slot-scope="scope">
           <el-button type="primary" @click="addToCart(scope.$index)">
             <svg-icon icon-class="shoppingCard" />
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
     <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
     <el-dialog title="生成转交单" :visible.sync="zhuanjiaoVisible" width="30%">
       <el-form ref="zhuanjiao" :model="zhuanjiao" :rules="rules" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="转交人" prop="zhuanjiaoren">
-              <el-input v-model="zhuanjiao.zhuanjiaoren" type="text" />
+            <el-form-item label="转交人" prop="createBy">
+              <el-input v-model="zhuanjiao.createBy" type="text" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="转交日期" prop="zhuanjiaoriqi">
-              <el-date-picker v-model="zhuanjiao.zhuanjiaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
+            <el-form-item label="转交日期" prop="createTime">
+              <el-date-picker v-model="zhuanjiao.createTime" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -135,19 +135,19 @@
         </el-button>
       </div>
     </el-dialog>
-    <el-dialog title="生成转交单" :visible.sync="zhuanjiaoCartVisible" width="30%">
+    <!--    <el-dialog title="生成转交单" :visible.sync="zhuanjiaoCartVisible" width="30%">
       <el-form ref="zhuanjiao" :model="zhuanjiao" :rules="rules" class="el-form" label-position="right" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="转交人" prop="zhuanjiaoren">
-              <el-input v-model="zhuanjiao.zhuanjiaoren" type="text" />
+            <el-form-item label="转交人" prop="createBy">
+              <el-input v-model="zhuanjiao.createBy" type="text" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="转交日期" prop="zhuanjiaoriqi">
-              <el-date-picker v-model="zhuanjiao.zhuanjiaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
+            <el-form-item label="转交日期" prop="createTime">
+              <el-date-picker v-model="zhuanjiao.createTime" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -160,7 +160,7 @@
           取 消
         </el-button>
       </div>
-    </el-dialog>
+    </el-dialog>-->
   </div>
 </template>
 
@@ -179,11 +179,7 @@ export default {
       listQuery: {
         pageNum: 1, // 页码
         pageRow: 20, // 每页条数
-        order: 'id', // 排序字段
-        sort: 'desc',
-        searchYsjl: {
-          departmentId: this.$store.getters.departmentId
-        }
+        orderBy: 'id desc' // 排序字段
       },
       flowUserList: [],
       dialogFormVisible: false,
@@ -192,33 +188,24 @@ export default {
       multipleSelection: [],
       multipleCartSelection: [],
       jianyanriqi: '',
-      jylbList: [{
-        code: '定期检验',
-        name: '定期检验'
-      }, {
-        code: '监督检验',
-        name: '监督检验'
-      }, {
-        code: '首次检验',
-        name: '首次检验'
-      }],
+      jylbList: [],
       userList: [],
       zhuanjiaoVisible: false,
       zhuanjiaoCartVisible: false,
       zhuanjiao: {
-        zhuanjiaoren: '',
-        zhuanjiaoriqi: '',
+        createBy: '',
+        createTime: '',
         ysjlId: ''
       },
       rules: {
-        zhuanjiaoren: [{ required: true, message: '转交人不能为空', trigger: 'blur', validator: this.validator }],
-        zhuanjiaoriqi: [{ required: true, message: '转交日期不能为空', trigger: 'blur', validator: this.validator }]
+        createBy: [{ required: true, message: '转交人不能为空', trigger: 'blur', validator: this.validator }],
+        createTime: [{ required: true, message: '转交日期不能为空', trigger: 'blur', validator: this.validator }]
       }
     }
   },
   created() {
     this.getList()
-    // this.jylbList = this.$store.getters.allCategory
+    this.jylbList = this.$store.getters.allCategory.filter(row => row.parentId)
     this.userList = this.$store.getters.allUser
   },
   mounted() {
@@ -238,14 +225,14 @@ export default {
     getList() {
       if (this.jianyanriqi) {
         // 解析
-        this.listQuery.searchYsjl.jianyankaishiriqi = this.jianyanriqi[0]
-        this.listQuery.searchYsjl.jianyanjieshuriqi = this.jianyanriqi[1]
+        this.listQuery.jianyankaishiriqi = this.jianyanriqi[0]
+        this.listQuery.jianyanjieshuriqi = this.jianyanriqi[1]
       } else {
-        this.listQuery.searchYsjl.jianyankaishiriqi = ''
-        this.listQuery.searchYsjl.jianyanjieshuriqi = ''
+        this.listQuery.jianyankaishiriqi = ''
+        this.listQuery.jianyanjieshuriqi = ''
       }
       this.api({
-        url: '/report/getList',
+        url: '/ysjl/getListCanZj',
         method: 'get',
         params: this.listQuery
       }).then(data => {
@@ -254,8 +241,7 @@ export default {
       })
     },
     sortChange(column) {
-      this.listQuery.order = column.prop
-      this.listQuery.sort = column.order.replace('ending', '')
+      this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
       this.getList()
     },
     getIndex($index) {
@@ -277,10 +263,10 @@ export default {
       this.selection = val
     },
     clearQuery() {
-      this.$set(this.listQuery, 'searchYsjl', {
-        departmentId: this.$store.getters.departmentId,
-        createBy: this.$store.getters.userId,
-        printState: 0
+      this.$set(this, 'listQuery', {
+        pageNum: 1,
+        pageRow: 20,
+        orderBy: 'id desc'
       })
       this.jianyanriqi = ''
       this.getList()
@@ -297,9 +283,18 @@ export default {
           return false
         }
       }
-      this.zhuanjiao.zhuanjiaoriqi = new Date()
-      this.zhuanjiao.zhuanjiaoren = this.$store.getters.nickname
-      this.zhuanjiaoVisible = true
+      this.api({
+        url: '/zjd',
+        method: 'post',
+        data: {
+          ysjlIds: this.$refs.list.selection.map(row => row.id),
+          sbzldm: this.$refs.list.selection[0].shebeizhongleidaima,
+          neibuleibie: this.$refs.list.selection[0].neibuleibie
+        }
+      }).then(data => {
+        this.getList()
+        Utils.$emit('zjd-list')
+      })
     },
     commitZjd() {
       if (this.multipleSelection.length === 0) {
diff --git a/src/views/zjd/zjd_list.vue b/src/views/zjd/zjd_list.vue
index f30897c..f95964e 100644
--- a/src/views/zjd/zjd_list.vue
+++ b/src/views/zjd/zjd_list.vue
@@ -52,10 +52,10 @@
           <span v-text="getIndex(scope.$index)" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="转交单编号" prop="bianhao" width="120" sortable="custom" />
-      <el-table-column align="center" label="转交人" prop="zhuanjiaoren" width="90" />
-      <el-table-column align="center" label="转交日期" prop="zhuanjiaoriqi" width="140" sortable="custom" />
-      <el-table-column align="center" label="确认人" prop="querenren" width="160" sortable="custom" />
+      <el-table-column align="center" label="转交单编号" prop="serialNumber" width="120" sortable="custom" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="转交人" prop="createBy" width="90" />
+      <el-table-column align="center" label="转交日期" prop="createTime" width="140" sortable="custom" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="确认人" prop="querenren" width="160" sortable="custom" />
       <el-table-column align="center" label="确认日期" prop="querenriqi" width="240" />
       <el-table-column align="center" label="操作" min-width="60">
         <template slot-scope="scope">
@@ -103,7 +103,7 @@
         <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="80" />
         <el-table-column align="center" label="注册代码" prop="zhucedaima" width="160" />
         <el-table-column align="center" label="使用登记编号" prop="shiyongdengjibianhao" width="160" />
-        <el-table-column align="center" label="检验日期" prop="jianyanriqi" width="160" />
+        <el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="160" />
       </el-table>
     </el-dialog>
     <iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@@ -170,7 +170,7 @@ export default {
     },
     getList() {
       this.api({
-        url: '/zjd',
+        url: '/zjd/list',
         method: 'get',
         params: this.listQuery
       }).then(data => {
@@ -220,9 +220,15 @@ export default {
           return false
         }
       }
-      this.zhuanjiao.querenriqi = new Date()
-      this.zhuanjiao.querenren = this.$store.getters.nickname
-      this.zhuanjiaoVisible = true
+      this.api({
+        url: '/zjd/complete',
+        method: 'post',
+        data: {
+          zjdIds: this.$refs.list.selection.map(row => row.id)
+        }
+      }).then(data => {
+        this.getList()
+      })
     },
     commitZjd() {
       if (this.multipleSelection.length === 0) {
@@ -260,7 +266,7 @@ export default {
           zjdId: this.list[$index].id
         }
       }).then(data => {
-        this.zjdList = data.list
+        this.zjdList = data
         this.zjdInfoVisible = true
       })
     },

From 56875b5fe8424cd59e29bfa61a56c6c9a57ce971 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Tue, 24 Aug 2021 23:38:10 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/archive/archive_info.vue | 46 +++++++++++++++++-------------
 src/views/archive/archive_scan.vue |  7 ++---
 src/views/archive/list.vue         |  9 ++++--
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/views/archive/archive_info.vue b/src/views/archive/archive_info.vue
index 40dda80..52d85a7 100644
--- a/src/views/archive/archive_info.vue
+++ b/src/views/archive/archive_info.vue
@@ -1,42 +1,46 @@
 <template>
   <el-dialog :visible.sync="dialog" append-to-body title="归档详情" width="50%">
     <el-form :model="archive" size="small" label-width="100px">
-      <el-form-item label="归档单号" prop="archiveNum">
-        <el-input v-model="archive.archiveNum" disabled style="width: 200px;" />
-      </el-form-item>
-      <el-row :gutter="16">
-        <el-col :span="8">
-          <el-form-item label="归档人员" prop="archiveUser">
-            <el-input v-model="archive.archiveUser" disabled style="width: 150px;" />
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="归档单号" prop="archiveNum">
+            <el-input v-model="archive.archiveNum" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="归档日期" prop="archiveDate">
-            <el-input v-model="archive.archiveDate" disabled style="width: 150px;" />
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
+          <el-form-item label="归档人员" prop="createBy">
+            <el-input v-model="archive.createBy" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="9">
+          <el-form-item label="归档日期" prop="createTime">
+            <el-input v-model="archive.createTime" disabled />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="16">
-        <el-col :span="8">
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="归档架号" prop="frameNum">
-            <el-input v-model="archive.frameNum" disabled style="width: 150px;" />
+            <el-input v-model="archive.frameNum" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="9">
           <el-form-item label="列" prop="columnNum">
-            <el-input v-model="archive.columnNum" disabled style="width: 150px;" />
+            <el-input v-model="archive.columnNum" disabled />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="16">
-        <el-col :span="8">
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="归档盒号" prop="boxNum">
-            <el-input v-model="archive.boxNum" disabled style="width: 150px;" />
+            <el-input v-model="archive.boxNum" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="9">
           <el-form-item label="报告数量" prop="archiveCount">
-            <el-input v-model="archive.archiveCount" disabled style="width: 150px;" />
+            <el-input v-model="archive.archiveCount" disabled />
           </el-form-item>
         </el-col>
       </el-row>
@@ -84,6 +88,8 @@ export default {
         }
       }).then(data => {
         this.archive = data.archive
+        this.archive.createBy = this.formatter.getChineseName(null, null, this.archive.createBy)
+        this.archive.createTime = this.formatter.dateFormat('YYYY-MM-dd', new Date(this.archive.createTime))
         this.paramList = data.paramList
       })
     }
diff --git a/src/views/archive/archive_scan.vue b/src/views/archive/archive_scan.vue
index c714e43..a0b05b7 100644
--- a/src/views/archive/archive_scan.vue
+++ b/src/views/archive/archive_scan.vue
@@ -36,7 +36,7 @@
         <el-table-column align="center" label="注册代码" prop="zhucedaima" />
         <el-table-column align="center" label="使用登记证编号" prop="shiyongdengjibianhao" />
         <el-table-column align="center" label="产品编号" prop="chanpinbianhao" />
-        <el-table-column align="center" label="操作" min-width="65">
+        <el-table-column align="center" label="操作">
           <template slot-scope="scope">
             <el-button v-if="!scope.row.archiveId" type="danger" size="small" icon="el-icon-delete" @click="removeInfo(scope.$index)" />
           </template>
@@ -161,11 +161,10 @@ export default {
 
           this.api({
             url: '/archive',
-            method: 'post',
+            method: this.isAppend ? 'put' : 'post',
             data: {
               archive: this.archive,
-              params: archiveParamList,
-              isAppend: this.isAppend
+              params: archiveParamList
             }
           }).then(() => {
             this.$message.success('添加成功。')
diff --git a/src/views/archive/list.vue b/src/views/archive/list.vue
index 678e803..e6f8883 100644
--- a/src/views/archive/list.vue
+++ b/src/views/archive/list.vue
@@ -50,15 +50,15 @@
       </el-form>
     </div>
     <el-table ref="list" :data="list" size="mini" border fit highlight-current-row stripe width="100%" @row-click="onRowClick" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" min-width="15" />
+      <el-table-column align="center" type="selection" />
       <el-table-column type="index" fixed="left" align="center" label="序号" min-width="30" />
       <el-table-column align="center" label="归档单号" prop="archiveNum" />
       <el-table-column align="center" label="归档架号" prop="frameNum" />
       <el-table-column align="center" label="列" prop="columnNum" />
       <el-table-column align="center" label="归档盒号" prop="boxNum" />
       <el-table-column align="center" label="报告数量" prop="archiveCount" />
-      <el-table-column align="center" label="归档人" prop="archiveUser" />
-      <el-table-column align="center" label="归档日期" prop="archiveDate" min-width="40" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="归档人" prop="createBy" />
+      <el-table-column :formatter="formatterDate" align="center" label="归档日期" prop="createTime" />
       <el-table-column align="center" label="操作" min-width="50">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showAddDialog(scope.row.id)">
@@ -166,6 +166,9 @@ export default {
       this.archiveId = id
       this.$refs.archive_scan.dialog = true
       this.$refs.archive_scan.doInit()
+    },
+    formatterDate(row, column, cellValue) {
+      return this.formatter.dateFormat('YYYY-MM-dd', new Date(cellValue))
     }
   }
 }

From a9978d8c1716e50f5ad6a98809053a2e638e2704 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Tue, 24 Aug 2021 23:38:47 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/print/1000/print_list.vue | 1 -
 src/views/print/2000/print_list.vue | 1 -
 src/views/print/3000/print_list.vue | 1 -
 src/views/print/4000/print_list.vue | 1 -
 src/views/print/5000/print_list.vue | 1 -
 5 files changed, 5 deletions(-)

diff --git a/src/views/print/1000/print_list.vue b/src/views/print/1000/print_list.vue
index 40219e3..ea4ef2b 100644
--- a/src/views/print/1000/print_list.vue
+++ b/src/views/print/1000/print_list.vue
@@ -43,7 +43,6 @@
       <el-form>
         <el-form-item>
           <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
diff --git a/src/views/print/2000/print_list.vue b/src/views/print/2000/print_list.vue
index c67d769..7048162 100644
--- a/src/views/print/2000/print_list.vue
+++ b/src/views/print/2000/print_list.vue
@@ -43,7 +43,6 @@
       <el-form>
         <el-form-item>
           <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
diff --git a/src/views/print/3000/print_list.vue b/src/views/print/3000/print_list.vue
index 74dcb08..4fee6ff 100644
--- a/src/views/print/3000/print_list.vue
+++ b/src/views/print/3000/print_list.vue
@@ -46,7 +46,6 @@
       <el-form ref="testrefprint">
         <el-form-item>
           <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.weibaodanwei" placeholder="维保单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
diff --git a/src/views/print/4000/print_list.vue b/src/views/print/4000/print_list.vue
index 798f94d..ece92f8 100644
--- a/src/views/print/4000/print_list.vue
+++ b/src/views/print/4000/print_list.vue
@@ -61,7 +61,6 @@
       <el-form>
         <el-form-item>
           <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
diff --git a/src/views/print/5000/print_list.vue b/src/views/print/5000/print_list.vue
index a47a0a5..2e31a3d 100644
--- a/src/views/print/5000/print_list.vue
+++ b/src/views/print/5000/print_list.vue
@@ -43,7 +43,6 @@
       <el-form>
         <el-form-item>
           <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.sfdSerialNumber" placeholder="（全部）收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />

From 3366666822b34ad8f89ff7fb58f1bbcf2e704ec4 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 25 Aug 2021 18:48:42 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E6=A3=80?=
 =?UTF-8?q?=E5=8F=8A=E5=88=86=E9=85=8D=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allot/components/chengya_list.vue | 1057 -------------------
 src/views/allot/components/jidian_list.vue  |  784 --------------
 src/views/allot/list.vue                    | 1000 +++++++++++++++++-
 src/views/bjd/dt_list.vue                   |    9 +-
 src/views/bjd/jj_list.vue                   |    4 +-
 src/views/task/list.vue                     |   67 +-
 6 files changed, 978 insertions(+), 1943 deletions(-)
 delete mode 100644 src/views/allot/components/chengya_list.vue
 delete mode 100644 src/views/allot/components/jidian_list.vue

diff --git a/src/views/allot/components/chengya_list.vue b/src/views/allot/components/chengya_list.vue
deleted file mode 100644
index 8409d42..0000000
--- a/src/views/allot/components/chengya_list.vue
+++ /dev/null
@@ -1,1057 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <sticky style="margin-bottom: 10px">
-        <div class="sub-navbar">
-          <el-button type="primary" icon="el-icon-sold-out" @click="renwuFp">
-            批量分配
-          </el-button>
-          <el-button type="warning" @click="returnToBjd">
-            <svg-icon icon-class="reject" /> 异常退回
-          </el-button>
-          <el-button type="danger" icon="el-icon-error" @click="renwuZf">
-            作废数据
-          </el-button>
-        </div>
-      </sticky>
-      <el-form>
-        <el-form-item>
-          <el-input
-            v-model="listQuery.serialNumber"
-            placeholder="报检单号"
-            clearable
-            style="width: 160px"
-            @keyup.enter.native="handleFilter"
-          />
-          <el-select
-            v-model="listQuery.shebeizhongleidaima"
-            placeholder="请选择设备种类"
-            clearable
-            @change="handleFilter"
-          >
-            <el-option
-              v-for="item in sbzlList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <el-select
-            v-model="listQuery.quhuadaima"
-            placeholder="请选择所属区划"
-            clearable
-            value=""
-            @change="handleFilter"
-          >
-            <el-option
-              v-for="item in areas"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <el-input
-            v-model="listQuery.shiyongdanwei"
-            placeholder="使用单位名称"
-            clearable
-            style="width: 400px"
-            @keyup.enter.native="handleFilter"
-          />
-          <el-button type="primary" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-          <el-button type="info" icon="el-icon-clear" @click="clearSearch">
-            清除
-          </el-button>
-          <br>
-          <el-select
-            v-model="listQuery.jianyanleibie"
-            placeholder="检验类别"
-            clearable
-            style="width: 100px"
-            value=""
-            @change="handleFilter"
-          >
-            <el-option value="DJ" label="定期检验" />
-            <el-option value="JJ" label="监督检验" />
-            <el-option value="ZJ" label="制造检验" />
-          </el-select>
-          <el-date-picker
-            v-model="listQuery.shouliriqi"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择报检日期"
-            style="width: 150px"
-            @change="handleFilter"
-          />
-          <el-input
-            v-model="listQuery.shigongdanwei"
-            placeholder="施工单位名称"
-            clearable
-            style="width: 300px"
-            @keyup.enter.native="handleFilter"
-          />
-          <el-date-picker
-            v-model="listQuery.xianchangjianyanStart"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="现场检验日期（起）"
-            style="width: 180px"
-          />
-          <el-date-picker
-            v-model="listQuery.xianchangjianyanEnd"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="现场检验日期（止）"
-            style="width: 180px"
-          />
-          <el-select
-            v-model="listQuery.shouliren"
-            filterable
-            allow-create
-            default-first-option
-            clearable
-            placeholder="请选择受理人员"
-            style="width: 110px"
-          >
-            <el-option
-              v-for="user in users"
-              :key="user.id"
-              :label="user.nickname"
-              :value="user.nickname"
-            />
-          </el-select>
-          <span class="radio-group-label">申请现场检验：</span>
-          <el-radio-group
-            v-model="listQuery.zhongjianState"
-            @change="handleFilter"
-          >
-            <el-radio :label="0">
-              否
-            </el-radio>
-            <el-radio :label="1">
-              是
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </div>
-    <el-table
-      ref="list"
-      v-loading="showLoading"
-      element-loading-text="正在加载"
-      element-loading-spinner="el-icon-loading"
-      :data="list"
-      border
-      fit
-      highlight-current-row
-      stripe
-      width="100%"
-      height="600px"
-      :row-class-name="tableRowZhongjian"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" width="40" />
-      <el-table-column align="center" label="序号" width="60">
-        <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)" />
-        </template>
-      </el-table-column>
-      <el-table-column
-        align="center"
-        label="检验类别"
-        prop="jianyanleibie"
-        width="80"
-      >
-        <template slot-scope="scope">
-          <span v-if="scope.row.jianyanleibie === 'DJ'">定期检验</span>
-          <span v-else-if="scope.row.jianyanleibie === 'JJ'">监督检验</span>
-          <span
-            v-else-if="
-              scope.row.jianyanleibie === 'JJ' && scope.row.neibuleibie === 'SC'
-            "
-          >首次检验</span>
-          <span v-else-if="scope.row.jianyanleibie === 'ZJ'">制造检验</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        align="center"
-        label="报检单号"
-        prop="serialNumber"
-        width="140"
-        sortable="custom"
-      />
-      <el-table-column align="center" label="使用单位" prop="shiyongdanwei" />
-      <el-table-column
-        align="center"
-        label="使用单位地址"
-        prop="shiyongdanweiDizhi"
-      />
-      <el-table-column
-        align="center"
-        label="区划名称"
-        prop="quhuamingcheng"
-        width="110"
-        sortable
-      />
-      <el-table-column
-        align="center"
-        label="报检日期"
-        prop="shouliriqi"
-        width="110"
-        sortable
-      />
-      <el-table-column
-        align="center"
-        label="受理人"
-        prop="shouliren"
-        width="100"
-      />
-      <el-table-column
-        v-if="departmentId !== 75"
-        align="center"
-        label="备注"
-        prop="bjdBeizhu"
-        width="80"
-      />
-      <el-table-column align="left" label="设备台数（待/总）" width="140">
-        <template slot-scope="scope">
-          <el-button
-            type="success"
-            size="small"
-            circle
-            icon="el-icon-view"
-            title="预览报检单"
-            @click="viewBjd(scope.row)"
-          />
-          <el-button
-            style="margin-left: 1px"
-            size="small"
-            circle
-            @click="viewBjdRenwu(scope.row.bjdId)"
-          >
-            <span style="color: #67c23a; font-weight: bold">{{
-              scope.row.allotNum
-            }}</span>
-            /
-            <span style="color: #f56c6c; font-weight: bold">{{
-              scope.row.totalNum
-            }}</span>
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      :current-page="listQuery.pageNum"
-      :page-size="listQuery.pageSize"
-      :total="total"
-      :page-sizes="[10, 20, 40, 100]"
-      background
-      layout="total, sizes, prev, pager, next, jumper"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :title="title"
-      width="70%"
-      @close="closeDialog"
-    >
-      <el-container>
-        <el-form>
-          <el-form-item>
-            <el-select
-              v-model="departmentId"
-              placeholder="请选择科室"
-              style="width: 150px"
-              @change="selectDepartmentUser"
-            >
-              <el-option
-                v-for="dept in depts"
-                :key="dept.id"
-                :label="dept.name"
-                :value="dept.id"
-              />
-            </el-select>
-            <el-select
-              v-model="renwudan.teamId"
-              placeholder="请选择检验小组"
-              style="width: 150px"
-              @change="selectTeamUser"
-            >
-              <el-option
-                v-for="team in teams"
-                :key="team.id"
-                :label="team.teamName"
-                :value="team.id"
-              />
-            </el-select>
-            <el-select
-              v-model="renlingren"
-              :collapse-tags="true"
-              placeholder="请选择人员"
-              multiple
-              style="width: 160px"
-            >
-              <el-option
-                v-for="user in users"
-                :key="user.id"
-                :label="user.name"
-                :value="user.id"
-              />
-            </el-select>
-            <el-button type="primary" @disabled="btnClick" @click="allotRenwu">
-              执行分配
-            </el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="renwudan.xiadariqi"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择下达日期"
-              style="width: 150px"
-            />
-            <el-date-picker
-              v-model="renwudan.yuejianriqi"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择约检日期"
-              style="width: 150px"
-              @blur="setWanchengqixian()"
-            />
-            <el-date-picker
-              v-model="renwudan.wanchengqixian"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择完成期限"
-              style="width: 150px"
-            />
-            <el-select
-              v-model="renwudan.jianyanleixing"
-              :collapse-tags="true"
-              placeholder="请选择检验类型"
-              style="width: 130px"
-            >
-              <el-option key="初检" label="初检" value="初检" />
-              <el-option key="复检" label="复检" value="复检" />
-            </el-select>
-            <el-input
-              v-model="renwudan.beizhu"
-              type="text"
-              style="width: 240px"
-              placeholder="请填写备注信息"
-            />
-          </el-form-item>
-        </el-form>
-      </el-container>
-      <el-table
-        ref="allotList"
-        :data="allotList"
-        size="small"
-        style="width: 150%"
-        border
-        fit
-        highlight-current-row
-        :row-class-name="tableRowBfZhongjian"
-        @row-click="onDialogRowClick"
-        @selection-change="handleDialogSelectionChange"
-      >
-        <el-table-column type="selection" width="45" />
-        <el-table-column align="center" label="序号" width="50" fixed="left">
-          <template slot-scope="scope">
-            <span v-text="getIndex(scope.$index)" />
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="allotSbzl === '2000'"
-          align="center"
-          label="设备名称"
-          prop="shebeimingcheng"
-          width="150"
-        />
-        <el-table-column
-          align="center"
-          :formatter="formatter.formatterCategory"
-          label="检验项目"
-          prop="neibuleibie"
-          width="100"
-        />
-        <el-table-column
-          align="center"
-          label="下次检验日期"
-          prop="xiacijianyanriqi"
-          width="100"
-        />
-        <el-table-column
-          align="center"
-          label="使用单位"
-          prop="shiyongdanwei"
-          width="240px;"
-        />
-        <el-table-column
-          v-if="allotSbzl !== '8000'"
-          align="center"
-          label="产品编号/出厂编号"
-          prop="chanpinbianhao"
-          width="140"
-        />
-        <el-table-column
-          align="center"
-          label="区划名称"
-          prop="quhuamingcheng"
-          width="80"
-        />
-        <el-table-column
-          align="center"
-          label="注册代码"
-          prop="zhucedaima"
-          width="160"
-        />
-        <el-table-column
-          align="center"
-          label="使用登记编号"
-          prop="shiyongdengjibianhao"
-          width="160"
-        />
-        <template v-if="allotSbzl === '8000'">
-          <el-table-column
-            align="center"
-            label="管道长度(m)/数量(条)"
-            prop="s32"
-            width="140"
-          />
-          <el-table-column
-            align="center"
-            label="管道级别"
-            prop="s7"
-            width="140"
-          />
-        </template>
-        <el-table-column
-          align="center"
-          label="申请现场检验日期"
-          prop="shenqingxianchangriqi"
-          width="160"
-        />
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Sticky from '@/components/Sticky'
-import Utils from '@/utils/contact'
-export default {
-  name: 'AllotListChengYa',
-  components: { Sticky },
-  data() {
-    return {
-      dialogVisible: false,
-      total: 0,
-      list: [],
-      sbzlList: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageSize: 20, // 每页条数
-        orderBy: 'shouliriqi desc',
-        shiyongdanwei: undefined,
-        shebeizhongleidaima: '',
-        bjState: '2'
-      },
-      renwudan: {
-        teamId: '',
-        xiadariqi: '',
-        yuejianriqi: '',
-        wanchengqixian: '',
-        jianyanleixing: '初检',
-        beizhu: ''
-      },
-      tempDepartment: {},
-      multipleSelection: [],
-      allotList: [],
-      depts: [],
-      users: [],
-      areas: [], // 区划数组
-      departmentId: this.$store.getters.departmentId,
-      renlingren: [],
-      selection: [],
-      departmentUserList: [],
-      unAllotUserList: [],
-      btnClick: false,
-      showLoading: true,
-      allotSbzl: '',
-      teams: [],
-      bjdIds: [],
-      dialogXianchangVisible: false,
-      dialogXcjyVisible: false,
-      bjdZhongjian: {
-        bjdid: '',
-        xianchangriqi: '',
-        xianchangbeizhu: '',
-        renwuIds: ''
-      },
-      title: '任务分配'
-    }
-  },
-  created() {
-    this.getList()
-    this.getDepartment()
-    this.getArea()
-    this.getSbzlList()
-    this.getUserList(this.departmentId)
-    this.getTeamList(this.departmentId)
-  },
-  mounted() {
-    const that = this
-    this.common.$on('AllotListChengYaListRefresh', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    getList() {
-      this.showLoading = true
-      this.apibjd({
-        url: '/renwu/list',
-        method: 'get',
-        params: this.listQuery
-      }).then((data) => {
-        this.list = data.list
-        this.total = data.total
-        this.showLoading = false
-      })
-    },
-    getSbzlList() {
-      this.api({
-        url: '/sedirectory/getList',
-        method: 'get',
-        params: {
-          sbzl: undefined,
-          level: '1'
-        }
-      }).then((data) => {
-        this.sbzlList = data
-      })
-    },
-    handleSizeChange(val) {
-      // 改变每页数量
-      this.listQuery.pageSize = val
-      this.handleFilter()
-    },
-    handleCurrentChange(val) {
-      // 改变页码
-      this.listQuery.pageNum = val
-      this.getList()
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    getIndex($index) {
-      // 表格序号
-      return (
-        (this.listQuery.pageNum - 1) * this.listQuery.pageSize + $index + 1
-      )
-    },
-    // 批量分配
-    renwuFp() {
-      this.allotList = []
-      if (this.multipleSelection.length === 0) {
-        this.$message({
-          message: '请在列表选择要操作的数据。',
-          type: 'warning'
-        })
-        return false
-      } else {
-        if (this.multipleSelection.length > 1 && !this.arrFn(this.multipleSelection)) {
-          return this.$message('所选报检单相同使用单位和相同施工单位才能批量分配')
-        }
-        this.bjdIds.length = 0
-        this.bjdIds = this.$refs.list.selection.map((rw) => rw.bjdId)
-        this.apibjd({
-          url: '/renwu/getAllotBaseList',
-          method: 'post',
-          data: {
-            bjdIds: this.bjdIds
-          }
-        }).then((data) => {
-          this.allotList = data
-          this.allotSbzl = this.allotList[0].shebeizhongleidaima
-          this.renwudan = {
-            shiyongdanwei: this.multipleSelection[0].shiyongdanwei,
-            shiyongdanweiLianxiren: this.multipleSelection[0].shiyongdanweiLianxiren,
-            shiyongdanweiDianhua: this.multipleSelection[0].shiyongdanweiDianhua,
-            shiyongdanweiDizhi: this.multipleSelection[0].shiyongdanweiDizhi,
-            shigongdanwei: this.multipleSelection[0].shigongdanwei,
-            shigongdanweiLianxiren: this.multipleSelection[0].shigongdanweiLianxiren,
-            shigongdanweiDianhua: this.multipleSelection[0].shigongdanweiDianhua,
-            xiadariqi: this.formatter.dateFormat('YYYY-MM-dd')
-          }
-          if (
-            this.multipleSelection[0].shebeileixing !== undefined &&
-          this.multipleSelection[0].shebeileixing !== null
-          ) {
-            this.title =
-            '任务分配（' + this.multipleSelection[0].shebeileixing + '）'
-          }
-          this.dialogVisible = true
-          this.$nextTick(() => {
-            this.$refs.allotList.toggleAllSelection()
-            this.selection = data.list
-          })
-        })
-      }
-    },
-    // 任务异常退回
-    returnToBjd() {
-      if (this.multipleSelection.length === 0) {
-        this.$message({
-          message: '请在列表选择要退回的数据。',
-          type: 'warning'
-        })
-        return false
-      }
-      this.bjdIds.length = 0
-      this.bjdIds = this.$refs.list.selection.map((rw) => rw.bjdId)
-      // 查询任务的分配状态
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (
-          this.multipleSelection[i].allotNum !==
-          this.multipleSelection[i].totalNum
-        ) {
-          this.$message({
-            message: '有任务已经分配，请重新选择。',
-            type: 'warning'
-          })
-          return false
-        } else {
-          this.$prompt('请输入退回原因', '提示', {
-            inputType: 'textarea',
-            confirmButtonText: '确定',
-            cancelButtonText: '取消'
-          })
-            .then(({ value }) => {
-              this.apibjd({
-                url: '/bjd/returnToBjd',
-                method: 'get',
-                params: {
-                  bjdIds: this.bjdIds,
-                  reason: value
-                }
-              }).then((data) => {
-                this.getList()
-                this.$message({ message: '任务异常退回成功', type: 'success' })
-              })
-            })
-            .catch(() => {
-              this.$message({
-                type: 'info',
-                message: '取消输入'
-              })
-            })
-        }
-      }
-    },
-    // 作废数据
-    renwuZf() {
-      if (this.multipleSelection.length === 0) {
-        this.$message({
-          message: '请在列表选择要作废的数据。',
-          type: 'warning'
-        })
-        return false
-      }
-      if (this.multipleSelection.length > 1) {
-        this.$message({
-          message: '请选择单条报检单进行作废。',
-          type: 'warning'
-        })
-        return false
-      }
-      this.$prompt('请输入作废原因！', '提示', {
-        inputType: 'textarea',
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      })
-        .then(({ value }) => {
-          if (value === null) {
-            this.$message({ message: '请填写作废原因！', type: 'warning' })
-            return false
-          }
-          this.apibjd({
-            url: '/bjd/zfDbRenwuByBjdId',
-            method: 'get',
-            params: {
-              bjdIds: this.$refs.list.selection[0].bjdId,
-              reason: value
-            }
-          }).then((data) => {
-            this.getList()
-            if (data.count > 0) {
-              this.$alert(data.count + '条任务作废成功！', '确认信息', {
-                confirmButtonText: '确定'
-              })
-            } else {
-              this.$message({ message: '任务作废失败！', type: 'warning' })
-            }
-          })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '取消作废'
-          })
-        })
-    },
-    viewBjd(bjd) {
-      const type = '/finish'
-      if (bjd.jianyanleibie === 'DJ') {
-        this.$router.push({
-          path:
-            '/bjd/bjd-dj-input/' +
-            bjd.bjdId +
-            '/' +
-            bjd.shebeizhongleidaima +
-            '/' +
-            bjd.shebeizhongleidaima +
-            type
-        })
-      } else {
-        this.$router.push({
-          path:
-            '/bjd/bjd-jj-input/' +
-            bjd.bjdId +
-            '/' +
-            bjd.shebeizhongleidaima +
-            '/' +
-            bjd.shebeizhongleidaima +
-            type
-        })
-      }
-    },
-    viewBjdRenwu(bjdid) {
-      if (this.$store.getters.username === 'shiting') {
-        return false
-      }
-      this.allotList = []
-      this.bjdIds = [bjdid]
-      this.apibjd({
-        url: '/renwu/getAllotBaseList',
-        method: 'post',
-        data: {
-          bjdIds: this.bjdIds
-        }
-      }).then((data) => {
-        this.allotList = data.list
-        this.allotSbzl = this.allotList[0].shebeizhongleidaima
-        this.dialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.allotList.toggleAllSelection()
-          this.selection = data.list
-        })
-      })
-    },
-    clearSearch() {
-      this.listQuery.bjState = '2'
-      this.getList()
-    },
-    // 表格单击选中行 getAllotListByBjdId
-    onRowClick(row) {
-      this.$refs.list.toggleRowSelection(row)
-    },
-    // 获取选中行的bjdId
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    onDialogRowClick(row) {
-      this.$refs.allotList.toggleRowSelection(row)
-    },
-    handleDialogSelectionChange(val) {
-      this.selection = val
-    },
-    // 查询检验科室
-    getDepartment() {
-      this.api({
-        url: '/department/all',
-        method: 'get'
-      }).then((data) => {
-        this.depts = data
-      })
-    },
-    getArea() {
-      // 查询区划
-      this.api({
-        url: '/area/getShiArea',
-        method: 'get',
-        params: {
-          shidaima: '370100'
-        }
-      }).then((data) => {
-        this.areas = data
-      })
-    },
-    selectDepartmentUser(val) {
-      this.renlingren = []
-      this.getTeamList(val)
-    },
-    getUserList(val) {
-      this.api({
-        url: '/user/getUserListByDepartmentId',
-        method: 'get',
-        params: {
-          departmentId: val
-        }
-      }).then((data) => {
-        this.users = data
-      })
-    },
-    openZhongjian() {
-      if (this.multipleSelection.length !== 1) {
-        this.$message({
-          message: '请在列表选择要进行现场检验的设备,只允许单台操作。',
-          type: 'warning'
-        })
-        return false
-      }
-      if (this.multipleSelection[0].zhongjianriqi) {
-        this.bjdZhongjian.xianchangriqi =
-          this.multipleSelection[0].zhongjianriqi
-      } else {
-        this.bjdZhongjian.xianchangriqi = new Date()
-      }
-      this.bjdZhongjian.xianchangbeizhu =
-        this.multipleSelection[0].zhongjianBeizhu
-      this.dialogXianchangVisible = true
-    },
-    openBaseZhongjian() {
-      if (this.multipleSelection.length !== 1) {
-        this.$message({
-          message: '请在列表选择要操作的数据，只能选择单台设备。',
-          type: 'warning'
-        })
-        return false
-      }
-      this.apibjd({
-        url: '/renwu/getAllotBaseList',
-        method: 'post',
-        data: {
-          bjdIds: [this.multipleSelection[0].bjdId]
-        }
-      }).then((data) => {
-        this.allotList = data.list
-        this.dialogXcjyVisible = true
-      })
-    },
-    clearBaseZhongjian() {
-      if (this.multipleSelection.length !== 1) {
-        this.$message({
-          message: '请在列表选择要操作的数据，只能选择单台设备。',
-          type: 'warning'
-        })
-        return false
-      }
-      this.apibjd({
-        url: '/renwu/clearZhongjian',
-        method: 'get',
-        params: {
-          bjdId: this.multipleSelection[0].bjdId
-        }
-      }).then((data) => {
-        if (data === '清除成功！') {
-          this.getList()
-        }
-      })
-    },
-    clearShenqingriqi(index) {
-      this.apibjd({
-        url: '/renwu/clearShenqingriqi',
-        method: 'get',
-        params: {
-          renwuId: this.allotList[index].id
-        }
-      }).then((data) => {
-        if (data === '清除成功！') {
-          this.allotList[index].shenqingxianchangriqi = null
-        }
-      })
-    },
-    closeDialog() {
-      this.renlingren = []
-      this.departmentId = this.$store.getters.departmentId
-      this.users = this.getUserList(this.departmentId)
-    },
-    arrFn(arr) {
-      const ary = new Array(arr)
-      const nary = arr
-      if (arr.length > 1) {
-        for (let i = 0; i < ary.length; i++) {
-          if (
-            nary[i].shiyongdanwei === nary[i + 1].shiyongdanwei &&
-          nary[i].shigongdanwei === nary[i + 1].shigongdanwei
-          ) {
-            return true
-          }
-        }
-      }
-    },
-    allotRenwu() {
-      this.btnClick = true
-      if (this.selection.length === 0) {
-        this.$message({ message: '请选择要分配的数据。', type: 'warning' })
-        return false
-      }
-
-      if (this.renlingren.length > 0) {
-        for (let i = 0; i < this.teams.length; i++) {
-          if (this.renwudan.teamId === this.teams[i].id) {
-            this.renwudan.teamName = this.teams[i].name
-            break
-          }
-        }
-        for (let i = 0; i < this.depts.length; i++) {
-          if (this.departmentId === this.depts[i].id) {
-            this.renwudan.departmentName = this.depts[i].name
-            break
-          }
-        }
-        this.apibjd({
-          url: '/renwu/completeAllot',
-          method: 'post',
-          data: {
-            renwuList: this.selection,
-            renlingren: this.renlingren,
-            renwudan: this.renwudan,
-            bjdIds: this.bjdIds
-          },
-          paramsSerializer: function(data) {
-            return require('qs').stringify(data, { indices: false })
-          }
-        }).then(() => {
-          this.multipleSelection = []
-          // 刷新分配任务列表
-          this.getList()
-          // 刷新我的任务列表
-          Utils.$emit('task-list')
-          this.$message({ message: '分配成功。', type: 'success' })
-          this.dialogVisible = false
-          this.showLoading = true
-        })
-      } else {
-        this.$message({ message: '请选择要分配的人员。', type: 'warning' })
-        return false
-      }
-    },
-    tijiaoJianyan() {
-      this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
-      this.apibjd({
-        url: '/bjd/updBjdEndState',
-        method: 'post',
-        data: this.bjdZhongjian
-      }).then((data) => {
-        this.$message.success('添加成功。')
-        this.getList()
-        this.dialogXianchangVisible = false
-      })
-    },
-    tijiaoJianyanBf() {
-      if (this.selection.length === 0) {
-        this.$message({
-          message: '请在列表选择要操作的数据。',
-          type: 'warning'
-        })
-        return false
-      }
-      this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
-      this.bjdZhongjian.renwuIds = this.$refs.allotList.selection
-        .map((rw) => {
-          return rw.id
-        })
-        .join(',')
-      this.apibjd({
-        url: '/renwu/updBjdEndState',
-        method: 'post',
-        data: this.bjdZhongjian
-      }).then((data) => {
-        this.$message.success('添加成功。')
-        this.getList()
-        this.dialogXcjyVisible = false
-      })
-    },
-    getTeamList(departmentId) {
-      // 获取对应组
-      this.apibjd({
-        url: '/team/getTeamList',
-        method: 'get',
-        params: { departmentId }
-      }).then((data) => {
-        this.teams = data
-      })
-    },
-    selectTeamUser(val) {
-      console.log(this.teams)
-      const _this = this
-      for (let i = 0; i < this.teams.length; i++) {
-        if (this.teams[i].id === val) {
-          this.users = this.teams[i].teamPerson.split(',')
-          break
-        }
-      }
-      this.users = this.users.map((item) => {
-        const obj = {}
-        obj.id = item
-        obj.name = _this.formatter.getChineseName(null, null, item)
-        return obj
-      })
-      console.log(this.users)
-    },
-    setWanchengqixian() {
-      var date = new Date(this.renwudan.yuejianriqi)
-      date.setMonth(date.getMonth() + 1)
-      this.$set(
-        this.renwudan,
-        'wanchengqixian',
-        this.formatter.dateFormat('YYYY-MM-dd', date)
-      )
-    },
-    tableRowZhongjian({ row, rowIndex }) {
-      if (row.zhongjianState === 1) {
-        return 'qiyezhongjian-row'
-      } else if (row.zhongjianState === 2) {
-        return 'keshizhongjian-row'
-      }
-      return ''
-    },
-    tableRowBfZhongjian({ row, rowIndex }) {
-      if (row.shenqingxianchangriqi !== null) {
-        return 'xianchangriqi-row'
-      }
-      return ''
-    },
-    sortChange(column) {
-      if (column.order !== null) {
-        this.listQuery.orderBy = column.prop + ' '
-        this.listQuery.orderBy += column.order.replace('ending', '')
-      } else {
-        this.listQuery.orderBy = 'shouliriqi desc'
-      }
-      this.getList()
-    }
-  }
-}
-</script>
-
-<style>
-/** 允许终检 */
-.el-table .qiyezhongjian-row {
-  color: #0831e4;
-}
-.el-table .keshizhongjian-row {
-  color: #da6b83;
-}
-.el-table .xianchangriqi-row {
-  color: #66e41e;
-}
-</style>
diff --git a/src/views/allot/components/jidian_list.vue b/src/views/allot/components/jidian_list.vue
deleted file mode 100644
index c04dada..0000000
--- a/src/views/allot/components/jidian_list.vue
+++ /dev/null
@@ -1,784 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <sticky style="margin-bottom: 10px;">
-        <div class="sub-navbar">
-          <el-button v-show="this.$store.getters.username !== 'shiting'" type="primary" icon="el-icon-sold-out" @click="renwuFp">
-            批量分配
-          </el-button>
-          <el-button type="primary" icon="el-icon-edit" @click="openZhongjian">
-            标注现场检验
-          </el-button>
-          <el-button type="warning" @click="clearBaseZhongjian">
-            <svg-icon icon-class="clear" />
-            取消现场检验
-          </el-button>
-          <el-button type="primary" icon="el-icon-edit" @click="openBaseZhongjian">
-            标注部分设备现场检验
-          </el-button>
-          <el-button type="warning" @click="returnToBjd">
-            <svg-icon icon-class="reject" /> 异常退回
-          </el-button>
-          <el-button type="danger" icon="el-icon-error" @click="renwuZf">
-            作废数据
-          </el-button>
-          <div style="float: right;margin-top:8px;">
-            <div style="width: 210px;float:left;margin-left: 50px;">
-              申请现场检验（<span style="background-color: #0831e4;">&emsp;</span>企/<span style="background-color: #da6b83;">&emsp;</span>科）
-            </div>
-          </div>
-        </div>
-      </sticky>
-      <el-form>
-        <el-form-item>
-          <el-input v-model="listQuery.searchRenwu.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchRenwu.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="handleFilter">
-            <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-          <el-select v-model="listQuery.searchRenwu.quhuadaima" placeholder="请选择所属区划" clearable value="" @change="handleFilter">
-            <el-option
-              v-for="item in areas"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <el-input v-model="listQuery.searchRenwu.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
-          <el-button type="primary" icon="el-icon-search" @click="handleFilter">
-            查询
-          </el-button>
-          <el-button type="info" icon="el-icon-clear" @click="clearSearch">
-            清除
-          </el-button>
-          <br>
-          <el-select v-model="listQuery.searchRenwu.jianyanleibie" placeholder="检验类别" clearable style="width:100px" value="" @change="handleFilter">
-            <el-option value="DJ" label="定期检验" />
-            <el-option value="JJ" label="监督检验" />
-          </el-select>
-          <el-date-picker v-model="listQuery.searchRenwu.shouliriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择报检日期" style="width: 150px" @change="handleFilter" />
-          <el-input v-model="listQuery.searchRenwu.shigongdanwei" placeholder="施工单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
-          <el-date-picker v-model="listQuery.searchRenwu.xianchangjianyanStart" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期（起）" style="width: 180px;" />
-          <el-date-picker v-model="listQuery.searchRenwu.xianchangjianyanEnd" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期（止）" style="width: 180px;" />
-          <el-select v-model="listQuery.searchRenwu.shouliren" filterable allow-create default-first-option clearable placeholder="请选择受理人员" style="width: 110px;">
-            <el-option v-for="user in users" :key="user.id" :label="user.nickname" :value="user.nickname" />
-          </el-select>
-          <span class="radio-group-label">申请现场检验：</span>
-          <el-radio-group v-model="listQuery.searchRenwu.zhongjianState" @change="handleFilter">
-            <el-radio :label="0">
-              否
-            </el-radio>
-            <el-radio :label="1">
-              是
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </div>
-    <el-table
-      ref="list"
-      v-loading="showLoading"
-      element-loading-text="正在加载"
-      element-loading-spinner="el-icon-loading"
-      :data="list"
-      border
-      fit
-      highlight-current-row
-      stripe
-      width="100%"
-      height="600px"
-      :row-class-name="tableRowZhongjian"
-      @row-click="onRowClick"
-      @selection-change="handleSelectionChange"
-      @sort-change="sortChange"
-    >
-      <el-table-column type="selection" width="40" />
-      <el-table-column fixed="left" align="center" label="序号" width="60">
-        <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="130">
-        <template slot-scope="scope">
-          <span v-if="scope.row.shebeizhongleidaima === '3000' && scope.row.shebeileixing !== null">电梯({{ scope.row.shebeileixing }})</span>
-          <span v-else>{{ scope.row.shebeizhonglei }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="检验类别" prop="jianyanleibie" width="80">
-        <template slot-scope="scope">
-          <span v-if="scope.row.jianyanleibie === 'DJ'">定期检验</span>
-          <span v-else-if="scope.row.jianyanleibie === 'JJ'">监督检验</span>
-          <span v-else-if="scope.row.jianyanleibie === 'JJ' && scope.row.neibuleibie === 'SC'">首次检验</span>
-          <span v-else-if="scope.row.jianyanleibie === 'ZZ' && scope.row.neibuleibie === 'ZJ'">制造检验</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="报检单号" prop="serialNumber" width="140" sortable="custom" />
-      <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="300" />
-      <el-table-column align="center" label="施工单位/维保单位" prop="shigongdanwei" width="240">
-        <template slot-scope="scope">
-          <span v-if="scope.row.jianyanleibie === 'DJ' && scope.row.shebeizhongleidaima === '3000'">{{ scope.row.weibaodanwei }}</span>
-          <span v-else>{{ scope.row.shigongdanwei }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="维保电话" prop="weibaodanweiDianhua" width="110" />
-      <el-table-column align="center" label="使用单位地址" prop="shiyongdanweiDizhi" width="300" />
-      <el-table-column align="center" label="申请现场检验日期" prop="zhongjianriqi" width="160" sortable="custom" />
-      <el-table-column align="center" label="现场检验备注" prop="zhongjianBeizhu" width="110" />
-      <el-table-column fixed="right" align="center" label="区划名称" prop="quhuamingcheng" width="110" sortable />
-      <el-table-column fixed="right" align="center" label="报检日期" prop="shouliriqi" width="110" sortable />
-      <el-table-column fixed="right" align="center" label="受理人" prop="shouliren" width="100" />
-      <el-table-column fixed="right" align="center" label="备注" prop="bjdBeizhu" width="80" />
-      <el-table-column fixed="right" align="left" label="设备台数（待/总）" width="140">
-        <template slot-scope="scope">
-          <el-button type="success" size="small" circle icon="el-icon-view" title="预览报检单" @click="viewBjd(scope.row)" />
-          <el-button style="margin-left:1px" size="small" circle @click="viewBjdRenwu(scope.row.bjdId)">
-            <span style="color: #67C23A;font-weight: bold">{{ scope.row.allotNum }}</span> / <span style="color: #F56C6C;font-weight: bold">{{ scope.row.totalNum }}</span>
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      :current-page="listQuery.pageNum"
-      :page-size="listQuery.pageSize"
-      :total="total"
-      :page-sizes="[10, 20, 40, 100]"
-      background
-      layout="total, sizes, prev, pager, next, jumper"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-    <el-dialog :visible.sync="dialogVisible" :title="title" width="70%" @close="closeDialog">
-      <el-container>
-        <el-form>
-          <el-form-item>
-            <el-select v-model="departmentId" placeholder="请选择科室" style="width: 150px;" @change="selectDepartmentUser">
-              <el-option v-for="dept in depts" :key="dept.id" :label="dept.name" :value="dept.id" />
-            </el-select>
-            <el-select v-model="renwudan.teamId" placeholder="请选择检验小组" style="width: 150px;" @change="selectTeamUser">
-              <el-option v-for="team in teams" :key="team.id" :label="team.name" :value="team.id" />
-            </el-select>
-            <el-select v-model="renlingren" :collapse-tags="true" placeholder="请选择人员" multiple style="width: 160px;">
-              <el-option v-for="user in users" :key="user.id" :label="user.nickname" :value="user.id" />
-            </el-select>
-            <el-button type="primary" @disabled="btnClick" @click="allotRenwu">
-              执行分配
-            </el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker v-model="renwudan.xiadariqi" type="date" placeholder="选择下达日期" style="width: 150px;" />
-            <el-date-picker v-model="renwudan.yuejianriqi" type="date" placeholder="选择约检日期" style="width: 150px;" @blur="setWanchengqixian()" />
-            <el-date-picker v-model="renwudan.wanchengqixian" type="date" placeholder="选择完成期限" style="width: 150px;" />
-            <el-select v-model="renwudan.jianyanleixing" :collapse-tags="true" placeholder="请选择检验类型" style="width: 130px;">
-              <el-option key="初检" label="初检" value="初检" />
-              <el-option key="复检" label="复检" value="复检" />
-            </el-select>
-            <el-input v-model="renwudan.beizhu" type="text" style="width: 240px;" placeholder="请填写备注信息" />
-          </el-form-item>
-        </el-form>
-      </el-container>
-      <el-table ref="allotList" :data="allotList" size="small" style="width: 150%" border fit highlight-current-row :row-class-name="tableRowBfZhongjian" @row-click="onDialogRowClick" @selection-change="handleDialogSelectionChange">
-        <el-table-column type="selection" width="45" />
-        <el-table-column align="center" label="序号" width="50" fixed="left">
-          <template slot-scope="scope">
-            <span v-text="getIndex(scope.$index)" />
-          </template>
-        </el-table-column>
-        <el-table-column v-if="allotSbzl === '2000'" align="center" label="设备名称" prop="shebeimingcheng" width="150" />
-        <el-table-column align="center" :formatter="formatter.formatterCategory" label="检验项目" prop="neibuleibie" width="100" />
-        <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="100" />
-        <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240px;" />
-        <el-table-column v-if="allotSbzl !== '8000'" align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="140" />
-        <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="80" />
-        <el-table-column align="center" label="注册代码" prop="zhucedaima" width="160" />
-        <el-table-column align="center" label="使用登记编号" prop="shiyongdengjibianhao" width="160" />
-        <template v-if="allotSbzl === '8000'">
-          <el-table-column align="center" label="管道长度(m)/数量(条)" prop="s32" width="140" />
-          <el-table-column align="center" label="管道级别" prop="s7" width="140" />
-        </template>
-        <el-table-column align="center" label="申请现场检验日期" prop="shenqingxianchangriqi" width="160" />
-      </el-table>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogXianchangVisible" title="标注现场检验日期及备注填写" width="30%" @close="dialogXianchangVisible = false">
-      <el-form ref="bjdZhongjian" :model="bjdZhongjian">
-        <el-form-item v-if="this.$store.getters.username === 'yangyq' || this.$store.getters.username === 'shiting'" label="申请现场日期" prop="xianchangriqi">
-          <el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 100%;" disabled />
-        </el-form-item>
-        <el-form-item v-else label="申请现场日期" prop="xianchangriqi">
-          <el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 100%;" />
-        </el-form-item>
-        <el-form-item label="申请现场备注" prop="xianchangbeizhu">
-          <el-input v-model="bjdZhongjian.xianchangbeizhu" type="textarea" :rows="5" placeholder="请填写备注信息" />
-        </el-form-item>
-      </el-form>
-      <el-button type="primary" @disabled="btnClick" @click="tijiaoJianyan">
-        提交
-      </el-button>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogXcjyVisible" title="标注设备申请现场检验" width="55%" @close="closeDialog">
-      <el-form ref="bjdZhongjian" :model="bjdZhongjian">
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item v-if="this.$store.getters.username === 'yangyq' || this.$store.getters.username === 'shiting'" label="申请现场日期" prop="xianchangriqi" style="width: 600px">
-              <el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 50%;" disabled />
-            </el-form-item>
-            <el-form-item v-else label="申请现场日期" prop="xianchangriqi">
-              <el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 50%;" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-button type="primary" @disabled="btnClick" @click="tijiaoJianyanBf">
-          提交
-        </el-button>
-      </el-form>
-      <el-table ref="allotList" :data="allotList" size="small" style="width: 100%" border fit highlight-current-row :row-class-name="tableRowBfZhongjian" @row-click="onDialogRowClick" @selection-change="handleDialogSelectionChange">
-        <el-table-column type="selection" width="45" />
-        <el-table-column align="center" label="序号" width="50" fixed="left">
-          <template slot-scope="scope">
-            <span v-text="getIndex(scope.$index)" />
-          </template>
-        </el-table-column>
-        <el-table-column align="center" :formatter="formatter.formatterCategory" label="检验项目" prop="neibuleibie" width="100" />
-        <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240px;" />
-        <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="80" />
-        <el-table-column align="center" label="产品编号" prop="chanpinbianhao" width="160" />
-        <el-table-column align="center" label="申请现场检验日期" prop="shenqingxianchangriqi" width="160" />
-        <el-table-column align="center" label="操作" width="140">
-          <template slot-scope="scope">
-            <el-button type="warning" size="small" circle @click="clearShenqingriqi(scope.$index)">
-              <svg-icon icon-class="clear" />
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Sticky from '@/components/Sticky'
-import Utils from '@/utils/contact'
-export default {
-  name: 'AllotListJiDian',
-  components: { Sticky },
-  data() {
-    return {
-      dialogVisible: false,
-      total: 0,
-      list: [],
-      sbzlList: [],
-      listQuery: {
-        pageNum: 1, // 页码
-        pageSize: 20, // 每页条数
-        orderBy: 'shouliriqi desc',
-        searchRenwu: {
-          shiyongdanwei: undefined,
-          shebeizhongleidaima: '',
-          bjState: '2'
-        }
-      },
-      renwudan: {
-        teamId: '',
-        xiadariqi: '',
-        yuejianriqi: '',
-        wanchengqixian: '',
-        jianyanleixing: '初检',
-        beizhu: ''
-      },
-      tempDepartment: {},
-      multipleSelection: [],
-      allotList: [],
-      depts: [],
-      users: [],
-      areas: [], // 区划数组
-      departmentId: this.$store.getters.departmentId,
-      renlingren: [],
-      selection: [],
-      departmentUserList: [],
-      unAllotUserList: [],
-      btnClick: false,
-      showLoading: true,
-      allotSbzl: '',
-      teams: [],
-      bjdids: '',
-      dialogXianchangVisible: false,
-      dialogXcjyVisible: false,
-      bjdZhongjian: {
-        bjdid: '',
-        xianchangriqi: '',
-        xianchangbeizhu: '',
-        renwuIds: ''
-      },
-      title: '任务分配'
-    }
-  },
-  created() {
-    this.getList()
-    this.getDepartment()
-    this.getArea()
-    this.getSbzlList()
-    this.getUserList(this.departmentId)
-    this.getTeamList(this.departmentId)
-  },
-  mounted() {
-    const that = this
-    this.common.$on('AllotListJiDianListRefresh', function() {
-      that.handleFilter()
-    })
-  },
-  methods: {
-    getList() {
-      this.showLoading = true
-      this.apibjd({
-        url: '/renwu/list',
-        method: 'get',
-        params: this.listQuery
-      }).then(data => {
-        this.list = data.list
-        this.total = data.total
-        this.showLoading = false
-      })
-    },
-    getSbzlList() {
-      this.api({
-        url: '/sedirectory/getList',
-        method: 'get',
-        params: {
-          sbzl: undefined,
-          level: '1'
-        }
-      }).then(data => {
-        this.sbzlList = data
-      })
-    },
-    handleSizeChange(val) {
-      // 改变每页数量
-      this.listQuery.pageSize = val
-      this.handleFilter()
-    },
-    handleCurrentChange(val) {
-      // 改变页码
-      this.listQuery.pageNum = val
-      this.getList()
-    },
-    handleFilter() {
-      // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
-    },
-    getIndex($index) {
-      // 表格序号
-      return (this.listQuery.pageNum - 1) * this.listQuery.pageSize + $index + 1
-    },
-    // 批量分配
-    renwuFp() {
-      this.allotList = []
-      if (this.multipleSelection.length === 0) {
-        this.$message({ message: '请在列表选择要操作的数据。', type: 'warning' })
-        return false
-      }
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (i === 0) {
-          this.bjdIds = this.multipleSelection[i].bjdId
-        } else {
-          this.bjdIds = this.bjdIds + ',' + this.multipleSelection[i].bjdId
-        }
-      }
-      this.apibjd({
-        url: '/renwu/getAllotBaseList',
-        method: 'post',
-        data: {
-          bjdIds: this.bjdIds
-        }
-      }).then(data => {
-        this.allotList = data.list
-        this.allotSbzl = this.allotList[0].shebeizhongleidaima
-        this.renwudan = {
-          xiadariqi: new Date()
-        }
-        if (this.multipleSelection[0].shebeileixing !== undefined && this.multipleSelection[0].shebeileixing !== null) {
-          this.title = '任务分配（' + this.multipleSelection[0].shebeileixing + '）'
-        }
-        this.dialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.allotList.toggleAllSelection()
-          this.selection = data.list
-        })
-      })
-    },
-    // 任务异常退回
-    returnToBjd() {
-      if (this.multipleSelection.length === 0) {
-        this.$message({ message: '请在列表选择要退回的数据。', type: 'warning' })
-        return false
-      }
-      let bjdIds = ''
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (i === 0) {
-          bjdIds = this.multipleSelection[i].bjdId
-        } else {
-          bjdIds = bjdIds + ',' + this.multipleSelection[i].bjdId
-        }
-      }
-      // 查询任务的分配状态
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (this.multipleSelection[i].allotNum !== this.multipleSelection[i].totalNum) {
-          this.$message({ message: '有任务已经分配，请重新选择。', type: 'warning' })
-          return false
-        } else {
-          this.$prompt('请输入退回原因', '提示', {
-            inputType: 'textarea',
-            confirmButtonText: '确定',
-            cancelButtonText: '取消'
-          }).then(({ value }) => {
-            this.apibjd({
-              url: '/bjd/returnToBjd',
-              method: 'get',
-              params: {
-                bjdIds: bjdIds,
-                reason: value
-              }
-            }).then(data => {
-              this.getList()
-              this.$message({ message: '任务异常退回成功', type: 'success' })
-            })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '取消输入'
-            })
-          })
-        }
-      }
-    },
-    // 作废数据
-    renwuZf() {
-      if (this.multipleSelection.length === 0) {
-        this.$message({ message: '请在列表选择要作废的数据。', type: 'warning' })
-        return false
-      }
-      let bjdIds = ''
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (i === 0) {
-          bjdIds = this.multipleSelection[i].bjdId
-        } else {
-          bjdIds = bjdIds + ',' + this.multipleSelection[i].bjdId
-        }
-      }
-      this.$prompt('共选择了' + this.multipleSelection.length + '台设备进行作废，请输入作废原因！', '提示', {
-        inputType: 'textarea',
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      }).then(({ value }) => {
-        if (value === null) {
-          this.$message({ message: '请填写作废原因！', type: 'warning' })
-          return false
-        }
-        this.apibjd({
-          url: '/bjd/updBjdToZfByRw',
-          method: 'get',
-          params: {
-            bjdIds: this.$refs.list.selection.map(rw => {
-              return rw.bjdId
-            }).join(','),
-            reason: value
-          }
-        }).then(data => {
-          this.getList()
-          if (data.count > 0) {
-            this.$alert(data.count + '条任务作废成功！', '确认信息', {
-              confirmButtonText: '确定'
-            })
-          } else {
-            this.$message({ message: '任务作废失败！', type: 'warning' })
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消作废'
-        })
-      })
-    },
-    viewBjd(bjd) {
-      const type = '/finish'
-      if (bjd.jianyanleibie === 'DJ') {
-        this.$router.push({ path: '/bjd/bjd-dj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type })
-      } else {
-        this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type })
-      }
-    },
-    viewBjdRenwu(bjdid) {
-      if (this.$store.getters.username === 'shiting') {
-        return false
-      }
-      this.allotList = []
-      this.bjdIds = bjdid
-      this.apibjd({
-        url: '/renwu/getAllotBaseList',
-        method: 'post',
-        data: {
-          bjdIds: bjdid
-        }
-      }).then(data => {
-        this.allotList = data.list
-        this.allotSbzl = this.allotList[0].shebeizhongleidaima
-        this.dialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.allotList.toggleAllSelection()
-          this.selection = data.list
-        })
-      })
-    },
-    clearSearch() {
-      this.listQuery.searchRenwu = {
-        bjState: '2'
-      }
-      this.getList()
-    },
-    // 表格单击选中行 getAllotListByBjdId
-    onRowClick(row) {
-      this.$refs.list.toggleRowSelection(row)
-    },
-    // 获取选中行的bjdId
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    onDialogRowClick(row) {
-      this.$refs.allotList.toggleRowSelection(row)
-    },
-    handleDialogSelectionChange(val) {
-      this.selection = val
-    },
-    // 查询检验科室
-    getDepartment() {
-      this.api({
-        url: '/department/all',
-        method: 'get'
-      }).then(data => {
-        this.depts = data
-      })
-    },
-    getArea() { // 查询区划
-      this.api({
-        url: '/area/getShiArea',
-        method: 'get',
-        params: {
-          shidaima: '370100'
-        }
-      }).then(data => {
-        this.areas = data
-      })
-    },
-    selectDepartmentUser(val) {
-      this.renlingren = []
-      this.getUserList(val)
-    },
-    getUserList(val) {
-      this.api({
-        url: '/user/getUserListByDepartmentId',
-        method: 'get',
-        params: {
-          departmentId: val
-        }
-      }).then(data => {
-        this.users = data
-      })
-    },
-    openZhongjian() {
-      if (this.multipleSelection.length !== 1) {
-        this.$message({ message: '请在列表选择要进行现场检验的设备,只允许单台操作。', type: 'warning' })
-        return false
-      }
-      if (this.multipleSelection[0].zhongjianriqi) {
-        this.bjdZhongjian.xianchangriqi = this.multipleSelection[0].zhongjianriqi
-      } else {
-        this.bjdZhongjian.xianchangriqi = new Date()
-      }
-      this.bjdZhongjian.xianchangbeizhu = this.multipleSelection[0].zhongjianBeizhu
-      this.dialogXianchangVisible = true
-    },
-    openBaseZhongjian() {
-      if (this.multipleSelection.length !== 1) {
-        this.$message({ message: '请在列表选择要操作的数据，只能选择单台设备。', type: 'warning' })
-        return false
-      }
-      this.apibjd({
-        url: '/renwu/getAllotBaseList',
-        method: 'post',
-        data: {
-          bjdIds: this.multipleSelection[0].bjdId
-        }
-      }).then(data => {
-        this.allotList = data.list
-        this.dialogXcjyVisible = true
-      })
-    },
-    clearBaseZhongjian() {
-      if (this.multipleSelection.length !== 1) {
-        this.$message({ message: '请在列表选择要操作的数据，只能选择单台设备。', type: 'warning' })
-        return false
-      }
-      this.apibjd({
-        url: '/renwu/clearZhongjian',
-        method: 'get',
-        params: {
-          bjdId: this.multipleSelection[0].bjdId
-        }
-      }).then(data => {
-        if (data === '清除成功！') {
-          this.getList()
-        }
-      })
-    },
-    clearShenqingriqi(index) {
-      this.apibjd({
-        url: '/renwu/clearShenqingriqi',
-        method: 'get',
-        params: {
-          renwuId: this.allotList[index].id
-        }
-      }).then(data => {
-        if (data === '清除成功！') {
-          this.allotList[index].shenqingxianchangriqi = null
-        }
-      })
-    },
-    closeDialog() {
-      this.renlingren = []
-      this.departmentId = this.$store.getters.departmentId
-      this.users = this.getUserList(this.departmentId)
-    },
-    allotRenwu() {
-      this.btnClick = true
-      if (this.selection.length === 0) {
-        this.$message({ message: '请选择要分配的数据。', type: 'warning' })
-        return false
-      }
-      if (this.renlingren.length > 0) {
-        for (let i = 0; i < this.teams.length; i++) {
-          if (this.renwudan.teamId === this.teams[i].id) {
-            this.renwudan.teamName = this.teams[i].name
-            break
-          }
-        }
-        for (let i = 0; i < this.depts.length; i++) {
-          if (this.departmentId === this.depts[i].id) {
-            this.renwudan.departmentName = this.depts[i].name
-            break
-          }
-        }
-        this.apibjd({
-          url: '/renwu/completeAllot',
-          method: 'post',
-          data: {
-            renwuList: this.selection,
-            renlingren: this.renlingren,
-            renwudan: this.renwudan,
-            bjdids: this.bjdIds
-          }
-        }).then(() => {
-          this.multipleSelection = []
-          // 刷新分配任务列表
-          this.getList()
-          // 刷新我的任务列表
-          Utils.$emit('task-list')
-          this.$message({ message: '分配成功。', type: 'success' })
-          this.dialogVisible = false
-          this.showLoading = true
-        })
-      } else {
-        this.$message({ message: '请选择要分配的人员。', type: 'warning' })
-        return false
-      }
-    },
-    tijiaoJianyan() {
-      this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
-      this.apibjd({
-        url: '/bjd/updBjdEndState',
-        method: 'post',
-        data: this.bjdZhongjian
-      }).then(data => {
-        this.$message.success('添加成功。')
-        this.getList()
-        this.dialogXianchangVisible = false
-      })
-    },
-    tijiaoJianyanBf() {
-      if (this.selection.length === 0) {
-        this.$message({ message: '请在列表选择要操作的数据。', type: 'warning' })
-        return false
-      }
-      this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
-      this.bjdZhongjian.renwuIds = this.$refs.allotList.selection.map(rw => {
-        return rw.id
-      }).join(',')
-      this.apibjd({
-        url: '/renwu/updBjdEndState',
-        method: 'post',
-        data: this.bjdZhongjian
-      }).then(data => {
-        this.$message.success('添加成功。')
-        this.getList()
-        this.dialogXcjyVisible = false
-      })
-    },
-    getTeamList(departmentId) { // 获取对应组
-      this.apibjd({
-        url: '/team/getTeamList',
-        method: 'get',
-        params: { departmentId }
-      }).then(data => {
-        this.teams = data
-      })
-    },
-    selectTeamUser(val) {
-      for (let i = 0; i < this.teams.length; i++) {
-        if (this.teams[i].id === val) {
-          this.renlingren = JSON.parse(this.teams[i].renyuans)
-          break
-        }
-      }
-    },
-    setWanchengqixian() {
-      var date = new Date(this.renwudan.yuejianriqi)
-      date.setMonth(date.getMonth() + 1)
-      this.$set(this.renwudan, 'wanchengqixian', date)
-    },
-    tableRowZhongjian({ row, rowIndex }) {
-      if (row.zhongjianState === 1) {
-        return 'qiyezhongjian-row'
-      } else if (row.zhongjianState === 2) {
-        return 'keshizhongjian-row'
-      }
-      return ''
-    },
-    tableRowBfZhongjian({ row, rowIndex }) {
-      if (row.shenqingxianchangriqi !== null) {
-        return 'xianchangriqi-row'
-      }
-      return ''
-    },
-    sortChange(column) {
-      if (column.order !== null) {
-        this.listQuery.orderBy = column.prop + ' '
-        this.listQuery.orderBy += column.order.replace('ending', '')
-      } else {
-        this.listQuery.orderBy = 'shouliriqi desc'
-      }
-      this.getList()
-    }
-  }
-}
-</script>
-
-<style>
-  /** 允许终检 */
-  .el-table .qiyezhongjian-row {
-    color: #0831e4;
-  }
-  .el-table .keshizhongjian-row {
-    color: #da6b83;
-  }
-  .el-table .xianchangriqi-row {
-    color: #66e41e;
-  }
-</style>
diff --git a/src/views/allot/list.vue b/src/views/allot/list.vue
index e7ce191..e1b5bde 100644
--- a/src/views/allot/list.vue
+++ b/src/views/allot/list.vue
@@ -1,65 +1,977 @@
 <template>
-  <RenwuChengYa v-if="visibleShow" />
-  <RenwuJiDian v-else />
+  <div class="app-container">
+    <div class="filter-container">
+      <sticky style="margin-bottom: 10px">
+        <div class="sub-navbar">
+          <el-button type="primary" icon="el-icon-sold-out" @click="renwuFp">
+            批量分配
+          </el-button>
+          <el-button type="warning" @click="returnToBjd">
+            <svg-icon icon-class="reject" /> 异常退回
+          </el-button>
+          <el-button type="danger" icon="el-icon-error" @click="renwuZf">
+            作废数据
+          </el-button>
+        </div>
+      </sticky>
+      <el-form>
+        <el-form-item>
+          <el-input
+            v-model="listQuery.serialNumber"
+            placeholder="报检单号"
+            clearable
+            style="width: 160px"
+            @keyup.enter.native="handleFilter"
+          />
+          <el-select
+            v-model="listQuery.shebeizhongleidaima"
+            placeholder="请选择设备种类"
+            clearable
+            @change="handleFilter"
+          >
+            <el-option
+              v-for="item in sbzlList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input
+            v-model="listQuery.shiyongdanwei"
+            placeholder="使用单位名称"
+            clearable
+            style="width: 400px"
+            @keyup.enter.native="handleFilter"
+          />
+          <el-button type="primary" icon="el-icon-search" @click="handleFilter">
+            查询
+          </el-button>
+          <el-button type="info" icon="el-icon-clear" @click="clearSearch">
+            清除
+          </el-button>
+          <br>
+          <el-select
+            v-model="listQuery.jianyanleibie"
+            placeholder="检验类别"
+            clearable
+            style="width: 100px"
+            value=""
+            @change="handleFilter"
+          >
+            <el-option value="DJ" label="定期检验" />
+            <el-option value="JJ" label="监督检验" />
+            <el-option value="ZJ" label="制造检验" />
+          </el-select>
+          <el-date-picker
+            v-model="listQuery.shouliriqi"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择报检日期"
+            style="width: 150px"
+            @change="handleFilter"
+          />
+          <el-input
+            v-model="listQuery.shigongdanwei"
+            placeholder="施工单位名称"
+            clearable
+            style="width: 300px"
+            @keyup.enter.native="handleFilter"
+          />
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-table
+      ref="list"
+      v-loading="showLoading"
+      element-loading-text="正在加载"
+      element-loading-spinner="el-icon-loading"
+      :data="list"
+      border
+      fit
+      highlight-current-row
+      stripe
+      width="100%"
+      height="600px"
+      :row-class-name="tableRowZhongjian"
+      @row-click="onRowClick"
+      @selection-change="handleSelectionChange"
+      @sort-change="sortChange"
+    >
+      <el-table-column type="selection" width="40" />
+      <el-table-column align="center" label="序号" width="60">
+        <template slot-scope="scope">
+          <span v-text="getIndex(scope.$index)" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        label="检验类别"
+        prop="jianyanleibie"
+        width="80"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.jianyanleibie === 'DJ'">定期检验</span>
+          <span v-else-if="scope.row.jianyanleibie === 'JJ'">监督检验</span>
+          <span
+            v-else-if="
+              scope.row.jianyanleibie === 'JJ' && scope.row.neibuleibie === 'SC'
+            "
+          >首次检验</span>
+          <span v-else-if="scope.row.jianyanleibie === 'ZJ'">制造检验</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        label="报检单号"
+        prop="serialNumber"
+        width="140"
+        sortable="custom"
+      />
+      <el-table-column align="center" label="使用单位" prop="shiyongdanwei" />
+      <el-table-column
+        align="center"
+        label="使用单位地址"
+        prop="shiyongdanweiDizhi"
+      />
+      <el-table-column
+        align="center"
+        label="区划名称"
+        prop="quhuamingcheng"
+        width="110"
+        sortable
+      />
+      <el-table-column
+        align="center"
+        label="报检日期"
+        prop="shouliriqi"
+        width="110"
+        sortable
+      />
+      <el-table-column
+        align="center"
+        label="受理人"
+        prop="shouliren"
+        width="100"
+      />
+      <el-table-column
+        v-if="departmentId !== 75"
+        align="center"
+        label="备注"
+        prop="bjdBeizhu"
+        width="80"
+      />
+      <el-table-column align="left" label="设备台数（待/总）" width="140">
+        <template slot-scope="scope">
+          <el-button
+            type="success"
+            size="small"
+            circle
+            icon="el-icon-view"
+            title="预览报检单"
+            @click="viewBjd(scope.row)"
+          />
+          <el-button
+            style="margin-left: 1px"
+            size="small"
+            circle
+            @click="viewBjdRenwu(scope.row.bjdId)"
+          >
+            <span style="color: #67c23a; font-weight: bold">{{
+              scope.row.allotNum
+            }}</span>
+            /
+            <span style="color: #f56c6c; font-weight: bold">{{
+              scope.row.totalNum
+            }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page="listQuery.pageNum"
+      :page-size="listQuery.pageSize"
+      :total="total"
+      :page-sizes="[10, 20, 40, 100]"
+      background
+      layout="total, sizes, prev, pager, next, jumper"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="title"
+      width="70%"
+      @close="closeDialog"
+    >
+      <el-container>
+        <el-form>
+          <el-form-item>
+            <el-select
+              v-model="departmentId"
+              placeholder="请选择科室"
+              style="width: 150px"
+              @change="selectDepartmentUser"
+            >
+              <el-option
+                v-for="dept in depts"
+                :key="dept.id"
+                :label="dept.name"
+                :value="dept.id"
+              />
+            </el-select>
+            <el-select
+              v-model="renwudan.teamId"
+              placeholder="请选择检验小组"
+              style="width: 150px"
+              @change="selectTeamUser"
+            >
+              <el-option
+                v-for="team in teams"
+                :key="team.id"
+                :label="team.teamName"
+                :value="team.id"
+              />
+            </el-select>
+            <el-select
+              v-model="renlingren"
+              :collapse-tags="true"
+              placeholder="请选择人员"
+              multiple
+              style="width: 160px"
+            >
+              <el-option
+                v-for="user in users"
+                :key="user.id"
+                :label="user.name"
+                :value="user.id"
+              />
+            </el-select>
+            <el-button type="primary" @disabled="btnClick" @click="allotRenwu">
+              执行分配
+            </el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-date-picker
+              v-model="renwudan.xiadariqi"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择下达日期"
+              style="width: 150px"
+            />
+            <el-date-picker
+              v-model="renwudan.yuejianriqi"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择约检日期"
+              style="width: 150px"
+              @blur="setWanchengqixian()"
+            />
+            <el-date-picker
+              v-model="renwudan.wanchengqixian"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择完成期限"
+              style="width: 150px"
+            />
+            <el-select
+              v-model="renwudan.jianyanleixing"
+              :collapse-tags="true"
+              placeholder="请选择检验类型"
+              style="width: 130px"
+            >
+              <el-option key="初检" label="初检" value="初检" />
+              <el-option key="复检" label="复检" value="复检" />
+            </el-select>
+            <el-input
+              v-model="renwudan.beizhu"
+              type="text"
+              style="width: 240px"
+              placeholder="请填写备注信息"
+            />
+          </el-form-item>
+        </el-form>
+      </el-container>
+      <el-table
+        ref="allotList"
+        :data="allotList"
+        size="small"
+        style="width: 150%"
+        border
+        fit
+        highlight-current-row
+        :row-class-name="tableRowBfZhongjian"
+        @row-click="onDialogRowClick"
+        @selection-change="handleDialogSelectionChange"
+      >
+        <el-table-column type="selection" width="45" />
+        <el-table-column align="center" label="序号" width="50" fixed="left">
+          <template slot-scope="scope">
+            <span v-text="getIndex(scope.$index)" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="allotSbzl === '2000'"
+          align="center"
+          label="设备名称"
+          prop="shebeimingcheng"
+          width="150"
+        />
+        <el-table-column
+          align="center"
+          :formatter="formatter.formatterCategory"
+          label="检验项目"
+          prop="neibuleibie"
+          width="100"
+        />
+        <el-table-column
+          align="center"
+          label="下次检验日期"
+          prop="xiacijianyanriqi"
+          width="100"
+        />
+        <el-table-column
+          align="center"
+          label="使用单位"
+          prop="shiyongdanwei"
+          width="240px;"
+        />
+        <el-table-column
+          v-if="allotSbzl !== '8000'"
+          align="center"
+          label="产品编号/出厂编号"
+          prop="chanpinbianhao"
+          width="140"
+        />
+        <el-table-column
+          align="center"
+          label="区划名称"
+          prop="quhuamingcheng"
+          width="80"
+        />
+        <el-table-column
+          align="center"
+          label="注册代码"
+          prop="zhucedaima"
+          width="160"
+        />
+        <el-table-column
+          align="center"
+          label="使用登记编号"
+          prop="shiyongdengjibianhao"
+          width="160"
+        />
+        <template v-if="allotSbzl === '8000'">
+          <el-table-column
+            align="center"
+            label="管道长度(m)/数量(条)"
+            prop="s32"
+            width="140"
+          />
+          <el-table-column
+            align="center"
+            label="管道级别"
+            prop="s7"
+            width="140"
+          />
+        </template>
+      </el-table>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import Sticky from '@/components/Sticky'
 import Utils from '@/utils/contact'
-import RenwuJiDian from '@/views/allot/components/jidian_list'
-import RenwuChengYa from '@/views/allot/components/chengya_list'
-
 export default {
   name: 'AllotList',
-  components: { RenwuJiDian, RenwuChengYa },
+  components: { Sticky },
   data() {
     return {
-      visibleShow: true,
-      departmentId: this.$store.getters.departmentId
+      dialogVisible: false,
+      total: 0,
+      list: [],
+      sbzlList: [],
+      listQuery: {
+        pageNum: 1, // 页码
+        pageSize: 20, // 每页条数
+        orderBy: 'shouliriqi desc',
+        shiyongdanwei: undefined,
+        shebeizhongleidaima: '',
+        bjState: '2'
+      },
+      renwudan: {
+        teamId: '',
+        xiadariqi: '',
+        yuejianriqi: '',
+        wanchengqixian: '',
+        jianyanleixing: '初检',
+        beizhu: ''
+      },
+      tempDepartment: {},
+      multipleSelection: [],
+      allotList: [],
+      depts: [],
+      users: [],
+      areas: [], // 区划数组
+      departmentId: this.$store.getters.departmentId,
+      renlingren: [],
+      selection: [],
+      departmentUserList: [],
+      unAllotUserList: [],
+      btnClick: false,
+      showLoading: true,
+      allotSbzl: '',
+      teams: [],
+      bjdIds: [],
+      dialogXianchangVisible: false,
+      dialogXcjyVisible: false,
+      bjdZhongjian: {
+        bjdid: '',
+        xianchangriqi: '',
+        xianchangbeizhu: '',
+        renwuIds: ''
+      },
+      title: '任务分配'
     }
   },
   created() {
-    // 68	管道检验科
-    // 69	安全阀定检科
-    // 70	压力容器定检科
-    // 71	办公室
-    // 72	起重机械检验科
-    // 73	电梯检验科
-    // 74	锅炉制造监检科
-    // 75	锅炉定检科
-    // 77	业务受理科
-    // 78	财务收费科
-    // 80	质量管理办公室
-    // 82	所领导
-    // 83	容器罐车科
-    // 84	容器制造检验科
-    // 85	莱芜业务受理科室
-    // 86	气瓶中心
+    this.getList()
+    this.getDepartment()
+    this.getArea()
+    this.getSbzlList()
+    this.getUserList(this.departmentId)
+    this.getTeamList(this.departmentId)
   },
   mounted() {
-    switch (this.departmentId) {
-      case 68 :
-      case 69 :
-      case 70 :
-      case 74 :
-      case 75 :
-      case 83 :
-      case 84 :
-      case 86 :
-        Utils.$emit('AllotListChengYaListRefresh')
-        this.visibleShow = true
-        break
-      case 72 :
-      case 73 :
-        Utils.$emit('AllotListJiDianListRefresh')
-        this.visibleShow = false
-        break
-    }
     const that = this
-    this.common.$on('allot-list', function() {
-      that.visibleShow ? Utils.$emit('AllotListChengYaListRefresh') : Utils.$emit('AllotListJiDianListRefresh')
+    this.common.$on('AllotListChengYaListRefresh', function() {
+      that.handleFilter()
     })
   },
   methods: {
+    getList() {
+      this.showLoading = true
+      this.apibjd({
+        url: '/renwu/list',
+        method: 'get',
+        params: this.listQuery
+      }).then((data) => {
+        this.list = data.list
+        this.total = data.total
+        this.showLoading = false
+      })
+    },
+    getSbzlList() {
+      this.api({
+        url: '/sedirectory/getList',
+        method: 'get',
+        params: {
+          sbzl: undefined,
+          level: '1'
+        }
+      }).then((data) => {
+        this.sbzlList = data
+      })
+    },
+    handleSizeChange(val) {
+      // 改变每页数量
+      this.listQuery.pageSize = val
+      this.handleFilter()
+    },
+    handleCurrentChange(val) {
+      // 改变页码
+      this.listQuery.pageNum = val
+      this.getList()
+    },
+    handleFilter() {
+      // 查询事件
+      this.listQuery.pageNum = 1
+      this.getList()
+    },
+    getIndex($index) {
+      // 表格序号
+      return (
+        (this.listQuery.pageNum - 1) * this.listQuery.pageSize + $index + 1
+      )
+    },
+    // 批量分配
+    renwuFp() {
+      this.allotList = []
+      if (this.multipleSelection.length === 0) {
+        this.$message({
+          message: '请在列表选择要操作的数据。',
+          type: 'warning'
+        })
+        return false
+      } else {
+        if (this.multipleSelection.length > 1 && !this.arrFn(this.multipleSelection)) {
+          return this.$message('所选报检单相同使用单位和相同施工单位才能批量分配')
+        }
+        this.bjdIds.length = 0
+        this.bjdIds = this.$refs.list.selection.map((rw) => rw.bjdId)
+        this.apibjd({
+          url: '/renwu/getAllotBaseList',
+          method: 'post',
+          data: {
+            bjdIds: this.bjdIds
+          }
+        }).then((data) => {
+          this.allotList = data
+          this.allotSbzl = this.allotList[0].shebeizhongleidaima
+          this.renwudan = {
+            shiyongdanwei: this.multipleSelection[0].shiyongdanwei,
+            shiyongdanweiLianxiren: this.multipleSelection[0].shiyongdanweiLianxiren,
+            shiyongdanweiDianhua: this.multipleSelection[0].shiyongdanweiDianhua,
+            shiyongdanweiDizhi: this.multipleSelection[0].shiyongdanweiDizhi,
+            shigongdanwei: this.multipleSelection[0].shigongdanwei,
+            shigongdanweiLianxiren: this.multipleSelection[0].shigongdanweiLianxiren,
+            shigongdanweiDianhua: this.multipleSelection[0].shigongdanweiDianhua,
+            xiadariqi: this.formatter.dateFormat('YYYY-MM-dd')
+          }
+          if (
+            this.multipleSelection[0].shebeileixing !== undefined &&
+              this.multipleSelection[0].shebeileixing !== null
+          ) {
+            this.title =
+                '任务分配（' + this.multipleSelection[0].shebeileixing + '）'
+          }
+          this.dialogVisible = true
+          this.$nextTick(() => {
+            this.$refs.allotList.toggleAllSelection()
+            this.selection = data.list
+          })
+        })
+      }
+    },
+    // 任务异常退回
+    returnToBjd() {
+      if (this.multipleSelection.length === 0) {
+        this.$message({
+          message: '请在列表选择要退回的数据。',
+          type: 'warning'
+        })
+        return false
+      }
+      this.bjdIds.length = 0
+      this.bjdIds = this.$refs.list.selection.map((rw) => rw.bjdId)
+      // 查询任务的分配状态
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        if (
+          this.multipleSelection[i].allotNum !==
+            this.multipleSelection[i].totalNum
+        ) {
+          this.$message({
+            message: '有任务已经分配，请重新选择。',
+            type: 'warning'
+          })
+          return false
+        } else {
+          this.$prompt('请输入退回原因', '提示', {
+            inputType: 'textarea',
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          })
+            .then(({ value }) => {
+              this.apibjd({
+                url: '/bjd/returnToBjd',
+                method: 'get',
+                params: {
+                  bjdIds: this.bjdIds,
+                  reason: value
+                }
+              }).then((data) => {
+                this.getList()
+                this.$message({ message: '任务异常退回成功', type: 'success' })
+              })
+            })
+            .catch(() => {
+              this.$message({
+                type: 'info',
+                message: '取消输入'
+              })
+            })
+        }
+      }
+    },
+    // 作废数据
+    renwuZf() {
+      if (this.multipleSelection.length === 0) {
+        this.$message({
+          message: '请在列表选择要作废的数据。',
+          type: 'warning'
+        })
+        return false
+      }
+      if (this.multipleSelection.length > 1) {
+        this.$message({
+          message: '请选择单条报检单进行作废。',
+          type: 'warning'
+        })
+        return false
+      }
+      this.$prompt('请输入作废原因！', '提示', {
+        inputType: 'textarea',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(({ value }) => {
+          if (value === null) {
+            this.$message({ message: '请填写作废原因！', type: 'warning' })
+            return false
+          }
+          this.apibjd({
+            url: '/bjd/zfDbRenwuByBjdId',
+            method: 'get',
+            params: {
+              bjdIds: this.$refs.list.selection[0].bjdId,
+              reason: value
+            }
+          }).then((data) => {
+            this.getList()
+            if (data.count > 0) {
+              this.$alert(data.count + '条任务作废成功！', '确认信息', {
+                confirmButtonText: '确定'
+              })
+            } else {
+              this.$message({ message: '任务作废失败！', type: 'warning' })
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消作废'
+          })
+        })
+    },
+    viewBjd(bjd) {
+      const type = '/finish'
+      if (bjd.jianyanleibie === 'DJ') {
+        this.$router.push({
+          path:
+              '/bjd/bjd-dj-input/' +
+              bjd.bjdId +
+              '/' +
+              bjd.shebeizhongleidaima +
+              '/' +
+              bjd.shebeizhongleidaima +
+              type
+        })
+      } else {
+        this.$router.push({
+          path:
+              '/bjd/bjd-jj-input/' +
+              bjd.bjdId +
+              '/' +
+              bjd.shebeizhongleidaima +
+              '/' +
+              bjd.shebeizhongleidaima +
+              type
+        })
+      }
+    },
+    viewBjdRenwu(bjdid) {
+      if (this.$store.getters.username === 'shiting') {
+        return false
+      }
+      this.allotList = []
+      this.bjdIds = [bjdid]
+      this.apibjd({
+        url: '/renwu/getAllotBaseList',
+        method: 'post',
+        data: {
+          bjdIds: this.bjdIds
+        }
+      }).then((data) => {
+        this.allotList = data.list
+        this.allotSbzl = this.allotList[0].shebeizhongleidaima
+        this.dialogVisible = true
+        this.$nextTick(() => {
+          this.$refs.allotList.toggleAllSelection()
+          this.selection = data.list
+        })
+      })
+    },
+    clearSearch() {
+      this.listQuery.bjState = '2'
+      this.getList()
+    },
+    // 表格单击选中行 getAllotListByBjdId
+    onRowClick(row) {
+      this.$refs.list.toggleRowSelection(row)
+    },
+    // 获取选中行的bjdId
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    onDialogRowClick(row) {
+      this.$refs.allotList.toggleRowSelection(row)
+    },
+    handleDialogSelectionChange(val) {
+      this.selection = val
+    },
+    // 查询检验科室
+    getDepartment() {
+      this.api({
+        url: '/department/all',
+        method: 'get'
+      }).then((data) => {
+        this.depts = data
+      })
+    },
+    getArea() {
+      // 查询区划
+      this.api({
+        url: '/area/getShiArea',
+        method: 'get',
+        params: {
+          shidaima: '370100'
+        }
+      }).then((data) => {
+        this.areas = data
+      })
+    },
+    selectDepartmentUser(val) {
+      this.renlingren = []
+      this.getTeamList(val)
+    },
+    getUserList(val) {
+      this.api({
+        url: '/user/getUserListByDepartmentId',
+        method: 'get',
+        params: {
+          departmentId: val
+        }
+      }).then((data) => {
+        this.users = data
+      })
+    },
+    openZhongjian() {
+      if (this.multipleSelection.length !== 1) {
+        this.$message({
+          message: '请在列表选择要进行现场检验的设备,只允许单台操作。',
+          type: 'warning'
+        })
+        return false
+      }
+      if (this.multipleSelection[0].zhongjianriqi) {
+        this.bjdZhongjian.xianchangriqi =
+            this.multipleSelection[0].zhongjianriqi
+      } else {
+        this.bjdZhongjian.xianchangriqi = new Date()
+      }
+      this.bjdZhongjian.xianchangbeizhu =
+          this.multipleSelection[0].zhongjianBeizhu
+      this.dialogXianchangVisible = true
+    },
+    openBaseZhongjian() {
+      if (this.multipleSelection.length !== 1) {
+        this.$message({
+          message: '请在列表选择要操作的数据，只能选择单台设备。',
+          type: 'warning'
+        })
+        return false
+      }
+      this.apibjd({
+        url: '/renwu/getAllotBaseList',
+        method: 'post',
+        data: {
+          bjdIds: [this.multipleSelection[0].bjdId]
+        }
+      }).then((data) => {
+        this.allotList = data.list
+        this.dialogXcjyVisible = true
+      })
+    },
+    clearBaseZhongjian() {
+      if (this.multipleSelection.length !== 1) {
+        this.$message({
+          message: '请在列表选择要操作的数据，只能选择单台设备。',
+          type: 'warning'
+        })
+        return false
+      }
+      this.apibjd({
+        url: '/renwu/clearZhongjian',
+        method: 'get',
+        params: {
+          bjdId: this.multipleSelection[0].bjdId
+        }
+      }).then((data) => {
+        if (data === '清除成功！') {
+          this.getList()
+        }
+      })
+    },
+    clearShenqingriqi(index) {
+      this.apibjd({
+        url: '/renwu/clearShenqingriqi',
+        method: 'get',
+        params: {
+          renwuId: this.allotList[index].id
+        }
+      }).then((data) => {
+        if (data === '清除成功！') {
+          this.allotList[index].shenqingxianchangriqi = null
+        }
+      })
+    },
+    closeDialog() {
+      this.renlingren = []
+      this.departmentId = this.$store.getters.departmentId
+      this.users = this.getUserList(this.departmentId)
+    },
+    arrFn(arr) {
+      const ary = new Array(arr)
+      const nary = arr
+      if (arr.length > 1) {
+        for (let i = 0; i < ary.length; i++) {
+          if (
+            nary[i].shiyongdanwei === nary[i + 1].shiyongdanwei &&
+              nary[i].shigongdanwei === nary[i + 1].shigongdanwei
+          ) {
+            return true
+          }
+        }
+      }
+    },
+    allotRenwu() {
+      this.btnClick = true
+      if (this.selection.length === 0) {
+        this.$message({ message: '请选择要分配的数据。', type: 'warning' })
+        return false
+      }
+
+      if (this.renlingren.length > 0) {
+        for (let i = 0; i < this.teams.length; i++) {
+          if (this.renwudan.teamId === this.teams[i].id) {
+            this.renwudan.teamName = this.teams[i].name
+            break
+          }
+        }
+        for (let i = 0; i < this.depts.length; i++) {
+          if (this.departmentId === this.depts[i].id) {
+            this.renwudan.departmentName = this.depts[i].name
+            break
+          }
+        }
+        this.apibjd({
+          url: '/renwu/completeAllot',
+          method: 'post',
+          data: {
+            renwuList: this.selection,
+            renlingren: this.renlingren,
+            renwudan: this.renwudan,
+            bjdIds: this.bjdIds
+          },
+          paramsSerializer: function(data) {
+            return require('qs').stringify(data, { indices: false })
+          }
+        }).then(() => {
+          this.multipleSelection = []
+          // 刷新分配任务列表
+          this.getList()
+          // 刷新我的任务列表
+          Utils.$emit('task-list')
+          this.$message({ message: '分配成功。', type: 'success' })
+          this.dialogVisible = false
+          this.showLoading = true
+        })
+      } else {
+        this.$message({ message: '请选择要分配的人员。', type: 'warning' })
+        return false
+      }
+    },
+    tijiaoJianyan() {
+      this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
+      this.apibjd({
+        url: '/bjd/updBjdEndState',
+        method: 'post',
+        data: this.bjdZhongjian
+      }).then((data) => {
+        this.$message.success('添加成功。')
+        this.getList()
+        this.dialogXianchangVisible = false
+      })
+    },
+    tijiaoJianyanBf() {
+      if (this.selection.length === 0) {
+        this.$message({
+          message: '请在列表选择要操作的数据。',
+          type: 'warning'
+        })
+        return false
+      }
+      this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
+      this.bjdZhongjian.renwuIds = this.$refs.allotList.selection.map(row => row.id).join(',')
+      this.apibjd({
+        url: '/renwu/updBjdEndState',
+        method: 'post',
+        data: this.bjdZhongjian
+      }).then((data) => {
+        this.$message.success('添加成功。')
+        this.getList()
+        this.dialogXcjyVisible = false
+      })
+    },
+    getTeamList(departmentId) {
+      // 获取对应组
+      this.apibjd({
+        url: '/team/getTeamList',
+        method: 'get',
+        params: { departmentId }
+      }).then((data) => {
+        this.teams = data
+      })
+    },
+    selectTeamUser(val) {
+      console.log(this.teams)
+      const _this = this
+      for (let i = 0; i < this.teams.length; i++) {
+        if (this.teams[i].id === val) {
+          this.users = this.teams[i].teamPerson.split(',')
+          break
+        }
+      }
+      this.users = this.users.map((item) => {
+        const obj = {}
+        obj.id = item
+        obj.name = _this.formatter.getChineseName(null, null, item)
+        return obj
+      })
+      console.log(this.users)
+    },
+    setWanchengqixian() {
+      const date = new Date(this.renwudan.yuejianriqi)
+      date.setMonth(date.getMonth() + 1)
+      this.$set(this.renwudan, 'wanchengqixian', this.formatter.dateFormat('YYYY-MM-dd', date))
+    },
+    tableRowZhongjian({ row, rowIndex }) {
+      if (row.zhongjianState === 1) {
+        return 'qiyezhongjian-row'
+      } else if (row.zhongjianState === 2) {
+        return 'keshizhongjian-row'
+      }
+      return ''
+    },
+    tableRowBfZhongjian({ row, rowIndex }) {
+      if (row.shenqingxianchangriqi !== null) {
+        return 'xianchangriqi-row'
+      }
+      return ''
+    },
+    sortChange(column) {
+      if (column.order !== null) {
+        this.listQuery.orderBy = column.prop + ' '
+        this.listQuery.orderBy += column.order.replace('ending', '')
+      } else {
+        this.listQuery.orderBy = 'shouliriqi desc'
+      }
+      this.getList()
+    }
   }
 }
 </script>
+
+<style>
+</style>
diff --git a/src/views/bjd/dt_list.vue b/src/views/bjd/dt_list.vue
index ee0ffb9..8663f91 100644
--- a/src/views/bjd/dt_list.vue
+++ b/src/views/bjd/dt_list.vue
@@ -73,7 +73,7 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           <span class="radio-group-label">受理人员：</span>
           <el-radio-group v-model="listQuery.shouliren" @change="handleFilter">
-            <el-radio :label="this.$store.getters.nickname">
+            <el-radio :label="$store.getters.userId">
               只看自己
             </el-radio>
             <el-radio :label="undefined">
@@ -148,9 +148,8 @@
 <script>
 import Sticky from '@/components/Sticky'
 import Pagination from '@/components/Pagination'
-import store from '../../store'
 import qs from 'qs'
-// import router from '../../router'
+
 export default {
   name: 'ProjectDtList',
   components: { Sticky, Pagination },
@@ -163,8 +162,8 @@ export default {
         pageRow: 20, // 每页条数
         orderBy: 'id desc',
         zfState: false,
-        shoulikeshi: store.getters.departmentId,
-        shouliren: store.getters.nickname,
+        shoulikeshi: this.$store.getters.departmentId,
+        shouliren: this.$store.getters.userId,
         bjState: undefined,
         dataSource: 0
       },
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index 273a471..fb26905 100644
--- a/src/views/bjd/jj_list.vue
+++ b/src/views/bjd/jj_list.vue
@@ -85,7 +85,7 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           <span class="radio-group-label">受理人员：</span>
           <el-radio-group v-model="listQuery.shouliren" @change="handleFilter">
-            <el-radio :label="this.$store.getters.nickname">
+            <el-radio :label="$store.getters.userId">
               只看自己
             </el-radio>
             <el-radio :label="undefined">
@@ -217,7 +217,7 @@ export default {
         orderBy: 'id desc',
         zfState: false,
         shoulikeshi: store.getters.departmentId,
-        shouliren: store.getters.nickname,
+        shouliren: this.$store.getters.userId,
         jianyanleibie: 'JJ',
         bjState: undefined
       },
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 3ea58b2..08df4fe 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -3,22 +3,22 @@
     <div class="filter-container">
       <sticky style="margin-bottom: 10px;">
         <div class="sub-navbar">
-          <el-button v-if="notHasDepartmentId(86)" type="primary" icon="el-icon-edit" @click="editYsjl('YSJL')">
+          <el-button type="primary" icon="el-icon-edit" @click="editYsjl('YSJL')">
             起草原始记录
           </el-button>
-          <el-button v-if="notHasDepartmentId([69, 74])" type="primary" icon="el-icon-edit" @click="editYsjl('JYBG')">
+          <el-button type="primary" icon="el-icon-edit" @click="editYsjl('JYBG')">
             起草报告
           </el-button>
           <el-button type="success" icon="el-icon-tickets" @click="copyYsjl">
             复制数据
           </el-button>
-          <el-button v-if="notHasDepartmentId([86, 74])" type="warning" @click="turnBack">
+          <el-button type="warning" @click="turnBack">
             <svg-icon icon-class="reject" /> 任务退回
           </el-button>
           <el-button type="danger" icon="el-icon-delete" @click="deleteRenwu">
             作废任务
           </el-button>
-          <el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
+          <el-button type="success" icon="el-icon-success" @click="completeRenwu">
             任务完成
           </el-button>
           <el-button type="danger" @click="terminationFn">
@@ -61,54 +61,19 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="40" />
-      <el-table-column align="center" label="序号" width="60" fixed="left" type="index">
-        <!-- <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)" />
-        </template> -->
-      </el-table-column>
-      <el-table-column v-if="$store.getters.departmentId !== 75" align="center" label="设备种类" prop="shebeizhonglei" width="100" />
+      <el-table-column align="center" label="序号" width="60" fixed="left" type="index" />
+      <el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="100" />
       <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
-      <template v-if="$store.getters.departmentId === 69 || $store.getters.departmentId === 86">
-        <el-table-column v-if="$store.getters.departmentId === 69" align="center" label="使用单位" prop="shiyongdanwei" width="240" />
-        <el-table-column v-if="$store.getters.departmentId === 86" align="center" label="安装单位" prop="shigongdanwei" width="240" />
-        <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
-        <el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
-        <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="150" />
-        <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
-        <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
-      </template>
-      <template v-else-if="$store.getters.departmentId === 74">
-        <el-table-column align="center" label="制造单位" prop="zhizaodanwei" />
-        <el-table-column align="center" label="设备代码" prop="shebeidaima" sortable="custom" />
-        <el-table-column align="center" label="锅炉型号" prop="guigexinghao" sortable="custom" />
-        <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" />
-        <el-table-column align="center" label="操作" prop="acces" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="info" size="small" circle icon="el-icon-info" title="相关鉴证" @click="showVerification(scope.row.id)" />
-          </template>
-        </el-table-column>
-      </template>
-      <template v-if="$store.getters.departmentId === 75">
-        <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
-        <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
-        <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
-        <el-table-column align="center" label="产品名称/设备名称" prop="shebeimingcheng" width="180" />
-        <el-table-column align="center" label="锅炉型号" prop="guigexinghao" width="150" />
-        <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="100" sortable />
-        <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
-      </template>
-      <template v-else>
-        <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
-        <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
-        <el-table-column align="center" label="使用单位" prop="shiyongdanwei" min-width="240" />
-        <el-table-column align="center" label="产品名称/设备名称" prop="shebeimingcheng" width="180" />
-        <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
-        <el-table-column v-if="$store.getters.departmentId === 68" align="center" label="管道级别" prop="s7" width="140" />
-        <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="150" />
-        <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
-        <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
-        <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
-      </template>
+      <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
+      <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
+      <el-table-column align="center" label="使用单位" prop="shiyongdanwei" min-width="240" />
+      <el-table-column align="center" label="产品名称/设备名称" prop="shebeimingcheng" width="180" />
+      <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
+      <el-table-column v-if="$store.getters.departmentId === 68" align="center" label="管道级别" prop="s7" width="140" />
+      <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="150" />
+      <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
+      <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
     </el-table>
     <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
 

From 0c68a494bf87e632a3ea715eaec3dc4b59844492 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 25 Aug 2021 20:10:53 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E6=A3=80?=
 =?UTF-8?q?=E5=8D=95=E4=BD=9C=E5=BA=9F=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api.js          | 11 +-------
 src/utils/apibjd.js       | 53 +--------------------------------------
 src/views/bjd/dj_list.vue | 11 +-------
 src/views/bjd/dt_list.vue | 15 +++--------
 src/views/bjd/jj_list.vue | 11 +-------
 src/views/bjd/qy_list.vue | 15 +++--------
 6 files changed, 10 insertions(+), 106 deletions(-)

diff --git a/src/utils/api.js b/src/utils/api.js
index dd4e5e2..2df76e3 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -29,16 +29,7 @@ service.interceptors.response.use(
     hideLoading()
     const res = response.data
     if (res.code === 1) {
-      if (res.data !== null) {
-        if (res.data.returnData !== undefined && JSON.stringify(res.data.returnData) !== '{}') {
-          return res.data.returnData
-        } else {
-          return res.data
-        }
-      }
-      return null
-    } else if (res.returnCode === 1) {
-      return res.returnData
+      return res.data
     } else if (res.code === 20001) {
       Notification({
         showClose: true,
diff --git a/src/utils/apibjd.js b/src/utils/apibjd.js
index e6ae09d..8090249 100644
--- a/src/utils/apibjd.js
+++ b/src/utils/apibjd.js
@@ -1,6 +1,5 @@
 import axios from 'axios'
 import { Notification } from 'element-ui'
-import store from '../store'
 import { showLoading, hideLoading } from './apiHelper'
 // 创建axios实例
 const service = axios.create({
@@ -27,55 +26,8 @@ service.interceptors.response.use(
   response => {
     hideLoading()
     const res = response.data
-    if (res.returnCode === '1000') {
-      return res
-    }
     if (res.code === 1) {
-      if (res.data !== null) {
-        if (res.data.returnCode) {
-          if (res.data.returnCode === 1) {
-            return res.data.returnData
-          } else if (res.data.returnCode === '20011') {
-            Notification({
-              showClose: true,
-              message: res.returnMsg,
-              type: 'error',
-              duration: 500,
-              onClose: () => {
-                store.dispatch('FedLogOut').then(() => {
-                  location.reload()// 为了重新实例化vue-router对象 避免bug
-                })
-              }
-            })
-            return Promise.reject('未登录')
-          } else {
-            Notification({
-              message: res.data.returnMsg || '请求处理异常，请稍后再试',
-              type: 'error',
-              duration: 3 * 1000
-            })
-            return Promise.reject(res)
-          }
-        } else {
-          return res.data
-        }
-      }
-      return null
-    } if (res.returnCode === 1) {
-      return res.returnData
-    } else if (res.returnCode === '20011') {
-      Notification({
-        showClose: true,
-        message: res.returnMsg,
-        type: 'error',
-        duration: 500,
-        onClose: () => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload()// 为了重新实例化vue-router对象 避免bug
-          })
-        }
-      })
-      return Promise.reject('未登录')
+      return res.data
     } else {
       let msg = ''
       if (res.message) {
@@ -85,9 +37,6 @@ service.interceptors.response.use(
       } else {
         msg = res.returnMsg
       }
-      if (res.data && res.data.constructor === String) {
-        msg = msg ? msg + '：' + res.data : res.data
-      }
       Notification({
         message: msg,
         type: 'error',
diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue
index c3742a1..4c74541 100644
--- a/src/views/bjd/dj_list.vue
+++ b/src/views/bjd/dj_list.vue
@@ -418,16 +418,7 @@ export default {
                   return qs.stringify(params, { indices: false })
                 }
               }).then((data) => {
-                this.$message({
-                  message:
-                    (data.bianhao !== null && data.bianhao !== undefined
-                      ? '流水号为' +
-                        data.bianhao +
-                        '的项目关联的任务已经分配不能作废！'
-                      : '') +
-                    (data.count === 0 ? '' : data.count + '条项目作废成功'),
-                  type: 'info'
-                })
+                this.$notify.success('操作成功！')
                 this.getList()
               })
             })
diff --git a/src/views/bjd/dt_list.vue b/src/views/bjd/dt_list.vue
index 8663f91..561fca9 100644
--- a/src/views/bjd/dt_list.vue
+++ b/src/views/bjd/dt_list.vue
@@ -272,16 +272,7 @@ export default {
                   return qs.stringify(params, { indices: false })
                 }
               }).then((data) => {
-                this.$message({
-                  message:
-                    (data.bianhao !== null && data.bianhao !== undefined
-                      ? '流水号为' +
-                        data.bianhao +
-                        '的项目关联的任务已经分配不能作废！'
-                      : '') +
-                    (data.count === 0 ? '' : data.count + '条项目作废成功'),
-                  type: 'info'
-                })
+                this.$notify.success('操作成功！')
                 this.getList()
               })
             })
@@ -357,7 +348,7 @@ export default {
     editBjd($index) {
       const bjd = this.list[$index]
       let type = '/update'
-      if (bjd.bjState === '2') {
+      if (bjd.bjState === 2) {
         type = '/finish'
       }
       if (bjd.jianyanleibie === 'DJ') {
@@ -466,7 +457,7 @@ export default {
           this.$message({ message: '只允许单台报检单收回', type: 'error' })
           return false
         }
-        if (this.multipleSelection[0].bjState !== '2') {
+        if (this.multipleSelection[0].bjState !== 2) {
           this.$message({ message: '非审核通过数据不允许异常收回！', type: 'error' })
           return false
         }
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index fb26905..e9ec88b 100644
--- a/src/views/bjd/jj_list.vue
+++ b/src/views/bjd/jj_list.vue
@@ -330,16 +330,7 @@ export default {
                   return qs.stringify(params, { indices: false })
                 }
               }).then((data) => {
-                this.$message({
-                  message:
-                    (data.bianhao !== null && data.bianhao !== undefined
-                      ? '流水号为' +
-                        data.bianhao +
-                        '的项目关联的任务已经分配不能作废！'
-                      : '') +
-                    (data.count === 0 ? '' : data.count + '条项目作废成功'),
-                  type: 'info'
-                })
+                this.$notify.success('操作成功！')
                 this.getList()
               })
             })
diff --git a/src/views/bjd/qy_list.vue b/src/views/bjd/qy_list.vue
index 423fae7..ca8dde3 100644
--- a/src/views/bjd/qy_list.vue
+++ b/src/views/bjd/qy_list.vue
@@ -250,17 +250,8 @@ export default {
                 paramsSerializer: function(params) {
                   return qs.stringify(params, { indices: false })
                 }
-              }).then((data) => {
-                this.$message({
-                  message:
-                    (data.bianhao !== null && data.bianhao !== undefined
-                      ? '流水号为' +
-                        data.bianhao +
-                        '的项目关联的任务已经分配不能作废！'
-                      : '') +
-                    (data.count === 0 ? '' : data.count + '条项目作废成功'),
-                  type: 'info'
-                })
+              }).then(() => {
+                this.$notify.success('操作成功！')
                 this.getList()
               })
             })
@@ -385,7 +376,7 @@ export default {
           this.$message({ message: '只允许单台报检单收回', type: 'error' })
           return false
         }
-        if (this.multipleSelection[0].bjState !== '2') {
+        if (this.multipleSelection[0].bjState !== 2) {
           this.$message({ message: '非审核通过数据不允许异常收回！', type: 'error' })
           return false
         }

From 219abf188da613a60bdffa65c1c2b6b71761b303 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 25 Aug 2021 21:23:04 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=9B=9E=E6=89=A7=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/bjdService.js  | 36 ++++++++++++++++++++++++++++++++++++
 src/views/bjd/dj_input.vue | 20 +-------------------
 src/views/bjd/dj_list.vue  | 30 +++---------------------------
 src/views/bjd/jj_input.vue | 10 +---------
 src/views/bjd/jj_list.vue  | 30 +++---------------------------
 5 files changed, 44 insertions(+), 82 deletions(-)

diff --git a/src/service/bjdService.js b/src/service/bjdService.js
index 7a9f824..139d792 100644
--- a/src/service/bjdService.js
+++ b/src/service/bjdService.js
@@ -1,5 +1,7 @@
 import XLSX from 'xlsx'
 import common from '@/utils/common'
+import qs from 'qs'
+import preview from '@/utils/preview'
 
 export default {
   /**
@@ -101,5 +103,39 @@ export default {
     }
     reader.readAsArrayBuffer(file)
     loading.close()
+  },
+  /**
+   * 批量打印回执单
+   *
+   * @param bjdIds  报检单主键数组
+   * @return {Promise<AxiosResponse<any>>}
+   */
+  batchPrintHzd(bjdIds) {
+    return new Promise(resolve => {
+      preview({
+        url: '/print/batchGeneratePdfHzd',
+        method: 'get',
+        params: {
+          bjdIds: bjdIds
+        },
+        paramsSerializer: function(params) {
+          return qs.stringify(params, { indices: false })
+        }
+      }).then((data) => {
+        preview({
+          url: '/print/createXmlOther',
+          method: 'post',
+          params: {
+            ids: bjdIds,
+            type: 'HZD'
+          },
+          paramsSerializer: function(params) {
+            return qs.stringify(params, { indices: false })
+          }
+        }).then((data) => {
+          resolve(data)
+        })
+      })
+    })
   }
 }
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index 1b2316b..ffc5279 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -2352,25 +2352,7 @@ export default {
             Utils.$emit('allot-list')
             if (audit) {
               this.$message({ message: '审核成功', type: 'success' })
-              // 不是锅炉定检科室时，提示是否打印回执单
-              if (this.$store.getters.departmentId !== 75) {
-                this.$confirm('是否打印回执单?', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                })
-                  .then(() => {
-                    this.printHzd()
-                  })
-                  .catch(() => {
-                    this.$store.dispatch('delCurrentViews', {
-                      view: this.$route,
-                      $router: this.$router
-                    })
-                  })
-              } else {
-                this.deleteCurrentView()
-              }
+              this.deleteCurrentView()
               // 更新省局设备状态
               this.apisjse({
                 url: '/baseInfo/updateStateAndRiqiByIds',
diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue
index 4c74541..377297a 100644
--- a/src/views/bjd/dj_list.vue
+++ b/src/views/bjd/dj_list.vue
@@ -527,33 +527,9 @@ export default {
         })
         return false
       }
-      const arr = this.$refs.bjdList.selection.map((bjd) => {
-        return bjd.id
-      })
-      console.log(arr)
-      this.preview({
-        url: '/print/batchGeneratePdfHzd',
-        method: 'get',
-        params: {
-          bjdIds: arr
-        },
-        paramsSerializer: function(params) {
-          return qs.stringify(params, { indices: false })
-        }
-      }).then((data) => {
-        this.preview({
-          url: '/print/createXmlOther',
-          method: 'post',
-          params: {
-            ids: arr,
-            type: 'HZD'
-          },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then((data) => {
-          this.printbutton = 'ReportPrintApp://' + data
-        })
+      const bjdIds = this.$refs.bjdList.selection.map(bjd => bjd.id)
+      this.bjdService.batchPrintHzd(bjdIds).then((data) => {
+        this.printbutton = 'ReportPrintApp://' + data
       })
     },
     // 打印回执单
diff --git a/src/views/bjd/jj_input.vue b/src/views/bjd/jj_input.vue
index 655ca2a..764842b 100644
--- a/src/views/bjd/jj_input.vue
+++ b/src/views/bjd/jj_input.vue
@@ -1411,16 +1411,8 @@ export default {
             Utils.$emit('bjd-list')
             Utils.$emit('allot-list')
             if (audit) {
-              this.$store.dispatch('delCurrentViews', {
-                view: this.$route,
-                $router: this.$router
-              })
+              this.deleteCurrentView()
               this.$message({ message: '审核成功', type: 'success' })
-              if (this.bjd.dataSource === 1) {
-                this.smsSendResult('已通过', '根据施工进度', '【申请现场检验】')
-                // 您的${project}项目报检申请资料审核${status}。请${action}登录企业管理平台${action1}。咨询电话：${phone}。
-                // 【济南市特种设备检验研究院】您的43项目报检申请资料审核已通过，请根据施工进度登录企业管理平台[申请现场检验]。咨询电话:89738113。
-              }
             } else {
               this.tableData = data.renwus
               for (const tableObj of this.tableData) {
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index e9ec88b..090df23 100644
--- a/src/views/bjd/jj_list.vue
+++ b/src/views/bjd/jj_list.vue
@@ -413,33 +413,9 @@ export default {
         this.$message({ message: '请选择至少一条数据进行打印！', type: 'error' })
         return false
       }
-      const arr = this.$refs.bjdList.selection.map((bjd) => {
-        return bjd.id
-      })
-      console.log(arr)
-      this.preview({
-        url: '/print/batchGeneratePdfHzd',
-        method: 'get',
-        params: {
-          bjdIds: arr
-        },
-        paramsSerializer: function(params) {
-          return qs.stringify(params, { indices: false })
-        }
-      }).then((data) => {
-        this.preview({
-          url: '/print/createXmlOther',
-          method: 'post',
-          params: {
-            ids: arr,
-            type: 'HZD'
-          },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then((data) => {
-          this.printbutton = 'ReportPrintApp://' + data
-        })
+      const bjdIds = this.$refs.bjdList.selection.map((bjd) => bjd.id)
+      this.bjdService.batchPrintHzd(bjdIds).then((data) => {
+        this.printbutton = 'ReportPrintApp://' + data
       })
     },
     // 打印回执单

From 8aa50a7724ca20f45c8e0460ec940a00f1c07fcb Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 25 Aug 2021 21:53:14 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E6=8A=A5=E9=94=99=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=B7=BB=E5=8A=A0=E4=B8=8A=E7=BA=A7=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/department.vue | 39 ++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/views/user/department.vue b/src/views/user/department.vue
index 0a5f5d9..0451d2f 100644
--- a/src/views/user/department.vue
+++ b/src/views/user/department.vue
@@ -84,6 +84,11 @@
         <el-form-item label="部门代码（选填）">
           <el-input v-model="tempDepartment.code" type="text" size="small" style="width: 200px" />
         </el-form-item>
+        <el-form-item label="上级科室">
+          <el-select v-model="tempDepartment.parentId" filterable clearable>
+            <el-option v-for="dept in departments" :key="dept.id" :value="dept.id" :label="dept.name" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="成员">
           <template>
             <el-transfer v-model="departmentUserList" :props="{key: 'id', label: 'nickname'}" :button-texts="['移除', '添加']" :titles="['未分配员工', '部门成员']" :data="unAllotUserList" />
@@ -134,15 +139,31 @@ export default {
       multipleSelection: [],
       isIndeterminate: true,
       sbzlList: [],
-      areas: []
+      areas: [],
+      departmentAll: []
+    }
+  },
+  computed: {
+    departments: function() {
+      return this.departmentAll.filter(row => row.id !== this.tempDepartment.id)
     }
   },
   created() {
     this.getList()
     this.getSbzlList()
     this.getArea()
+    this.getAllDepartment()
   },
   methods: {
+    getAllDepartment() {
+      this.api({
+        url: '/department/all',
+        method: 'get'
+      }).then(data => {
+        this.departmentAll = [{ id: 0, name: '顶级科室' }]
+        this.departmentAll = this.departmentAll.concat(data)
+      })
+    },
     getSbzlList() {
       this.api({
         url: '/sedirectory/getList',
@@ -181,7 +202,9 @@ export default {
     },
     showCreate() {
       this.leaders = this.$store.getters.allUser
-      this.tempDepartment = {}
+      this.tempDepartment = {
+        parentId: 0
+      }
       this.getUserListByDepartmentIdOrNull(0)
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
@@ -189,9 +212,9 @@ export default {
     showUpdate(item) {
       this.leaders = this.$store.getters.allUser
       this.tempDepartment = item
-      this.tempDepartment.quhuadaima = item.quhuadaima.split(',')
-      this.tempDepartment.shebeizhongleidaima = item.shebeizhongleidaima.split(',')
-      this.tempDepartment.jianyanleibie = item.jianyanleibie.split(',')
+      this.tempDepartment.quhuadaima = item.quhuadaima && item.quhuadaima.split(',')
+      this.tempDepartment.shebeizhongleidaima = item.shebeizhongleidaima && item.shebeizhongleidaima.split(',')
+      this.tempDepartment.jianyanleibie = item.jianyanleibie && item.jianyanleibie.split(',')
       this.getUserListByDepartmentIdOrNull(item.id)
       this.getUserListByDepartmentId(item.id)
       this.dialogStatus = 'update'
@@ -227,9 +250,9 @@ export default {
       const form = {}
       form.department = this.tempDepartment
       form.userIds = this.departmentUserList
-      form.department.quhuadaima = form.department.quhuadaima.toString()
-      form.department.shebeizhongleidaima = form.department.shebeizhongleidaima.toString()
-      form.department.jianyanleibie = form.department.jianyanleibie.toString()
+      form.department.quhuadaima = form.department.quhuadaima && form.department.quhuadaima.toString()
+      form.department.shebeizhongleidaima = form.department.shebeizhongleidaima && form.department.shebeizhongleidaima.toString()
+      form.department.jianyanleibie = form.department.jianyanleibie && form.department.jianyanleibie.toString()
       this.$refs['tempDepartment'].validate(valid => {
         if (valid) {
           addDepartmentFn(form).then(() => {

From 863d3e5c5d67984650c2a3ff2128e5032d0f0334 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Thu, 26 Aug 2021 10:49:15 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bjd/dj_list.vue | 57 +++++++++++++++----------------------
 src/views/bjd/dt_list.vue | 59 +++++++++++++++------------------------
 src/views/bjd/jj_list.vue | 39 ++++++++++----------------
 3 files changed, 60 insertions(+), 95 deletions(-)

diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue
index 377297a..cc4971f 100644
--- a/src/views/bjd/dj_list.vue
+++ b/src/views/bjd/dj_list.vue
@@ -393,42 +393,31 @@ export default {
         })
         return false
       } else {
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.$prompt(
-            '请输入作废原因',
-            '共' +
-              this.multipleSelection.length +
-              '条报检项目将作废，是否继续?',
-            {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              inputPattern: /\S/,
-              inputErrorMessage: '作废原因不能为空'
-            }
-          )
-            .then(({ value }) => {
-              for (let i = 0; i < this.multipleSelection.length; i++) {
-                this.ids.push(this.multipleSelection[i].id)
+        this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputPattern: /\S/,
+          inputErrorMessage: '作废原因不能为空'
+        }).then(({ value }) => {
+          for (let i = 0; i < this.multipleSelection.length; i++) {
+            this.apibjd({
+              url: '/bjd/updBjdToZf',
+              method: 'get',
+              params: { reason: value, bjdId: this.multipleSelection[i].id },
+              paramsSerializer: function(params) {
+                return qs.stringify(params, { indices: false })
               }
-              this.apibjd({
-                url: '/bjd/updBjdToZf',
-                method: 'get',
-                params: { reason: value, bjdId: this.ids },
-                paramsSerializer: function(params) {
-                  return qs.stringify(params, { indices: false })
-                }
-              }).then((data) => {
-                this.$notify.success('操作成功！')
-                this.getList()
-              })
-            })
-            .catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消作废'
-              })
+            }).then((data) => {
+              this.$notify.success('操作成功！')
+              this.getList()
             })
-        }
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消作废'
+          })
+        })
       }
     },
     // 删除报检单---只有未审核的报检单才能删除
diff --git a/src/views/bjd/dt_list.vue b/src/views/bjd/dt_list.vue
index 561fca9..a0e32c6 100644
--- a/src/views/bjd/dt_list.vue
+++ b/src/views/bjd/dt_list.vue
@@ -245,44 +245,31 @@ export default {
         })
         return false
       } else {
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.$prompt(
-            '请输入作废原因',
-            '共' +
-              this.multipleSelection.length +
-              '条报检项目将作废，是否继续?',
-            {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              inputPattern: /\S/,
-              inputErrorMessage: '作废原因不能为空'
-            }
-          )
-            .then(({ value }) => {
-              for (let i = 0; i < this.multipleSelection.length; i++) {
-                this.ids.push(this.multipleSelection[i].id)
+        this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputPattern: /\S/,
+          inputErrorMessage: '作废原因不能为空'
+        }).then(({ value }) => {
+          for (let i = 0; i < this.multipleSelection.length; i++) {
+            this.apibjd({
+              url: '/bjd/updBjdToZf',
+              method: 'get',
+              params: { reason: value, bjdId: this.multipleSelection[i].id },
+              paramsSerializer: function(params) {
+                return qs.stringify(params, { indices: false })
               }
-              this.apibjd({
-                url: '/bjd/updBjdToZf',
-                method: 'get',
-                params: { reason: value, bjdId: this.multipleSelection.map(rw => {
-                  return rw.id
-                }) },
-                paramsSerializer: function(params) {
-                  return qs.stringify(params, { indices: false })
-                }
-              }).then((data) => {
-                this.$notify.success('操作成功！')
-                this.getList()
-              })
-            })
-            .catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消作废'
-              })
+            }).then((data) => {
+              this.$notify.success('操作成功！')
+              this.getList()
             })
-        }
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消作废'
+          })
+        })
       }
     },
 
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index 090df23..39ca84d 100644
--- a/src/views/bjd/jj_list.vue
+++ b/src/views/bjd/jj_list.vue
@@ -304,28 +304,17 @@ export default {
         return false
       } else {
         for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.$prompt(
-            '请输入作废原因',
-            '共' +
-              this.multipleSelection.length +
-              '条报检项目将作废，是否继续?',
-            {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              inputPattern: /\S/,
-              inputErrorMessage: '作废原因不能为空'
-            }
-          )
-            .then(({ value }) => {
-              for (let i = 0; i < this.multipleSelection.length; i++) {
-                this.ids.push(this.multipleSelection[i].id)
-              }
+          this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            inputPattern: /\S/,
+            inputErrorMessage: '作废原因不能为空'
+          }).then(({ value }) => {
+            for (let i = 0; i < this.multipleSelection.length; i++) {
               this.apibjd({
                 url: '/bjd/updBjdToZf',
                 method: 'get',
-                params: { reason: value, bjdId: this.multipleSelection.map(rw => {
-                  return rw.id
-                }) },
+                params: { reason: value, bjdId: this.multipleSelection[i].id },
                 paramsSerializer: function(params) {
                   return qs.stringify(params, { indices: false })
                 }
@@ -333,13 +322,13 @@ export default {
                 this.$notify.success('操作成功！')
                 this.getList()
               })
+            }
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消作废'
             })
-            .catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消作废'
-              })
-            })
+          })
         }
       }
     },

From 7e7fa6fab8da8ff38901c16ea550ef572e1c8fe7 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Thu, 26 Aug 2021 10:51:36 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allot/list.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/allot/list.vue b/src/views/allot/list.vue
index e1b5bde..d059e18 100644
--- a/src/views/allot/list.vue
+++ b/src/views/allot/list.vue
@@ -578,6 +578,9 @@ export default {
                 params: {
                   bjdIds: this.bjdIds,
                   reason: value
+                },
+                paramsSerializer: function(params) {
+                  return require('qs').stringify(params, { indices: false })
                 }
               }).then((data) => {
                 this.getList()