diff --git a/src/views/ysjl/1000/dj/wb/gywb.vue b/src/views/ysjl/1000/dj/wb/gywb.vue
index 82ba80d..cba5080 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>
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/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) => {