diff --git a/src/views/ysjl/1000/common/sz/gyscl.vue b/src/views/ysjl/1000/common/sz/gyscl.vue
index 65f63c8..c319928 100644
--- a/src/views/ysjl/1000/common/sz/gyscl.vue
+++ b/src/views/ysjl/1000/common/sz/gyscl.vue
@@ -339,6 +339,17 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="10">
+              <el-form-item label="选择科室" prop="departmentId">
+                <el-cascader
+                  v-model="ysjl.departmentId"
+                  :options="departmemtArr"
+                  :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                  :show-all-levels="false"
+                  @change="handleChange"
+                />
+              </el-form-item>
+            </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="下次检验日期" prop="xiacijianyanriqi">
@@ -434,6 +445,8 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import Bzz from '../../common/gysclJyxmBzz.js'
+import { getDepartmentTreeList } from '@/api/common'
+
 export default {
   name: 'GlGysclYsjl',
   components: { SignName, Sticky },
@@ -484,6 +497,7 @@ export default {
         }
       ],
       multipleSelection: [],
+      departmemtArr: [],
       ysjlId: this.$route.query.id,
       tableData: [] // 存储报告检验项目
     }
@@ -513,8 +527,17 @@ export default {
       this.getYsjl(this.ysjlId)
       this.getJyxmInfoByYsjl()
     }
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -530,6 +553,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.getXcjyrq()
@@ -558,6 +582,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/1000/dj/nb/gynb.vue b/src/views/ysjl/1000/dj/nb/gynb.vue
index 91d3897..bd5b10d 100644
--- a/src/views/ysjl/1000/dj/nb/gynb.vue
+++ b/src/views/ysjl/1000/dj/nb/gynb.vue
@@ -292,6 +292,7 @@
                     v-model="ysjl.departmentId"
                     :options="departmemtArr"
                     :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
                     @change="handleChange"
                   />
                 </el-form-item>
@@ -423,6 +424,9 @@ export default {
         this.departmemtArr = res
       })
     },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     // 签名方法
     singNameValue(data) {
       this.jianyanrenyuan = data.name
@@ -461,6 +465,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.getXcjyrq()
@@ -488,6 +493,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/1000/dj/sy/sysy.vue b/src/views/ysjl/1000/dj/sy/sysy.vue
index 4badb8b..07ee012 100644
--- a/src/views/ysjl/1000/dj/sy/sysy.vue
+++ b/src/views/ysjl/1000/dj/sy/sysy.vue
@@ -230,6 +230,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="10">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检验人员" prop="jianyanrenyuan">
@@ -267,6 +280,7 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'GlSysyYsjl',
   components: { SignName, Sticky },
@@ -286,6 +300,7 @@ export default {
       state: this.$route.query.state,
       jianyanrenyuan: '',
       departmentId: this.$store.getters.departmentId,
+      departmemtArr: [],
       isRepeat: false,
       edit: false,
       checkedTab: 'first',
@@ -337,11 +352,20 @@ export default {
     }
     this.getJyxm(1)
     this.getUserList()
+    this.getDepartmentArr()
   },
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     // 签名方法
     singNameValue(data) {
       this.jianyanrenyuan = data.name
@@ -388,6 +412,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         this.ysjl.jilubianhao = this.jilubianhao
         this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误
@@ -413,6 +438,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/1000/dj/wb/gywb.vue b/src/views/ysjl/1000/dj/wb/gywb.vue
index 82ba80d..b691c8f 100644
--- a/src/views/ysjl/1000/dj/wb/gywb.vue
+++ b/src/views/ysjl/1000/dj/wb/gywb.vue
@@ -145,7 +145,7 @@
             <legend>性能参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="额定蒸发量(热功率)" prop="edingzhengfaliang">
+                <el-form-item label="额定蒸发量(热功率)" prop="edingzhengfaliang" label-width="150px">
                   <el-input v-model="param.edingzhengfaliang" />
                 </el-form-item>
               </el-col>
@@ -289,6 +289,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="departmentId"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :options="tree"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="20" style="height: 110px;">
               <el-col :span="18">
                 <el-form-item label="其它缺陷情况或说明:" prop="beizhu">
@@ -327,6 +340,8 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common.js'
+
 export default {
   name: 'GlGywbYsjl',
   components: { SignName, Sticky },
@@ -347,6 +362,7 @@ export default {
       sybjSData: [],
       tableData: [],
       users: [],
+      tree: [],
       checkedTab: 'first',
       ysjlId: this.$route.query.id,
       // 表格合并相关
@@ -415,11 +431,20 @@ export default {
       this.getJyxm(1)
     }
     this.getUserList()
+    this.getDepartment()
   },
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
   },
   methods: {
+    getDepartment() {
+      getDepartmentTreeList().then(res => {
+        this.tree = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     // 签名方法
     singNameValue(data) {
       this.jianyanrenyuan = data.name
@@ -444,6 +469,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         this.getXcjyrq()
         this.ysjl.jilubianhao = this.jilubianhao
@@ -474,6 +500,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/2000/2100/zbg/dj/edit.vue b/src/views/ysjl/2000/2100/zbg/dj/edit.vue
index dedb2e7..8b04ac6 100644
--- a/src/views/ysjl/2000/2100/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2100/zbg/dj/edit.vue
@@ -343,6 +343,17 @@
                   <el-date-picker v-else v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" />
                 </el-form-item>
               </el-col>
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
@@ -1043,6 +1054,8 @@ import Utils from '@/utils/contact'
 import pictureUpload from '@/components/Upload'
 import SliceUpload from '@/components/SliceUpload'
 import Symbols from '@/views/common/Symbols'
+import { getDepartmentTreeList } from '@/api/common'
+
 export default {
   name: 'RqDjYsjl',
   components: { SignName, Sticky, jyfa, pictureUpload, SliceUpload, Symbols },
@@ -1075,6 +1088,7 @@ export default {
       state: this.$route.query.state,
       ysjl: {},
       departmentId: this.$route.query.departmentId,
+      departmemtArr: [],
       param: {},
       checkedTab: 'third',
       // 表格合并相关
@@ -1144,6 +1158,7 @@ export default {
     }
     // 获取区划
     this.getArea()
+    this.getDepartmentArr()
   },
   mounted() {
     // 下面的监听事件的名字由于需要添加主原始记录的主键，所以暂不生成监听事件，保存后会刷新页面会执行下面的监听事件
@@ -1161,6 +1176,14 @@ export default {
     })
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -1176,6 +1199,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
         // 设置初始值
         const tempTime = new Date()
@@ -1266,13 +1290,14 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -1564,9 +1589,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
-                state: operation
+                cyJyxm:{
+                  jyxm: jyxm,
+                  bgjyxm: jyxm,
+                }
               }
             }).then(data => {
               // 刷新任务列表，原始记录待办，原始记录已办，检验报告
diff --git a/src/views/ysjl/2000/2100/zbg/jj/dxgz.vue b/src/views/ysjl/2000/2100/zbg/jj/dxgz.vue
deleted file mode 100644
index 13c34c6..0000000
--- a/src/views/ysjl/2000/2100/zbg/jj/dxgz.vue
+++ /dev/null
@@ -1,740 +0,0 @@
-<!--压力容器改造和重大修理监检证书-->
-<template>
-  <div class="app-container">
-    <sticky style="margin-bottom: 10px;">
-      <div class="sub-navbar">
-        <el-button v-show="state === 'update' && ysjl.jilubianhao" size="medium" style="margin-left: 10px;" type="text">
-          编号：{{ ysjl.jilubianhao }}
-        </el-button>
-        <el-button v-if="state === 'create'" type="success" icon="el-icon-edit" size="medium" @click="saveYsjl('add')">
-          保存
-        </el-button>
-        <el-button v-if="state === 'update'" type="primary" icon="el-icon-edit" size="medium" @click="saveYsjl('upd')">
-          更新
-        </el-button>
-        <el-button v-show="state === 'update'" type="success" icon="el-icon-upload2" size="medium" @click="saveYsjl('build')">
-          生成报告
-        </el-button>
-        <el-button type="primary" size="medium" @click="Signjyxm">
-          <svg-icon icon-class="sign" />
-          检验项目批量签名
-        </el-button>
-        <el-button type="danger" icon="el-icon-delete" size="medium" @click="signClear">
-          批量清除签名
-        </el-button>
-        <el-button type="success" size="medium" icon="el-icon-edit" @click="batchUpdDate">
-          批量修改日期
-        </el-button>
-        <el-button v-if="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
-          预览
-        </el-button>
-        <Symbols />
-      </div>
-    </sticky>
-    <el-tabs v-model="checkedTab" type="card">
-      <el-tab-pane label="基本信息" name="first">
-        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="130px">
-          <fieldset>
-            <legend>基本信息</legend>
-            <el-row :gutter="25">
-              <el-col v-if="state === 'create'" :span="14">
-                <el-form-item label="报告编号">
-                  <el-input v-model="bgbh1" style="width:80px" disabled />
-                  <el-input v-model="bgbh2" style="width:80px" disabled />-
-                  <el-input v-model="bgbh3" style="width:80px" @blur="judgeRepeat(bgbh1 + '(' + bgbh2 + ')-' + bgbh3, ysjl.id)" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="state !== 'create'" :span="9">
-                <el-form-item label="报告编号" prop="jilubianhao">
-                  <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="isRepeat" :span="2" style="vertical-align: middle;padding-top: 3px;font-size: 15px;">
-                <span style="color:red">编号重复</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <el-form-item label="施工单位" prop="shigongdanwei">
-                  <el-input v-model="ysjl.shigongdanwei" :disabled="edit" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="许可证编号" prop="shigongxukezheng">
-                  <el-input v-model="ysjl.shigongxukezheng" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="施工类别" prop="shigongleibie">
-                  <el-select v-model="ysjl.shigongleibie" :disabled="edit" type="text" placeholder="请选择" style="width: 232px">
-                    <el-option label="改造" value="改造" />
-                    <el-option label="重大修理" value="重大修理" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <el-form-item label="使用单位" prop="shiyongdanwei">
-                  <el-input v-model="ysjl.shiyongdanwei" :disabled="edit" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <el-form-item label="设备使用地点" prop="shiyongdanweiDizhi">
-                  <el-input v-model="ysjl.shiyongdanweiDizhi" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="设备类别" prop="shebeileibiedaima">
-                  <el-input v-model="ysjl.shebeileibie" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="设备名称" prop="shebeimingcheng">
-                  <el-input v-model="ysjl.shebeimingcheng" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="使用登记证编号" prop="shiyongdengjibianhao">
-                  <el-input v-model="ysjl.shiyongdengjibianhao" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="注册代码" prop="zhucedaima">
-                  <el-input v-model="ysjl.zhucedaima" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="设备代码" prop="shebeidaima">
-                  <el-input v-model="ysjl.shebeidaima" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="竣工日期" prop="shejiriqi">
-                  <el-input v-model="ysjl.shejiriqi" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="产品图号" prop="rongqituhao">
-                  <el-input v-model="param.rongqituhao" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="登记机关" prop="dengjijiguan">
-                  <el-select v-model="ysjl.dengjijiguan" filterable style="width: 100%;">
-                    <el-option v-for="(item, index) in djjgs" :key="index" :label="item" :value="item" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="检验金额(元)" prop="jianyanheding">
-                  <el-input-number v-model="ysjl.jianyanheding" :disabled="ysjl.retreatState === 2 && ysjl.jfState !== null && ysjl.jfState" :controls="false" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </fieldset>
-          <fieldset>
-            <legend>检验信息</legend>
-            <el-row :gutter="20" style="height: 100px">
-              <el-col :span="18">
-                <el-form-item label="改造与重大修理项目:" prop="beizhu" label-width="200px">
-                  <el-input v-model="ysjl.beizhu" :rows="4" :disabled="edit" type="textarea" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20" style="text-align:left;margin-left: 50px;font-size: 18px;color: #606266;line-height: 40px;font-weight: bolder;">
-              按照《中华人民共和国特种设备安全法》《特种设备安全监察条例》的规定，该台压力容器改造与重大修理经我机构实施监督检验，安全性能
-              <el-select v-model="ysjl.baogaojielun" placeholder="请选择" style="width: 100px;">
-                <el-option label="符合" value="符合" />
-                <el-option label="不符合" value="不符合" />
-              </el-select>《固定式压力容器安全技术监察规程》（TSG21-2016）的要求，特发此证书。<br>
-            </el-row>
-            <el-row :gutter="20" style="margin-top: 20px;">
-              <el-col :span="9">
-                <el-form-item label="检验日期" prop="jianyanjieshuriqi">
-                  <el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-              <!--<el-col :span="9">
-                <el-form-item label="下次检验日期" prop="xiacijianyanriqi">
-                  <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
-                </el-form-item>
-              </el-col>-->
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="9">
-                <el-form-item label="检验人员" prop="jianyanrenyuan">
-                  <el-input v-model="jianyanrenyuan" disabled />
-                  <el-input v-show="false" v-model="ysjl.jianyanrenyuan" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="state !== 'bgView'" :span="9">
-                <sign-name :ysjl="ysjl" :jianyanrenyuan="jianyanrenyuan" :disabled="edit" @setSignValue="singNameValue" />
-              </el-col>
-            </el-row>
-          </fieldset>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="压力容器改造与重大修理监督检验项目表" name="second">
-        <el-table ref="jyxmData" :data="jyxmData" :span-method="mergeCols" :row-class-name="tableRowClassName" border stripe style="width:95%" @row-click="onRowClick" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column type="index" align="center" width="50" label="序号" />
-          <el-table-column align="center" label="检验项目">
-            <el-table-column align="center" prop="jianyanxiang" label="" />
-            <el-table-column align="left" prop="jianyanneirong" label="" />
-          </el-table-column>
-          <el-table-column align="center" prop="xiangmuleibie" width="80" label="类别" />
-          <el-table-column align="center" prop="jianyanjieguo" label="检验结果">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.jianyanjieguo" :disabled="edit" filterable allow-create default-first-option placeholder="请选择" style="width: 100%;">
-                <el-option label="符合要求" value="符合要求" />
-                <el-option label="不符合要求" value="不符合要求" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="gongzuojianzheng" label="工作见证">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.gongzuojianzheng" :disabled="edit" name="fyGongzuojianzheng" placeholder="请输入内容" />
-            </template>
-          </el-table-column>
-          <el-table-column v-if="false" align="center" prop="jianjianyuan" label="监检人员">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.jianjianyuan" name="Jianjianyuan" disabled />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="jianjianyuanName" label="监检员">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.jianjianyuanName" disabled />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="querenriqi" label="检验日期">
-            <template slot-scope="scope">
-              <el-date-picker v-model="scope.row.querenriqi" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
-            </template>
-          </el-table-column>
-        </el-table>
-        <br><br>
-        <!--<el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="50px">
-          <el-row>
-            <el-col :span="18" style="height: 90px">
-              <el-form-item label="说明" prop="shuoming">
-                <el-input v-model="param.shuoming" :rows="3" type="textarea" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>-->
-      </el-tab-pane>
-      <el-tab-pane label="压力容器原始资料" name="third">
-        <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
-      </el-tab-pane>
-    </el-tabs>
-    <el-dialog :visible.sync="jyxmrqShow" title="批量修改日期" width="500px" @close="closeDialog">
-      <template>
-        <el-date-picker v-model="querenriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
-      </template>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="jyxmrqShow = false">取 消</el-button>
-        <el-button type="primary" @click="batchUpd">确 定</el-button>
-      </span>
-    </el-dialog>
-    <sign-name v-show="signShow" ref="qmButton" :ysjl="ysjl" :jianjianyuan="jianjianyuan" field-name="xmqianming" @setSignValue="signNameValue" />
-  </div>
-</template>
-<script>
-import Sticky from '@/components/Sticky'
-import SignName from '@/views/common/SignName'
-import Utils from '@/utils/contact.js'
-import SliceUpload from '@/components/SliceUpload'
-import Symbols from '@/views/common/Symbols'
-export default {
-  name: 'RqGzwx',
-  components: { SignName, Sticky, SliceUpload, Symbols },
-  data() {
-    return {
-      bgbh1: 'RDG',
-      bgbh2: new Date().getFullYear(),
-      bgbh3: '',
-      ysjl: {},
-      defaultParam: {},
-      param: {},
-      state: this.$route.query.state,
-      jianyanrenyuan: '',
-      jianjianyuan: '',
-      departmentId: this.$store.getters.departmentId,
-      isRepeat: false,
-      edit: false,
-      checkedTab: 'first',
-      jyxmData: [],
-      sblbList: [],
-      // 表格合并相关
-      // 参与列合并的字段，在这里增加即可
-      cols: [
-        {
-          name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致
-          getValue(row) { // 该列用于比较的值的获取方法
-            return row.jianyanxiang
-          }
-        }
-      ],
-      // 参与行内合并的字段
-      rows: [
-        {
-          name: 'jianyanxiang',
-          getValue(row) {
-            return row.jianyanxiang
-          }
-        }
-      ],
-      jyxmrqShow: false,
-      signShow: false,
-      multipleSelection: [],
-      querenriqi: new Date(),
-      djjgs: ['无']
-    }
-  },
-  created() {
-    if (this.state === 'create') {
-      this.initYsjl()
-    } else {
-      this.getYsjl()
-      this.getParam()
-    }
-    this.getSbList('2000', undefined, 2)
-    this.getJyxm(1)
-    this.getArea()
-  },
-  methods: {
-    initYsjl() {
-      this.api({
-        url: '/ysjl/initYsjl',
-        method: 'post',
-        data: {
-          templateId: this.$route.query.templateId,
-          renwuId: this.$route.query.renwuId,
-          neibuleibie: this.$route.query.neibuleibie,
-          sblbdm: this.$route.query.sblbdm,
-          sblbmc: this.$route.query.sblbmc,
-          sbpzdm: this.$route.query.sbpzdm,
-          sbpzmc: this.$route.query.sbpzmc
-        }
-      }).then(data => {
-        this.ysjl = data.ysjl
-        this.param = data.param ? data.param : {}
-        this.$set(this.ysjl, 'shejiriqi', '年 月 日')
-        this.$set(this.ysjl, 'zhizaoriqi', '')
-        this.$set(this.ysjl, 'renlingren', this.$store.getters.userId)
-        this.$set(this.ysjl, 'departmentId', this.$store.getters.departmentId)
-        this.$set(this.ysjl, 'jigouhezhunzhenghao', process.env.VUE_APP_HZZBH)
-        this.$set(this.ysjl, 'baogaojielun', '符合')
-        this.$set(this.ysjl, 'shigongleibie', '改造')
-        this.$set(this.ysjl, 'zfState', '0')
-        this.$set(this.ysjl, 'source', 'web')
-        this.$set(this.ysjl, 'jianyanjieshuriqi', this.dateFormat(new Date()))
-        this.$set(this.ysjl, 'jianyanjieshuriqi', this.dateFormat(new Date()))
-        this.ysjl.jilubianhao = this.bgbh1 + '(' + this.bgbh2 + ')-' + this.bgbh3
-        this.getMaxBh()
-      })
-    },
-    getYsjl() {
-      this.api({
-        url: '/ysjl/getYsjlById',
-        method: 'get',
-        params: {
-          ysjlId: this.ysjl.id
-        }
-      }).then(data => {
-        this.ysjl = data.ysjl
-        if (this.ysjl.jianyanrenyuan) {
-          this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
-        }
-        // 查询最大记录编号
-        if (this.ysjl.jilubianhao) {
-          this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
-        } else {
-          this.getMaxBh()
-        }
-      })
-    },
-    getParam() {
-      // 根据原始记录id查询参数
-      this.api({
-        url: '/ysjl/getParamByYsjlId',
-        method: 'get',
-        params: {
-          ysjlId: this.$route.params.id,
-          sbzldm: this.$route.query.sbzldm
-        }
-      }).then(data => {
-        this.param = data
-      })
-    },
-    // 签名方法
-    singNameValue(data) {
-      this.jianyanrenyuan = data.name
-      this.ysjl.jianyanrenyuan = data.id
-      if (this.state !== 'create') {
-        this.common.signName(this.ysjl.id, this.ysjl.jianyanrenyuan)
-        Utils.$emit('ysjl-list')
-      }
-    },
-    // 批量签名方法
-    signNameValue(data) {
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (this.multipleSelection[i].jianjianyuan === null || this.multipleSelection[i].jianjianyuan === undefined || this.multipleSelection[i].jianjianyuan === '') {
-          this.multipleSelection[i].jianjianyuan = data.id + ''
-          this.multipleSelection[i].jianjianyuanName = data.name
-        } else {
-          this.multipleSelection[i].jianjianyuan = data.id === '' ? data.id : this.multipleSelection[i].jianjianyuan + ',' + data.id
-          this.multipleSelection[i].jianjianyuanName = data.name === '' ? data.name : this.multipleSelection[i].jianjianyuanName + ',' + data.name
-        }
-        for (let j = 0; j < this.jyxmData.length; j++) {
-          if (this.jyxmData[j].id === this.multipleSelection[i].id) {
-            this.$set(this.jyxmData[j], this.multipleSelection[i])
-          }
-        }
-      }
-      this.signShow = false
-      Utils.$emit('ysjl-list')
-    },
-    // 检验项目批量签名
-    Signjyxm() {
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要签名的数据。')
-        return false
-      }
-      this.signShow = true
-      this.$refs.qmButton.dialogFormVisible = true
-    },
-    // 检验项目清除签名
-    signClear: function() {
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要清除签名的数据。')
-        return false
-      }
-      this.$refs.qmButton.clearSign()
-      this.$message({ message: '清除签名成功', type: 'success' })
-    },
-    // 批量修改日期
-    batchUpdDate() {
-      if (this.multipleSelection.length === 0) {
-        this.$message('请在列表选择要修改日期的数据。')
-        return false
-      }
-      this.jyxmrqShow = true
-    },
-    batchUpd() {
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        this.multipleSelection[i].querenriqi = this.querenriqi
-        for (let j = 0; j < this.jyxmData.length; j++) {
-          if (this.jyxmData[j].id === this.multipleSelection[i].id) {
-            this.$set(this.jyxmData[j], this.multipleSelection[i])
-          }
-        }
-      }
-      this.jyxmrqShow = false
-    },
-    formartDate: function(param) {
-      var time = new Date(param)
-      var y = time.getFullYear()
-      var m = time.getMonth() + 1
-      var d = time.getDate() > 9 ? time.getDate().toString() : '0' + time.getDate()
-      return y + '-' + m + '-' + d
-    },
-    closeDialog() {
-      this.jyxmrqShow = false
-    },
-    getSbList(sbzl, sblb, level) {
-      this.api({
-        url: '/sedirectory/getList',
-        method: 'get',
-        params: {
-          sbzl: sbzl,
-          sblb: sblb,
-          level: level
-        }
-      }).then(data => {
-        switch (level) {
-          case 2:
-            this.sblbList = data
-            return ''
-          default:
-            this.sbzlList = data
-            return ''
-        }
-      })
-    },
-    dateFormat() {
-      const year = new Date().getFullYear()
-      const month = new Date().getMonth() + 1 > 9 ? (new Date().getMonth() + 1).toString() : '0' + (new Date().getMonth() + 1)
-      const day = new Date().getDate() > 9 ? new Date().getDate().toString() : '0' + new Date().getDate()
-      return year + '-' + month + '-' + day
-    },
-    // 查询检验项目
-    getJyxm(sort) {
-      let url = ''
-      let data = {}
-      if (this.state === 'create') {
-        url = '/jyxm/getCyJyxm'
-        data = {
-          templateId: this.$route.query.templateId,
-          order: sort
-        }
-      } else {
-        url = '/jyxm/getCyJyxmByYsjl'
-        data = {
-          ysjlId: this.$route.params.id,
-          isReport: false,
-          order: sort
-        }
-      }
-      this.api({
-        url: url,
-        method: 'get',
-        params: data
-      }).then(data => {
-        switch (sort) {
-          case 1:
-            this.jyxmData = data
-            if (this.state === 'create') {
-              for (let i = 0; i < this.jyxmData.length; i++) {
-                this.jyxmData[i].querenriqi = this.dateFormat()
-                if (data[i].jianyanjieguo === '' || data[i].jianyanjieguo === null || data[i].jianyanjieguo === undefined) {
-                  data[i].jianyanjieguo = '符合要求'
-                }
-              }
-            }
-            for (let i = 0; i < this.jyxmData.length; i++) {
-              if (this.jyxmData[i].jianjianyuan !== null && this.jyxmData[i].jianjianyuan !== undefined && this.jyxmData[i].jianjianyuan.length > 0) {
-                this.jyxmData[i].jianjianyuanName = this.common.convertCnName(this.jyxmData[i].jianjianyuan)
-              }
-            }
-            break
-        }
-        this.tableJs.getData(this.cols, this.rows, data)
-      })
-    },
-    // 获取表格中的id, 不为空的检验结果和备注
-    getProp: function(data) {
-      const retData = []
-      for (let i = 0; i < data.length; i++) {
-        const retRow = {}
-        retRow.id = data[i].id
-        if (data[i].jianyanjieguo !== '' && data[i].jianyanjieguo !== null && data[i].jianyanjieguo !== undefined) {
-          retRow.jianyanjieguo = data[i].jianyanjieguo
-        }
-        if (data[i].querenriqi !== '' && data[i].querenriqi !== null && data[i].querenriqi !== undefined) {
-          retRow.querenriqi = this.formartDate(data[i].querenriqi)
-        }
-        if (data[i].gongzuojianzheng !== '' && data[i].gongzuojianzheng !== null && data[i].gongzuojianzheng !== undefined) {
-          retRow.gongzuojianzheng = data[i].gongzuojianzheng
-        }
-        if (data[i].jianjianyuan !== '' && data[i].jianjianyuan !== null && data[i].jianjianyuan !== undefined) {
-          retRow.jianjianyuan = data[i].jianjianyuan
-        }
-        retData.push(retRow)
-      }
-      return retData
-    },
-    saveYsjl: function(operation) {
-      if (operation === 'add') {
-        if (this.bgbh3.trim() === '') {
-          this.$message({ message: '请先确认报告编号是否完整！', type: 'warning' })
-          return false
-        }
-      }
-      if (operation === 'build' && !this.ysjl.jianyanheding) {
-        this.$message.warning('请填写检验金额！')
-        return false
-      }
-      this.tableData = []
-      this.tableData.push(this.getProp(this.jyxmData))
-      let type = ''
-      this.ysjl.bglx = 1
-      this.ysjl.zfState = false
-      this.ysjl.jianyanxiangmu = 'dxgz'
-      this.ysjl.jlprintState = 0
-      if (operation === 'add') {
-        type = 'post'
-        this.ysjl.cjState = 'ysjl'
-        this.ysjl.jilubianhao = this.bgbh1 + '(' + this.bgbh2 + ')-' + this.bgbh3
-      } else if (operation === 'upd') {
-        type = 'put'
-      } else if (operation === 'build') {
-        if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
-          this.$message({
-            type: 'error',
-            message: '请先签名再生成报告!'
-          })
-          return false
-        }
-        type = 'put'
-      }
-      if (this.isRepeat) {
-        this.$message({ message: '报告编号重复，请先修改报告编号再保存', type: 'error' })
-        return false
-      } else {
-        this.$refs['ysjl'].validate(valid => {
-          if (valid) {
-            const jyxm = JSON.stringify(this.tableData)
-            this.api({
-              url: '/ysjl',
-              method: type,
-              data: {
-                ysjl: this.ysjl,
-                param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
-                flag: operation
-              }
-            }).then(data => {
-              // 刷新任务列表，检验报告
-              Utils.$emit('task-list')
-              Utils.$emit('ysjl-list')
-              Utils.$emit('bggl-daiban-list')
-              if (operation === 'add' && data !== '') {
-                this.$message({ message: '保存成功', type: 'success' })
-                this.ysjl.id = data
-                this.param.ysjlId = data
-                // 刷新路由网址
-                this.$store.dispatch('delCurrentViews', {
-                  view: this.$route,
-                  $router: this.$router
-                })
-                this.$router.push({
-                  path: '/ysjl/2000/2100/dxgz/' + this.ysjl.id,
-                  query: {
-                    id: this.ysjl.id,
-                    jyxm: this.ysjl.jianyanxiangmu,
-                    departmentId: this.ysjl.departmentId,
-                    jianyanrenyuan: this.ysjl.jianyanrenyuan,
-                    state: 'update',
-                    renwuId: this.ysjl.renwuId,
-                    modelId: this.ysjl.modelId,
-                    jylb: this.ysjl.jianyanleibie,
-                    neibuleibie: this.ysjl.neibuleibie,
-                    sbzldm: this.ysjl.shebeizhongleidaima,
-                    sblbdm: this.ysjl.shebeileibiedaima,
-                    sbpzdm: this.ysjl.shebeipinzhongdaima
-                  }
-                })
-              } else if (operation === 'upd') {
-                Utils.$emit('ysjl-list')
-                this.$message({ message: '更新成功', type: 'success' })
-              } else {
-                Utils.$emit('ysjl-list')
-                // 修改16版任务状态
-                this.common.updRenwuState(this.ysjl.id, 2, true)
-                Utils.$emit('bggl-daiban-list')
-                this.$message({ message: '生成报告成功', type: 'success' })
-                this.$store.dispatch('delCurrentViews', {
-                  view: this.$route,
-                  $router: this.$router
-                })
-              }
-              this.state = 'update'
-            })
-          }
-        })
-      }
-    },
-    // 查询最大记录编号
-    getMaxBh() {
-      const aheadPart = this.bgbh1 + '(' + this.bgbh2 + ')-'
-      this.api({
-        url: '/ysjl/gainCurrentBh',
-        method: 'get',
-        params: {
-          aheadPart: aheadPart,
-          hinderPart: ''
-        }
-      }).then(data => {
-        this.bgbh3 = data
-      })
-    },
-    judgeRepeat(bianhao, id) {
-      this.api({
-        url: '/ysjl/judgeRepeat',
-        method: 'get',
-        params: {
-          ysjlId: id,
-          bianhao: bianhao
-        }
-      }).then(data => {
-        if (data > 0) {
-          this.isRepeat = true
-        } else {
-          this.isRepeat = false
-        }
-      })
-    },
-    onRowClick(row) {
-      this.$refs.jyxmData.toggleRowSelection(row)
-    },
-    tableRowClassName({ row, rowIndex }) {
-      row.index = rowIndex
-    },
-    handleSelectionChange: function(val) {
-      this.multipleSelection = val
-    },
-    mergeCols({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 2) {
-        if (rowIndex === 0 || rowIndex === 3) {
-          return {
-            rowspan: 3,
-            colspan: 1
-          }
-        } else if (rowIndex === 1 || rowIndex === 2 || rowIndex === 4 || rowIndex === 5) {
-          return {
-            rowspan: 0,
-            colspan: 0
-          }
-        }
-      }
-      if (rowIndex > 5) {
-        if (columnIndex === 2) {
-          return {
-            rowspan: 1,
-            colspan: 2
-          }
-        } else if (columnIndex === 3) {
-          return {
-            rowspan: 0,
-            colspan: 0
-          }
-        }
-      }
-    },
-    /**
-     * 查询区划
-     */
-    getArea() {
-      this.api({
-        url: '/area/getShiArea',
-        method: 'get',
-        params: {
-          shidaima: '370100'
-        }
-      }).then(data => {
-        data.forEach(area => {
-          this.djjgs.push(area.label + '市场监督管理局')
-        })
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/ysjl/2000/2100/zbg/nd/edit.vue b/src/views/ysjl/2000/2100/zbg/nd/edit.vue
index 426fad1..1d51cb2 100644
--- a/src/views/ysjl/2000/2100/zbg/nd/edit.vue
+++ b/src/views/ysjl/2000/2100/zbg/nd/edit.vue
@@ -206,7 +206,18 @@
               </el-col>
               <el-col :span="9">
                 <el-form-item label="检查日期" prop="jianyanjieshuriqi">
-                  <el-date-picker v-model="ysjl.jianyanjieshuriqi" name="jianyanjieshuriqi" type="date" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker v-model="ysjl.jianyanjieshuriqi" name="jianyanjieshuriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -260,9 +271,9 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="压力容器原始资料" name="forth">
+      <!-- <el-tab-pane label="压力容器原始资料" name="forth">
         <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
   </div>
 </template>
@@ -270,11 +281,11 @@
 import Utils from '@/utils/contact.js' // 导入签名方法
 import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
-import SliceUpload from '@/components/SliceUpload'
 import Symbols from '@/views/common/Symbols'
+import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'RqNdYsjl',
-  components: { SignName, Sticky, SliceUpload, Symbols },
+  components: { SignName, Sticky, Symbols },
   data() {
     return {
       edit: false, // 页面编辑状态
@@ -313,7 +324,9 @@ export default {
         nblb: this.$route.query.neibuleibie,
         type: 'YSJL'
       },
-      djjgs: ['无']
+      djjgs: ['无'],
+      departmentId: '',
+      departmemtArr: []
     }
   },
   computed: {
@@ -340,8 +353,17 @@ export default {
     // 年度检查检验项目
     this.getJyxm(1)
     this.getArea()
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -357,6 +379,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
         const tempTime = new Date()
         this.ysjl.jianyanjieshuriqi = tempTime
@@ -370,13 +393,14 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -512,10 +536,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
-                flag: operation
-              }
+                cyJyxm: {
+                  bgjyxm: jyxm,
+                  jyxm: jyxm
+                }}
             }).then(data => {
               // 刷新任务列表，原始记录待办，原始记录已办，检验报告
               Utils.$emit('task-list')
diff --git a/src/views/ysjl/2000/2200/zbg/dj/edit.vue b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
index 04205f8..d8bce7c 100644
--- a/src/views/ysjl/2000/2200/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
@@ -360,6 +360,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检验人员" prop="jianyanrenyuan">
@@ -798,6 +811,7 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '../../../../../../utils/contact.js'
 import jyfa from '@/views/ysjl/addJyfa'
+import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'RqDjGcYsjl',
   components: { SignName, Sticky, jyfa },
@@ -875,7 +889,8 @@ export default {
       value: '',
       similarVisible: false,
       similarTableData: [],
-      djjgs: ['无']
+      djjgs: ['无'],
+      departmemtArr: []
     }
   },
   computed: {
@@ -908,8 +923,17 @@ export default {
       this.getUserList(this.$route.query.departmentId)
     }
     this.getArea()
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -925,6 +949,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.templateId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
         const tempTime = new Date()
         this.$set(this.ysjl, 'jianyankaishiriqi', this.dateFormat(new Date()))
@@ -955,6 +980,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.templateId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -1159,9 +1185,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
+                cyJyxm:{
                 jyxm: jyxm,
                 bgjyxm: jyxm,
-                flag: operation
+                }
               }
             }).then(data => {
               Utils.$emit('bggl-daiban-list')
diff --git a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
index f08a23b..a461d1a 100644
--- a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
+++ b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
@@ -221,6 +221,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检查人员" prop="jianyanrenyuan">
@@ -280,6 +293,7 @@
 import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '../../../../../../utils/contact.js'
+import { getDepartmentTreeList } from '@/api/common'
 
 export default {
   name: 'RqNdTuoche',
@@ -344,7 +358,8 @@ export default {
           }
         }
       ],
-      djjgs: ['无']
+      djjgs: ['无'],
+      departmemtArr: []
     }
   },
   computed: {
@@ -372,8 +387,17 @@ export default {
     // 提取检验项目
     this.getJyxm(1)
     this.getArea()
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -389,6 +413,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
         const tempTime = new Date()
         this.ysjl.createTime = tempTime
@@ -415,6 +440,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
index 86d5706..0f43138 100644
--- a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
+++ b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
@@ -146,6 +146,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检验人员" prop="jianyanrenyuan">
@@ -220,6 +233,8 @@
 import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact.js'
+import { getDepartmentTreeList } from '@/api/common'
+
 export default {
   name: 'CyqpAjYsjl',
   components: { SignName, Sticky },
@@ -273,7 +288,8 @@ export default {
       ],
       isRepeat: false,
       users: [],
-      djjgs: ['无']
+      djjgs: ['无'],
+      departmemtArr: []
     }
   },
   // computed: {
@@ -313,8 +329,17 @@ export default {
     if (!this.ysjl.jilubianhao) {
       this.getMaxBh()
     }
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -330,6 +355,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
         const tempTime = new Date()
         this.$set(this.ysjl, 'jianyanjielun', '符合')
@@ -351,6 +377,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/2000/2400/common/ycjl.vue b/src/views/ysjl/2000/2400/common/ycjl.vue
index 55fcd85..cf2775f 100644
--- a/src/views/ysjl/2000/2400/common/ycjl.vue
+++ b/src/views/ysjl/2000/2400/common/ycjl.vue
@@ -502,9 +502,9 @@
           </el-row>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane label="压力容器原始资料" name="third">
+      <!-- <el-tab-pane label="压力容器原始资料" name="third">
         <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
     <el-dialog :visible.sync="jyfaDialogVisible" title="添加检验方案" width="600px">
       <jyfa ref="jyfa" :info="info" />
@@ -547,11 +547,10 @@ import Sticky from '@/components/Sticky'
 import jyfa from '@/views/ysjl/addJyfa'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact.js'
-import SliceUpload from '@/components/SliceUpload'
 import Symbols from '@/views/common/Symbols'
 export default {
   name: 'Ycjl',
-  components: { SignName, Sticky, jyfa, SliceUpload, Symbols },
+  components: { SignName, Sticky, jyfa, Symbols },
   props: {
     neibuleibieparam: {
       type: String,
diff --git a/src/views/ysjl/2000/2400/zbg/jj/edit.vue b/src/views/ysjl/2000/2400/zbg/jj/edit.vue
index a024a27..a67f721 100644
--- a/src/views/ysjl/2000/2400/zbg/jj/edit.vue
+++ b/src/views/ysjl/2000/2400/zbg/jj/edit.vue
@@ -295,6 +295,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检验人员" prop="jianyanrenyuan">
@@ -446,6 +459,8 @@ import Utils from '@/utils/contact.js'
 import SliceUpload from '@/components/SliceUpload'
 import Symbols from '@/views/common/Symbols'
 import jyfa from '@/views/ysjl/addJyfa'
+import { getDepartmentTreeList } from '@/api/common'
+
 export default {
   name: 'YcJdYsjl',
   components: { SignName, Sticky, SliceUpload, Symbols, jyfa },
@@ -476,6 +491,7 @@ export default {
       state: this.$route.query.state,
       ysjl: {},
       departmentId: this.$route.query.departmentId,
+      departmemtArr: [],
       param: {},
       jyxm: 'ycjd',
       checkedTab: 'first',
@@ -565,8 +581,17 @@ export default {
     this.getUserList(this.$route.query.departmentId)
     this.getJyxm()
     this.getArea()
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -582,6 +607,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
         // 设置初始值
         const tempTime = new Date()
@@ -606,6 +632,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 4b115af..fee7dda 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -659,6 +659,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="departmentId"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :options="tree"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <template>
               <el-row :gutter="10">
                 <el-col :span="9">
@@ -725,6 +738,7 @@ import Inspection from '@/views/ysjl/3000/common/inspection-items'
 import Table from '@/views/ysjl/3000/dj/common/table'
 import Phxsb from '@/views/ysjl/3000/dj/common/phxsb'
 import ZdftFb from '@/views/ysjl/3000/dj/common/zdftFb'
+import { getDepartmentTreeList } from '@/api/common.js'
 
 export default {
   name: 'BaseInfo',
@@ -813,7 +827,8 @@ export default {
       pic: '',
       fubiao1: [],
       fubiao2: [],
-      fubiao3: []
+      fubiao3: [],
+      tree: []
     }
   },
   created() {
@@ -842,12 +857,21 @@ export default {
       this.getJyxm(1)
       this.getJyxmInfoByYsjl()
     }
+    this.getDepartment()
     this.getDicJyxm(1)
     this.userList = this.$store.getters.allUser.filter(
       (user) => user.departmentId === 74 && user.clientType === 'System'
     )
   },
   methods: {
+    getDepartment() {
+      getDepartmentTreeList().then(res => {
+        this.tree = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     initYsjl() {
       this.ysjlService.init(this.$route.query).then((data) => {
         this.ysjl = data.ysjl
@@ -856,6 +880,7 @@ export default {
         this.ysjl.bglx = 1
         this.ysjl.cjState = 'ysjl'
         this.ysjl.xianchangjianyantiaojian = '符合'
+        this.departmentId = this.ysjl.departmentId
         this.getJyxm(1)
         this.getSbList()
       })
@@ -897,6 +922,7 @@ export default {
     getYsjl() {
       this.ysjlService.getYsjl(this.ysjlId).then((data) => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         this.ysjl.imagePath = ''
         if (
           this.ysjl.jianyanrenyuan !== null &&
diff --git a/src/views/ysjl/4000/dj/common/index.vue b/src/views/ysjl/4000/dj/common/index.vue
index 90ccb9e..d466cf5 100644
--- a/src/views/ysjl/4000/dj/common/index.vue
+++ b/src/views/ysjl/4000/dj/common/index.vue
@@ -1,88 +1,173 @@
 <!--工业锅炉内部检验-->
 <template>
   <div class="app-container">
-    <sticky style="margin-bottom: 10px;">
+    <sticky style="margin-bottom: 10px">
       <div class="sub-navbar">
-        <el-button v-if="state === 'create'" type="success" icon="el-icon-edit" size="medium" @click="saveYsjl('add')">
+        <el-button
+          v-if="state === 'create'"
+          type="success"
+          icon="el-icon-edit"
+          size="medium"
+          @click="saveYsjl('add')"
+        >
           保存
         </el-button>
-        <el-button v-if="state === 'update'" type="primary" icon="el-icon-edit" size="medium" @click="saveYsjl('upd')">
+        <el-button
+          v-if="state === 'update'"
+          type="primary"
+          icon="el-icon-edit"
+          size="medium"
+          @click="saveYsjl('upd')"
+        >
           更新
         </el-button>
-        <el-button v-if="state === 'update'" type="success" icon="el-icon-upload2" size="medium" @click="saveYsjl('build')">
+        <el-button
+          v-if="state === 'update'"
+          type="success"
+          icon="el-icon-upload2"
+          size="medium"
+          @click="saveYsjl('build')"
+        >
           生成报告
         </el-button>
-        <el-button v-if="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL', false)">
+        <el-button
+          v-if="state !== 'create'"
+          type="warning"
+          icon="el-icon-view"
+          size="medium"
+          @click="common.viewYsjl(ysjl.id, 'YSJL', false)"
+        >
           预览
         </el-button>
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
       <el-tab-pane label="基本信息" name="first">
-        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="140px">
+        <el-form
+          ref="ysjl"
+          :model="ysjl"
+          class="el-form"
+          label-position="right"
+          label-width="140px"
+        >
           <fieldset>
             <legend>基本信息</legend>
             <el-row :gutter="25">
-              <el-col v-if="state === 'create' || ysjl.jilubianhao === null || ysjl.jilubianhao === ''" :span="14">
+              <el-col
+                v-if="
+                  state === 'create' ||
+                    ysjl.jilubianhao === null ||
+                    ysjl.jilubianhao === ''
+                "
+                :span="14"
+              >
                 <el-form-item label="记录编号">
-                  <el-input v-model="jlbh1" style="width:80px" disabled />
-                  <el-input v-model="jlbh2" style="width:80px" disabled />-
-                  <el-input v-model="jlbh3" style="width:85px" @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3 , ysjl.id)" />
+                  <el-input v-model="jlbh1" style="width: 80px" disabled />
+                  <el-input v-model="jlbh2" style="width: 80px" disabled />-
+                  <el-input
+                    v-model="jlbh3"
+                    style="width: 85px"
+                    @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id)"
+                  />
                 </el-form-item>
               </el-col>
               <el-col v-else :span="9">
                 <el-form-item label="记录编号" prop="jilubianhao">
-                  <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" />
+                  <el-input
+                    v-if="state !== 'create'"
+                    v-model="ysjl.jilubianhao"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col v-if="isRepeat" :span="2" style="vertical-align: middle;padding-top: 3px;font-size: 15px;">
-                <span style="color:red">编号重复</span>
+              <el-col
+                v-if="isRepeat"
+                :span="2"
+                style="
+                  vertical-align: middle;
+                  padding-top: 3px;
+                  font-size: 15px;
+                "
+              >
+                <span style="color: red">编号重复</span>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item label="使用单位名称" prop="shiyongdanwei">
-                  <el-input v-model="ysjl.shiyongdanwei" :disabled="edit" type="text" />
+                  <el-input
+                    v-model="ysjl.shiyongdanwei"
+                    :disabled="edit"
+                    type="text"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item label="使用单位地址" prop="shiyongdanweiDizhi">
-                  <el-input v-model="ysjl.shiyongdanweiDizhi" :disabled="edit" type="text" />
+                  <el-input
+                    v-model="ysjl.shiyongdanweiDizhi"
+                    :disabled="edit"
+                    type="text"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item label="使用地址" prop="anzhuangdidian">
-                  <el-input v-model="ysjl.anzhuangdidian" :disabled="edit" type="text" />
+                  <el-input
+                    v-model="ysjl.anzhuangdidian"
+                    :disabled="edit"
+                    type="text"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="使用单位统一社会信用代码" prop="shiyongdanweiCode" label-width="240px">
+                <el-form-item
+                  label="使用单位统一社会信用代码"
+                  prop="shiyongdanweiCode"
+                  label-width="240px"
+                >
                   <el-input v-model="ysjl.shiyongdanweiCode" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="使用单位安全管理人员" prop="anquanguanlirenyuan" label-width="180px">
-                  <el-input v-model="ysjl.anquanguanlirenyuan" :disabled="edit" />
+                <el-form-item
+                  label="使用单位安全管理人员"
+                  prop="anquanguanlirenyuan"
+                  label-width="180px"
+                >
+                  <el-input
+                    v-model="ysjl.anquanguanlirenyuan"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="使用单位联系电话" prop="shiyongdanweiDianhua">
-                  <el-input v-model="ysjl.shiyongdanweiDianhua" :disabled="edit" />
+                <el-form-item
+                  label="使用单位联系电话"
+                  prop="shiyongdanweiDianhua"
+                >
+                  <el-input
+                    v-model="ysjl.shiyongdanweiDianhua"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="单位内编号" prop="danweineibubianhao">
-                  <el-input v-model="ysjl.danweineibubianhao" :disabled="edit" />
+                  <el-input
+                    v-model="ysjl.danweineibubianhao"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -95,7 +180,11 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="改造（重大修理）单位名称" prop="gaizaodanwei" label-width="200px">
+                <el-form-item
+                  label="改造（重大修理）单位名称"
+                  prop="gaizaodanwei"
+                  label-width="200px"
+                >
                   <el-input v-model="ysjl.gaizaodanwei" :disabled="edit" />
                 </el-form-item>
               </el-col>
@@ -127,78 +216,90 @@
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="投入使用日期" prop="touyongriqi">
-                  <el-date-picker v-model="ysjl.touyongriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker
+                    v-model="ysjl.touyongriqi"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="设计使用年限" prop="shejishiyongnianxian">
-                  <el-input v-model="ysjl.shejishiyongnianxian" :disabled="edit" />
+                  <el-input
+                    v-model="ysjl.shejishiyongnianxian"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
 
-            <el-row v-if="fromType!==4&&fromType!==5&&fromType!==5" :gutter="20">
+            <el-row
+              v-if="fromType !== 4 && fromType !== 5 && fromType !== 5"
+              :gutter="20"
+            >
               <el-col :span="9">
                 <el-form-item label="工作级别" prop="gongzuojibie">
                   <el-input v-model="ysjl.gongzuojibie" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType===2||fromType===3" :gutter="20">
+            <el-row v-if="fromType === 2 || fromType === 3" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="取物装置" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="集装箱吊具">
-                      集装箱吊具
+                    <el-radio label="集装箱吊具">
+                      集装箱吊具
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType===1" :gutter="20">
+            <el-row v-if="fromType === 1" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="吊具形式" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="集装箱吊具">
-                      集装箱吊具
+                    <el-radio label="集装箱吊具">
+                      集装箱吊具
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType!==4&&fromType!==5" :gutter="20">
+            <el-row v-if="fromType !== 4 && fromType !== 5" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="检验类别" prop="jianyanleibie">
                   <el-radio-group v-model="ysjl.jianyanleibie">
-                    <el-radio label="SC">
-                      首次检验
+                    <el-radio label="SC">
+                      首次检验
                     </el-radio>
-                    <el-radio label="DQ">
-                      定期检验
+                    <el-radio label="DQ">
+                      定期检验
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -207,28 +308,25 @@
 
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item
-                  label="工作环境"
-                  prop="jianyanhuanjing"
-                >
+                <el-form-item label="工作环境" prop="jianyanhuanjing">
                   <el-radio-group v-model="param.jianyanhuanjing">
-                    <el-radio label="露天">
-                      露天
+                    <el-radio label="露天">
+                      露天
                     </el-radio>
-                    <el-radio label="非露天">
-                      非露天
+                    <el-radio label="非露天">
+                      非露天
                     </el-radio>
-                    <el-radio label="高温">
-                      高温
+                    <el-radio label="高温">
+                      高温
                     </el-radio>
-                    <el-radio label="粉尘">
-                      粉尘
+                    <el-radio label="粉尘">
+                      粉尘
                     </el-radio>
-                    <el-radio label="有毒">
-                      有毒
+                    <el-radio label="有毒">
+                      有毒
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -242,18 +340,18 @@
                   prop="jianyanhuanjingtiaojian"
                 >
                   <el-radio-group v-model="ysjl.jianyanhuanjingtiaojian">
-                    <el-radio label="符合">
-                      符合
+                    <el-radio label="符合">
+                      符合
                     </el-radio>
-                    <el-radio label="不符合">
-                      不符合
+                    <el-radio label="不符合">
+                      不符合
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==1">
+          <fieldset v-if="fromType == 1">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -304,7 +402,7 @@
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==2||fromType==5">
+          <fieldset v-if="fromType == 2 || fromType == 5">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -372,31 +470,31 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType==1" :gutter="20">
+            <el-row v-if="fromType == 1" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="取物装置" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="集装箱吊具">
-                      集装箱吊具
+                    <el-radio label="集装箱吊具">
+                      集装箱吊具
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==3">
+          <fieldset v-if="fromType == 3">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -447,7 +545,7 @@
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==4">
+          <fieldset v-if="fromType == 4">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -458,7 +556,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="提升高度（检验结束时）" prop="qishenggaodu">
+                <el-form-item
+                  label="提升高度（检验结束时）"
+                  prop="qishenggaodu"
+                >
                   <el-input v-model="param.qishenggaodu" :disabled="edit">
                     <span slot="suffix">m</span>
                   </el-input>
@@ -499,39 +600,57 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="防坠安全器、限速器、安全钳编号" prop="faxBianhao">
+                <el-form-item
+                  label="防坠安全器、限速器、安全钳编号"
+                  prop="faxBianhao"
+                >
                   <el-input v-model="ysjl.faxBianhao" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="防坠安全器、限速器、安全钳型号" prop="faxXinghao">
+                <el-form-item
+                  label="防坠安全器、限速器、安全钳型号"
+                  prop="faxXinghao"
+                >
                   <el-input v-model="ysjl.faxXinghao" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="防坠安全器、限速器、安全钳有效标定期限" prop="faxBiaodingqixian">
+                <el-form-item
+                  label="防坠安全器、限速器、安全钳有效标定期限"
+                  prop="faxBiaodingqixian"
+                >
                   <el-input v-model="ysjl.faxBiaodingqixian" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==6">
+          <fieldset v-if="fromType == 6">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="适停车辆重量" prop="shitingcheliangzhongliang">
+                <el-form-item
+                  label="适停车辆重量"
+                  prop="shitingcheliangzhongliang"
+                >
                   <el-input v-model="param.shitingcheliangzhongliang">
                     <span slot="suffix">t</span>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="适停车辆尺寸（长×宽×高）" prop="shitingcheliangchicun">
-                  <el-input v-model="param.shitingcheliangchicun" :disabled="edit">
+                <el-form-item
+                  label="适停车辆尺寸（长×宽×高）"
+                  prop="shitingcheliangchicun"
+                >
+                  <el-input
+                    v-model="param.shitingcheliangchicun"
+                    :disabled="edit"
+                  >
                     <span slot="suffix">m</span>
                   </el-input>
                 </el-form-item>
@@ -571,8 +690,14 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="单车进出最大时间" prop="danchejinchuzuidashijian">
-                  <el-input v-model="ysjl.danchejinchuzuidashijian" :disabled="edit" />
+                <el-form-item
+                  label="单车进出最大时间"
+                  prop="danchejinchuzuidashijian"
+                >
+                  <el-input
+                    v-model="ysjl.danchejinchuzuidashijian"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -586,7 +711,7 @@
           </fieldset>
           <fieldset>
             <legend>检验信息</legend>
-            <el-row :gutter="20" style="margin-bottom:20px">
+            <el-row :gutter="20" style="margin-bottom: 20px">
               <el-col :span="18">
                 <el-form-item label="检验依据" prop="jianyanyiju">
                   <el-input v-model="ysjl.jianyanyiju" type="textarea" />
@@ -607,17 +732,17 @@
               <el-col :span="18">
                 <el-form-item label="检验结论" prop="jianyanjielun">
                   <el-radio-group v-model="ysjl.jianyanjielun">
-                    <el-radio label="合格">
-                      合格
+                    <el-radio label="合格">
+                      合格
                     </el-radio>
-                    <el-radio label="不合格">
-                      不合格
+                    <el-radio label="不合格">
+                      不合格
                     </el-radio>
-                    <el-radio label="复检合格">
-                      复检合格
+                    <el-radio label="复检合格">
+                      复检合格
                     </el-radio>
-                    <el-radio label="复检不合格">
-                      复检不合格
+                    <el-radio label="复检不合格">
+                      复检不合格
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -632,7 +757,7 @@
                     :autosize="{ minRows: 2, maxRows: 5 }"
                     :disabled="edit"
                   />
-                  <span v-if="fromType===5">（需备注扶墙架道数）</span>
+                  <span v-if="fromType === 5">（需备注扶墙架道数）</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -658,6 +783,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="departmentId"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :options="tree"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <template>
               <el-row :gutter="10">
                 <el-col :span="9">
@@ -694,14 +832,30 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="检验项目" name="second">
-        <el-table ref="sybjSData" :data="sybjSData" :span-method="tableJs.mergeColRows" border stripe style="width:90%">
+        <el-table
+          ref="sybjSData"
+          :data="sybjSData"
+          :span-method="tableJs.mergeColRows"
+          border
+          stripe
+          style="width: 90%"
+        >
           <el-table-column align="center" label="检验项目">
             <el-table-column align="center" prop="jianyanxiang" width="200" />
             <el-table-column align="left" prop="jianyanneirong" />
           </el-table-column>
           <el-table-column align="center" prop="D1" label="检验结果">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.D1" :disabled="edit" type="text" placeholder="请选择" style="width: 100%;" filterable allow-create default-first-option>
+              <el-select
+                v-model="scope.row.D1"
+                :disabled="edit"
+                type="text"
+                placeholder="请选择"
+                style="width: 100%"
+                filterable
+                allow-create
+                default-first-option
+              >
                 <el-option label="√" value="√" />
                 <el-option label="○" value="○" />
                 <el-option label="×" value="×" />
@@ -720,6 +874,8 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common.js'
+
 export default {
   name: 'GlGynbYsjl',
   components: { SignName, Sticky },
@@ -746,6 +902,7 @@ export default {
       edit: false,
       sybjSData: [],
       tableData: [],
+      tree: [],
       checkedTab: 'first',
       ysjlId: this.$route.query.id,
       // 表格合并相关
@@ -753,7 +910,8 @@ export default {
       cols: [
         {
           name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致
-          getValue(row) { // 该列用于比较的值的获取方法
+          getValue(row) {
+            // 该列用于比较的值的获取方法
             return row.jianyanxiang
           }
         }
@@ -774,9 +932,7 @@ export default {
       ]
     }
   },
-  computed: {
-
-  },
+  computed: {},
   watch: {
     // jlbh3: function(val) {
     //   this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
@@ -800,11 +956,21 @@ export default {
       this.getYsjl(this.$route.query.id)
       this.getJyxm(1)
     }
+    this.getDepartment()
   },
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
   },
   methods: {
+    getDepartment() {
+      getDepartmentTreeList().then((res) => {
+        console.log(res, 555)
+        this.tree = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     /**
      * 签名方法
      * @param data
@@ -846,7 +1012,7 @@ export default {
           aheadPart: aheadPart + '-',
           hinderPart: ''
         }
-      }).then(data => {
+      }).then((data) => {
         this.jlbh3 = data
       })
     },
@@ -863,9 +1029,11 @@ export default {
           sbpzdm: this.$route.query.sbpzdm,
           sbpzmc: this.$route.query.sbpzmc
         }
-      }).then(data => {
+      }).then((data) => {
         this.ysjl = data.ysjl
-        this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
+        this.departmentId = this.ysjl.departmentId
+        this.param =
+          data.param !== null && data.param !== undefined ? data.param : {}
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.getXcjyrq()
         this.ysjl.jilubianhao = this.jilubianhao
@@ -876,7 +1044,9 @@ export default {
         this.$set(this.param, 'qita', '/')
         // // 制造日期、投用日期、上次检验日期设置成正确的日期格式
         // this.ysjl.zhizaoriqi = this.common.checkDateFormat(this.ysjl.zhizaoriqi)
-        this.ysjl.touyongriqi = this.common.checkDateFormat(this.ysjl.touyongriqi)
+        this.ysjl.touyongriqi = this.common.checkDateFormat(
+          this.ysjl.touyongriqi
+        )
         // this.param.shangcijianyanriqi = this.common.checkDateFormat(this.param.shangcijianyanriqi)
       })
     },
@@ -887,13 +1057,23 @@ export default {
         params: {
           ysjlId: id
         }
-      }).then(data => {
+      }).then((data) => {
         this.ysjl = data
-        if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
-          this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
+        this.departmentId = this.ysjl.departmentId
+        if (
+          this.ysjl.jianyanrenyuan !== null &&
+          this.ysjl.jianyanrenyuan.length > 0
+        ) {
+          this.jianyanrenyuan = this.common.convertCnName(
+            this.ysjl.jianyanrenyuan
+          )
         }
         // 查询最大记录编号
-        if (this.ysjl.jilubianhao === null || this.ysjl.jilubianhao === undefined || this.ysjl.jilubianhao === '') {
+        if (
+          this.ysjl.jilubianhao === null ||
+          this.ysjl.jilubianhao === undefined ||
+          this.ysjl.jilubianhao === ''
+        ) {
           this.getMaxBh()
         }
         this.getParam(this.ysjl.id, this.ysjl.shebeizhongleidaima)
@@ -908,7 +1088,7 @@ export default {
           ysjlId: ysjlId,
           sbzldm: sbzldm
         }
-      }).then(data => {
+      }).then((data) => {
         this.param = data
       })
     },
@@ -936,7 +1116,10 @@ export default {
     saveYsjl: function(operation) {
       if (operation === 'add') {
         if (this.jlbh3.trim() === '') {
-          this.$message({ message: '请先确认记录编号是否完整！', type: 'warning' })
+          this.$message({
+            message: '请先确认记录编号是否完整！',
+            type: 'warning'
+          })
           return false
         }
       }
@@ -968,7 +1151,10 @@ export default {
         this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + this.jlbh3
         method = 'post'
       } else if (operation === 'build') {
-        if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
+        if (
+          this.ysjl.jianyanrenyuan === null ||
+          this.ysjl.jianyanrenyuan === ''
+        ) {
           this.$message({
             type: 'error',
             message: '请先签名再生成报告!'
@@ -987,10 +1173,13 @@ export default {
         method = 'put'
       }
       if (this.isRepeat) {
-        this.$message({ message: '记录编号重复，请先修改记录编号再保存', type: 'error' })
+        this.$message({
+          message: '记录编号重复，请先修改记录编号再保存',
+          type: 'error'
+        })
         return false
       } else {
-        this.$refs['ysjl'].validate(valid => {
+        this.$refs['ysjl'].validate((valid) => {
           if (valid) {
             const jyxm = tableData
             this.api({
@@ -1002,11 +1191,14 @@ export default {
                 cyJyxm: {},
                 jdJyxm: jyxm
               }
-            }).then(data => {
+            }).then((data) => {
               Utils.$emit('task-list')
               Utils.$emit('ysjl-list')
               if (operation === 'add' && data !== '') {
-                this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' })
+                this.$message({
+                  message: '保存成功, 请前往待办记录中查看。',
+                  type: 'success'
+                })
                 this.ysjl.id = data
                 this.param.ysjlId = data
                 // 刷新路由网址
@@ -1018,7 +1210,9 @@ export default {
                 this.$message({ message: '更新成功', type: 'success' })
                 // 替换路由中的参数
                 this.$router.push({
-                  query: merge(this.$route.query, { 'jianyanrenyuan': this.ysjl.jianyanrenyuan })
+                  query: merge(this.$route.query, {
+                    jianyanrenyuan: this.ysjl.jianyanrenyuan
+                  })
                 })
                 // this.$refs.bill.updateChargeBill()
               } else {
@@ -1045,7 +1239,7 @@ export default {
           ysjlId: id,
           bianhao: bianhao
         }
-      }).then(data => {
+      }).then((data) => {
         if (data > 0) {
           this.isRepeat = true
         } else {
@@ -1055,8 +1249,15 @@ export default {
     },
     getXcjyrq() {
       const xcjyrq = new Date(this.ysjl.jianyanjieshuriqi)
-      xcjyrq.setFullYear(xcjyrq.getFullYear() + 2, xcjyrq.getMonth(), xcjyrq.getDate() - 1)
-      this.ysjl.xiacijianyanriqi = this.formatter.dateFormat('YYYY-MM-dd', xcjyrq)
+      xcjyrq.setFullYear(
+        xcjyrq.getFullYear() + 2,
+        xcjyrq.getMonth(),
+        xcjyrq.getDate() - 1
+      )
+      this.ysjl.xiacijianyanriqi = this.formatter.dateFormat(
+        'YYYY-MM-dd',
+        xcjyrq
+      )
     },
     setYsjlData(data) {
       this.ysjl.sfdId = data
diff --git a/src/views/ysjl/4000/jj/common/index.vue b/src/views/ysjl/4000/jj/common/index.vue
index 36ca7dd..88343bb 100644
--- a/src/views/ysjl/4000/jj/common/index.vue
+++ b/src/views/ysjl/4000/jj/common/index.vue
@@ -1,74 +1,147 @@
 <!--工业锅炉内部检验-->
 <template>
   <div class="app-container">
-    <sticky style="margin-bottom: 10px;">
+    <sticky style="margin-bottom: 10px">
       <div class="sub-navbar">
-        <el-button v-if="state === 'create'" type="success" icon="el-icon-edit" size="medium" @click="saveYsjl('add')">
+        <el-button
+          v-if="state === 'create'"
+          type="success"
+          icon="el-icon-edit"
+          size="medium"
+          @click="saveYsjl('add')"
+        >
           保存
         </el-button>
-        <el-button v-if="state === 'update'" type="primary" icon="el-icon-edit" size="medium" @click="saveYsjl('upd')">
+        <el-button
+          v-if="state === 'update'"
+          type="primary"
+          icon="el-icon-edit"
+          size="medium"
+          @click="saveYsjl('upd')"
+        >
           更新
         </el-button>
-        <el-button v-if="state === 'update'" type="success" icon="el-icon-upload2" size="medium" @click="saveYsjl('build')">
+        <el-button
+          v-if="state === 'update'"
+          type="success"
+          icon="el-icon-upload2"
+          size="medium"
+          @click="saveYsjl('build')"
+        >
           生成报告
         </el-button>
-        <el-button v-if="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL', false)">
+        <el-button
+          v-if="state !== 'create'"
+          type="warning"
+          icon="el-icon-view"
+          size="medium"
+          @click="common.viewYsjl(ysjl.id, 'YSJL', false)"
+        >
           预览
         </el-button>
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
       <el-tab-pane label="基本信息" name="first">
-        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="140px">
+        <el-form
+          ref="ysjl"
+          :model="ysjl"
+          class="el-form"
+          label-position="right"
+          label-width="140px"
+        >
           <fieldset>
             <legend>基本信息</legend>
             <el-row :gutter="25">
-              <el-col v-if="state === 'create' || ysjl.jilubianhao === null || ysjl.jilubianhao === ''" :span="14">
+              <el-col
+                v-if="
+                  state === 'create' ||
+                    ysjl.jilubianhao === null ||
+                    ysjl.jilubianhao === ''
+                "
+                :span="14"
+              >
                 <el-form-item label="记录编号">
-                  <el-input v-model="jlbh1" style="width:80px" disabled />
-                  <el-input v-model="jlbh2" style="width:80px" disabled />-
-                  <el-input v-model="jlbh3" style="width:85px" @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3 , ysjl.id)" />
+                  <el-input v-model="jlbh1" style="width: 80px" disabled />
+                  <el-input v-model="jlbh2" style="width: 80px" disabled />-
+                  <el-input
+                    v-model="jlbh3"
+                    style="width: 85px"
+                    @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id)"
+                  />
                 </el-form-item>
               </el-col>
               <el-col v-else :span="9">
                 <el-form-item label="记录编号" prop="jilubianhao">
-                  <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" />
+                  <el-input
+                    v-if="state !== 'create'"
+                    v-model="ysjl.jilubianhao"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col v-if="isRepeat" :span="2" style="vertical-align: middle;padding-top: 3px;font-size: 15px;">
-                <span style="color:red">编号重复</span>
+              <el-col
+                v-if="isRepeat"
+                :span="2"
+                style="
+                  vertical-align: middle;
+                  padding-top: 3px;
+                  font-size: 15px;
+                "
+              >
+                <span style="color: red">编号重复</span>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item label="施工单位名称" prop="shigongdanwei">
-                  <el-input v-model="ysjl.shigongdanwei" :disabled="edit" type="text" />
+                  <el-input
+                    v-model="ysjl.shigongdanwei"
+                    :disabled="edit"
+                    type="text"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="安装改造维修许可证(受理决定书)编号" prop="shigongxukezheng" label-width="300px">
+                <el-form-item
+                  label="安装改造维修许可证(受理决定书)编号"
+                  prop="shigongxukezheng"
+                  label-width="300px"
+                >
                   <el-input v-model="ysjl.shigongxukezheng" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="施工单位负责人" prop="shigongdanweiFuzeren	" label-width="200px">
-                  <el-input v-model="ysjl.shigongdanweiFuzeren	" type="text" />
+                <el-form-item
+                  label="施工单位负责人"
+                  prop="shigongdanweiFuzeren	"
+                  label-width="200px"
+                >
+                  <el-input v-model="ysjl.shigongdanweiFuzeren" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="施工单位联系人" prop="shigongdanweiLianxiren	" label-width="200px">
-                  <el-input v-model="ysjl.shigongdanweiLianxiren	" type="text" />
+                <el-form-item
+                  label="施工单位联系人"
+                  prop="shigongdanweiLianxiren	"
+                  label-width="200px"
+                >
+                  <el-input v-model="ysjl.shigongdanweiLianxiren" type="text" />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="联系电话" prop="shigongdanweiDianhua	" label-width="200px">
-                  <el-input v-model="ysjl.shigongdanweiDianhua	" type="text" />
+                <el-form-item
+                  label="联系电话"
+                  prop="shigongdanweiDianhua	"
+                  label-width="200px"
+                >
+                  <el-input v-model="ysjl.shigongdanweiDianhua" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -88,32 +161,54 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="使用单位联系人" prop="shiyongdanweiLianxiren">
-                  <el-input v-model="ysjl.shiyongdanweiLianxiren" :disabled="edit" />
+                <el-form-item
+                  label="使用单位联系人"
+                  prop="shiyongdanweiLianxiren"
+                >
+                  <el-input
+                    v-model="ysjl.shiyongdanweiLianxiren"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="联系电话" prop="shiyongdanweiDianhua">
-                  <el-input v-model="ysjl.shiyongdanweiDianhua" :disabled="edit" />
+                  <el-input
+                    v-model="ysjl.shiyongdanweiDianhua"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="使用单位安全管理人员" prop="anquanguanlirenyuan" label-width="180px">
-                  <el-input v-model="ysjl.anquanguanlirenyuan" :disabled="edit" />
+                <el-form-item
+                  label="使用单位安全管理人员"
+                  prop="anquanguanlirenyuan"
+                  label-width="180px"
+                >
+                  <el-input
+                    v-model="ysjl.anquanguanlirenyuan"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="单位内编号" prop="danweineibubianhao">
-                  <el-input v-model="ysjl.danweineibubianhao" :disabled="edit" />
+                  <el-input
+                    v-model="ysjl.danweineibubianhao"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item label="施工地点" prop="shigongdanweiDizhi">
-                  <el-input v-model="ysjl.shigongdanweiDizhi" :disabled="edit" />
+                  <el-input
+                    v-model="ysjl.shigongdanweiDizhi"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -126,7 +221,11 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="制造许可证编号(型式试验备案号)" prop="zhizaoxukezhengbianhao" label-width="300px">
+                <el-form-item
+                  label="制造许可证编号(型式试验备案号)"
+                  prop="zhizaoxukezhengbianhao"
+                  label-width="300px"
+                >
                   <el-input v-model="ysjl.zhizaoxukezhengbianhao" />
                 </el-form-item>
               </el-col>
@@ -165,12 +264,21 @@
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="制造日期" prop="zhizaoriqi">
-                  <el-date-picker v-model="ysjl.zhizaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker
+                    v-model="ysjl.zhizaoriqi"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="设计使用年限" prop="shejishiyongnianxian">
-                  <el-input v-model="ysjl.shejishiyongnianxian" :disabled="edit" />
+                  <el-input
+                    v-model="ysjl.shejishiyongnianxian"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -179,11 +287,11 @@
               <el-col :span="9">
                 <el-form-item label="取证样机" prop="quzhengyangji">
                   <el-radio-group v-model="param.quzhengyangji">
-                    <el-radio label="是">
-                      是
+                    <el-radio label="是">
+                      是
                     </el-radio>
-                    <el-radio label="否">
-                      否
+                    <el-radio label="否">
+                      否
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -198,56 +306,62 @@
               <el-col :span="10">
                 <el-form-item label="施工类别" prop="shigongleibie">
                   <el-radio-group v-model="param.shigongleibie">
-                    <el-radio label="安装">
-                      安装
+                    <el-radio label="安装">
+                      安装
                     </el-radio>
-                    <el-radio label="改造">
-                      改造
+                    <el-radio label="改造">
+                      改造
                     </el-radio>
-                    <el-radio label="改造">
-                      改造
+                    <el-radio label="改造">
+                      改造
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col v-if="fromType===5" :span="9">
+              <el-col v-if="fromType === 5" :span="9">
                 <el-form-item label="施工告知日期" prop="shigonggaozhiriqi">
-                  <el-date-picker v-model="ysjl.shigonggaozhiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker
+                    v-model="ysjl.shigonggaozhiriqi"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType!==6" :gutter="20">
+            <el-row v-if="fromType !== 6" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="取物装置" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType===2" :gutter="20">
+            <el-row v-if="fromType === 2" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="导电方式" prop="daodianfangshi">
                   <el-radio-group v-model="param.daodianfangshi">
-                    <el-radio label="中心滑环式">
-                      中心滑环式
+                    <el-radio label="中心滑环式">
+                      中心滑环式
                     </el-radio>
-                    <el-radio label="电缆">
-                      电缆
+                    <el-radio label="电缆">
+                      电缆
                     </el-radio>
-                    <el-radio label="其它">
-                      其它
+                    <el-radio label="其它">
+                      其它
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -255,28 +369,25 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item
-                  label="工作环境"
-                  prop="jianyanhuanjing"
-                >
+                <el-form-item label="工作环境" prop="jianyanhuanjing">
                   <el-radio-group v-model="param.jianyanhuanjing">
-                    <el-radio label="露天">
-                      露天
+                    <el-radio label="露天">
+                      露天
                     </el-radio>
-                    <el-radio label="非露天">
-                      非露天
+                    <el-radio label="非露天">
+                      非露天
                     </el-radio>
-                    <el-radio label="高温">
-                      高温
+                    <el-radio label="高温">
+                      高温
                     </el-radio>
-                    <el-radio label="粉尘">
-                      粉尘
+                    <el-radio label="粉尘">
+                      粉尘
                     </el-radio>
-                    <el-radio label="有毒">
-                      有毒
+                    <el-radio label="有毒">
+                      有毒
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -290,18 +401,18 @@
                   prop="jianyananquanhuanjing"
                 >
                   <el-radio-group v-model="param.jianyananquanhuanjing">
-                    <el-radio label="符合">
-                      符合
+                    <el-radio label="符合">
+                      符合
                     </el-radio>
-                    <el-radio label="不符合">
-                      不符合
+                    <el-radio label="不符合">
+                      不符合
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType===1">
+          <fieldset v-if="fromType === 1">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -352,10 +463,10 @@
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType===2||fromType===5">
+          <fieldset v-if="fromType === 2 || fromType === 5">
             <legend>技术参数</legend>
             <el-row :gutter="20">
-              <el-col v-if="fromType==2" :span="9">
+              <el-col v-if="fromType == 2" :span="9">
                 <el-form-item label="额定起重量" prop="edingqizhongliang">
                   <el-input v-model="param.edingqizhongliang">
                     <span slot="suffix">t</span>
@@ -378,7 +489,7 @@
               </el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col v-if="fromType===2" :span="9">
+              <el-col v-if="fromType === 2" :span="9">
                 <el-form-item label="行走速度" prop="xingzousudu">
                   <el-input v-model="param.xingzousudu">
                     <span slot="suffix">m/min</span>
@@ -391,7 +502,7 @@
                     <span slot="suffix">t·m</span>
                   </el-input>
                 </el-form-item>
-              </el-col>
+              </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -425,7 +536,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType===5" :gutter="20">
+            <el-row v-if="fromType === 5" :gutter="20">
               <el-col :span="9">
                 <el-form-item label="大车运行速度" prop="dacheyunxingsudu">
                   <el-input v-model="param.dacheyunxingsudu">
@@ -435,7 +546,7 @@
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==3">
+          <fieldset v-if="fromType == 3">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -486,7 +597,7 @@
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==4">
+          <fieldset v-if="fromType == 4">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -497,7 +608,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="提升高度（检验结束时）" prop="qishenggaodu">
+                <el-form-item
+                  label="提升高度（检验结束时）"
+                  prop="qishenggaodu"
+                >
                   <el-input v-model="param.qishenggaodu" :disabled="edit">
                     <span slot="suffix">m</span>
                   </el-input>
@@ -545,39 +659,61 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="防坠安全器、限速器、安全钳编号" prop="faxBianhao">
+                <el-form-item
+                  label="防坠安全器、限速器、安全钳编号"
+                  prop="faxBianhao"
+                >
                   <el-input v-model="param.faxBianhao" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="防坠安全器、限速器、安全钳型号" prop="faxXinghao">
+                <el-form-item
+                  label="防坠安全器、限速器、安全钳型号"
+                  prop="faxXinghao"
+                >
                   <el-input v-model="param.faxXinghao" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="防坠安全器、限速器、安全钳有效标定期限" prop="faxBiaodingqixian">
-                  <el-input v-model="param.faxBiaodingqixian" :disabled="edit" />
+                <el-form-item
+                  label="防坠安全器、限速器、安全钳有效标定期限"
+                  prop="faxBiaodingqixian"
+                >
+                  <el-input
+                    v-model="param.faxBiaodingqixian"
+                    :disabled="edit"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset v-if="fromType==6">
+          <fieldset v-if="fromType == 6">
             <legend>技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="适停车辆重量" prop="shitingcheliangzhongliang">
+                <el-form-item
+                  label="适停车辆重量"
+                  prop="shitingcheliangzhongliang"
+                >
                   <el-input v-model="param.shitingcheliangzhongliang">
                     <span slot="suffix">t</span>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="适停车辆尺寸（长×宽×高）" prop="shitingcheliangchicun" label-width="200px">
-                  <el-input v-model="param.shitingcheliangchicun" :disabled="edit">
+                <el-form-item
+                  label="适停车辆尺寸（长×宽×高）"
+                  prop="shitingcheliangchicun"
+                  label-width="200px"
+                >
+                  <el-input
+                    v-model="param.shitingcheliangchicun"
+                    :disabled="edit"
+                  >
                     <span slot="suffix">mm</span>
                   </el-input>
                 </el-form-item>
@@ -617,8 +753,14 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="单车进出最大时间" prop="danchejinchuzuidashijian">
-                  <el-input v-model="param.danchejinchuzuidashijian" :disabled="edit">
+                <el-form-item
+                  label="单车进出最大时间"
+                  prop="danchejinchuzuidashijian"
+                >
+                  <el-input
+                    v-model="param.danchejinchuzuidashijian"
+                    :disabled="edit"
+                  >
                     <span slot="suffix">s</span>
                   </el-input>
                 </el-form-item>
@@ -627,7 +769,7 @@
           </fieldset>
           <fieldset>
             <legend>检验信息</legend>
-            <el-row :gutter="20" style="margin-bottom:20px">
+            <el-row :gutter="20" style="margin-bottom: 20px">
               <el-col :span="18">
                 <el-form-item label="检验依据" prop="jianyanyiju">
                   <el-input v-model="ysjl.jianyanyiju" type="textarea" />
@@ -648,17 +790,17 @@
               <el-col :span="18">
                 <el-form-item label="检验结论" prop="jianyanjielun">
                   <el-radio-group v-model="ysjl.jianyanjielun">
-                    <el-radio label="合格">
-                      合格
+                    <el-radio label="合格">
+                      合格
                     </el-radio>
-                    <el-radio label="不合格">
-                      不合格
+                    <el-radio label="不合格">
+                      不合格
                     </el-radio>
-                    <el-radio label="复检合格">
-                      复检合格
+                    <el-radio label="复检合格">
+                      复检合格
                     </el-radio>
-                    <el-radio label="复检不合格">
-                      复检不合格
+                    <el-radio label="复检不合格">
+                      复检不合格
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -673,7 +815,7 @@
                     :autosize="{ minRows: 2, maxRows: 5 }"
                     :disabled="edit"
                   />
-                  <span v-if="fromType===5">（需备注扶墙架道数）</span>
+                  <span v-if="fromType === 5">（需备注扶墙架道数）</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -699,6 +841,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="departmentId"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :options="tree"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <template>
               <el-row :gutter="10">
                 <el-col :span="9">
@@ -735,7 +890,14 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="检验项目" name="second">
-        <el-table ref="sybjSData" :data="sybjSData" :span-method="tableJs.mergeColRows" border stripe style="width:90%">
+        <el-table
+          ref="sybjSData"
+          :data="sybjSData"
+          :span-method="tableJs.mergeColRows"
+          border
+          stripe
+          style="width: 90%"
+        >
           <el-table-column align="center" label="检验项目">
             <el-table-column align="center" prop="jianyanxiang" width="200" />
             <el-table-column align="center" prop="jianyanmu" width="200" />
@@ -743,7 +905,16 @@
           </el-table-column>
           <el-table-column align="center" prop="D1" label="检验结果">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.D1" :disabled="edit" type="text" placeholder="请选择" style="width: 100%;" filterable allow-create default-first-option>
+              <el-select
+                v-model="scope.row.D1"
+                :disabled="edit"
+                type="text"
+                placeholder="请选择"
+                style="width: 100%"
+                filterable
+                allow-create
+                default-first-option
+              >
                 <el-option label="√" value="√" />
                 <el-option label="○" value="○" />
                 <el-option label="×" value="×" />
@@ -762,6 +933,8 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common.js'
+
 export default {
   name: 'GlGynbYsjl',
   components: { SignName, Sticky },
@@ -784,6 +957,7 @@ export default {
       state: this.$route.query.state,
       jianyanrenyuan: '',
       departmentId: this.$store.getters.departmentId,
+      tree: [],
       isRepeat: false,
       edit: false,
       sybjSData: [],
@@ -795,13 +969,15 @@ export default {
       cols: [
         {
           name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致
-          getValue(row) { // 该列用于比较的值的获取方法
+          getValue(row) {
+            // 该列用于比较的值的获取方法
             return row.jianyanxiang
           }
         },
         {
           name: 'jianyanmu', // 参与计算的列名，必须和el-table-column prop=''值一致
-          getValue(row) { // 该列用于比较的值的获取方法
+          getValue(row) {
+            // 该列用于比较的值的获取方法
             return row.jianyanmu
           }
         }
@@ -822,9 +998,7 @@ export default {
       ]
     }
   },
-  computed: {
-
-  },
+  computed: {},
   watch: {
     // jlbh3: function(val) {
     //   this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
@@ -848,11 +1022,21 @@ export default {
       this.getYsjl(this.$route.query.id)
       this.getJyxm(1)
     }
+    this.getDepartment()
   },
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
   },
   methods: {
+    getDepartment() {
+      getDepartmentTreeList().then((res) => {
+        console.log(res, 555)
+        this.tree = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     /**
      * 签名方法
      * @param data
@@ -894,7 +1078,7 @@ export default {
           aheadPart: aheadPart + '-',
           hinderPart: ''
         }
-      }).then(data => {
+      }).then((data) => {
         this.jlbh3 = data
       })
     },
@@ -911,9 +1095,11 @@ export default {
           sbpzdm: this.$route.query.sbpzdm,
           sbpzmc: this.$route.query.sbpzmc
         }
-      }).then(data => {
+      }).then((data) => {
         this.ysjl = data.ysjl
-        this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
+        this.departmentId = this.ysjl.departmentId
+        this.param =
+          data.param !== null && data.param !== undefined ? data.param : {}
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.getXcjyrq()
         this.ysjl.jilubianhao = this.jilubianhao
@@ -926,9 +1112,15 @@ export default {
         this.ysjl.anzhuangdidian = this.ysjl.shiyongdanweiDizhi
         this.$set(this.param, 'qita', '/')
         // 制造日期、投用日期、上次检验日期设置成正确的日期格式
-        this.ysjl.zhizaoriqi = this.common.checkDateFormat(this.ysjl.zhizaoriqi)
-        this.ysjl.touyongriqi = this.common.checkDateFormat(this.ysjl.touyongriqi)
-        this.param.shangcijianyanriqi = this.common.checkDateFormat(this.param.shangcijianyanriqi)
+        this.ysjl.zhizaoriqi = this.common.checkDateFormat(
+          this.ysjl.zhizaoriqi
+        )
+        this.ysjl.touyongriqi = this.common.checkDateFormat(
+          this.ysjl.touyongriqi
+        )
+        this.param.shangcijianyanriqi = this.common.checkDateFormat(
+          this.param.shangcijianyanriqi
+        )
       })
     },
     getYsjl(id) {
@@ -938,13 +1130,23 @@ export default {
         params: {
           ysjlId: id
         }
-      }).then(data => {
+      }).then((data) => {
         this.ysjl = data
-        if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
-          this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
+        this.departmentId = this.ysjl.departmentId
+        if (
+          this.ysjl.jianyanrenyuan !== null &&
+          this.ysjl.jianyanrenyuan.length > 0
+        ) {
+          this.jianyanrenyuan = this.common.convertCnName(
+            this.ysjl.jianyanrenyuan
+          )
         }
         // 查询最大记录编号
-        if (this.ysjl.jilubianhao === null || this.ysjl.jilubianhao === undefined || this.ysjl.jilubianhao === '') {
+        if (
+          this.ysjl.jilubianhao === null ||
+          this.ysjl.jilubianhao === undefined ||
+          this.ysjl.jilubianhao === ''
+        ) {
           this.getMaxBh()
         }
         this.getParam(this.ysjl.id, this.ysjl.shebeizhongleidaima)
@@ -959,7 +1161,7 @@ export default {
           ysjlId: ysjlId,
           sbzldm: sbzldm
         }
-      }).then(data => {
+      }).then((data) => {
         this.param = data
       })
     },
@@ -988,7 +1190,10 @@ export default {
     saveYsjl: function(operation) {
       if (operation === 'add') {
         if (this.jlbh3.trim() === '') {
-          this.$message({ message: '请先确认记录编号是否完整！', type: 'warning' })
+          this.$message({
+            message: '请先确认记录编号是否完整！',
+            type: 'warning'
+          })
           return false
         }
       }
@@ -1020,7 +1225,10 @@ export default {
         this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + this.jlbh3
         method = 'post'
       } else if (operation === 'build') {
-        if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
+        if (
+          this.ysjl.jianyanrenyuan === null ||
+          this.ysjl.jianyanrenyuan === ''
+        ) {
           this.$message({
             type: 'error',
             message: '请先签名再生成报告!'
@@ -1039,10 +1247,13 @@ export default {
         method = 'put'
       }
       if (this.isRepeat) {
-        this.$message({ message: '记录编号重复，请先修改记录编号再保存', type: 'error' })
+        this.$message({
+          message: '记录编号重复，请先修改记录编号再保存',
+          type: 'error'
+        })
         return false
       } else {
-        this.$refs['ysjl'].validate(valid => {
+        this.$refs['ysjl'].validate((valid) => {
           if (valid) {
             const jyxm = tableData
             this.api({
@@ -1054,11 +1265,14 @@ export default {
                 cyJyxm: {},
                 jdJyxm: jyxm
               }
-            }).then(data => {
+            }).then((data) => {
               Utils.$emit('task-list')
               Utils.$emit('ysjl-list')
               if (operation === 'add' && data !== '') {
-                this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' })
+                this.$message({
+                  message: '保存成功, 请前往待办记录中查看。',
+                  type: 'success'
+                })
                 this.ysjl.id = data
                 this.param.ysjlId = data
                 // 刷新路由网址
@@ -1070,7 +1284,9 @@ export default {
                 this.$message({ message: '更新成功', type: 'success' })
                 // 替换路由中的参数
                 this.$router.push({
-                  query: merge(this.$route.query, { 'jianyanrenyuan': this.ysjl.jianyanrenyuan })
+                  query: merge(this.$route.query, {
+                    jianyanrenyuan: this.ysjl.jianyanrenyuan
+                  })
                 })
                 // this.$refs.bill.updateChargeBill()
               } else {
@@ -1097,7 +1313,7 @@ export default {
           ysjlId: id,
           bianhao: bianhao
         }
-      }).then(data => {
+      }).then((data) => {
         if (data > 0) {
           this.isRepeat = true
         } else {
@@ -1107,8 +1323,15 @@ export default {
     },
     getXcjyrq() {
       const xcjyrq = new Date(this.ysjl.jianyanjieshuriqi)
-      xcjyrq.setFullYear(xcjyrq.getFullYear() + 2, xcjyrq.getMonth(), xcjyrq.getDate() - 1)
-      this.ysjl.xiacijianyanriqi = this.formatter.dateFormat('YYYY-MM-dd', xcjyrq)
+      xcjyrq.setFullYear(
+        xcjyrq.getFullYear() + 2,
+        xcjyrq.getMonth(),
+        xcjyrq.getDate() - 1
+      )
+      this.ysjl.xiacijianyanriqi = this.formatter.dateFormat(
+        'YYYY-MM-dd',
+        xcjyrq
+      )
     },
     setYsjlData(data) {
       this.ysjl.sfdId = data
diff --git a/src/views/ysjl/5000/dj/jdgy-cl/index.vue b/src/views/ysjl/5000/dj/jdgy-cl/index.vue
index 76652d1..f462dae 100644
--- a/src/views/ysjl/5000/dj/jdgy-cl/index.vue
+++ b/src/views/ysjl/5000/dj/jdgy-cl/index.vue
@@ -52,7 +52,7 @@
                 <el-form-item label="设备注册代码（使用登记证编号）" prop="zhucedaima" label-width="240px">
                   <el-input v-model="ysjl.zhucedaima" :disabled="edit" />
                 </el-form-item>
-              </el-col>
+              </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
@@ -311,6 +311,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="departmentId"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :options="tree"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <template>
               <el-row :gutter="10">
                 <el-col :span="9">
@@ -374,6 +387,7 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common.js'
 export default {
   name: 'GlGynbYsjl',
   components: { SignName, Sticky },
@@ -393,6 +407,7 @@ export default {
       isRepeat: false,
       edit: false,
       sybjSData: [],
+      tree: [],
       tableData: [],
       checkedTab: 'first',
       ysjlId: this.$route.query.id,
@@ -454,11 +469,18 @@ export default {
       this.getYsjl(this.$route.query.id)
       this.getJyxm(1)
     }
+    this.getDepartment()
   },
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
   },
   methods: {
+    getDepartment() {
+      getDepartmentTreeList().then(res => {
+        console.log(res, 555)
+        this.tree = res
+      })
+    },
     /**
      * 签名方法
      * @param data
@@ -531,12 +553,16 @@ export default {
         this.ysjl.xiacijianyanriqishuoming = '/'
         this.ysjl.anzhuangdidian = this.ysjl.shiyongdanweiDizhi
         this.$set(this.param, 'qita', '/')
+        this.departmentId = this.ysjl.departmentId
         // 制造日期、投用日期、上次检验日期设置成正确的日期格式
         this.ysjl.zhizaoriqi = this.common.checkDateFormat(this.ysjl.zhizaoriqi)
         this.ysjl.touyongriqi = this.common.checkDateFormat(this.ysjl.touyongriqi)
         this.param.shangcijianyanriqi = this.common.checkDateFormat(this.param.shangcijianyanriqi)
       })
     },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     getYsjl(id) {
       this.api({
         url: '/ysjl',
@@ -546,6 +572,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/5000/dj/lygg-cl/index.vue b/src/views/ysjl/5000/dj/lygg-cl/index.vue
index 8221fdd..7485e96 100644
--- a/src/views/ysjl/5000/dj/lygg-cl/index.vue
+++ b/src/views/ysjl/5000/dj/lygg-cl/index.vue
@@ -304,6 +304,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="departmentId"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :options="tree"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <template>
               <el-row :gutter="10">
                 <el-col :span="9">
@@ -367,6 +380,8 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common.js'
+
 export default {
   name: 'GlGynbYsjl',
   components: { SignName, Sticky },
@@ -388,6 +403,8 @@ export default {
       tableData: [],
       checkedTab: 'first',
       ysjlId: this.$route.query.id,
+      departmentId: '',
+      tree: [],
       // 表格合并相关
       // 参与列合并的字段，在这里增加即可
       cols: [
@@ -446,11 +463,18 @@ export default {
       this.getYsjl(this.$route.query.id)
       this.getJyxm(1)
     }
+    this.getDepartment()
   },
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
   },
   methods: {
+    getDepartment() {
+      getDepartmentTreeList().then(res => {
+        console.log(res, 555)
+        this.tree = res
+      })
+    },
     /**
      * 签名方法
      * @param data
@@ -518,6 +542,7 @@ export default {
         this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误
         this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
         this.ysjl.beizhu = '/'
+        this.departmentId = this.ysjl.departmentId
         this.ysjl.anzhuangdidian = this.ysjl.shiyongdanweiDizhi
         this.$set(this.param, 'qita', '/')
         // 制造日期、投用日期、上次检验日期设置成正确的日期格式
@@ -534,6 +559,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
+        this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -544,6 +570,9 @@ export default {
         this.getParam(this.ysjl.id, this.ysjl.shebeizhongleidaima)
       })
     },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     getParam() {
       const id = this.ysjlId || this.$route.query.templateId
       this.ysjlService.getParam(id, this.$route.query.sbzldm).then((data) => {
diff --git a/src/views/ysjl/7000/jj/edit.vue b/src/views/ysjl/7000/jj/edit.vue
index 0ee3d0a..5ad4623 100644
--- a/src/views/ysjl/7000/jj/edit.vue
+++ b/src/views/ysjl/7000/jj/edit.vue
@@ -164,6 +164,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检验人员" prop="jianyanrenyuan">
@@ -226,7 +239,7 @@ import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
 import SliceUpload from '@/components/SliceUpload'
-
+import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'YlgdyjYsjl',
   components: { SignName, Sticky, SliceUpload },
@@ -241,6 +254,7 @@ export default {
       state: this.$route.query.state,
       jianyanrenyuan: '',
       departmentId: this.$route.query.departmentId,
+      departmemtArr: [],
       isRepeat: false,
       edit: false,
       bgfyData: [],
@@ -322,8 +336,17 @@ export default {
       this.getMaxBh()
     }
     this.getJyxm(1)
+    this.getDepartmentArr()
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     init() {
       this.api({
         url: '/ysjl/initYsjl',
@@ -339,6 +362,7 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
+        this.templateId = this.ysjl.departmentId
         this.param = data.param
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.ysjl.jianyanjielun = '符合'
@@ -430,13 +454,14 @@ export default {
     },
     getYsjl(id) {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
+        this.templateId = this.ysjl.departmentId
         this.complexShow = true
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
@@ -564,8 +589,9 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: JSON.stringify(this.tableData),
-                flag: operation
+                cyJyxm:{
+                  jyxm: JSON.stringify(this.tableData),
+                }
               }
             }).then(data => {
               Utils.$emit('mission-list')
diff --git a/src/views/ysjl/8000/dj/edit.vue b/src/views/ysjl/8000/dj/edit.vue
index fcfedfa..c1959f7 100644
--- a/src/views/ysjl/8000/dj/edit.vue
+++ b/src/views/ysjl/8000/dj/edit.vue
@@ -392,6 +392,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="选择科室" prop="departmentId">
+                  <el-cascader
+                    v-model="ysjl.departmentId"
+                    :options="departmemtArr"
+                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
+                    :show-all-levels="false"
+                    @change="handleChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="10">
               <el-col :span="9">
                 <el-form-item label="检验人员" prop="jianyanrenyuan">
@@ -768,6 +781,7 @@ import Sticky from '@/components/Sticky'
 import jyfa from '../../addJyfa'
 import SignName from '@/views/common/SignName'
 import Utils from '../../../../utils/contact.js'
+import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'GdDjYsjl',
   components: { SignName, Sticky, jyfa },
@@ -793,6 +807,7 @@ export default {
       // 页面状态 {create=> 创建，update=> 更新}
       state: this.$route.params.state,
       ysjl: this.$route.query.ysjl,
+      departmemtArr: [],
       departmentId: this.$route.query.ysjl.departmentId,
       param: (this.$route.query.param === null || this.$route.query.param === undefined) ? Object.assign({}, this.defaultParam) : this.$route.query.param,
       checkedTab: 'first',
@@ -908,6 +923,7 @@ export default {
         this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
       }
     })
+    this.getDepartmentArr()
   },
   mounted() {
     const that = this
@@ -916,6 +932,14 @@ export default {
     })
   },
   methods: {
+    getDepartmentArr() {
+      getDepartmentTreeList().then(res => {
+        this.departmemtArr = res
+      })
+    },
+    handleChange(v) {
+      this.ysjl.departmentId = v[1]
+    },
     // 签名方法
     singNameValue(data) {
       this.jianyanrenyuan = data.name
diff --git a/src/views/ysjl/F000/dj/edit.vue b/src/views/ysjl/F000/dj/edit.vue
index 01cb1f8..6bf7fd7 100644
--- a/src/views/ysjl/F000/dj/edit.vue
+++ b/src/views/ysjl/F000/dj/edit.vue
@@ -505,13 +505,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         this.ysjl.xiacijianyanriqishuoming = '—'
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)