Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/system/followupdetails/index.vue

src/api/system/dict/code.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}

src/api/system/dict/type.js

@@ -16,6 +16,13 @@ export function getType(dictId) {
     method: 'get'
   })
 }
+// 查询字典编码详情
+export function getTypecode(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
 
 // 新增字典类型
 export function addType(data) {

src/components/myPagination/index.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="pagination">
-        <button style="background-color: #ffff">共 {{ totalPage }} 条</button>
+        <button style="background-color: #ffff">共 {{ total }} 条</button>
-        <el-select v-model="currentpageSize" placeholder="请选择" style="width: 100px;" size="mini" @change="changesize">
+        <el-select v-model="currentpageSize" placeholder="请选择" style="width: 100px;margin-right:16px" size="mini"
+            @change="changesize">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
         </el-select>
@@ -12,7 +13,7 @@
             @mouseenter="onMouseenter('left')" @mouseleave="quickprevIconClass = 'el-icon-more'">
         </button>
         <template v-for="(item, index) in totalPage">
-            <button :class="{ active: currentPage === item }" :key="index"
+            <button :class="{ active: Number(currentPage) === item }" :key="index"
                 v-if="item >= startEnd.start && item <= startEnd.end" @click="updateCPage(item)">{{ item }}</button>
         </template>
         <button v-if="startEnd.end < totalPage - 1" icon="el-icon-more"
@@ -22,6 +23,12 @@
         </button>
         <button v-if="startEnd.end < totalPage" @click="updateCPage(totalPage)">{{ totalPage }}</button>
         <button @click="updateCPage(currentPage + 1)" :disabled="currentPage >= totalPage">下一页</button>
+        <span style="margin-left:16px">
+            前往
+            <el-input v-model="page" min="1" :max="totalPage" style="width: 50px;margin:0 6px;" size="mini"
+                @focus="foucus" @keyup.enter.native="blur" @blur="blur"></el-input>
+            页
+        </span>
     </div>
 </template>
 
@@ -43,6 +50,7 @@ export default {
         return {
             lxyms: 7,
             currentPage: this.indexFromWrap,
+            page: this.indexFromWrap,
             quickprevIconClass: "el-icon-more",
             quicknextIconClass: 'el-icon-more',
             options: [{
@@ -102,7 +110,19 @@ export default {
         }
     },
     methods: {
+        foucus() { },
+        blur() {
+            if (!this.page) {
+                this.page = 1
+            }
+            if (this.page > this.totalPage) {
+                this.page = this.totalPage
+            }
+            this.updateCPage(Number(this.page))
+        },
         changesize() {
+            this.currentPage = 1
+            this.page = 1
             this.$emit("updateCPage", this.currentPage, this.currentpageSize)
         },
         onMouseenter(direction) {
@@ -128,6 +148,13 @@ export default {
         }
     },
     watch: {
+        currentPage: {
+            handler(val) {
+                this.page = val
+            },
+            deep: true,
+            immediate: true
+        },
         //监听当前页下标
         indexFromWrap: {
             handler(val) {
@@ -148,14 +175,38 @@ export default {
     height: 40px;
     margin: 0 !important;
     padding: 0 !important;
+    display: flex;
+    align-items: center;
+
+    ::v-deep .el-input__inner {
+        padding: 0 !important;
+        font-size: 13px;
+        text-align: center;
+    }
+
+    ::v-deep .el-input--suffix {
+        .el-input__inner {
+            padding-right: 20px !important;
+        }
+    }
+
+    span {
+        display: inline-block;
+        font-size: 13px;
+        min-width: 35.5px;
+        height: 28px;
+        line-height: 28px;
+        vertical-align: top;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+    }
 
     button {
         margin: 0 5px;
         background-color: #f4f4f5;
-        color: #606266;
+        color: black;
         outline: none;
         border-radius: 2px;
-        padding: 0 8px;
         vertical-align: top;
         display: inline-block;
         font-size: 13px;

src/main.js

@@ -26,6 +26,7 @@ import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/xinelu";
 // 分页组件
 import Pagination from "@/components/Pagination";
+import myPagination from "@/components/myPagination";
 // 自定义表格工具组件
 import RightToolbar from "@/components/RightToolbar"
 // 富文本组件
@@ -63,6 +64,7 @@ Vue.prototype.handleTree = handleTree
 Vue.component('font-awesome-icon', FontAwesomeIcon)
 Vue.component('DictTag', DictTag)
 Vue.component('Pagination', Pagination)
+Vue.component('myPagination', myPagination)
 Vue.component('RightToolbar', RightToolbar)
 Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)

src/router/index.js

@@ -134,6 +134,20 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/system/dict-code',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index/:dictCode(\\d+)',
+        component: () => import('@/views/system/dict/code'),
+        name: 'Code',
+        meta: { title: '字典编码', activeMenu: '/system/dict' }
+      }
+    ]
+  },
   {
     path: '/monitor/job-log',
     component: Layout,

src/views/manage/Datadetails/index.vue

@@ -262,6 +262,7 @@
         :page.sync="informationqueryParams.pageNum"
         :limit.sync="informationqueryParams.pageSize"
         @pagination="informationInfoinfo"
+        class="pag"
       />
     </el-dialog>
     <!-- 运动弹框 -->
@@ -388,6 +389,7 @@
         :page.sync="SporParams.pageNum"
         :limit.sync="SporParams.pageSize"
         @pagination="spotgetList"
+        class="pag"
       />
     </el-dialog>
     <!-- 饮食弹框 -->
@@ -508,6 +510,7 @@
         :page.sync="DieParams.pageNum"
         :limit.sync="DieParams.pageSize"
         @pagination="DiegetList"
+        class="pag"
       />
     </el-dialog>
     <!-- 护理弹框 -->
@@ -608,6 +611,7 @@
         :page.sync="NursingParams.pageNum"
         :limit.sync="NursingParams.pageSize"
         @pagination="NursinggetList"
+        class="pag"
       />
     </el-dialog>
   </div>
@@ -977,6 +981,12 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.pag{
+  top: 13px;
+    position: relative;
+    left: 61%;
+  
+}
 ::v-deep .el-card__body {
   position: relative;
 }

src/views/manage/message/index.vue

@@ -219,7 +219,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
     </el-dialog>
     <!-- 病种弹框 -->
     <el-dialog title="" :visible.sync="diseaseshowst" width="1000px" append-to-body :before-close="canceldiseases">
@@ -247,7 +247,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="diseasetotal > 0" :total="diseasetotal" :page.sync="querydisease.pageNum"
-        :limit.sync="querydisease.pageSize" @pagination="infodisease" />
+        :limit.sync="querydisease.pageSize" @pagination="infodisease" class="pag"/>
     </el-dialog>
   </div>
 </template>
@@ -733,6 +733,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.pag{
+  top: 13px;
+    position: relative;
+    left: 61%;
+  
+}
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/manage/newSigning/index.vue

@@ -343,6 +343,8 @@ export default {
     width: 98%;
     margin: 0 auto;
     border-radius: 8px;
+    height: calc(100% - 5px);
+    overflow: auto;
     }
 
     .btns {

src/views/manage/projectdevice/index.vue

@@ -190,7 +190,7 @@
         patientPhone
       </el-table>
       <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
     </el-dialog>
   </div>
 </template>
@@ -486,3 +486,11 @@ export default {
   },
 };
 </script>
+<style scoped>
+.pag{
+  top: 13px;
+    position: relative;
+    left: 61%;
+  
+}
+</style>

src/views/manage/propaganda/index.vue

@@ -324,7 +324,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="diseasetotal > 0" :total="diseasetotal" :page.sync="querydisease.pageNum"
-        :limit.sync="querydisease.pageSize" @pagination="infodisease" />
+        :limit.sync="querydisease.pageSize" @pagination="infodisease" class="pag"/>
     </el-dialog>
     <!-- 审核弹框 -->
     <el-dialog title="提示" :visible.sync="dialogexamine" width="30%" :before-close="handleClose" center>
@@ -1202,10 +1202,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// ::v-deep .el-form-item--medium .el-form-item__content{
+.pag{
-//   width: 800px;
+  top: 13px;
-
+    position: relative;
-// }
+    left: 61%;
+}
 ::v-deep iframe {
   width: 100%;
   height: 500px;

src/views/manage/script/index.vue

@@ -201,7 +201,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
     </el-dialog>
     <!-- 病种弹框 -->
     <el-dialog title="" :visible.sync="diseaseshowst" width="1000px" append-to-body :before-close="canceldiseases">
@@ -229,7 +229,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="diseasetotal > 0" :total="diseasetotal" :page.sync="querydisease.pageNum"
-        :limit.sync="querydisease.pageSize" @pagination="infodisease" />
+        :limit.sync="querydisease.pageSize" @pagination="infodisease" class="pag"/>
     </el-dialog>
     <!-- 预览弹框 -->
     <el-dialog title="预览" :visible.sync="dialogsee" width="40%" :before-close="seeClose">
@@ -895,6 +895,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.pag{
+  top: 13px;
+    position: relative;
+    left: 61%;
+  
+}
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/manage/template/index.vue

@@ -173,7 +173,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
     </el-dialog>
     <!-- 病种弹框 -->
     <el-dialog title="" :visible.sync="diseaseshowst" width="1000px" append-to-body :before-close="canceldiseases">
@@ -201,7 +201,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="diseasetotal > 0" :total="diseasetotal" :page.sync="querydisease.pageNum"
-        :limit.sync="querydisease.pageSize" @pagination="infodisease" />
+        :limit.sync="querydisease.pageSize" @pagination="infodisease" class="pag"/>
     </el-dialog>
   </div>
 </template>
@@ -683,6 +683,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.pag{
+  top: 13px;
+    position: relative;
+    left: 61%;
+  
+}
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/monitor/logininfor/index.vue

@@ -68,8 +68,10 @@
         </el-table-column>
       </el-table>
     </div>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      @pagination="getList" />
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
   </div>
 </template>
 
@@ -116,6 +118,11 @@ export default {
     this.screenChange()
   },
   methods: {
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     /** 查询登录日志列表 */
     getList() {
       this.loading = true;

src/views/monitor/operlog/index.vue

@@ -84,8 +84,8 @@
         </el-table-column>
       </el-table>
     </div>
-    <Pagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize" :indexFromWrap="queryParams.pageNum"
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      @updateCPage="updateCPage"></Pagination>
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
     <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" /> -->
     <!-- 操作日志详细 -->
@@ -132,11 +132,7 @@
 
 <script>
 import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
-import Pagination from '../../components/Pagination'
 export default {
-  components: {
-    Pagination,
-  },
   name: "Operlog",
   dicts: ['sys_oper_type', 'sys_common_status'],
   data() {

src/views/operationInfo/operationInfo/index.vue

@@ -133,7 +133,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
     </el-dialog>
   </div>
 </template>
@@ -516,6 +516,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.pag{
+  top: 13px;
+    position: relative;
+    left: 61%;
+  
+}
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/system/dict/code.vue

@@ -0,0 +1,385 @@
+<template>
+    <div class="app-container" ref="layout">
+      <div ref="topform" class="form">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <!-- <el-form-item label="字典名称1111" prop="dictType">
+            <el-select v-model="queryParams.dictType">
+              <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
+            </el-select>
+          </el-form-item> -->
+          <el-form-item label="字典标签" prop="dictLabel">
+            <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </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>
+      </div>
+      <div ref="mb8" class="mb8">
+        <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="['system:dict: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="['system:dict: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="['system:dict: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="['system:dict:export']">导出</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose">关闭</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </div>
+      <div ref="table">
+        <el-table :max-height="maxTableHeight" v-loading="loading" :data="dataList"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="字典编码" align="center" prop="dictCode">
+            <template slot-scope="scope">
+              <router-link :to="'/system/dict-code/index/' + scope.row.dictCode" class="link-type">
+                <span>{{ scope.row.dictCode }}</span>
+              </router-link>
+            </template>
+          </el-table-column>
+          <el-table-column label="字典标签" align="center" prop="dictLabel">
+            <template slot-scope="scope">
+              <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
+              <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel
+                }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="字典键值" align="center" prop="dictValue" />
+          <el-table-column label="字典排序" align="center" prop="dictSort" />
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <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="['system:dict:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:dict:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+  
+      <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="550px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-form-item label="数据标签上级">
+            <el-input v-model="form.parentDictCode" :disabled="true" />
+          </el-form-item>
+          <el-form-item label="数据标签" prop="dictLabel">
+            <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+          </el-form-item>
+          <el-form-item label="数据键值" prop="dictValue">
+            <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+          </el-form-item>
+          <el-form-item label="样式属性" prop="cssClass">
+            <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+          </el-form-item>
+          <el-form-item label="显示排序" prop="dictSort">
+            <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+          </el-form-item>
+          <el-form-item label="回显样式" prop="listClass">
+            <el-select v-model="form.listClass">
+              <el-option v-for="item in listClassOptions" :key="item.value" :label="item.label + '(' + item.value + ')'"
+                :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="form.status">
+              <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
+                }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          </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 { listData, getData, delData, addData, updateData ,} from "@/api/system/dict/code";
+  import { optionselect as getDictOptionselect, getTypecode } from "@/api/system/dict/type";
+  
+  export default {
+    name: "Data",
+    dicts: ['sys_normal_disable'],
+    data() {
+      return {
+        maxTableHeight: undefined,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 字典表格数据
+        dataList: [],
+        // 默认字典类型
+        defaultDictType: "",
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 数据标签回显样式
+        listClassOptions: [
+          {
+            value: "default",
+            label: "默认"
+          },
+          {
+            value: "primary",
+            label: "主要"
+          },
+          {
+            value: "success",
+            label: "成功"
+          },
+          {
+            value: "info",
+            label: "信息"
+          },
+          {
+            value: "warning",
+            label: "警告"
+          },
+          {
+            value: "danger",
+            label: "危险"
+          }
+        ],
+        // 类型数据字典
+        typeOptions: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          parentDictCode:undefined,
+          dictName: undefined,
+        //   dictType: undefined,
+        dictLabel:undefined,
+          status: undefined
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          dictLabel: [
+            { required: true, message: "数据标签不能为空", trigger: "blur" }
+          ],
+          dictValue: [
+            { required: true, message: "数据键值不能为空", trigger: "blur" }
+          ],
+          dictSort: [
+            { required: true, message: "数据顺序不能为空", trigger: "blur" }
+          ]
+        }
+      };
+    },
+    created() {
+      this.queryParams.parentDictCode = this.$route.params && this.$route.params.dictCode;
+      this.getTypecode(this.queryParams.parentDictCode);
+      this.getTypeList();
+    },
+    mounted() {
+      this.getMaxTableHeight()
+      this.screenChange()
+    },
+    methods: {
+      /** 查询字典类型详细 */
+      getTypecode(parentDictCode) {
+        getTypecode(parentDictCode).then(response => {
+        //   this.queryParams.dictType = response.data.dictType;
+          this.defaultDictType = response.data.dictType;
+          this.getList();
+        });
+      },
+      /** 查询字典类型列表 */
+      getTypeList() {
+        getDictOptionselect().then(response => {
+          this.typeOptions = response.data;
+        });
+      },
+      /** 查询字典数据列表 */
+      getList() {
+        this.loading = true;
+        listData(this.queryParams).then(response => {
+          this.dataList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          dictCode: undefined,
+          dictLabel: undefined,
+          dictValue: undefined,
+          cssClass: undefined,
+          listClass: 'default',
+          dictSort: 0,
+          status: "0",
+          remark: undefined
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 返回按钮操作 */
+      handleClose() {
+        this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.go(-1);
+
+        // this.$router.go(-1);
+    //     setTimeout(() => {
+    //     window.close();
+    //   }, 500);
+
+        // const obj = { path: "/system/dict-data/index" };
+        // this.$tab.closeOpenPage(obj);
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        // this.queryParams.dictType = this.defaultDictType;
+        this.handleQuery();
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加字典编码";
+        this.form.parentDictCode = this.queryParams.parentDictCode;
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.dictCode)
+        this.single = selection.length != 1
+        this.multiple = !selection.length
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const dictCode = row.dictCode || this.ids
+        getData(dictCode).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改字典编码";
+        });
+      },
+      /** 提交按钮 */
+      submitForm: function () {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.dictCode != undefined) {
+              updateData(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addData(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const dictCodes = row.dictCode || this.ids;
+        this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function () {
+          return delData(dictCodes);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => { });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/dict/data/export', {
+          ...this.queryParams
+        }, `data_${new Date().getTime()}.xlsx`)
+      },
+      // 获取表格最高高度
+      getMaxTableHeight() {
+        const windowInnerHeight = window.innerHeight // 屏幕可视高度
+        const layoutDiv = this.$refs.layout
+        const formDiv = this.$refs.topform
+        const mb8Div = this.$refs.mb8
+        console.log(windowInnerHeight)
+        console.log(this.getBoxPadding(layoutDiv))
+        console.log(this.getBoxHeight(mb8Div))
+        console.log(this.getBoxHeight(formDiv))
+        this.maxTableHeight =
+          windowInnerHeight - 134 -
+          this.getBoxPadding(layoutDiv) -
+          this.getBoxHeight(mb8Div) -
+          this.getBoxHeight(formDiv)
+      },
+      // 屏幕resize监听
+      screenChange() {
+        // 屏幕resize监听事件：一旦屏幕宽高发生变化，就会执行resize
+        window.addEventListener('resize', this.getMaxTableHeight, true)
+        // 将屏幕监听事件移除
+        // 这步是必须的。离开页面时不移除，再返回，或者进入到别的有相同元素的页面会报错
+        // 或者将这里的方法直接写在beforeDestroy函数中也可以
+        this.$once('hook:beforeDestroy', () => {
+          window.removeEventListener('resize', this.getMaxTableHeight, true)
+        })
+      },
+    }
+  };
+  </script>

src/views/system/dict/data.vue

@@ -50,7 +50,13 @@
       <el-table :max-height="maxTableHeight" v-loading="loading" :data="dataList"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="字典编码" align="center" prop="dictCode" />
+        <el-table-column label="字典编码" align="center" prop="dictCode">
+          <template slot-scope="scope">
+            <router-link :to="'/system/dict-code/index/' + scope.row.dictCode" class="link-type">
+              <span>{{ scope.row.dictCode }}</span>
+            </router-link>
+          </template>
+        </el-table-column>
         <el-table-column label="字典标签" align="center" prop="dictLabel">
           <template slot-scope="scope">
             <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>

src/views/system/followupdetails/index.vue

@@ -2,18 +2,8 @@
   <div class="header">
     <div class="topheader">
       <div class="user">
-        <img
+        <img class="headsculpture" src="../../../assets/manage/touxiang.png" alt="" v-if="list.sex == 'MALE'" />
-          class="headsculpture"
+        <img class="headsculpture" src="../../../assets/manage/nvtouxiang.png" alt="" v-if="list.sex == 'FEMALE'" />
-          src="../../../assets/manage/touxiang.png"
-          alt=""
-          v-if="list.sex == 'MALE'"
-        />
-        <img
-          class="headsculpture"
-          src="../../../assets/manage/nvtouxiang.png"
-          alt=""
-          v-if="list.sex == 'FEMALE'"
-        />
         <div class="name">
           {{ list.patientName }}
         </div>
@@ -47,191 +37,83 @@
     <div class="bottomheader">
       <div style="display: flex">
         <!-- 问卷模板 -->
-        <div
+        <div class="right" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
-          class="right"
-          v-if="
-            $route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
           $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
-          "
+          ">
-        >
+          <div style="float: right; margin-top: 20px" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
-          <div
-            style="float: right; margin-top: 20px"
-            v-if="
-              $route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
           $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
-            "
+          ">
-          >
+            <el-form :inline="true" class="demo-form-inline" :model="questiondata" :rules="rules" ref="questiondata">
-            <el-form
-              :inline="true"
-              class="demo-form-inline"
-              :model="questiondata"
-              :rules="rules"
-              ref="questiondata"
-            >
               <el-form-item label="任务处理信息" prop="routeHandleRemark">
-                <el-input
+                <el-input disabled type="textarea" placeholder="请输入任务处理信息" v-model="questiondata.routeHandleRemark" />
-                  disabled
-                  type="textarea"
-                  placeholder="请输入任务处理信息"
-                  v-model="questiondata.routeHandleRemark"
-                />
               </el-form-item>
             </el-form>
           </div>
-          <div
+          <div class="sport" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'">
-            class="sport"
-            v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
-          >
             问卷模板: Barthel指数评定问卷
           </div>
-          <div
+          <div class="words" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'">
-            class="words"
-            v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
-          >
             您好!本问卷用于评估日常生活能力，请根据自身日常实际表现选择合适的选项。
           </div>
 
-          <div
+          <div class="sport" v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'">
-            class="sport"
-            v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
-          >
             人工随访模板: 神经内科人工随访
           </div>
-          <div
+          <div class="words" v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'">
-            class="words"
-            v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
-          >
             **您好!
           </div>
-          <div
+          <div class="words" v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'">
-            class="words"
-            v-if="$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'"
-          >
             我是✕✕医院的工作人员，今天给您打电话想要了解一下您的恢复情况。
           </div>
 
-          <div
+          <div class="words" v-for="(item, index) in questiondata.subjectResultList" :key="index">
-            class="words"
-            v-for="(item, index) in questiondata.subjectResultList"
-            :key="index"
-          >
             {{ index + 1 }}.{{ item.questionName }}
-            <span v-if="item.questionType == 'MULTIPLE_CHOICE'"
+            <span v-if="item.questionType == 'MULTIPLE_CHOICE'">（单选题）</span>
-              >（单选题）</span
+            <span v-if="item.questionType == 'MULTIPLE_CHOICE_QUESTIONS'">（多选题）</span>
-            >
+            <span v-if="item.questionType == 'SCORING_QUESTIONS'">（打分题）</span>
-            <span v-if="item.questionType == 'MULTIPLE_CHOICE_QUESTIONS'"
+            <span v-if="item.questionType == 'COMBINATION_RADIO_SUBJECT'">（组合单选题）</span>
-              >（多选题）</span
+            <span v-if="item.questionType == 'COMBINATION_MULTIPLE_SUBJECT'">（组合多选题）</span>
-            >
+            <span v-if="item.questionType == 'COMBINATION_BLANKS_SUBJECT'">（组合填空题）</span>
-            <span v-if="item.questionType == 'SCORING_QUESTIONS'"
+            <span v-if="item.questionType == 'FILL_IN_THE_BLANKS'">（填空题）</span>
-              >（打分题）</span
+            <span v-if="item.questionType == 'COMBINATION_SCORING_SUBJECT'">（组合打分题）</span>
-            >
+            <span v-if="item.questionType == 'DATE_BLANKS_SUBJECT'">（日期填空题）</span>
-            <span v-if="item.questionType == 'COMBINATION_RADIO_SUBJECT'"
+            <span v-if="item.questionType == 'TIME_BLANKS_SUBJECT'">（时间填空题）</span>
-              >（组合单选题）</span
+            <el-radio-group v-if="item.questionType == 'MULTIPLE_CHOICE' ||
-            >
-            <span v-if="item.questionType == 'COMBINATION_MULTIPLE_SUBJECT'"
-              >（组合多选题）</span
-            >
-            <span v-if="item.questionType == 'COMBINATION_BLANKS_SUBJECT'"
-              >（组合填空题）</span
-            >
-            <span v-if="item.questionType == 'FILL_IN_THE_BLANKS'"
-              >（填空题）</span
-            >
-            <span v-if="item.questionType == 'COMBINATION_SCORING_SUBJECT'"
-              >（组合打分题）</span
-            >
-            <span v-if="item.questionType == 'DATE_BLANKS_SUBJECT'"
-              >（日期填空题）</span
-            >
-            <span v-if="item.questionType == 'TIME_BLANKS_SUBJECT'"
-              >（时间填空题）</span
-            >
-            <el-radio-group
-              v-if="
-                item.questionType == 'MULTIPLE_CHOICE' ||
           item.questionType == 'COMBINATION_RADIO_SUBJECT' ||
           item.questionType == 'SCORING_QUESTIONS' ||
           item.questionType == 'COMBINATION_SCORING_SUBJECT'
-              "
+          " v-model="item.checked" class="custom-radio-group">
-              v-model="item.checked"
+              <el-radio disabled class="custom" v-for="(aitem, aindex) in item.optionResults" :key="aindex"
-              class="custom-radio-group"
+                :label="aitem.id" @change="radioChange($event, aitem, index)">{{ aitem.optionName }}</el-radio>
-            >
-              <el-radio
-                disabled
-                class="custom"
-                v-for="(aitem, aindex) in item.optionResults"
-                :key="aindex"
-                :label="aitem.id"
-                @change="radioChange($event, aitem, index)"
-                >{{ aitem.optionName }}</el-radio
-              >
             </el-radio-group>
             <!-- 多选、组合多选 -->
-            <el-checkbox-group
+            <el-checkbox-group v-model="checkeddata" v-if="item.questionType == 'MULTIPLE_CHOICE_QUESTIONS' ||
-              v-model="checkeddata"
-              v-if="
-                item.questionType == 'MULTIPLE_CHOICE_QUESTIONS' ||
           item.questionType == 'COMBINATION_MULTIPLE_SUBJECT'
-              "
+          ">
-            >
+              <el-checkbox disabled v-for="(aitem, aindex) in item.optionResults" :key="aindex" :label="aitem.id"
-              <el-checkbox
+                @change="radioChangecheck($event, aitem, index, aindex)">{{ aitem.optionName }}</el-checkbox>
-                disabled
-                v-for="(aitem, aindex) in item.optionResults"
-                :key="aindex"
-                :label="aitem.id"
-                @change="radioChangecheck($event, aitem, index, aindex)"
-                >{{ aitem.optionName }}</el-checkbox
-              >
             </el-checkbox-group>
             <!-- 填空题、组合填空 -->
-            <div
+            <div v-if="item.questionType == 'FILL_IN_THE_BLANKS' ||
-              v-if="
-                item.questionType == 'FILL_IN_THE_BLANKS' ||
           item.questionType == 'COMBINATION_BLANKS_SUBJECT'
-              "
+          " class="tk">
-              class="tk"
+              <el-input disabled v-model="item.fillBlanksAnswer" placeholder="请输入答案" type="textarea" />
-            >
-              <el-input
-                disabled
-                v-model="item.fillBlanksAnswer"
-                placeholder="请输入答案"
-                type="textarea"
-              />
               <!-- <el-input></el-input> -->
             </div>
             <!-- 日期填空题、 -->
-            <div
+            <div v-if="item.questionType == 'DATE_BLANKS_SUBJECT'" style="margin: 20px 0 10px 30px">
-              v-if="item.questionType == 'DATE_BLANKS_SUBJECT'"
+              <el-date-picker disabled @change="timepicker($event, index)" clearable v-model="item.fillBlanksAnswer"
-              style="margin: 20px 0 10px 30px"
+                type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
-            >
-              <el-date-picker
-                disabled
-                @change="timepicker($event, index)"
-                clearable
-                v-model="item.fillBlanksAnswer"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              >
               </el-date-picker>
             </div>
             <!-- 时间填空题 -->
-            <div
+            <div style="margin: 20px 0 10px 30px" v-if="item.questionType == 'TIME_BLANKS_SUBJECT'">
-              style="margin: 20px 0 10px 30px"
+              <el-time-select disabled @change="timepickerselect($event, index)" clearable
-              v-if="item.questionType == 'TIME_BLANKS_SUBJECT'"
+                v-model="item.fillBlanksAnswer" :picker-options="{
-            >
-              <el-time-select
-                disabled
-                @change="timepickerselect($event, index)"
-                clearable
-                v-model="item.fillBlanksAnswer"
-                :picker-options="{
           start: '08:30',
           step: '00:30',
           end: '23:30',
-                }"
+        }" placeholder="选择时间">
-                placeholder="选择时间"
-              >
               </el-time-select>
             </div>
           </div>
@@ -286,29 +168,16 @@
           <div class="sport">电话外呼</div>
 
           <div class="nexttime">
-            <el-form
+            <el-form ref="formlist" :model="formlist" label-width="110px" :inline="true">
-              ref="formlist"
-              :model="formlist"
-              label-width="110px"
-              :inline="true"
-
-            >
               <!-- <br/> -->
               <el-form-item label="是否接通" prop="phone">
-                <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED"
+                <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED">已接通</el-radio>
-                  >已接通</el-radio
+                <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED">未接通</el-radio>
-                >
-                <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED"
-                  >未接通</el-radio
-                >
               </el-form-item>
               <br />
 
               <el-form-item label="任务处理信息" prop="routeHandleRemark">
-                <el-input
+                <el-input v-model="formlist.routeHandleRemark" placeholder="请输入任务处理信息" />
-                  v-model="formlist.routeHandleRemark"
-                  placeholder="请输入任务处理信息"
-                />
               </el-form-item>
               <br />
               <!-- <el-form-item label="话术名称" prop="scriptName">
@@ -321,11 +190,7 @@
               </el-form-item> -->
               <!-- <br /> -->
               <el-form-item label="通用话术名称" prop="phoneTemplateName">
-                <el-input
+                <el-input disabled v-model="formlist.phoneTemplateName" placeholder="请输入通用话术名称" />
-                  disabled
-                  v-model="formlist.phoneTemplateName"
-                  placeholder="请输入通用话术名称"
-                />
               </el-form-item>
               <br />
               <!-- <el-form-item label="话术简介" prop="scriptIntroduction">
@@ -360,52 +225,28 @@
                   inactive-value="0"
                 >
                 </el-switch> -->
-                <el-radio disabled v-model="formlist.phonePushSign" label="1"
+                <el-radio disabled v-model="formlist.phonePushSign" label="1">已开启</el-radio>
-                  >已开启</el-radio
+                <el-radio disabled v-model="formlist.phonePushSign" label="0">未开启</el-radio>
-                >
-                <el-radio  disabled v-model="formlist.phonePushSign" label="0"
-                  >未开启</el-radio
-                >
               </el-form-item>
               <br />
 
               <el-form-item label="电话" prop="patientPhone">
-                <el-input
+                <el-input disabled v-model="formlist.patientPhone" placeholder="请输入电话" />
-                  disabled
-                  v-model="formlist.patientPhone"
-                  placeholder="请输入电话"
-                />
               </el-form-item>
               <br />
               <!-- <div style="background:red;width:200px;height:1600px"> -->
               <el-form-item label="重复次数" prop="phoneRedialTimes">
-                <el-select
+                <el-select v-model="formlist.phoneRedialTimes" disabled style="width: 200px">
-                  v-model="formlist.phoneRedialTimes"
+                  <el-option v-for="item in optionslistS" :key="item.dictValue" :label="item.dictLabel"
-                  disabled
+                    :value="item.dictValue">
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in optionslistS"
-                    :key="item.dictValue"
-                    :label="item.dictLabel"
-                    :value="item.dictValue"
-                  >
                   </el-option>
                 </el-select>
               </el-form-item>
               <br />
-              <el-form-item label="发送短信" prop="phone">
+              <el-form-item label="电话短信提醒" prop="phone">
-                <el-select
+                <el-select disabled v-model="formlist.phoneMessageRemind" style="width: 200px">
-                  disabled
+                  <el-option v-for="item in optionslist" :key="item.dictValue" :label="item.dictLabel"
-                  v-model="formlist.phoneMessageRemind"
+                    :value="item.dictValue">
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in optionslist"
-                    :key="item.dictValue"
-                    :label="item.dictLabel"
-                    :value="item.dictValue"
-                  >
                   </el-option>
                 </el-select>
                 <!-- <el-input
@@ -417,22 +258,15 @@
               <br />
 
               <el-form-item label="话术图" prop="phone">
-                <img
+                <img :src="formlist.scriptFilePath" style="width: 250px; height: 200px" />
-                  :src="formlist.scriptFilePath"
-                  style="width: 250px; height: 200px"
-
-                />
               </el-form-item>
               <br />
               <div class="pushMethod">
                 <el-form-item label="短信模板：" prop="phone">
                   <span class="spanname">
-                  <message
+                    <message style="width: 200px;height:100px" @on-template="messageontemplateMESSAGE"
-                  style="width: 200px;height:100px"
+                      :templateId="formlist.phoneMessageTemplateId" :templateName="formlist.phoneMessageTemplateName">
-                  @on-template="messageontemplateMESSAGE"
+                    </message>
-                  :templateId="formlist.phoneMessageTemplateId"
-                  :templateName="formlist.phoneMessageTemplateName"
-                ></message>
                   </span>
 
                 </el-form-item>
@@ -446,14 +280,13 @@
   </div>
 </template>
 
-      <script>
+<script>
+import message from "../components/message.vue";
 import { selectFollowPatientInfo, question, addPatientQuestionResult, selectPhonePush, } from "@/api/system/followupsee";
 import {
   selectPatientQuestionSubmit,
 } from "@/api/system/taskExecuteRecord";
 import { getScript } from "@/api/manage/script";
-import message from "../components/message.vue";
-
 import Cookies from 'js-cookie'
 export default {
   components: {
@@ -466,8 +299,8 @@ export default {
       checkList: [],
       checked: false,
       formlist: {},
-      optionslistS:[],
+      optionslistS: [],
-      optionslist:[],
+      optionslist: [],
       rules: {
         routeHandleRemark: [
           { required: true, message: '请输入任务处理信息', trigger: 'change' }
@@ -484,7 +317,7 @@ export default {
         routeHandlePerson: null,
         routeHandleId: null,
       },
-      optionslist:[],
+      optionslist: [],
 
     };
 
@@ -505,6 +338,11 @@ export default {
       selectPhonePush(this.$route.query.manageRouteNodeId).then(response => {
         if (response.data) {
           this.formlist = response.data;
+          if(this.formlist.phonePushSign==0){
+            this.formlist.phonePushSign='0'
+          }else if(this.formlist.phonePushSign==1){
+            this.formlist.phonePushSign='1'
+          }
         }
       });
     }
@@ -640,59 +478,69 @@ export default {
 
   },
 };
-    </script>
+</script>
-       <style lang="scss" scoped>
+<style lang="scss" scoped>
-       ::v-deep .el-input.is-disabled .el-input__inner {
+::v-deep .el-input.is-disabled .el-input__inner {
   background: #fff !important;
   color: #606266;
-       }
+}
-       .pushMethod {
+
+.pushMethod {
   height: 30px;
   // margin-top: 30px;
   line-height: 30px;
   font-size: 13px;
   color: #64666a;
+
   .spanname {
     width: 100%;
 
     pointer-events: none;
   }
-      }
+}
+
 ::v-deep .el-input.is-disabled .el-input__inner {
   background: #fff !important;
   color: #606266;
 }
-       ::v-deep .el-textarea.is-disabled .el-textarea__inner {
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #606266;
   background: #fff;
-       }
+}
-       .tk {
+
+.tk {
   ::v-deep .el-textarea__inner {
     margin: 20px 0 10px 30px;
   }
-       }
+}
 
-       ::v-deep .el-radio {
+::v-deep .el-radio {
   padding: 10px;
-       }
+}
-       ::v-deep .el-checkbox-group {
+
+::v-deep .el-checkbox-group {
   display: flex;
   flex-direction: column;
   padding: 10px 0px 10px 24px;
-       }
+}
-       ::v-deep .el-checkbox {
+
+::v-deep .el-checkbox {
   padding: 10px 0 10px 0px;
   // padding: 10px;
-       }
+}
-       .custom-radio-group {
+
+.custom-radio-group {
   display: flex;
   flex-direction: column;
   padding: 10px 0 10px 10px;
+
   .custom {
     padding: 10px 0 10px 10px;
   }
-       }
+}
-       .bodytop {
+
+.bodytop {
   position: relative;
   top: 20px;
   // height: 500px;
@@ -701,35 +549,42 @@ export default {
   // background: red;f
   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: 20px;
     font-weight: 550;
   }
+
   .knowlist {
     margin: 10px 0px 10px 30px;
     font-size: 16px;
   }
-       }
+}
-       .right {
+
+.right {
   width: 100%;
   height: 500px;
   // background: yellow;
-       }
+}
-       .header {
+
+.header {
   background-color: #f1f3f5;
   padding-top: 10px;
 
@@ -748,15 +603,18 @@ export default {
     background-color: #fff;
     margin: 10px auto;
     padding: 10px 20px;
+
     .sport {
       padding: 10px 50px 10px 10px;
       font-size: 20px;
       font-weight: 600;
     }
+
     .words {
       font-size: 15px;
       padding: 10px 50px 10px 10px;
     }
+
     .sports {
       position: absolute;
       left: 50%;
@@ -764,21 +622,25 @@ export default {
       font-size: 18px;
       font-weight: 600;
     }
+
     .word {
       font-size: 14px;
       font-weight: 550;
       padding: 50px 50px 10px 10px;
     }
+
     .videoleft {
       width: 40%;
       height: 200px;
       background: red;
     }
+
     .time {
       font-size: 20px;
       font-weight: 550;
       padding: 10px 50px 10px 10px;
     }
+
     .number {
       width: 25px;
       height: 25px;
@@ -788,21 +650,25 @@ export default {
       background: blue;
       border-radius: 50%;
     }
+
     .nexttime {
       font-size: 15px;
       padding: 10px 50px 10px 10px;
     }
+
     .images {
       width: 53%;
       height: 241px;
       margin: 0 auto;
       background: red;
     }
+
     .attention {
       font-size: 14px;
       font-weight: 550;
       padding: 10px 50px 10px 10px;
     }
+
     // .videobottom
     // {
     //   font-size: 14px;
@@ -847,6 +713,7 @@ export default {
         position: relative;
         right: 59px;
         position: absolute;
+
         .item {
           margin-left: 20px;
         }
@@ -872,6 +739,5 @@ export default {
       }
     }
   }
-       }
+}
-       </style>
+</style>
-

src/views/system/followupsee/index.vue

@@ -197,28 +197,17 @@
                 </el-select>
               </el-form-item>
               <br />
-              <el-form-item label="发送短信" prop="phone">
+              <el-form-item label="电话短信提醒" prop="phone">
                 <el-select disabled v-model="formlist.phoneMessageRemind" style="width: 200px">
                   <el-option v-for="item in optionslist" :key="item.dictValue" :label="item.dictLabel"
                     :value="item.dictValue">
                   </el-option>
                 </el-select>
-                <!-- <el-input
-                  style="width: 200px"
-                  v-model="formlist.phoneMessageRemind"
-                  placeholder="请输入电话"
-                /> -->
               </el-form-item>
               <br />
-
-              <el-form-item label="话术图" prop="phone">
-                <img :src="formlist.scriptFilePath" style="width: 250px; height: 200px" />
-              </el-form-item>
-              <br />
-
               <el-form-item label="短信模板：" prop="phone">
                 <span class="spanname">
-                  <message style="width: 200px;height:100px" @on-template="messageontemplateMESSAGE"
+                  <message style="width: 200px;height:50px" @on-template="messageontemplateMESSAGE"
                     :templateId="formlist.phoneMessageTemplateId" :templateName="formlist.phoneMessageTemplateName">
                   </message>
                 </span>
@@ -283,12 +272,12 @@ export default {
       },
       rules: {
         routeHandleRemark: [
-          { required: true, message: "请输入任务处理信息", trigger: "change" },
+          { required: true, message: "请输入任务处理信息", trigger: "blur" },
         ],
       },
       rulesphone: {
         routeHandleRemark: [
-          { required: true, message: "请输入任务处理信息", trigger: "change" },
+          { required: true, message: "请输入任务处理信息", trigger: "blur" },
         ],
       },
       radio: "B",
@@ -304,9 +293,10 @@ export default {
     };
   },
   created() {
-    this.infolistword();
+
     this.id = this.$route.query.manageRouteId;
     this.info();
+    this.infolistword()
     this.infolistMESSAGE();
     if (
       this.$route.query.taskType == "QUESTIONNAIRE_SCALE" ||
@@ -317,8 +307,16 @@ export default {
         selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
         if (response.data) {
           this.formlist = response.data;
+          if(this.formlist.phonePushSign==0){
+            this.formlist.phonePushSign='0'
+          }else if(this.formlist.phonePushSign==1){
+            this.formlist.phonePushSign='1'
+          }
         }
       });
+
+
+
     }
   },
   methods: {
@@ -385,6 +383,7 @@ export default {
     info() {
       selectFollowPatientInfo(this.id).then((res) => {
         this.list = res.data;
+
       });
     },
     questioninfo() {

src/views/system/record/record.vue

@@ -307,7 +307,7 @@
                 </el-select>
               </el-form-item>
               <br />
-              <el-form-item label="发送短信" prop="phone">
+              <el-form-item label="电话短信提醒" prop="phone">
                 <el-select
                   disabled
                   v-model="formlist.phoneMessageRemind"
@@ -460,6 +460,11 @@ export default {
       selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
         if (response.data) {
           this.formlist = response.data;
+          if(this.formlist.phonePushSign==0){
+            this.formlist.phonePushSign='0'
+          }else if(this.formlist.phonePushSign==1){
+            this.formlist.phonePushSign='1'
+          }
         }
       });
     }

src/views/unitconfig/PatientConfigurationVisitRecords/index.vue

@@ -2,30 +2,49 @@
   <div class="header">
     <div class="header-app">
       <div class="addbtn">
-                <el-button type="primary" @click="add" size="small">添加就诊记录</el-button>
+        <el-button type="primary" @click="add" size="small"
+          >添加就诊记录</el-button
+        >
       </div>
       <el-descriptions title="患者信息">
-                <el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
+        <el-descriptions-item label="患者姓名">{{
-                <el-descriptions-item label="性别">{{ $route.query.sex == 'MALE' ? '男' : "" }}
+          $route.query.patientName
-                    {{ $route.query.sex == 'FEMALE' ? '女' : "" }}
+        }}</el-descriptions-item>
+        <el-descriptions-item label="性别"
+          >{{ $route.query.sex == "MALE" ? "男" : "" }}
+          {{ $route.query.sex == "FEMALE" ? "女" : "" }}
         </el-descriptions-item>
-                <el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item>
+        <el-descriptions-item label="年龄">{{
-                <el-descriptions-item label="电话">{{ $route.query.patientPhone }}</el-descriptions-item>
+          $route.query.age
-                <el-descriptions-item label="pat_id">{{ $route.query.patientId }}</el-descriptions-item>
+        }}</el-descriptions-item>
-                <el-descriptions-item label="身份证号">{{ $route.query.cardNo }}</el-descriptions-item>
+        <el-descriptions-item label="电话">{{
+          $route.query.patientPhone
+        }}</el-descriptions-item>
+        <el-descriptions-item label="pat_id">{{
+          $route.query.patientId
+        }}</el-descriptions-item>
+        <el-descriptions-item label="身份证号">{{
+          $route.query.cardNo
+        }}</el-descriptions-item>
       </el-descriptions>
     </div>
-        <div class="header-app" style="margin-top: 16px;padding:0">
+    <div class="header-app" style="margin-top: 16px; padding: 0">
       <div class="left">
         <div class="list">
-                    <div class="item" v-for="(item, index) in recodelist" :key="item.id"
+          <div
-                        @click="clickrecord(item, index)" :class="index == recodeindex ? 'tapitem' : ''">
+            class="item"
-                        <div class="text">入院时间：{{ item.admissionTime }}
+            v-for="(item, index) in recodelist"
-                        </div>
+            :key="item.id"
-                        <div class="text">出院时间：{{ item.dischargeTime }}
+            @click="clickrecord(item, index)"
-                        </div>
+            :class="index == recodeindex ? 'tapitem' : ''"
-                        <div class="text">就诊类型：{{ item.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : "" }}
+          >
-                            {{ item.visitMethod == 'BE_IN_HOSPITAL' ? '住院' : "" }}
+            <div class="text">入院时间：{{ item.admissionTime }}</div>
+            <div class="text">出院时间：{{ item.dischargeTime }}</div>
+            <div class="text">
+              就诊类型：{{
+                item.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : ""
+              }}
+              {{ item.visitMethod == "BE_IN_HOSPITAL" ? "住院" : "" }}
             </div>
           </div>
         </div>
@@ -34,7 +53,9 @@
         <el-descriptions :title="form.id ? '就诊信息' : '新增就诊信息'">
         </el-descriptions>
         <div class="btns">
-                    <el-button type="primary" @click="submitForm" size="small">保 存</el-button>
+          <el-button type="primary" @click="submitForm" size="small"
+            >保 存</el-button
+          >
           <el-button @click="cancel" size="small">取 消</el-button>
         </div>
         <el-form ref="form" :model="form" label-width="120px" :rules="rules">
@@ -45,56 +66,118 @@
             </el-radio-group>
           </el-form-item>
         </el-form>
-                <el-form ref="form" :model="form" :rules="rules" label-width="130px" :inline="true">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="130px"
+          :inline="true"
+        >
           <el-form-item label="主要诊断" prop="mainDiagnosis">
-                        <el-input v-model="form.mainDiagnosis" style="width:300px" placeholder="请输入主要诊断"></el-input>
+            <el-input
+              v-model="form.mainDiagnosis"
+              style="width: 300px"
+              placeholder="请输入主要诊断"
+            ></el-input>
           </el-form-item>
           <el-form-item label="就诊流水号" prop="visitSerialNumber">
-                        <el-input v-model="form.visitSerialNumber" style="width:300px"
+            <el-input
-                            placeholder="请输入就诊流水号"></el-input>
+              v-model="form.visitSerialNumber"
+              style="width: 300px"
+              placeholder="请输入就诊流水号"
+            ></el-input>
           </el-form-item>
           <el-form-item label="科室名称" prop="departmentId">
-                        <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:300px"
+            <el-select
-                            clearable>
+              v-model="form.departmentId"
-                            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName"
+              filterable
-                                :value="item.id">
+              placeholder="请选择科室"
+              style="width: 300px"
+              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="attendingPhysicianId">
-                        <el-select v-model="form.attendingPhysicianId" filterable placeholder="请选择主治医生"
+            <el-select
-                            style="width:300px" clearable>
+              v-model="form.attendingPhysicianId"
-                            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              filterable
-                                :value="item.userId">
+              placeholder="请选择主治医生"
+              style="width: 300px"
+              clearable
+            >
+              <el-option
+                v-for="item in attendingPhysicianlist"
+                :key="item.userId"
+                :label="item.nickName"
+                :value="item.userId"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="门诊/住院编号" prop="inHospitalNumber">
-                        <el-input v-model="form.inHospitalNumber" style="width:300px"
+            <el-input
-                            placeholder="请输入门诊/住院编号"></el-input>
+              v-model="form.inHospitalNumber"
+              style="width: 300px"
+              placeholder="请输入门诊/住院编号"
+            ></el-input>
           </el-form-item>
           <el-form-item label="入院时间" prop="admissionTime">
-                        <el-date-picker style="width:300px" v-model="form.admissionTime" type="datetime"
+            <el-date-picker
-                            value-format="yyyy-MM-dd HH:mm" format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions"
+              style="width: 300px"
-                            placeholder="选择日期时间">
+              v-model="form.admissionTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm"
+              format="yyyy-MM-dd HH:mm"
+              :picker-options="pickerOptions"
+              placeholder="选择日期时间"
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="出院时间" prop="dischargeTime">
-                        <el-date-picker style="width:300px" v-model="form.dischargeTime" type="datetime"
+            <el-date-picker
-                            :picker-options="pickerOptionstwo" value-format="yyyy-MM-dd HH:mm" format='yyyy-MM-dd HH:mm'
+              style="width: 300px"
-                            placeholder="选择日期时间">
+              v-model="form.dischargeTime"
+              type="datetime"
+              :picker-options="pickerOptionstwo"
+              value-format="yyyy-MM-dd HH:mm"
+              format="yyyy-MM-dd HH:mm"
+              placeholder="选择日期时间"
+            >
             </el-date-picker>
           </el-form-item>
-                    <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-form-item
+            label="手术记录"
+            prop="surgicalRecord"
+            v-if="form.visitMethod == 'BE_IN_HOSPITAL'"
+          >
             <editor v-model="form.surgicalRecord" :min-height="192" />
           </el-form-item>
-                    <el-form-item label="入院病历" prop="inHospitalInfo" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-form-item
+            label="入院病历"
+            prop="inHospitalInfo"
+            v-if="form.visitMethod == 'BE_IN_HOSPITAL'"
+          >
             <editor v-model="form.inHospitalInfo" :min-height="192" />
           </el-form-item>
-                    <el-form-item label="门诊病历" prop="inHospitalInfo" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+          <el-form-item
+            label="门诊病历"
+            prop="inHospitalInfo"
+            v-if="form.visitMethod == 'OUTPATIENT_SERVICE'"
+          >
             <editor v-model="form.inHospitalInfo" :min-height="192" />
           </el-form-item>
-                    <el-form-item label="出院病历" prop="outHospitalInfo" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-form-item
+            label="出院病历"
+            prop="outHospitalInfo"
+            v-if="form.visitMethod == 'BE_IN_HOSPITAL'"
+          >
             <editor v-model="form.outHospitalInfo" :min-height="192" />
           </el-form-item>
         </el-form>
@@ -277,7 +360,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .header {
-    background-color: #F1F3F5;
+  background-color: #f1f3f5;
   padding-top: 16px;
 
   .header-app {
@@ -305,7 +388,7 @@ export default {
         width: 96%;
 
         .tapitem {
-                    background-color: #D2E9FC;
+          background-color: #d2e9fc;
           border-left: 2px solid #1890ff !important;
           border-bottom: 1px solid #fff !important;
         }
@@ -314,8 +397,8 @@ export default {
           height: 130px;
           padding: 10px 10px;
           position: relative;
-                    border-left: 2px solid #D2E9FC;
+          border-left: 2px solid #d2e9fc;
-                    border-bottom: 1px solid #E7E7E7;
+          border-bottom: 1px solid #e7e7e7;
 
           .text {
             overflow: hidden;
@@ -331,9 +414,11 @@ export default {
     }
 
     .right {
+      overflow: auto;
       width: 75%;
       margin-top: 15px;
       position: relative;
+      height: 63vh;
 
       .btns {
         position: absolute;