diff --git a/src/api/manage/blacklist.js b/src/api/manage/blacklist.js
index 799dc22..37ae26d 100644
--- a/src/api/manage/blacklist.js
+++ b/src/api/manage/blacklist.js
@@ -42,3 +42,15 @@ export function delBlacklist(id) {
         method: 'delete'
     })
 }
+
+
+//查异常原因的时候，abnormalCauseLevel传ABNORMAL_CAUSE，
+// 补充说明查询的时候，parentId传上面选中的异常原因的id
+
+export function causegetlist(query) {
+    return request({
+        url: '/manage/cause/getList',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/api/manage/materials.js b/src/api/manage/materials.js
new file mode 100644
index 0000000..fcb6ff8
--- /dev/null
+++ b/src/api/manage/materials.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询素材信息列表
+export function listMaterials(query) {
+    return request({
+        url: '/manage/materials/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询素材信息详细
+export function getMaterials(id) {
+    return request({
+        url: '/manage/materials/' + id,
+        method: 'get'
+    })
+}
+
+// 新增素材信息
+export function addMaterials(data) {
+    return request({
+        url: '/manage/materials',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改素材信息
+export function updateMaterials(data) {
+    return request({
+        url: '/manage/materials',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除素材信息
+export function delMaterials(id) {
+    return request({
+        url: '/manage/materials/' + id,
+        method: 'delete'
+    })
+}
diff --git a/src/api/manage/propaganda.js b/src/api/manage/propaganda.js
new file mode 100644
index 0000000..d2b1369
--- /dev/null
+++ b/src/api/manage/propaganda.js
@@ -0,0 +1,68 @@
+import request from '@/utils/request'
+
+// 查询患者宣教信息列表
+export function listPropaganda(query) {
+    return request({
+        url: '/manage/propaganda/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询患者宣教信息详细
+export function getPropaganda(id) {
+    return request({
+        url: '/manage/propaganda/' + id,
+        method: 'get'
+    })
+}
+// 复制宣教内容
+export function copy(id) {
+    return request({
+        url: '/manage/propaganda/copy/' + id,
+        method: 'get'
+    })
+}
+
+// 审核患者宣教信息
+export function updateStatus(data) {
+    return request({
+        url: '/manage/propaganda/updateStatus',
+        method: 'post',
+        data: data
+    })
+}
+// 新增患者宣教信息
+export function addPropaganda(data) {
+    return request({
+        url: '/manage/propaganda',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改患者宣教信息
+export function updatePropaganda(data) {
+    return request({
+        url: '/manage/propaganda',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除患者宣教信息
+export function delPropaganda(id) {
+    return request({
+        url: '/manage/propaganda/' + id,
+        method: 'delete'
+    })
+}
+// 左侧列表
+
+export function listWechatTemplateNum(query) {
+    return request({
+        url: '/system/department/listWechatTemplateNum',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/api/manage/selectAgencyList.js b/src/api/manage/selectAgencyList.js
new file mode 100644
index 0000000..a9c90ee
--- /dev/null
+++ b/src/api/manage/selectAgencyList.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 医院：HOSPITAL，院区：CAMPUS
+export function selectAgencyList(query) {
+    return request({
+        url: '/system/agency/selectAgencyList',
+        method: 'get',
+        params: query
+    })
+}
+
+//院区
+export function subordinateAgencyList(query) {
+    return request({
+        url: '/system/agency/subordinateAgencyList',
+        method: 'get',
+        params: query
+    })
+}
+
+// 科室及病区的
+export function getDepartmentList(query) {
+    return request({
+        url: '/system/department/getDepartmentList',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js
new file mode 100644
index 0000000..65094a4
--- /dev/null
+++ b/src/api/manage/signRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询签约记录列表
+export function listSignRecord(query) {
+    return request({
+        url: '/manage/signRecord/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询签约记录详细
+export function getSignRecord(id) {
+    return request({
+        url: '/manage/signRecord/' + id,
+        method: 'get'
+    })
+}
+
+// 新增签约记录
+export function addSignRecord(data) {
+    return request({
+        url: '/manage/signRecord',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改签约记录
+export function updateSignRecord(data) {
+    return request({
+        url: '/manage/signRecord',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除签约记录
+export function delSignRecord(id) {
+    return request({
+        url: '/manage/signRecord/' + id,
+        method: 'delete'
+    })
+}
diff --git a/src/api/manage/signingRecords.js b/src/api/manage/signingRecords.js
new file mode 100644
index 0000000..c64af87
--- /dev/null
+++ b/src/api/manage/signingRecords.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+
+// 根据患者主键查询签约记录
+export function getByPatient(patientId) {
+    return request({
+        url: `/manage/signRecord/getByPatient/${patientId}`,
+        method: 'get',
+    })
+}
+
+// 根据签约记录表主键查询签约详情
+export function getByRecordId(patientSignRecordId) {
+    return request({
+        url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`,
+        method: 'get',
+    })
+}
\ No newline at end of file
diff --git a/src/api/system/stationAvatar.js b/src/api/system/stationAvatar.js
new file mode 100644
index 0000000..8a1664f
--- /dev/null
+++ b/src/api/system/stationAvatar.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+// 用户头像上传
+export function updateNurseStationHeads(data) {
+    return request({
+        url: '/system/station/updateNurseStationHeads',
+        method: 'post',
+        data: data
+    })
+}
+export function uploadFilefm(data) {
+    return request({
+        url: '/manage/file/uploadFile',
+        method: 'post',
+        data: data
+    })
+}
+
+//海报视频上传
+export function updatePoserHeads(data) {
+    return request({
+        url: '/system/poser/updatePoserHeads',
+        method: 'post',
+        data: data
+    })
+}
+export function uploadVideoUrl(data) {
+    return request({
+        url: '/system/trainingItem/uploadVideoUrl',
+        method: 'post',
+        data: data
+    })
+}
+
+export function uploadUrl(data) {
+    return request({
+        url: '/system/trainingItem/uploadUrl',
+        method: 'post',
+        data: data
+    })
+}
+export function uploadTrainingCategoryPicture(data) {
+    return request({
+        url: '/system/trainingCategory/uploadTrainingCategoryPicture',
+        method: 'post',
+        data: data
+    })
+}
+
+export function posts(data) {
+    return request({
+        url: 'https://jsonplaceholder.typicode.com/posts/',
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/assets/manage/gld.png b/src/assets/manage/gld.png
index a9b9bcd..1003e99 100644
Binary files a/src/assets/manage/gld.png and b/src/assets/manage/gld.png differ
diff --git a/src/assets/manage/gzh.png b/src/assets/manage/gzh.png
index a2aa156..ccc9bec 100644
Binary files a/src/assets/manage/gzh.png and b/src/assets/manage/gzh.png differ
diff --git a/src/assets/manage/xcx.png b/src/assets/manage/xcx.png
index 6dba3a4..e063fb7 100644
Binary files a/src/assets/manage/xcx.png and b/src/assets/manage/xcx.png differ
diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
index 514572a..303cbab 100644
--- a/src/views/manage/blacklist/index.vue
+++ b/src/views/manage/blacklist/index.vue
@@ -7,12 +7,25 @@
       <el-form-item label="电话" prop="patientPhone">
         <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="医院" prop="hospitalAgencyName">
-        <el-input v-model="queryParams.hospitalAgencyName" placeholder="请输入医院" clearable
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="医院" prop="hospitalAgencyId">
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentName">
-        <el-input v-model="queryParams.departmentName" placeholder="请输入科室" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable>
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="异常原因" prop="abnormalCauseValue">
         <el-input v-model="queryParams.abnormalCauseValue" placeholder="请输入异常原因" clearable
@@ -50,6 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="blacklistList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
       <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="姓名" align="center" prop="patientName" />
       <el-table-column label="电话" align="center" prop="patientPhone" width='120' />
@@ -75,33 +89,55 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
-
     <!-- 添加或修改患者-黑明单关系对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="姓名" prop="patientName">
-          <el-input v-model="form.patientName" placeholder="请输入姓名" />
+          <el-input v-model="form.patientName" placeholder="请输入姓名" :disabled="title == '修改黑名单'" />
         </el-form-item>
         <el-form-item label="身份证" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证" />
+          <el-input v-model="form.cardNo" placeholder="请输入身份证" :disabled="title == '修改黑名单'" />
         </el-form-item>
         <el-form-item label="电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入电话" />
+          <el-input v-model="form.patientPhone" placeholder="请输入电话" :disabled="title == '修改黑名单'" />
         </el-form-item>
-        <el-form-item label="医院名称" prop="hospitalAgencyName">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入医院名称" />
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:380px" clearable
+            :disabled="title == '修改黑名单'" @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室名称" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入科室名称" />
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:380px" clearable
+            :disabled="title == '修改黑名单'" @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:380px" clearable
+            :disabled="title == '修改黑名单'">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="异常原因" prop="abnormalCauseValue">
-          <el-input v-model="form.abnormalCauseValue" placeholder="请输入异常原因" />
+          <el-select v-model="form.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:380px" clearable
+            @clear="clearabnormalCauseValue" @change="changeabnormalCauseValue">
+            <el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="补充说明" prop="supplementIllustrateValue">
-          <el-input v-model="form.supplementIllustrateValue" placeholder="请输入补充说明" />
+          <el-select v-model="form.supplementIllustrateValue" filterable placeholder="请输入异常原因" style="width:380px"
+            clearable>
+            <el-option v-for="item in supplementIllustratelist" :key="item.id" :label="item.abnormalCauseValue"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="功能限制" prop="functionLimitation">
           <el-input v-model="form.functionLimitation" placeholder="请输入功能限制" />
@@ -122,13 +158,34 @@
 </template>
 
 <script>
-import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist } from "@/api/manage/blacklist";
+import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist, causegetlist } from "@/api/manage/blacklist";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "Blacklist",
   dicts: ['blacklist_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
+      //异常原因
+      abnormalCauselist: [],
+      //补充说明
+      supplementIllustratelist: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -151,19 +208,48 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        hospitalAgencyId: null,
         abnormalCauseId: null,
         abnormalCauseValue: null,
+        departmentId: null,
+        campusAgencyId: null,
         blacklistSource: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        cardNo: [
+          { required: true, message: '请输入患者身份证号', trigger: 'change' }
+        ],
+        hospitalAgencyId: [
+          { required: true, message: '请选择医院', trigger: 'change' }
+        ],
+        campusAgencyId: [
+          { required: true, message: '请选择院区', trigger: 'change' }
+        ],
+        departmentId: [
+          { required: true, message: '请选择科室', trigger: 'change' }
+        ],
+        abnormalCauseValue: [
+          { required: true, message: '请输入异常原因', trigger: 'change' }
+        ],
+        supplementIllustrateValue: [
+          { required: true, message: '请输入补充说明', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
+    this.selectAgencyinfo();
     this.getList();
+    this.causegetinfo();
   },
   methods: {
     /** 查询患者-黑明单关系列表 */
@@ -183,6 +269,9 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        campusAgencyId: null,
+        departmentId: null,
+        wardId: null,
         patientName: null,
         abnormalCauseId: null,
         abnormalCauseValue: null,
@@ -225,6 +314,18 @@ export default {
       const id = row.id || this.ids
       getBlacklist(id).then(response => {
         this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
+        if (this.form.abnormalCauseValue) {
+          this.changeabnormalCauseValue(this.form.abnormalCauseValue, 1)
+        }
         this.open = true;
         this.title = "修改黑名单";
       });
@@ -264,7 +365,134 @@ export default {
       this.download('manage/blacklist/export', {
         ...this.queryParams
       }, `blacklist_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
+    //获取异常原因
+    causegetinfo() {
+      let query = {
+        abnormalCauseLevel: 'ABNORMAL_CAUSE'
+      }
+      causegetlist(query).then(res => {
+        this.abnormalCauselist = res.data
+        this.form.supplementIllustrateValue = null
+      })
+    },
+    //清空异常原因
+    clearabnormalCauseValue() {
+      this.form.supplementIllustrateValue = null
+    },
+    //选中异常原因
+    changeabnormalCauseValue(id, type) {
+      let query = {
+        parentId: id,
+      }
+      causegetlist(query).then(res => {
+        this.supplementIllustratelist = res.data
+        if (!type) {
+          this.form.supplementIllustrateValue = null
+        }
+      })
+    },
   }
 };
 </script>
diff --git a/src/views/manage/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue
index c9e8d6e..80b2804 100644
--- a/src/views/manage/components/healthEducation.vue
+++ b/src/views/manage/components/healthEducation.vue
@@ -48,16 +48,6 @@ export default {
     name: "healthEducation",
     data() {
         return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() > Date.now(); //禁止选择今天以后的时间
-                },
-            },
-            //选择时间区间
-            datePickerStart: "",
-            datePickerEnd: "",
-            //右侧标题选中
-            recordindex: 0,
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item
diff --git a/src/views/manage/components/indicatorMonitoring.vue b/src/views/manage/components/indicatorMonitoring.vue
index 940c63b..b391a76 100644
--- a/src/views/manage/components/indicatorMonitoring.vue
+++ b/src/views/manage/components/indicatorMonitoring.vue
@@ -20,16 +20,6 @@ export default {
     name: "indicatorMonitoring",
     data() {
         return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() > Date.now(); //禁止选择今天以后的时间
-                },
-            },
-            //选择时间区间
-            datePickerStart: "",
-            datePickerEnd: "",
-            //右侧标题选中
-            recordindex: 0,
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item
diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue
index 4f718cb..3176a50 100644
--- a/src/views/manage/components/signingRecords.vue
+++ b/src/views/manage/components/signingRecords.vue
@@ -3,13 +3,9 @@
         <div class="leftheader">
             <div class="item" v-for="(item, index) in categorylist" :key="item.id" @click="clickcategory(item, index)"
                 :class="index == categoryindex ? 'selectitem' : ''">
-                <div class="time">{{ item.time }}
+                <div class="time">{{ item.signTime }}
                 </div>
-                <div class="name">
-                    {{ item.name }}
-                </div>
-                <div class="text">
-                    {{ item.text }}
+                <div class="name"> {{ item.packageName }}
                 </div>
                 <el-tag class="type" size="mini">服务中</el-tag>
                 <!-- <el-tag class="type" size="mini" type="success">门诊</el-tag> -->
@@ -18,66 +14,91 @@
         <div class="rightheader">
             <div class="richtext">
                 <el-descriptions title="基本信息" style="margin-top: 20px;">
-                    <el-descriptions-item label="医院">kooriookami</el-descriptions-item>
-                    <el-descriptions-item label="科室">18100000000</el-descriptions-item>
-                    <el-descriptions-item label="签约时诊断">苏州市</el-descriptions-item>
-                    <el-descriptions-item label="院区">苏州市</el-descriptions-item>
-                    <el-descriptions-item label="病区">苏州市</el-descriptions-item>
-                    <el-descriptions-item label="审核后诊断">苏州市</el-descriptions-item>
+                    <el-descriptions-item label="医院">{{ ByRecord.hospitalAgencyName }}</el-descriptions-item>
+                    <el-descriptions-item label="科室">{{ ByRecord.departmentName }}</el-descriptions-item>
+                    <el-descriptions-item label="签约时诊断">{{ ByRecord.signDiagnosis }}</el-descriptions-item>
+                    <el-descriptions-item label="院区">{{ ByRecord.campusAgencyName }}</el-descriptions-item>
+                    <el-descriptions-item label="病区">{{ ByRecord.wardName }}</el-descriptions-item>
+                    <el-descriptions-item label="审核后诊断">{{ ByRecord.reviewDiagnosis }}</el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions title="签约信息" style="margin-top: 40px;">
-                    <el-descriptions-item label="服务包">kooriookami</el-descriptions-item>
-                    <el-descriptions-item label="服务包缴费状态">18100000000</el-descriptions-item>
-                    <el-descriptions-item label="到期时间">苏州市</el-descriptions-item>
-                    <el-descriptions-item label="服务包价格">￥1188</el-descriptions-item>
-                    <el-descriptions-item label="服务时间">2024-02-19 00:00:00至2024-03-1823:59:59</el-descriptions-item>
-                    <el-descriptions-item label="服务周期">苏州市 1188 号</el-descriptions-item>
-                    <el-descriptions-item label="签约时间">2024-02-19 15:43:40</el-descriptions-item>
+                    <el-descriptions-item label="服务包">{{ ByRecord.packageName }}</el-descriptions-item>
+                    <el-descriptions-item label="服务包缴费状态">{{
+                        ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' ?
+                        '未缴费' : ''
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="到期时间">{{ ByRecord.serviceEndTime }}</el-descriptions-item>
+                    <el-descriptions-item label="服务包价格">{{ ByRecord.packagePrice }}</el-descriptions-item>
+                    <el-descriptions-item label="服务时间">{{ ByRecord.serviceStartTime }}</el-descriptions-item>
+                    <el-descriptions-item label="服务周期">{{ ByRecord.serviceCycle }}月</el-descriptions-item>
+                    <el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions">
+                    <el-descriptions-item>
+                        <el-table :data="ByRecord.signDevices" style="width: 100%">
+                            <el-table-column label="序号" type="index" width="55" align="center" />
+                            <el-table-column prop="hardwareType" label="硬件类型" width="180" align="center">
+                                <template slot-scope="scope">
+                                    {{ scope.row.hardwareType == 'BLOOD_PRESSURE' ? '血压仪' : '' }}
+                                    {{ scope.row.hardwareType == 'GLUCOSE_METER' ? '血糖仪' : '' }}
+                                    {{ scope.row.hardwareType == 'ELECTROCARDIOGRA' ? '心电仪' : '' }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="snCode" label="SN码" width="180" align="center" />
+                            <el-table-column prop="hardwarePrice" label="硬件金额(元)" align="center" />
+                            <el-table-column prop="hardwareStatus" label="硬件状态" align="center" />
+                        </el-table>
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions title="其他材料" style="margin-top: 20px;" class="descriptions">
+                    <el-descriptions-item>
+
+                    </el-descriptions-item>
                 </el-descriptions>
             </div>
         </div>
     </div>
 </template>
 <script>
+import {
+    getByPatient,
+    getByRecordId
+} from '@/api/manage/signingRecords'
 export default {
     name: "signingRecords",
     data() {
         return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() > Date.now(); //禁止选择今天以后的时间
-                },
-            },
-            //选择时间区间
-            datePickerStart: "",
-            datePickerEnd: "",
-            //右侧标题选中
-            recordindex: 0,
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item
             categoryItem: {},
             //左侧list
-            categorylist: [{
-                id: 1,
-                name: '冠状动脉粥样硬化性心脏病',
-                text: '冠状动脉粥样硬化性心脏病',
-                time: '2022-02-02 10:33:00'
-            }, {
-                id: 2,
-                name: '冠状动脉粥样硬化性心脏病',
-                text: '冠状动脉粥样硬化性心脏病',
-                time: '2022-02-02 10:33:00'
-            }]
+            categorylist: [],
+            ByRecord: { signDevices: [], },
         };
     },
     created() {
-        this.categoryItem = this.categorylist[0]
+        this.info();
     },
     methods: {
+        info() {
+            getByPatient(this.$route.query.patientId).then(res => {
+                if (res.data.length > 0) {
+                    this.categorylist = res.data
+                    this.categoryItem = this.categorylist[0]
+                    this.getByRecordIdinfo();
+                }
+            })
+        },
+        getByRecordIdinfo() {
+            getByRecordId(this.categoryItem.id).then(res => {
+                this.ByRecord = res.data
+            })
+        },
         clickcategory(item, index) {
             this.categoryindex = index
             this.categoryItem = item
+            this.getByRecordIdinfo();
         }
     }
 };
@@ -88,6 +109,12 @@ export default {
     padding: 0 !important;
     display: flex;
 
+    .descriptions {
+        ::v-deep .el-descriptions-item__label.has-colon::after {
+            display: none;
+        }
+    }
+
     .rightheader {
         width: 75%;
         padding-top: 20px;
@@ -97,6 +124,9 @@ export default {
             width: 90%;
             margin: 0 auto;
             height: 450px;
+            overflow: scroll;
+            // 隐藏表头的滚动条
+            overflow-x: hidden !important;
         }
     }
 
@@ -115,7 +145,7 @@ export default {
         }
 
         .item {
-            height: 120px;
+            height: 100px;
             padding: 25px 10px;
             position: relative;
             border-left: 2px solid #fff;
@@ -128,13 +158,6 @@ export default {
                 font-size: 12px;
             }
 
-            .text {
-                height: 20px;
-                line-height: 20px;
-                font-size: 12px;
-                color: #999999;
-            }
-
             .name {
                 overflow: hidden;
                 text-overflow: ellipsis;
diff --git a/src/views/manage/details/patientdetails.vue b/src/views/manage/details/patientdetails.vue
index d6fa587..3c78969 100644
--- a/src/views/manage/details/patientdetails.vue
+++ b/src/views/manage/details/patientdetails.vue
@@ -14,19 +14,21 @@
           {{ $route.query.age }}
         </div>
         <div class="source">
-          <div class="item" v-if="$route.query.patientSource == 'WE_CHAT_OFFICIAL_ACCOUNT'">
-            <img src="../../../assets/manage/gzh.png" alt="">
+          <div class="item" style="color:#00E06E;border-color:#00E06E"
+            v-if="$route.query.patientSource == 'WE_CHAT_OFFICIAL_ACCOUNT'">
+            <img src="../../../assets/manage/gzh.png" alt="" style="width:24px">
             <div>
               公众号
             </div>
           </div>
-          <div class="item" v-if="$route.query.patientSource == 'WE_CHAT_APPLET'">
+          <div class="item" style="color:#339DE5;border-color:#339DE5"
+            v-if="$route.query.patientSource == 'WE_CHAT_APPLET'">
             <img src="../../../assets/manage/xcx.png" alt="">
             <div>
               小程序
             </div>
           </div>
-          <div class="item" v-if="$route.query.patientSource == 'MANAGE_END'">
+          <div class="item" style="color:#F4881F;border-color:#F4881F" v-if="$route.query.patientSource == 'MANAGE_END'">
             <img src="../../../assets/manage/gld.png" alt="">
             <div>
               管理端
@@ -150,7 +152,6 @@ export default {
         display: flex;
 
         .item {
-          color: #787878;
           line-height: 30px;
           font-size: 14px;
           margin-left: 20px;
@@ -161,7 +162,6 @@ export default {
           height: 30px;
           display: flex;
           align-items: center;
-          background-color: #F5F5F5;
 
           img {
             margin-right: 10px;
diff --git a/src/views/manage/materials/index.vue b/src/views/manage/materials/index.vue
new file mode 100644
index 0000000..fc7f478
--- /dev/null
+++ b/src/views/manage/materials/index.vue
@@ -0,0 +1,877 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="素材状态" prop="materialsStatus">
+        <el-select
+          v-model="queryParams.materialsStatus"
+          placeholder="请选择素材状态"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="素材来源" prop="materialsName">
+        <el-select
+          v-model="queryParams.materialsName"
+          placeholder="请选择素材来源"
+        >
+          <el-option
+            v-for="item in optionsly"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <!-- <el-input
+          v-model="queryParams.materialsName"
+          placeholder="请输入素材来源"
+          clearable
+          @keyup.enter.native="handleQuery"
+        /> -->
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['manage:materials:add']"
+          >新增素材</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['manage:materials:remove']"
+          >批量删除</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="图片" name="IMAGE_TEXT"></el-tab-pane>
+      <el-tab-pane label="视频" name="VIDEO"></el-tab-pane>
+    </el-tabs>
+    <div class="bodytopxj">
+      <div class="bodylist" @click.stop="viewshow">
+        <el-checkbox v-model="checked"></el-checkbox>
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label" @click.stop="labelchange">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+
+      <div class="bodylist">
+        <img src="@/assets/system/userinfo.jpg" alt="" />
+        <div class="texttitle">测试素材封面</div>
+        <div class="dataliat">
+          创建人/创建时间：<span>张程程</span>/<span
+            >555555555555555555555555555555555555</span
+          >
+        </div>
+        <div class="dataliat">素材来源：</div>
+        <div class="dataliat">标签：暂无</div>
+        <div class="label">标签管理</div>
+      </div>
+    </div>
+    <!-- <el-table
+      v-loading="loading"
+      :data="materialsList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="素材名称" align="center" prop="materialsName" />
+      <el-table-column
+        label="
+素材类型，图文：IMAGE_TEXT，视频：VIDEO"
+        align="center"
+        prop="materialsType"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.materials_type"
+            :value="scope.row.materialsType"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="素材选择，AI生成：AI_GENERATION，手动上传：MANUAL_UPLOAD"
+        align="center"
+        prop="materialsOption"
+      />
+      <el-table-column
+        label="素材图片/者视频文件存放路径"
+        align="center"
+        prop="materialsFilePath"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.video_cover_type"
+            :value="scope.row.materialsFilePath"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="视频封面类型，视频首帧：VIDEO_FIRST_FRAME，手动上传：MANUAL_UPLOAD"
+        align="center"
+        prop="videoCoverType"
+        width="100"
+      >
+        <template slot-scope="scope">
+          <image-preview
+            :src="scope.row.videoCoverType"
+            :width="50"
+            :height="50"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="视频封面存放路径"
+        align="center"
+        prop="videoCoverFilePath"
+      />
+      <el-table-column
+        label="素材摘要"
+        align="center"
+        prop="materialsAbstract"
+      />
+      <el-table-column label="适用症状" align="center" prop="indications" />
+      <el-table-column
+        label="适用疾病"
+        align="center"
+        prop="applicableDiseases"
+      />
+      <el-table-column label="药物名称" align="center" prop="drugName" />
+      <el-table-column label="手术名称" align="center" prop="surgicalName" />
+      <el-table-column label="检查项目" align="center" prop="checkItems" />
+      <el-table-column label="检验项目" align="center" prop="inspectionItems" />
+      <el-table-column label="所属人群表id" align="center" prop="crowdId">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.crowd_type"
+            :value="scope.row.crowdId"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="人群名称" align="center" prop="crowName" />
+      <el-table-column
+        label="素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED"
+        align="center"
+        prop="materialsStatus"
+      />
+      <el-table-column label="素材备注" align="center" prop="materialsRemark" />
+      <el-table-column
+        label="素材排序，值越小排序越靠前"
+        align="center"
+        prop="materialsSort"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:materials:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:materials:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table> -->
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改素材信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      v-if="open"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="素材名称" prop="materialsName">
+          <el-input v-model="form.materialsName" placeholder="请输入素材名称" />
+        </el-form-item>
+        <el-form-item label="素材类型">
+          <el-radio
+            v-model="form.materialsType"
+            label="IMAGE_TEXT"
+            @change="radioChange('IMAGE_TEXT')"
+            >图文</el-radio
+          >
+          <el-radio
+            v-model="form.materialsType"
+            label="VIDEO"
+            @change="radioChange('VIDEO')"
+            >视频</el-radio
+          >
+        </el-form-item>
+        <el-form-item
+          label="素材上传"
+          prop="materialsName111"
+          v-if="form.materialsType == 'IMAGE_TEXT'"
+        >
+          <stationAcatar
+            @imgUrl="imgUrl"
+            :img="form.propagandaCoverPath"
+            :type="'propagandaCoverUrl'"
+          />
+        </el-form-item>
+        <el-form-item
+          label="视频素材上传"
+          prop="materialsName111"
+          v-if="form.materialsType == 'VIDEO'"
+        >
+          <stationAcatar
+            style="width: 208px"
+            @imgUrl="imgUrl2"
+            :tovideo="form.posterVideoUrl"
+            :type="'posterVideoUrl'"
+            v-if="open"
+          />
+        </el-form-item>
+
+        <el-form-item
+          label="视频封面"
+          prop="materialsName111"
+          v-if="form.materialsType == 'VIDEO'"
+        >
+          <stationAcatar
+            @imgUrl="imgUrl"
+            :img="form.propagandaCoverPath"
+            :type="'propagandaCoverUrl'"
+          />
+        </el-form-item>
+
+        <el-form-item label="素材摘要" prop="materialsAbstract">
+          <el-input
+            v-model="form.materialsAbstract"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <!-- <el-form-item
+          label="素材选择，AI生成：AI_GENERATION，手动上传：MANUAL_UPLOAD"
+        >
+          <file-upload v-model="form.materialsOption" />
+        </el-form-item> -->
+        <!-- <el-form-item label="素材图片/者视频文件存放路径">
+          <el-radio-group v-model="form.materialsFilePath">
+            <el-radio
+              v-for="dict in dict.type.video_cover_type"
+              :key="dict.value"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          label="视频封面类型，视频首帧：VIDEO_FIRST_FRAME，手动上传：MANUAL_UPLOAD"
+        >
+          <image-upload v-model="form.videoCoverType" />
+        </el-form-item>
+        <el-form-item label="视频封面存放路径" prop="videoCoverFilePath">
+          <el-input
+            v-model="form.videoCoverFilePath"
+            placeholder="请输入视频封面存放路径"
+          />
+        </el-form-item> -->
+
+        <el-form-item label="适用症状" prop="indications">
+          <el-input v-model="form.indications" placeholder="请输入适用症状" />
+        </el-form-item>
+        <el-form-item label="适用疾病" prop="applicableDiseases">
+          <el-input
+            v-model="form.applicableDiseases"
+            placeholder="请输入适用疾病"
+          />
+        </el-form-item>
+        <el-form-item label="药物名称" prop="drugName">
+          <el-input v-model="form.drugName" placeholder="请输入药物名称" />
+        </el-form-item>
+        <el-form-item label="手术名称" prop="surgicalName">
+          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" />
+        </el-form-item>
+        <el-form-item label="检查项目" prop="checkItems">
+          <el-input v-model="form.checkItems" placeholder="请输入检查项目" />
+        </el-form-item>
+        <el-form-item label="检验项目" prop="inspectionItems">
+          <el-input
+            v-model="form.inspectionItems"
+            placeholder="请输入检验项目"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="所属人群表id" prop="crowdId">
+          <el-select v-model="form.crowdId" placeholder="请选择所属人群表id">
+            <el-option
+              v-for="dict in dict.type.crowd_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item label="人群名称" prop="crowName">
+          <el-select v-model="form.crowName" placeholder="请选择" style="width: 381px;">
+            <el-option
+              v-for="item in optionscrowName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="form.crowName" placeholder="请输入人群名称" /> -->
+        </el-form-item>
+        <!-- <el-form-item label="素材备注" prop="materialsRemark">
+          <el-input
+            v-model="form.materialsRemark"
+            placeholder="请输入素材备注"
+          />
+        </el-form-item>
+        <el-form-item label="素材排序，值越小排序越靠前" prop="materialsSort">
+          <el-input
+            v-model="form.materialsSort"
+            placeholder="请输入素材排序，值越小排序越靠前"
+          />
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 预览弹框 -->
+    <el-dialog title="预览" :visible.sync="openview" width="60%">
+      <div class="viewbody">
+        <div class="left">
+          <video
+            v-if="activeName == 'VIDEO'"
+            ref="myVideo"
+            src="./text.mp4"
+            controls
+          ></video>
+          <img
+            src="@/assets/system/userinfo.jpg"
+            alt=""
+            v-if="activeName == 'IMAGE_TEXT'"
+          />
+        </div>
+        <div class="right">
+          <div class="nametitle">素材名称</div>
+          <div class="nameitem">半蹲起立练习（室早）</div>
+          <div class="nametitle">创建人员</div>
+          <div class="nameitem">张宇</div>
+          <div class="nametitle">创建时间</div>
+          <div class="nameitem">2024-1-25 15:42</div>
+          <div class="nametitle">素材摘要</div>
+          <div class="nameitem">88888888888888888888888888888888888</div>
+          <div class="nametitle">素材标签：</div>
+          <div class="nameitem">适用症状：</div>
+          <div class="nameitem">药物名称：</div>
+          <div class="nameitem">适用疾病：</div>
+          <div class="nameitem">手术名称：</div>
+          <div class="nameitem">检验项目：</div>
+          <div class="nameitem">检查项目：</div>
+          <div class="nameitem">人群：</div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMaterials, getMaterials, delMaterials, addMaterials, updateMaterials } from "@/api/manage/materials";
+import stationAcatar from "../../system/stationAvatar/index.vue";
+
+export default {
+  name: "Materials",
+  components: { stationAcatar },
+  dicts: ['crowd_type', 'materials_type', 'video_cover_type'],
+  data() {
+    return {
+      videoState: false, // 视频播放状态
+      // 学时
+      studyTime: {
+        currentTime: 0, // 当前已学时长
+        duration: 0 // 总时长
+      },
+      timer: {}, // 定时器
+      pauseTimer: {}, // 暂停定时器
+      checked: true,
+      openview: false,//预览
+      activeName: 'IMAGE_TEXT',
+      options: [{
+        value: 'ALL',
+        label: '全部'
+      }, {
+        value: 'LISTED',
+        label: '已上架'
+      }, {
+        value: 'NOT_LISTED',
+        label: '未上架'
+      }],
+      // 人群
+      optionscrowName: [
+        {
+          value: '选项1',
+          label: '黄金糕'
+        }, {
+          value: '选项2',
+          label: '双皮奶'
+        },
+
+      ],
+      optionsly: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 素材信息表格数据
+      materialsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 素材排序，值越小排序越靠前时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        materialsName: null,
+        materialsStatus: null,
+        createTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 图片/视频
+    handleClick(e) {
+      this.activeName = e.name
+      // this.type
+      console.log(e.name);
+    },
+    // 素材类型
+    radioChange(e) {
+
+      console.log(e)
+
+    },
+    // 素材上传
+    imgUrl(imgUrl) {
+      this.form.propagandaCoverPath = imgUrl;
+    },
+    // 视频
+    imgUrl2(imgUrl) {
+      this.videoForm.showVideoPath = process.env.VUE_APP_BASE_API + imgUrl;
+      this.form.posterVideoUrl = imgUrl;
+    },
+    // 预览
+    viewshow() {
+      this.openview = true
+
+    },
+    /** 查询素材信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listMaterials(this.queryParams).then(response => {
+        this.materialsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        materialsName: null,
+        materialsType: "IMAGE_TEXT",
+        materialsOption: 'MANUAL_UPLOAD',
+        materialsFilePath: "0",
+        videoCoverType: null,
+        videoCoverFilePath: null,
+        materialsAbstract: null,
+        indications: null,
+        applicableDiseases: null,
+        drugName: null,
+        surgicalName: null,
+        checkItems: null,
+        inspectionItems: null,
+        crowdId: null,
+        crowName: null,
+        materialsStatus: "0",
+        materialsRemark: null,
+        materialsSort: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      console.log(this.form)
+      this.open = true;
+      this.title = "添加素材信息";
+    },
+    /** 修改按钮操作 */
+    labelchange(row) {
+      this.reset();
+      this.open = true;
+
+      const id = row.id || this.ids
+      // getMaterials(id).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改素材信息";
+      // });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMaterials(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaterials(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除素材信息编号为"' + ids + '"的数据项？').then(function () {
+        return delMaterials(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/materials/export', {
+        ...this.queryParams
+      }, `materials_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-checkbox__inner {
+  position: absolute !important;
+  top: -84px;
+  left: 8px;
+}
+video {
+  height: 500px;
+  width: 100%;
+}
+.viewbody {
+  width: 100%;
+  height: 500px;
+  // background: #409eff;
+  display: flex;
+  .left {
+    width: 77%;
+    height: 500px;
+    // background: #989992;
+  }
+  .right {
+    width: 20%;
+    // background: red;
+    margin-left: 30px;
+    .nametitle {
+      font-size: 14px;
+      font-weight: 600;
+    }
+    .nameitem {
+      color: #959595;
+      margin: 5px;
+    }
+  }
+}
+.bodytopxj {
+  width: 100%;
+  display: flex;
+  white-space: wrap;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  align-content: space-between;
+  .bodylist {
+    width: 19%;
+    height: 210px;
+    border: 2px solid #e2e3e5;
+    border-radius: 10px;
+    position: relative;
+    margin-bottom: 10px;
+    .texttitle {
+      font-weight: 700;
+      margin: 5px 0px 5px 10px;
+    }
+    //
+    .dataliat {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin: 0px 0px 5px 10px;
+      font-size: 12px;
+      color: #989992;
+    }
+    img {
+      width: 100%;
+      height: 100px;
+    }
+    .label {
+      position: absolute;
+      right: 0px;
+      right: 18px;
+      color: #409eff;
+      bottom: 11px;
+      font-size: 13px;
+    }
+  }
+}
+</style>
+
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
new file mode 100644
index 0000000..e396fd8
--- /dev/null
+++ b/src/views/manage/newSigning/index.vue
@@ -0,0 +1,66 @@
+<template>
+    <div class="app-container">
+        <div class="header">
+            <el-descriptions title="签约详情" class="descriptions">
+            </el-descriptions>
+            <el-descriptions title="患者信息" style="padding:0 30px">
+                <el-descriptions-item label="患者姓名">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="性别">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="年龄">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="电话">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="就诊方式">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="诊断">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="住院/门诊号">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="医院">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="科室">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="服务包缴费状态">18100000000</el-descriptions-item>
+                <el-descriptions-item label="出院/门诊时间">苏州市</el-descriptions-item>
+                <el-descriptions-item label="注册时间"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions title="服务包信息" style="padding:0 30px">
+                <el-descriptions-item label="选择服务包"></el-descriptions-item>
+            </el-descriptions>
+        </div>
+    </div>
+</template>
+    
+<script>
+
+export default {
+    name: "newSigning",
+    data() {
+        return {
+        };
+    },
+    created() {
+    },
+    methods: {
+
+    }
+};
+</script>
+<style lang="scss" scoped>
+.app-container {
+    padding: 14px 0 0;
+    background-color: #F2F3F5 !important;
+    width: 100%;
+
+    .descriptions {
+        padding: 20px 20px 10px;
+    }
+
+    .descriptions {
+        ::v-deep .el-descriptions-item__label.has-colon::after {
+            display: none;
+        }
+    }
+
+    .header {
+        background-color: #fff;
+        width: 98%;
+        margin: 0 auto;
+        border-radius: 8px;
+    }
+}
+</style>
+    
\ No newline at end of file
diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index 3c0fa0e..41f0a2f 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -9,25 +9,41 @@
         <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
       </el-form-item>
+      <el-form-item label="就诊时间" prop="visitTimeStart">
+        <el-date-picker v-model="visitTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="诊断" prop="mainDiagnosis">
         <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="门诊号" prop="outpatientNumber">
         <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
@@ -63,16 +79,11 @@
           <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="就诊时间" prop="visitTimeStart">
-        <el-date-picker v-model="visitTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入院时间" prop="admissionDateStart">
+      <!-- <el-form-item label="入院时间" prop="admissionDateStart">
         <el-date-picker v-model="admissionDate" type="daterange" range-separator="至" start-placeholder="开始日期"
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -147,6 +158,7 @@
 <script>
 import { listPatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "PatientInfo",
@@ -159,14 +171,6 @@ export default {
       total: 0,
       // 患者信息表格数据
       patientInfoList: [],
-      // 是否显示弹出层
-      pickerOptions: {
-        disabledDate: (time) => {
-          if (this.queryParams.appointmentDateEnd != null) {
-            return time.getTime() < new Date(this.queryParams.appointmentDateStart).getTime();
-          }
-        },
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -197,10 +201,19 @@ export default {
       },
       visitTime: [],
       admissionDate: [],
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -250,10 +263,76 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.admissionDate = [];
+      this.admissionDate = [];
+      this.queryParams.admissionDateStart = null
+      this.queryParams.admissionDateEnd = null
+      this.visitTime = []
+      this.queryParams.visitTimeStart = null
+      this.queryParams.visitTimeEnd = null
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        this.campusAgencylist = res.data
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.departmentlist = res.data
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.wardlist = res.data
+        this.queryParams.wardId = null
+      })
+    },
+    //清空医院
+    clearhospitalAgency() {
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空院区
+    clearcampusAgency() {
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空科室
+    cleardepartment() {
+      this.queryParams.wardId = null
+    },
   }
 };
 </script>
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index 6b4a35c..b2bc84e 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -34,20 +34,31 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="出生日期" prop="birthDate">
         <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
@@ -212,17 +223,32 @@
         <el-form-item label="开证医生" prop="certificateIssuingDoctor">
           <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyName">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyName">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室名称" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="预约病区" prop="wardName">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+        <el-form-item label="预约病区" prop="wardId" v-if="form.departmentId">
+          <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
           <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约治疗组" style="width:200px" />
@@ -343,12 +369,29 @@
 <script>
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "preHospitalized",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
       //导入
       fileList: [],
       // 遮罩层
@@ -403,11 +446,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
+        appointmentDate: [
+          { required: true, message: '请选择患者预约时间', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -486,6 +539,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.appointmentDate = []
+      this.queryParams.appointmentDateStart = ''
       this.queryParams.appointmentDateEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
@@ -508,12 +563,22 @@ export default {
       const id = row.id || this.ids
       getPatientInfo(id).then(response => {
         this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
         this.open = true;
         this.title = "修改患者信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -566,6 +631,107 @@ export default {
     uploadcancel() {
       this.uploadopen = false
     },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue
new file mode 100644
index 0000000..451f563
--- /dev/null
+++ b/src/views/manage/propaganda/index.vue
@@ -0,0 +1,1225 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="创建时间" prop="">
+        <el-date-picker
+          v-model="queryParams.createTimeStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+          @change="changecreateTimeStart"
+        >
+        </el-date-picker
+        >-
+        <el-date-picker
+          v-model="queryParams.createTimeEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+          @change="changecreateTimeEnd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="宣教类型" prop="propagandaType">
+        <el-select v-model="queryParams.propagandaType" placeholder="请选择">
+          <el-option
+            v-for="item in optionstype"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <!-- <el-input
+          v-model="queryParams.departmentName"
+          placeholder="请输入所属科室名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        /> -->
+      </el-form-item>
+      <el-form-item label="宣教来源" prop="hospitalAgencyId">
+        <el-input
+          v-model="queryParams.hospitalAgencyId"
+          placeholder="请输入宣教来源"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教状态" prop="propagandaStatus">
+        <el-select v-model="queryParams.propagandaStatus" placeholder="请选择">
+          <el-option
+            v-for="item in optionsstate"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <!-- <el-input
+          v-model="queryParams.diseaseTypeName"
+          placeholder="请输入所属病种名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        /> -->
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['manage:propaganda:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="5">
+        <div class="left" ref="box">
+          <div class="name">科室名称</div>
+          <div>
+            <el-input
+              v-model="name"
+              placeholder="请输入科室名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </div>
+          <div class="listitem">
+            <div
+              :class="itemname == null ? 'allactive' : 'all'"
+              @click="itemdata()"
+            >
+              全部
+            </div>
+            <span class="count">{{ count }}</span>
+          </div>
+          <div
+            class="listitem"
+            v-for="(item, index) in DepartmentoList"
+            :key="index"
+            @click="itemdata(item)"
+          >
+            <div :class="itemname == item.id ? 'allactive' : 'all'">
+              {{ item.departmentName }}
+            </div>
+            <span class="count">{{ item.countNum }}</span>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="19">
+        <el-table
+          v-loading="loading"
+          :data="propagandaList"
+          @selection-change="handleSelectionChange"
+        >
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <el-table-column label="序号" align="center" prop="id" type="index" />
+          <el-table-column
+            label="宣教名称"
+            align="center"
+            prop="propagandaTitle"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            label="宣教类型"
+            align="center"
+            prop="propagandaType"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.propagandaType == "MEDICATION_KNOWLEDGE"
+                  ? "用药知识"
+                  : ""
+              }}
+              {{
+                scope.row.propagandaType == "DISEASE_POPULARIZATION"
+                  ? "疾病科普"
+                  : ""
+              }}
+              {{
+                scope.row.propagandaType == "SPORT_NUTRITION" ? "运动营养" : ""
+              }}
+              {{
+                scope.row.propagandaType == "OTHER_KNOWLEDGE" ? "其他知识" : ""
+              }}
+              {{
+                scope.row.propagandaType == "CUSTOMIZED_CONTENT"
+                  ? "定制内容"
+                  : ""
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="宣教ID"
+            align="center"
+            prop="propagandaCode"
+          />
+          <el-table-column
+            label="宣教状态"
+            align="center"
+            prop="propagandaStatus"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.propagandaStatus == "CREATE_PROCESS" ? "创作中" : ""
+              }}
+              {{
+                scope.row.propagandaStatus == "CREATE_COMPLETE"
+                  ? "创作完成"
+                  : ""
+              }}
+              {{ scope.row.propagandaStatus == "IN_REVIEW" ? "审核中" : "" }}
+              {{ scope.row.propagandaStatus == "APPROVED" ? "审核通过" : "" }}
+              {{
+                scope.row.propagandaStatus == "REVIEW_FAILED"
+                  ? "审核不通过"
+                  : ""
+              }}
+              <div></div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="宣教来源"
+            align="center"
+            prop="hospitalAgencyId"
+          />
+          <el-table-column label="创建时间" align="center" prop="createTime" />
+          <el-table-column label="更新时间" align="center" prop="updateTime" />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+            width="300%"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                icon="el-icon-zoom-in"
+                size="mini"
+                @click="Preview(scope.row)"
+                >预览</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-tickets"
+                size="mini"
+                @click="copyUrl(scope.row)"
+                >复制</el-button
+              >
+
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-aim"
+                v-if="scope.row.propagandaStatus=='CREATE_COMPLETE'"
+                @click="examine(scope.row)"
+                >审核</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['manage:propaganda:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['manage:propaganda:remove']"
+                >删除</el-button
+              >
+              <!-- <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-copy-document"
+                @click="copylink(scope.row)"
+                >复制链接</el-button
+              > -->
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改患者宣教信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      v-if="open"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="宣教标题" prop="propagandaTitle">
+          <el-input
+            v-model="form.propagandaTitle"
+            placeholder="请输入宣教标题"
+          />
+        </el-form-item>
+        <el-form-item label="宣教类型" prop="propagandaType">
+          <el-select
+            v-model="form.propagandaType"
+            placeholder="请选择"
+            style="width: 378px"
+          >
+            <el-option
+              v-for="item in optionstype"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医院名称" prop="hospitalAgencyName">
+          <el-input
+            v-model="form.hospitalAgencyName"
+            placeholder="请输入医院名称"
+          />
+        </el-form-item>
+        <el-form-item label="医生名称" prop="departmentName">
+          <el-input
+            v-model="form.departmentName"
+            placeholder="请输入医生名称"
+          />
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentId">
+          <el-button
+            type=""
+            v-if="departmentName == '请选择科室'"
+            @click="clickinnerVisible()"
+            style="
+              width: 379px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ departmentName }}</el-button
+          >
+          <el-button
+            @click="clickinnerVisible()"
+            type=""
+            v-else
+            style="
+              width: 379px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ departmentName }}</el-button
+          >
+        </el-form-item>
+        <el-form-item label="病种名称" prop="diseaseTypeName">
+          <el-button
+            type=""
+            v-if="diseaseTypeName == '请选择病种'"
+            @click="clickdisease()"
+            style="
+              width: 379px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ diseaseTypeName }}</el-button
+          >
+          <el-button
+            @click="clickdisease()"
+            type=""
+            v-else
+            style="
+              width: 379px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ diseaseTypeName }}</el-button
+          >
+        </el-form-item>
+        <el-form-item label="添加封面" prop="propagandaCoverPath">
+          <stationAcatar
+            @imgUrl="imgUrl"
+            :img="form.propagandaCoverPath"
+            :type="'propagandaCoverUrl'"
+          />
+        </el-form-item>
+        <el-form-item label="语音播报" prop="voicebroadcast">
+          <el-input
+            v-model="form.voicebroadcast"
+            type="textarea"
+            placeholder="请输入语音播报"
+          />
+        </el-form-item>
+        <el-form-item label="宣教正文内容" prop="propagandaContent">
+          <el-input
+            v-model="form.propagandaContent"
+            type="textarea"
+            placeholder="请输入宣教正文内容"
+          />
+        </el-form-item>
+        <el-form-item label="文章摘要" prop="articleSummary">
+          <editor v-model="form.articleSummary" :min-height="192" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 科室弹框 -->
+    <el-dialog
+      title=""
+      :visible.sync="innerVisibleshow"
+      width="1000px"
+      append-to-body
+      :before-close="innerVisiblecancel"
+    >
+      <el-form
+        ref="queryForm"
+        :model="informationqueryParams"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item label="科室名称" prop="departmentName" label-width="120">
+          <el-input
+            v-model="informationqueryParams.departmentName"
+            placeholder="请输入科室名称"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="informationInfoinfo"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="addresetQuerylist"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        :data="infolist"
+        @cell-dblclick="nurseclick"
+        v-loading="loading"
+      >
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="form.departmentId == scope.row.departmentCode"
+              circle
+              @click="nurseclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="departmentName"
+          label="科室名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="totaldepartment > 0"
+        :total="totaldepartment"
+        :page.sync="informationqueryParams.pageNum"
+        :limit.sync="informationqueryParams.pageSize"
+        @pagination="informationInfoinfo"
+      />
+    </el-dialog>
+    <!-- 病种弹框 -->
+    <el-dialog
+      title=""
+      :visible.sync="diseaseshowst"
+      width="1000px"
+      append-to-body
+      :before-close="canceldiseases"
+    >
+      <el-form
+        ref="queryForm"
+        :model="querydisease"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+          <el-input
+            v-model="querydisease.departmentName"
+            placeholder="请输入病种名称"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="infodisease"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetdisease"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        :data="listdisease"
+        @cell-dblclick="nurseclickdisease"
+        v-loading="loading"
+      >
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
+              circle
+              @click="nurseclickdisease(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclickdisease(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="diseaseTypeName"
+          label="病种名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="diseasetotal > 0"
+        :total="diseasetotal"
+        :page.sync="querydisease.pageNum"
+        :limit.sync="querydisease.pageSize"
+        @pagination="infodisease"
+      />
+    </el-dialog>
+    <!-- 审核弹框 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogexamine"
+      width="30%"
+      :before-close="handleClose"
+      center
+    >
+      <span style="font-size: 18px; margin-left: 55px">是否同意审核？</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelamine">同意</el-button>
+        <el-button type="primary" @click="submitamine">不同意</el-button>
+      </span>
+    </el-dialog>
+    <!-- 预览弹框 -->
+    <el-dialog
+      title="预览"
+      :visible.sync="dialogview"
+      width="30%"
+      :before-close="handleview"
+    >
+      <div class="titletop">文章模板:{{ formview.propagandaTitle }}</div>
+      <div class="bodytop">
+        <div class="titledata">{{ formview.propagandaTitle }}?</div>
+        <!-- <div class="audiotop">
+          <audio controls="controls" ref="audio"></audio>
+        </div> -->
+        <div>
+          <img src="@/assets/system/userinfo.jpg" alt="" />
+          <div class="know">知识卡片</div>
+          <div class="knowlist">
+            {{ formview.propagandaContent }}
+            <!-- 二甲双胍的用药安全性良好，已经过多年临床用药实践论证。但不用于10岁以下患者、肝功能不全患者(尤其转氨酶高于3倍正常值的患者)、肾功能异 -->
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPropaganda, getPropaganda, delPropaganda, addPropaganda, updatePropaganda, listWechatTemplateNum, copy, updateStatus } from "@/api/manage/propaganda";
+import stationAcatar from "../../system/stationAvatar/index.vue";
+import { department, listDisease } from "@/api/manage/script";
+export default {
+  name: "Propaganda",
+  components: { stationAcatar },
+  data() {
+    return {
+      itemname: null,
+      departmentName: null,
+      diseaseTypeName: null,
+      name: '',
+      departmentId: null,
+      count: '',//全部
+      DepartmentoList: [],//左侧数组
+      // 左侧传值
+      querydepartmen: {
+        departmentName: "",
+        // pageNum: 1,
+        // pageSize: 10,
+
+      },
+
+
+      innerVisibleshow: false, //科室弹框
+      // 科室
+      informationqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        departmentName: null,
+      },
+      infolist: [],
+      totaldepartment: 0,
+
+      diseaseshowst: false,//病种弹框
+      querydisease: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      listdisease: [],
+      diseasetotal: 0,
+
+
+      dialogexamine: false,//审核
+      dialogview: false,//预览
+      formview: {
+        articleSummary: null,
+        propagandaTitle: null,
+
+      },//预览数据
+      copyid: null,//复制id
+      examineid: null,//审核id
+
+      optionstype: [{
+        value: 'MEDICATION_KNOWLEDGE',
+        label: '用药知识'
+      }, {
+        value: 'DISEASE_POPULARIZATION',
+        label: '疾病科普'
+      }, {
+        value: 'SPORT_NUTRITION',
+        label: '运动营养'
+      }, {
+        value: 'OTHER_KNOWLEDGE',
+        label: '其他知识'
+      }, {
+        value: 'CUSTOMIZED_CONTENT',
+        label: '定制内容'
+      }],
+      value: '',
+      optionsstate: [{
+        value: 'CREATE_PROCESS',
+        label: '创作中'
+      }, {
+        value: 'CREATE_COMPLETE',
+        label: '创作完成'
+      }, {
+        value: 'IN_REVIEW',
+        label: '审核中'
+      }, {
+        value: 'APPROVED',
+        label: '审核通过'
+      }, {
+        value: 'REVIEW_FAILED',
+        label: '审核不通过'
+      }],
+      value: '',
+      // 遮罩层
+      // loading: true,
+      loading: false,
+
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 患者宣教信息表格数据
+      propagandaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        patientId: null,
+        propagandaId: null,
+        departmentName: null,
+        createTimeStart: null,
+        createTimeEnd: null,
+        propagandaTitle: null,
+        propagandaType: null,
+        propagandaCode: null,
+        propagandaContent: null,
+        propagandaCoverPath: null,
+        articleSummary: null,
+        voicebroadcast: null,
+        diseaseTypeName: null,
+        propagandaLink: null,
+        propagandaBarcodePath: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        departmentId: [
+          { required: true, message: "科室不能为空", trigger: "blur" }
+        ],
+        propagandaType: [
+          { required: true, message: "宣教类型不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.Departmentlist();
+    this.getList();
+    this.getlistcount();
+  },
+  watch: {
+    name(val) {
+      this.querydepartmen.departmentName = val
+      this.Departmentlist();
+    }
+  },
+  methods: {
+    // 开始时间
+    changecreateTimeStart(e) {
+      this.queryParams.createTimeStart = e
+      console.log(e)
+
+    },
+    // 结束时间
+    changecreateTimeEnd(e) {
+      this.queryParams.createTimeEnd = e
+    },
+    // 复制
+    copyUrl(row) {
+      this.copyid = row.id
+      console.log(this.copyid, '00000')
+      this.$confirm('确定复制该文章内容?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log(this.copyid)
+        copy(this.copyid).then(response => {
+          this.$message({
+            type: "success",
+            message: "复制成功"
+          });
+          this.getList()
+          this.getlistcount()
+
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消复制'
+        });
+      });
+    },
+    // 复制链接
+    copylink() {
+
+    },
+    // 预览
+    Preview(row) {
+      console.log(row)
+      const id = row.id || this.ids
+      getPropaganda(id).then(response => {
+        this.formview = response.data;
+        this.dialogview = true
+
+
+      });
+    },
+    // 关闭预览
+    handleview() {
+      this.dialogview = false
+    },
+    // 审核
+    examine(row) {
+      this.examineid = row.id
+      this.dialogexamine = true
+    },
+    // 审核同意按钮
+
+    cancelamine() {
+      var formexmine = {
+        id: this.examineid,
+        propagandaStatus: 'APPROVED'
+
+      }
+      updateStatus(formexmine).then(response => {
+        this.$message({
+          type: "success",
+          message: "审核通过"
+        });
+        this.getList()
+      });
+      this.dialogexamine = false
+
+    },
+    // 审核关闭按钮
+
+    handleClose() {
+      this.dialogexamine = false
+    },
+    // 审核不同意按钮
+
+    submitamine() {
+      var formexmine = {
+        id: this.examineid,
+        propagandaStatus: 'REVIEW_FAILED'
+
+      }
+      updateStatus(formexmine).then(response => {
+        this.$message({
+          type: "success",
+          message: "审核不通过"
+        });
+        this.getList()
+      });
+
+      this.dialogexamine = false
+    },
+    // 左侧科室列表
+    Departmentlist() {
+      this.loading = true;
+      listWechatTemplateNum(this.querydepartmen).then(response => {
+        this.DepartmentoList = response.data;
+        this.loading = false;
+      });
+    },
+    // 左侧科室
+    itemdata(item) {
+      if (item) {
+        this.itemname = item.id
+        this.departmentName = item.departmentName
+        this.loading = true;
+        this.queryParams.departmentId = item.id
+        this.getList()
+      } else {
+        this.queryParams.departmentId = ''
+        this.itemname = null
+        this.getList()
+
+      }
+    },
+    // 获取总数
+    getlistcount() {
+      var qure={
+        pageNum: 1,
+        pageSize: 10,
+
+      }
+      listPropaganda(qure).then(response => {
+        this.count = response.total;
+      });
+    },
+
+
+    /** 查询患者宣教信息列表 */
+    getList() {
+      this.loading = true;
+      listPropaganda(this.queryParams).then(response => {
+        this.propagandaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 点击科室
+    clickinnerVisible() {
+      this.innerVisibleshow = true;
+      if (this.itemname) {
+        this.informationqueryParams.departmentId = this.itemname
+
+      } else {
+        this.informationqueryParams.departmentId = null
+      }
+      this.informationInfoinfo();
+    },
+    // 科室列表
+    informationInfoinfo() {
+      department(this.informationqueryParams).then((response) => {
+        this.infolist = response.rows;
+        this.totaldepartment = response.total;
+        this.loading = false;
+      });
+      // this.informationqueryParams.page = 1;
+    },
+    // 科室名称重置
+    addresetQuerylist() {
+      this.informationqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.informationInfoinfo();
+    },
+    innerVisiblecancel() {
+      this.innerVisibleshow = false;
+    },
+    // 科室名称圆点按钮
+    nurseclick(row) {
+      this.form.departmentId = row.departmentCode;
+      this.departmentName = row.departmentName;
+      this.innerVisibleshow = false;
+    },
+
+    // 病种列表
+    infodisease() {
+      listDisease(this.querydisease).then((response) => {
+        this.listdisease = response.rows;
+        this.diseasetotal = response.total;
+        this.loading = false;
+      });
+    },
+    // 点击病种
+    clickdisease() {
+      if (this.departmentName == '请选择科室') {
+        this.$modal.msgError("请先选择科室");
+      } else {
+        this.diseaseshowst = true;
+        this.querydisease.departmentId = this.form.departmentId
+        this.infodisease()
+      }
+    },
+    // 病种名称圆点按钮
+    nurseclickdisease(row) {
+      this.form.diseaseTypeId = row.diseaseTypeCode;
+      this.diseaseTypeName = row.diseaseTypeName;
+      this.diseaseshowst = false;
+    },
+    // 重置
+    resetdisease() {
+      querydisease = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.infodisease()
+    },
+
+    canceldiseases() {
+      this.diseaseshowst = false;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        patientId: null,
+        propagandaId: null,
+        propagandaStatus:null,
+        departmentName: null,
+        propagandaTitle: null,
+        propagandaType: null,
+        propagandaCode: null,
+        propagandaContent: null,
+        propagandaCoverPath: null,
+        articleSummary: null,
+        voicebroadcast: null,
+        diseaseTypeName: null,
+        propagandaLink: null,
+        propagandaBarcodePath: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      // this.queryParams.departmentId = null;
+      this.queryParams.createTimeEnd = null,
+        this.queryParams.createTimeStart = null,
+        this.itemname = null;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.propagandaStatus='CREATE_COMPLETE'
+      if (this.itemname) {
+        this.form.departmentName = this.departmentName
+        this.form.departmentId = this.itemname
+      } else if (this.itemname == null) {
+        this.departmentName = "请选择科室"
+      }
+      else {
+        this.departmentName = "请选择科室"
+      }
+      this.diseaseTypeName = "请选择病种"
+
+      this.open = true;
+      this.title = "新增宣教";
+    },
+    /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.reset();
+    //   const id = row.id || this.ids
+    //   getPropaganda(id).then(response => {
+    //     this.form = response.data;
+    //     this.open = true;
+    //     this.title = "修改患者宣教信息";
+    //   });
+    // },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if (!this.itemname) {
+        this.$modal.msgError("请先选择科室");
+      } else {
+        // this.reset();
+        const id = row.id || this.ids
+        getPropaganda(id).then(response => {
+          this.form = response.data;
+          this.form.suitTaskTypeIds = response.data.suitTaskTypeIds
+          this.diseaseTypeName = response.data.diseaseTypeName
+          this.departmentName = response.data.departmentName
+          this.open = true;
+          this.title = "修改患者宣教信息";
+        });
+      }
+    },
+    // 上传封面
+    imgUrl(imgUrl) {
+      this.form.propagandaCoverPath = imgUrl;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            this.form.departmentName = this.departmentName
+            this.form.diseaseTypeName = this.diseaseTypeName
+            updatePropaganda(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.getlistcount()
+            });
+          } else {
+            if (this.diseaseTypeName == "请选择病种") {
+              this.form.diseaseTypeName == null
+            } else {
+              this.form.diseaseTypeName = this.diseaseTypeName
+            }
+            if (this.itemname) {
+
+              this.form.departmentName = this.departmentName
+              this.form.departmentId = this.itemname
+
+            } else {
+              this.form.departmentName = this.departmentName
+
+            }
+            addPropaganda(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.getlistcount()
+            });
+
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除该宣教信息？').then(function () {
+        return delPropaganda(ids);
+      }).then(() => {
+        this.getList();
+        this.getlistcount()
+        // var quer = {
+        //   pageNum: 1,
+        //   pageSize: 10,
+
+        // }
+        // listPropaganda(quer).then(response => {
+        //   this.count = response.total;
+        // });
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/propaganda/export', {
+        ...this.queryParams
+      }, `propaganda_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+<style lang="scss">
+.left {
+  height: 530px;
+  overflow: auto;
+  .name {
+    font-weight: 700;
+    margin-bottom: 10px;
+  }
+  .listitem {
+    width: 100%;
+    height: 50px;
+    border-bottom: 1px solid #dcdfe6;
+    .count {
+      display: inline-block;
+      position: relative;
+      // right: -172px;
+      left: 210px;
+      color: #a4a6aa;
+      top: -35px;
+      font-size: 13px;
+    }
+    .all {
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+    }
+    .allactive {
+      background: #e8f4ff;
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+      border-left: 3px solid #4d9de7;
+    }
+  }
+}
+.button {
+  display: inline-block;
+  position: relative;
+  left: 20px;
+  top: -11px;
+}
+audio {
+  width: 350px;
+
+  // background: #4d9de7;
+}
+.titletop {
+  font-size: 16px;
+  font-weight: 700;
+}
+.bodytop {
+  position: relative;
+  top: 20px;
+  height: 500px;
+  overflow: auto;
+  border: 1px solid #e2e2e2;
+  .titledata {
+    margin: 30px 0px 15px 30px;
+    top: 14px;
+    font-size: 20px;
+  }
+  .audiotop {
+    margin: 10px 0px 10px 30px;
+  }
+  img {
+    width: 362px;
+    height: 127px;
+    margin: 0px 0px 0px 30px;
+  }
+  .know {
+    margin: 11px 0px 10px 30px;
+    font-size: 16px;
+  }
+  .knowlist {
+    margin: 10px 0px 10px 30px;
+    font-size: 16px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
new file mode 100644
index 0000000..568e8cf
--- /dev/null
+++ b/src/views/manage/signRecord/index.vue
@@ -0,0 +1,497 @@
+<template>
+  <div class="app-container">
+    <el-tabs v-model="queryParams.serviceStatus" @tab-click="handleClick">
+      <el-tab-pane label="意向签约" name="INTENTIONAL_SIGNING"></el-tab-pane>
+      <el-tab-pane label="服务中" name="SERVICE_CENTER"></el-tab-pane>
+      <el-tab-pane label="服务结束" name="SERVICE_END"></el-tab-pane>
+      <el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane>
+    </el-tabs>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
+      <el-form-item label="加入意向时间" prop="intentionalTimeStart" label-width="110px"
+        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
+        <el-date-picker v-model="intentionalTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="签约时间" prop="signTimeStart" v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
+        <el-date-picker v-model="signTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="到期时间" prop="serviceEndTimeStart" v-if="queryParams.serviceStatus == 'SERVICE_END'">
+        <el-date-picker v-model="serviceEndTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="提交时间" prop="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
+        <el-date-picker v-model="submissionTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="医院" prop="hospitalAgencyId">
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
+      <el-form-item label="就诊方式" prop="visitMethod">
+        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="签约时诊断" prop="signDiagnosis">
+        <el-input v-model="queryParams.signDiagnosis" placeholder="请输入签约时诊断" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item label="意向来源" prop="intentionalSource">
+        <el-input v-model="queryParams.intentionalSource" placeholder="请输入意向来源" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开单医生" prop="billingDoctorName">
+        <el-input v-model="queryParams.billingDoctorName" placeholder="请输入开单医生姓名" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="患者姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <el-form-item label="患者电话" prop="patientPhone">
+        <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <!-- <el-form-item label="身份证号" prop="cardNo">
+        <el-input v-model="queryParams.cardNo" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['manage:signRecord:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['manage:signRecord:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['manage:signRecord:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['manage:signRecord:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+    <el-table v-loading="loading" :data="signRecordList" @selection-change="handleSelectionChange">
+      <el-table-column label="序号" type="index" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="patientName" />
+      <el-table-column label="电话" align="center" prop="patientPhone" width="130" />
+      <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
+      <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+      <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
+      <el-table-column label="院区" align="center" prop="campusAgencyName" />
+      <el-table-column label="科室" align="center" prop="departmentName" />
+      <el-table-column label="病区" align="center" prop="wardName" />
+      <el-table-column label="就诊方式" align="center" prop="visitMethod">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
+        </template>
+      </el-table-column>
+      <el-table-column label="意向来源" align="center" prop="intentionalSource"
+        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'" />
+      <el-table-column label="患者来源" align="center" prop="intentionalSource" v-else />
+      <el-table-column label="签约时间" align="center" prop="signTime" width="180"
+        v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.signTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="加入意向时间" align="center" prop="intentionalTime" width="180"
+        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.intentionalTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="服务包名称" align="center" prop="packageName" width="130"
+        v-if="queryParams.serviceStatus != 'INTENTIONAL_SIGNING'" />
+      <div v-else>
+        <el-table-column label="开单医生" align="center" prop="billingDoctorName" />
+        <el-table-column label="金额" align="center" prop="price" />
+        <el-table-column label="缴费状态" align="center" prop="paymentStatus">
+          <template slot-scope="scope">
+            <span>{{ scope.row.paymentStatus == 'PAID' ? '已缴费' : '' }}
+              {{ scope.row.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
+            </span>
+          </template>
+        </el-table-column>
+      </div>
+      <el-table-column label="签约时长" align="center" prop="serviceCycle">
+        <template slot-scope="scope">
+          <span>{{ scope.row.serviceCycle }}月</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="服务状态" align="center"
+        prop="serviceStatus" >
+      ，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
+        </el-table-column> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handlenewsign(scope.row)"
+            v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">签约</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">忽略</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">详情</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">取消签约</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">续约</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { getAge } from "@/utils/age";
+import { listSignRecord, getSignRecord, delSignRecord, addSignRecord, updateSignRecord } from "@/api/manage/signRecord";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
+
+export default {
+  dicts: ['visit_method'],
+  name: "SignRecord",
+  data() {
+    return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 签约记录表格数据
+      signRecordList: [],
+      intentionalTime: [],
+      signTime: [],
+      serviceEndTime: [],
+      submissionTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        patientName: null,
+        patientPhone: null,
+        cardNo: null,
+        signTimeStart: null,
+        signTimeEnd: null,
+        hospitalAgencyId: null,
+        campusAgencyId: null,
+        departmentId: null,
+        wardId: null,
+        wardName: null,
+        visitMethod: null,
+        signDiagnosis: null,
+        serviceStatus: 'INTENTIONAL_SIGNING',
+        intentionalSource: null,
+        intentionalTimeStart: null,
+        intentionalTimeEnd: null,
+        billingDoctorName: null,
+        paymentStatus: null,
+        serviceEndTimeStart: null,
+        serviceEndTimeEnd: null,
+        submissionTimeStart: null,
+        submissionTimeEnd: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        patientId: [
+          { required: true, message: "患者信息表id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.selectAgencyinfo();
+    this.getList();
+  },
+  methods: {
+    /** 查询签约记录列表 */
+    getList() {
+      this.loading = true;
+      listSignRecord(this.queryParams).then(response => {
+        this.signRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        patientId: null,
+        patientName: null,
+        patientPhone: null,
+        cardNo: null,
+        signTime: null,
+        hospitalAgencyId: null,
+        hospitalAgencyName: null,
+        campusAgencyId: null,
+        campusAgencyName: null,
+        departmentId: null,
+        departmentName: null,
+        wardId: null,
+        wardName: null,
+        visitSerialNumber: null,
+        visitMethod: null,
+        signDiagnosis: null,
+        reviewDiagnosis: null,
+        serviceStatus: "0",
+        signStatus: "0",
+        intentionalSource: null,
+        intentionalTime: null,
+        billingDoctorId: null,
+        billingDoctorName: null,
+        price: null,
+        paymentStatus: "0",
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.intentionalTime.length > 0) {
+        this.queryParams.intentionalTimeStart = this.intentionalTime[0]
+        this.queryParams.intentionalTimeEnd = this.intentionalTime[1]
+      }
+      if (this.signTime.length > 0) {
+        this.queryParams.signTimeStart = this.signTime[0]
+        this.queryParams.signTimeEnd = this.signTime[1]
+      }
+      if (this.serviceEndTime.length > 0) {
+        this.queryParams.serviceEndTimeStart = this.serviceEndTime[0]
+        this.queryParams.serviceEndTimeEnd = this.serviceEndTime[1]
+      }
+      if (this.submissionTime.length > 0) {
+        this.queryParams.submissionTimeStart = this.submissionTime[0]
+        this.queryParams.submissionTimeEnd = this.submissionTime[1]
+      }
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.intentionalTime = []
+      this.signTime = []
+      this.queryParams.signTimeStart = null
+      this.queryParams.signTimeEnd = null
+      this.queryParams.intentionalTimeStart = null
+      this.queryParams.intentionalTimeEnd = null
+      this.serviceEndTime = []
+      this.submissionTime = []
+      this.queryParams.serviceEndTimeStart = null
+      this.queryParams.serviceEndTimeEnd = null
+      this.queryParams.submissionTimeStart = null
+      this.queryParams.submissionTimeEnd = null
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSignRecord(id).then(response => {
+        this.form = response.data;
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除签约记录编号为"' + ids + '"的数据项？').then(function () {
+        return delSignRecord(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/signRecord/export', {
+        ...this.queryParams
+      }, `signRecord_${new Date().getTime()}.xlsx`)
+    },
+    handleClick(tab, event) {
+      this.intentionalTime = []
+      this.queryParams.intentionalTimeStart = null
+      this.queryParams.intentionalTimeEnd = null
+      this.signTime = []
+      this.queryParams.signTimeStart = null
+      this.queryParams.signTimeEnd = null
+      this.getList();
+    },
+    // 格式化日期格式如：2017-9-19 18:04:33
+    formatDate(value) {
+      if (!value) {
+        return
+      }
+      // 计算日期相关值
+      let time = new Date(value)
+      let Y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      let D = time.getDate();
+      let h = time.getHours();
+      let m = time.getMinutes();
+      let s = time.getSeconds();
+      // 如果传递了type的话
+      return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+    },
+    handlenewsign(row) {
+      this.$router.push({
+        path: "/patient/newSigning",
+        query: {
+          patientName: row.patientName,
+          patientPhone: row.patientPhone,
+          visitMethod: row.visitMethod,
+          mainDiagnosis: row.mainDiagnosis,
+          visitSerialNumber: row.visitSerialNumber,
+          hospitalAgencyName: row.hospitalAgencyName,
+          departmentName: row.departmentName,
+          paymentStatus: row.paymentStatus,
+          sex: row.sex,
+          age: row.birthDate ? getAge(row.birthDate) : '',
+          patientId: row.id,
+          createTime: row.createTime,
+        },
+      });
+    },
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        this.campusAgencylist = res.data
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.departmentlist = res.data
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.wardlist = res.data
+        this.queryParams.wardId = null
+      })
+    },
+    //清空医院
+    clearhospitalAgency() {
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空医院
+    clearhospitalAgency() {
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空院区
+    clearcampusAgency() {
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空科室
+    cleardepartment() {
+      this.queryParams.wardId = null
+    },
+  }
+};
+</script>
diff --git a/src/views/manage/template/index.vue b/src/views/manage/template/index.vue
index f75bfe9..d2ef07e 100644
--- a/src/views/manage/template/index.vue
+++ b/src/views/manage/template/index.vue
@@ -133,6 +133,7 @@
             label="适用任务类型"
             align="center"
             prop="suitTaskTypeName"
+            :show-overflow-tooltip="true"
           />
           <el-table-column
             label="病种名称"
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index be453a1..a1a6655 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -34,20 +34,31 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
@@ -221,17 +232,32 @@
         <el-form-item label="主治医生" prop="attendingPhysician">
           <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyName">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyName">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="病区" prop="wardName">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+        <el-form-item label="预约病区" prop="wardId" v-if="form.departmentId">
+          <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="住院号" prop="admissionNumber">
           <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
@@ -342,16 +368,32 @@
     </el-dialog>
   </div>
 </template>
-
 <script>
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "visitin",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
       //导入
       fileList: [],
       // 遮罩层
@@ -406,11 +448,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
+        visitMethod: [
+          { required: true, message: '请输入就诊方式', trigger: 'change' }
+        ],
+        admissionDate: [
+          { required: true, message: '请选择患者入院时间', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -505,6 +560,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.admissionDate = []
+      this.queryParams.admissionDateStart = ''
       this.queryParams.admissionDateEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
@@ -527,6 +584,15 @@ export default {
       const id = row.id || this.ids
       getPatientInfo(id).then(response => {
         this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
         this.open = true;
         this.title = "修改患者信息";
       });
@@ -585,6 +651,107 @@ export default {
     uploadcancel() {
       this.uploadopen = false
     },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 995ac3b..1ce7067 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -34,20 +34,31 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
@@ -224,17 +235,32 @@
         <el-form-item label="主治医生" prop="attendingPhysician">
           <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyName">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyName">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="病区" prop="wardName">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+        <el-form-item label="预约病区" prop="wardId" v-if="form.departmentId">
+          <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="门诊号" prop="outpatientNumber" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
           <el-input v-model="form.outpatientNumber" placeholder="请输入门诊号" style="width:200px" />
@@ -353,12 +379,29 @@
 <script>
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "visitout",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
       //导入
       fileList: [],
       // 遮罩层
@@ -413,11 +456,27 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
+        visitMethod: [
+          { required: true, message: '请输入就诊方式', trigger: 'change' }
+        ],
+        admissionDate: [
+          { required: true, message: '请选择患者入院时间', trigger: 'change' }
+        ],
+        visitTime: [
+          { required: true, message: '请选择患者就诊时间', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -511,6 +570,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dischargeDate = []
+      this.queryParams.dischargeDateStart = ''
       this.queryParams.dischargeDateEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
@@ -533,6 +594,16 @@ export default {
       const id = row.id || this.ids
       getPatientInfo(id).then(response => {
         this.form = response.data;
+        this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
         this.open = true;
         this.title = "修改患者信息";
       });
@@ -596,6 +667,107 @@ export default {
     uploadcancel() {
       this.uploadopen = false
     },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/system/manage/propaganda/index.vue b/src/views/system/manage/propaganda/index.vue
new file mode 100644
index 0000000..a6604c5
--- /dev/null
+++ b/src/views/system/manage/propaganda/index.vue
@@ -0,0 +1,391 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="患者信息表id" prop="patientId">
+        <el-input
+          v-model="queryParams.patientId"
+          placeholder="请输入患者信息表id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教表id" prop="propagandaId">
+        <el-input
+          v-model="queryParams.propagandaId"
+          placeholder="请输入宣教表id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属科室名称" prop="departmentName">
+        <el-input
+          v-model="queryParams.departmentName"
+          placeholder="请输入所属科室名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教标题" prop="propagandaTitle">
+        <el-input
+          v-model="queryParams.propagandaTitle"
+          placeholder="请输入宣教标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教ID" prop="propagandaCode">
+        <el-input
+          v-model="queryParams.propagandaCode"
+          placeholder="请输入宣教ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教封面文件存放地址" prop="propagandaCoverPath">
+        <el-input
+          v-model="queryParams.propagandaCoverPath"
+          placeholder="请输入宣教封面文件存放地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属病种名称" prop="diseaseTypeName">
+        <el-input
+          v-model="queryParams.diseaseTypeName"
+          placeholder="请输入所属病种名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教链接" prop="propagandaLink">
+        <el-input
+          v-model="queryParams.propagandaLink"
+          placeholder="请输入宣教链接"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宣教二维码图片存放地址" prop="propagandaBarcodePath">
+        <el-input
+          v-model="queryParams.propagandaBarcodePath"
+          placeholder="请输入宣教二维码图片存放地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['manage:propaganda:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['manage:propaganda:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['manage:propaganda:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['manage:propaganda:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="propagandaList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="患者信息表id" align="center" prop="patientId" />
+      <el-table-column label="宣教表id" align="center" prop="propagandaId" />
+      <el-table-column label="所属科室名称" align="center" prop="departmentName" />
+      <el-table-column label="宣教标题" align="center" prop="propagandaTitle" />
+      <el-table-column label="宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，
+定制内容：CUSTOMIZED_CONTENT" align="center" prop="propagandaType" />
+      <el-table-column label="宣教ID" align="center" prop="propagandaCode" />
+      <el-table-column label="宣教正文内容" align="center" prop="propagandaContent" />
+      <el-table-column label="宣教封面文件存放地址" align="center" prop="propagandaCoverPath" />
+      <el-table-column label="宣教文章摘要" align="center" prop="articleSummary" />
+      <el-table-column label="语音播报" align="center" prop="voicebroadcast" />
+      <el-table-column label="所属病种名称" align="center" prop="diseaseTypeName" />
+      <el-table-column label="宣教链接" align="center" prop="propagandaLink" />
+      <el-table-column label="宣教二维码图片存放地址" align="center" prop="propagandaBarcodePath" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:propaganda:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:propaganda:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改患者宣教信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="患者信息表id" prop="patientId">
+          <el-input v-model="form.patientId" placeholder="请输入患者信息表id" />
+        </el-form-item>
+        <el-form-item label="宣教表id" prop="propagandaId">
+          <el-input v-model="form.propagandaId" placeholder="请输入宣教表id" />
+        </el-form-item>
+        <el-form-item label="所属科室名称" prop="departmentName">
+          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
+        </el-form-item>
+        <el-form-item label="宣教标题" prop="propagandaTitle">
+          <el-input v-model="form.propagandaTitle" placeholder="请输入宣教标题" />
+        </el-form-item>
+        <el-form-item label="宣教ID" prop="propagandaCode">
+          <el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" />
+        </el-form-item>
+        <el-form-item label="宣教正文内容">
+          <editor v-model="form.propagandaContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="宣教封面文件存放地址" prop="propagandaCoverPath">
+          <el-input v-model="form.propagandaCoverPath" placeholder="请输入宣教封面文件存放地址" />
+        </el-form-item>
+        <el-form-item label="宣教文章摘要" prop="articleSummary">
+          <el-input v-model="form.articleSummary" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="语音播报" prop="voicebroadcast">
+          <el-input v-model="form.voicebroadcast" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="所属病种名称" prop="diseaseTypeName">
+          <el-input v-model="form.diseaseTypeName" placeholder="请输入所属病种名称" />
+        </el-form-item>
+        <el-form-item label="宣教链接" prop="propagandaLink">
+          <el-input v-model="form.propagandaLink" placeholder="请输入宣教链接" />
+        </el-form-item>
+        <el-form-item label="宣教二维码图片存放地址" prop="propagandaBarcodePath">
+          <el-input v-model="form.propagandaBarcodePath" placeholder="请输入宣教二维码图片存放地址" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPropaganda, getPropaganda, delPropaganda, addPropaganda, updatePropaganda } from "@/api/manage/propaganda";
+
+export default {
+  name: "Propaganda",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 患者宣教信息表格数据
+      propagandaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        patientId: null,
+        propagandaId: null,
+        departmentName: null,
+        propagandaTitle: null,
+        propagandaType: null,
+        propagandaCode: null,
+        propagandaContent: null,
+        propagandaCoverPath: null,
+        articleSummary: null,
+        voicebroadcast: null,
+        diseaseTypeName: null,
+        propagandaLink: null,
+        propagandaBarcodePath: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        patientId: [
+          { required: true, message: "患者信息表id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询患者宣教信息列表 */
+    getList() {
+      this.loading = true;
+      listPropaganda(this.queryParams).then(response => {
+        this.propagandaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        patientId: null,
+        propagandaId: null,
+        departmentName: null,
+        propagandaTitle: null,
+        propagandaType: null,
+        propagandaCode: null,
+        propagandaContent: null,
+        propagandaCoverPath: null,
+        articleSummary: null,
+        voicebroadcast: null,
+        diseaseTypeName: null,
+        propagandaLink: null,
+        propagandaBarcodePath: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加患者宣教信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPropaganda(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改患者宣教信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePropaganda(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPropaganda(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除患者宣教信息编号为"' + ids + '"的数据项？').then(function() {
+        return delPropaganda(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/propaganda/export', {
+        ...this.queryParams
+      }, `propaganda_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
new file mode 100644
index 0000000..1249f4c
--- /dev/null
+++ b/src/views/system/stationAvatar/index.vue
@@ -0,0 +1,463 @@
+<template>
+  <div>
+    <div class="user-info-head" :class="video.VideoPath ? 'wihi' : ''" @click="editCropper()">
+      <video
+        style="width: 208px; height: 208px"
+        v-if="video.VideoPath"
+        v-bind:src="video.VideoPath"
+        class="avatar video-avatar"
+        controls="controls"
+      >您的浏览器不支持视频播放</video>
+      <img
+        v-if="options.img"
+        v-bind:src="options.img"
+        title="点击上传图片"
+        style="width: 100px; height: 100px; line-height: 200px"
+      />
+      <i
+        v-else-if="!options.img && !video.VideoPath"
+        class="el-icon-plus avatar-uploader-icon"
+        style="
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+        "
+      ></i>
+    </div>
+    <el-dialog
+      :title="title"
+      :visible.sync="openimg"
+      width="950px"
+      append-to-body
+      @opened="modalOpened"
+      @close="closeDialog"
+    >
+      <el-row>
+        <el-col :xs="24" :md="0" :style="{ height: '350px' }">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+          <div class="avatar-upload-preview">
+            <video
+              style="width: 100%; height: 100%"
+              v-if="videoForm.showVideoPath"
+              v-bind:src="videoForm.showVideoPath"
+              class="avatar video-avatar"
+              controls="controls"
+            >您的浏览器不支持视频播放</video>
+            <img style="width: 100%; height: 100%" v-if="previews.url" :src="previews.url" />
+            <div v-else></div>
+          </div>
+          <div
+            class="title"
+            v-if="
+              types != 'posterVideoUrl' &&
+              types != 'posterPictureUrl' &&
+              types != 'itemDirectoryUrl'
+            "
+          >请上传图片为800x800px的正方形</div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload
+            action="#"
+            :http-request="requestUpload"
+            :show-file-list="false"
+            :before-upload="beforeUpload"
+          >
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <!-- <el-col :lg="{ span: 1, offset: 2 }" :md="2">
+          <el-button
+            icon="el-icon-plus"
+            size="small"
+            @click="changeScale(1)"
+          ></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button
+            icon="el-icon-minus"
+            size="small"
+            @click="changeScale(-1)"
+          ></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button
+            icon="el-icon-refresh-left"
+            size="small"
+            @click="rotateLeft()"
+          ></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button
+            icon="el-icon-refresh-right"
+            size="small"
+            @click="rotateRight()"
+          ></el-button>
+        </el-col>-->
+        <el-col :lg="{ span: 2, offset: 19 }" :md="2">
+          <el-button v-if="uploadbtn" type="primary" size="small" @click="uploadImg()">提 交</el-button>
+          <el-button v-else :loading="!uploadbtn" type="primary" size="small">提 交 中...</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { VueCropper } from "vue-cropper";
+import {
+  updateNurseStationHeads,
+  posts,
+  uploadVideoUrl,
+  uploadTrainingCategoryPicture,
+  updatePoserHeads,
+  uploadUrl,
+  uploadFilefm
+} from "@/api/system/stationAvatar.js";
+
+export default {
+  components: { VueCropper },
+  props: ["img", "type", "item", "tovideo"],
+  data() {
+    return {
+      uploadbtn: true, //上传中不允许点击
+      imageUrl: "",
+      types: "",
+      // 是否显示弹出层
+      openimg: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "上传图片/视频",
+      options: {
+        img: null, //裁剪图片的地址
+        autoCrop: true, // 是否默认生成截图框
+        autoCropWidth: 300, // 默认生成截图框宽度
+        autoCropHeight: 300, // 默认生成截图框高度
+        fixedBox: true // 固定截图框大小 不允许改变
+      },
+      previews: {},
+      items: {},
+      //显示上传按钮
+      videoForm: {
+        showVideoPath: null //回显的变量
+      },
+      video: {
+        VideoPath: null //回显的变量
+      }
+    };
+  },
+  created() {
+    this.types = this.type;
+    this.items = this.item;
+    if (this.tovideo == null) {
+      this.video.VideoPath = null;
+    } else if (this.tovideo == "") {
+      this.video.VideoPath = null;
+    } else {
+      this.video.VideoPath = process.env.VUE_APP_BASE_API + this.tovideo;
+    }
+    if (this.img == null) {
+      this.options.img = null;
+    } else if (this.img == "") {
+      this.options.img = null;
+    } else {
+      this.options.img = process.env.VUE_APP_BASE_API + this.img;
+    }
+    if (this.types == "posterVideoUrl" || this.types == "itemDirectoryUrl") {
+      this.title = "上传视频";
+    } else {
+      this.title = "上传图片";
+    }
+  },
+  watch: {
+    tovideo: {
+      handler(newimg, oldimg) {
+        if (this.tovideo == null) {
+          this.video.VideoPath = null;
+        } else if (this.tovideo == "") {
+          this.video.VideoPath = null;
+        } else {
+          this.video.VideoPath = process.env.VUE_APP_BASE_API + this.tovideo;
+        }
+      }
+    },
+    item: {
+      handler(newimg, oldimg) {
+        this.items = this.item;
+      }
+    },
+    img: {
+      handler(newimg, oldimg) {
+        if (this.img == null) {
+          this.options.img = null;
+        } else if (this.img == "") {
+          this.options.img = null;
+        } else {
+          this.options.img = process.env.VUE_APP_BASE_API + this.img;
+        }
+      }
+    },
+    type: {
+      handler(newimg, oldimg) {
+        this.types = this.type;
+      }
+    }
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.openimg = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {},
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      console.log(file)
+      if (this.types == "posterVideoUrl" || this.types == "itemDirectoryUrl") {
+        const reader = new FileReader();
+        this.previews.data = file;
+        this.videoForm.showVideoPath = URL.createObjectURL(file);
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+
+        };
+      } else {
+        if (file.type.indexOf("image/") == -1) {
+          this.$modal.msgError(
+            "文件格式错误，请上传图片类型,如:JPG,PNG后缀的文件。"
+          );
+        } else {
+          const reader = new FileReader();
+          this.previews.data = file;
+          this.previews.url = URL.createObjectURL(file);
+          reader.readAsDataURL(file);
+          reader.onload = () => {
+            this.options.img = reader.result;
+          };
+        }
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.uploadbtn = true;
+      let formData = new FormData();
+      if (this.previews.data) {
+        formData.append("file", this.previews.data);
+        formData.append("type", this.types);
+        if (this.types == "itemDirectoryUrl") {
+          this.$modal.msgSuccess("上传视频中,请耐心等待");
+          this.uploadbtn = false;
+          uploadVideoUrl(formData).then(response => {
+            if (response.code == 200) {
+              this.video.VideoPath =
+                process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.items.itemDirectoryUrl = response.imgUrl;
+              this.$emit("item", JSON.stringify(this.items));
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+            this.uploadbtn = true;
+          });
+        } else if (
+          this.types == "trainingItemCoverUrl" ||
+          this.types == "trainingItemContentUrl" ||
+          this.types == "trainingItemPosterUrl"
+        ) {
+          uploadUrl(formData).then(response => {
+            if (response.code == 200) {
+              this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+        } else if (this.types == "trainingCategoryPictureUrl") {
+          uploadTrainingCategoryPicture(formData).then(response => {
+            if (response.code == 200) {
+              this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+        } else if (this.types == "posterVideoUrl") {
+          updatePoserHeads(formData).then(response => {
+            if (response.code == 200) {
+              this.video.VideoPath =
+                process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+        // 封面上传
+        } else if(this.types == "propagandaCoverUrl"){
+          uploadFilefm(formData).then(response => {
+            if (response.code == 200) {
+              this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+
+        }
+        else {
+          updateNurseStationHeads(formData).then(response => {
+            if (response.code == 200) {
+              this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              if (this.types == "attributePitureUrl") {
+                this.items.attributePitureUrl = response.imgUrl;
+                this.$emit("item", JSON.stringify(this.items));
+              }
+              if (this.types == "nurseItemClassifyUrl") {
+                this.items.classifyPictureUrl = response.imgUrl;
+                this.$emit("item", JSON.stringify(this.items));
+              }
+              if (this.types == "nurseStationClassifyUrl") {
+                this.items.classifyPictureUrl = response.imgUrl;
+                this.$emit("item", JSON.stringify(this.items));
+              }
+              if (this.types == "posterPictureUrl") {
+                this.items.posterPictureUrl = response.imgUrl;
+                this.$emit("item", JSON.stringify(this.items));
+              }
+              if (this.types == "certificateUrl") {
+                this.items.certificateUrl = response.imgUrl;
+                this.$emit("item", JSON.stringify(this.items));
+              }
+              if (this.types == "personCertificateUrl") {
+                this.items.certificateUrl = response.imgUrl;
+                this.$emit("item", JSON.stringify(this.items));
+              }
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+        }
+      } else {
+        this.openimg = false;
+      }
+      // this.videoForm.showVideoPath = null;
+      this.previews.data = null;
+    },
+    // 实时预览
+    realTime(data) {
+      // this.previews = data;
+    },
+    // 关闭窗口
+    closeDialog() {
+      this.imgs = "";
+      this.visible = false;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.title {
+  position: absolute;
+  bottom: 5%;
+  left: 50%;
+  transform: translate(-50%, 0%);
+}
+.avatar-upload-preview {
+  position: absolute;
+  top: 0%;
+  left: 50%;
+  transform: translate(-50%, 0%);
+  width: 300px;
+  height: 300px;
+  border-radius: 0%;
+  box-shadow: 0 0 4px #ccc;
+  overflow: hidden;
+}
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  background: #fafafa;
+  width: 100px;
+  height: 100px;
+}
+
+.user-info-head:hover:after {
+  content: "";
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+.wihi {
+  background-color: #fff;
+  width: 100px;
+  height: 100px;
+}
+.wihi:hover:after {
+  transform: translate(50%, 50%);
+}
+</style>