提交

src/api/activiti/definition.js

@@ -95,16 +95,16 @@ export function addGenhistorilisr(data) {
 // 修改关联表
 export function setGenTable(data) {
   return request({
-    url: '/boman-gen/genTableRelation',
-    method: 'put',
+    url: '/boman-gen/genTableRelation/put',
+    method: 'post',
     data
   })
 }
 // 删除关联表
 export function delGenTable(tableId) {
   return request({
-    url: '/boman-gen/genTableRelation/' + tableId,
-    method: 'delete',
+    url: '/boman-gen/genTableRelation/delete/' + tableId,
+    method: 'get',
   })
 }
 // 查看关联表
@@ -177,8 +177,8 @@ export function genTableColumnList(query) {
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
-    url: '/code/gen',
-    method: 'put',
+    url: '/code/gen/put',
+    method: 'post',
     data: data
   })
 }
@@ -203,15 +203,15 @@ export function previewTable(tableId) {
 // 删除表数据
 export function delTable(tableId) {
   return request({
-    url: '/code/gen/' + tableId,
-    method: 'delete'
+    url: '/code/gen/delete/' + tableId,
+    method: 'get'
   })
 }
 // 删除
 export function delPost(id) {
   return request({
-    url: '/genTableColumn/columnIds/' + id,
-    method: 'delete'
+    url: '/genTableColumn/columnIds/delete/' + id,
+    method: 'get'
   })
 }
 
@@ -265,15 +265,15 @@ export function addGenTableColumn(data) {
 // 删除字段信息
 export function delGenTableColumn(id) {
   return request({
-    url: '/boman-gen/genTableColumn/' + id,
-    method: 'delete',
+    url: '/boman-gen/genTableColumn/delete/' + id,
+    method: 'get',
   })
 }
 // 修改字段信息
 export function setGenTableColumn(data) {
   return request({
-    url: '/boman-gen/genTableColumn',
-    method: 'put',
+    url: '/boman-gen/genTableColumn/put',
+    method: 'post',
     data
   })
 }

src/api/bdc/adoption.js

@@ -28,6 +28,9 @@ export function delInfohy(query) {
 }
 
 
+
+
+
 // 查询疫苗信息详细
 export function getInfo(id) {
   return request({

src/api/core/gridInfo.js

@@ -38,8 +38,8 @@ export function addGridInfo(data) {
 // 修改网格信息
 export function updateGridInfo(data) {
   return request({
-    url: '/boman-web-core/gridInfo',
-    method: 'put',
+    url: '/boman-web-core/gridInfo/put',
+    method: 'post',
     data: data
   })
 }
@@ -47,7 +47,7 @@ export function updateGridInfo(data) {
 // 删除网格信息
 export function delGridInfo(id) {
   return request({
-    url: '/boman-web-core/gridInfo/' + id,
-    method: 'delete'
+    url: '/boman-web-core/gridInfo/delete/' + id,
+    method: 'get'
   })
 }

src/api/index.js

@@ -86,8 +86,8 @@ export function addDevice(data) {
 // 修改设备信息
 export function updateDevice(data) {
   return request({
-    url: '/school/device',
-    method: 'put',
+    url: '/school/device/put',
+    method: 'post',
     data: data
   })
 }
@@ -95,8 +95,8 @@ export function updateDevice(data) {
 // 删除设备信息
 export function delDevice(id) {
   return request({
-    url: '/school/device/' + id,
-    method: 'delete'
+    url: '/school/device/delete/' + id,
+    method: 'get'
   })
 }
 

src/api/login.js

@@ -29,7 +29,7 @@ export function getInfo() {
 export function logout() {
   return request({
     url: '/auth/logout',
-    method: 'delete'
+    method: 'get'
   })
 }
 

src/api/monitor/job.js

@@ -29,8 +29,8 @@ export function addJob(data) {
 // 修改定时任务调度
 export function updateJob(data) {
   return request({
-    url: '/schedule/job',
-    method: 'put',
+    url: '/schedule/job/put',
+    method: 'post',
     data: data
   })
 }
@@ -38,8 +38,8 @@ export function updateJob(data) {
 // 删除定时任务调度
 export function delJob(jobId) {
   return request({
-    url: '/schedule/job/' + jobId,
-    method: 'delete'
+    url: '/schedule/job/delete/' + jobId,
+    method: 'get'
   })
 }
 
@@ -51,7 +51,7 @@ export function changeJobStatus(jobId, status) {
   }
   return request({
     url: '/schedule/job/changeStatus',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -65,7 +65,7 @@ export function runJob(jobId, jobGroup) {
   }
   return request({
     url: '/schedule/job/run',
-    method: 'put',
+    method: 'post',
     data: data
   })
-}
+}

src/api/monitor/jobLog.js

@@ -12,15 +12,15 @@ export function listJobLog(query) {
 // 删除调度日志
 export function delJobLog(jobLogId) {
   return request({
-    url: '/schedule/job/log/' + jobLogId,
-    method: 'delete'
+    url: '/schedule/job/log/delete/' + jobLogId,
+    method: 'get'
   })
 }
 
 // 清空调度日志
 export function cleanJobLog() {
   return request({
-    url: '/schedule/job/log/clean',
-    method: 'delete'
+    url: '/schedule/job/log/clean/delete',
+    method: 'get'
   })
 }

src/api/monitor/online.js

@@ -12,7 +12,7 @@ export function list(query) {
 // 强退用户
 export function forceLogout(tokenId) {
   return request({
-    url: '/system/online/' + tokenId,
-    method: 'delete'
+    url: '/system/online/delete/' + tokenId,
+    method: 'get'
   })
 }

src/api/sendSms/sendSms.js

@@ -37,8 +37,8 @@ export function addSendSmsxf(data) {
 // 修改中考下发短信日志
 export function updateSendSms(data) {
   return request({
-    url: '/boman-web-core/sendSms',
-    method: 'put',
+    url: '/boman-web-core/sendSms/put',
+    method: 'post',
     data: data
   })
 }
@@ -46,8 +46,8 @@ export function updateSendSms(data) {
 // 删除中考下发短信日志
 export function delSendSms(id) {
   return request({
-    url: '/boman-web-core/sendSms/' + id,
-    method: 'delete'
+    url: '/boman-web-core/sendSms/delete/' + id,
+    method: 'get'
   })
 }
 

src/api/system/config.js

@@ -155,8 +155,8 @@ export function listIndextanl(data) {
 // 修改参数配置
 export function updateConfig(data) {
   return request({
-    url: '/system/config',
-    method: 'put',
+    url: '/system/config/put',
+    method: 'post',
     data: data
   })
 }
@@ -164,8 +164,8 @@ export function updateConfig(data) {
 // 删除参数配置
 export function delConfig(id) {
   return request({
-    url: '/system/config/' + id,
-    method: 'delete'
+    url: '/system/config/delete/' + id,
+    method: 'get'
   })
 }
 
@@ -181,7 +181,7 @@ export function delIndexnabd(data) {
 export function clearCache() {
   return request({
     url: '/system/config/clearCache',
-    method: 'delete'
+    method: 'get'
   })
 }
 // 查询用户个人信息

src/api/system/dept.js

@@ -92,8 +92,8 @@ export function addDept(data) {
 // 修改部门
 export function updateDept(data) {
   return request({
-    url: '/system/dept',
-    method: 'put',
+    url: '/system/dept/put',
+    method: 'post',
     data: data
   })
 }
@@ -101,7 +101,7 @@ export function updateDept(data) {
 // 删除部门
 export function delDept(id) {
   return request({
-    url: '/system/dept/' + id,
-    method: 'delete'
+    url: '/system/dept/delete/' + id,
+    method: 'get'
   })
 }

src/api/system/dict/data.js

@@ -37,8 +37,8 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
   return request({
-    url: '/system/dict/data',
-    method: 'put',
+    url: '/system/dict/data/put',
+    method: 'post',
     data: data
   })
 }
@@ -46,7 +46,7 @@ export function updateData(data) {
 // 删除字典数据
 export function delData(dictCode) {
   return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'delete'
+    url: '/system/dict/data/delete/' + dictCode,
+    method: 'get'
   })
 }

src/api/system/dict/menuDict.js

@@ -37,8 +37,8 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
   return request({
-    url: '/system/dict/data',
-    method: 'put',
+    url: '/system/dict/data/put',
+    method: 'post',
     data: data
   })
 }
@@ -46,7 +46,7 @@ export function updateData(data) {
 // 删除字典数据
 export function delData(dictCode) {
   return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'delete'
+    url: '/system/dict/data/delete/' + dictCode,
+    method: 'get'
   })
 }

src/api/system/dict/type.js

@@ -29,8 +29,8 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/system/dict/type',
-    method: 'put',
+    url: '/system/dict/type/put',
+    method: 'post',
     data: data
   })
 }
@@ -38,8 +38,8 @@ export function updateType(data) {
 // 删除字典类型
 export function delType(id) {
   return request({
-    url: '/system/dict/type/' + id,
-    method: 'delete'
+    url: '/system/dict/type/delete/' + id,
+    method: 'get'
   })
 }
 
@@ -47,7 +47,7 @@ export function delType(id) {
 export function clearCache() {
   return request({
     url: '/system/dict/type/clearCache',
-    method: 'delete'
+    method: 'get'
   })
 }
 

src/api/system/editing.js

@@ -44,7 +44,7 @@ export function getByTableName(data) {
 export function delMenu(id) {
   return request({
     url: 'boman-web-core/p/cs/objectDelete',
-    method: 'delete'
+    method: 'POST'
   })
 }
 
@@ -71,4 +71,4 @@ export function tableSubimt(data) {
      method: 'POST',
      data
    })
- }
+ }

src/api/system/logininfor.js

@@ -12,8 +12,8 @@ export function list(query) {
 // 删除登录日志
 export function delLogininfor(id) {
   return request({
-    url: '/system/logininfor/' + id,
-    method: 'delete'
+    url: '/system/logininfor/delete' + id,
+    method: 'get'
   })
 }
 
@@ -21,6 +21,6 @@ export function delLogininfor(id) {
 export function cleanLogininfor() {
   return request({
     url: '/system/logininfor/clean',
-    method: 'delete'
+    method: 'get'
   })
 }

src/api/system/menu.js

@@ -59,8 +59,8 @@ export function addMenu(data) {
 // 修改菜单
 export function updateMenu(data) {
   return request({
-    url: '/system/menu',
-    method: 'put',
+    url: '/system/menu/put',
+    method: 'post',
     data: data
   })
 }
@@ -68,7 +68,7 @@ export function updateMenu(data) {
 // 删除菜单
 export function delMenu(id) {
   return request({
-    url: '/system/menu/' + id,
-    method: 'delete'
+    url: '/system/menu/delete/' + id,
+    method: 'get'
   })
 }

src/api/system/notice.js

@@ -29,8 +29,8 @@ export function addNotice(data) {
 // 修改公告
 export function updateNotice(data) {
   return request({
-    url: '/system/notice',
-    method: 'put',
+    url: '/system/notice/put',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +38,7 @@ export function updateNotice(data) {
 // 删除公告
 export function delNotice(id) {
   return request({
-    url: '/system/notice/' + id,
-    method: 'delete'
+    url: '/system/notice/delete/' + id,
+    method: 'get'
   })
 }

src/api/system/operlog.js

@@ -12,15 +12,15 @@ export function list(query) {
 // 删除操作日志
 export function delOperlog(id) {
   return request({
-    url: '/system/operlog/' + id,
-    method: 'delete'
+    url: '/system/operlog/delete/' + id,
+    method: 'get'
   })
 }
 
 // 清空操作日志
 export function cleanOperlog() {
   return request({
-    url: '/system/operlog/clean',
-    method: 'delete'
+    url: '/system/operlog/clean/delete',
+    method: 'get'
   })
 }

src/api/system/permisss.js

@@ -28,15 +28,15 @@ export function getRoler(id) {
 
 export function piutRoler(data) {
   return request({
-    url: '/boman-system/roleData',
-    method:'put',
+    url: '/boman-system/roleData/put',
+    method:'post',
     data:data
   })
 }
 // // 删除
 export function delelistPostporen(id) {
   return request({
-    url: '/boman-system/roleData/' + id,
-    method: 'delete'
+    url: '/boman-system/roleData/delete/' + id,
+    method: 'get'
   })
 }

src/api/system/post.js

@@ -29,8 +29,8 @@ export function addPost(data) {
 // 修改岗位
 export function updatePost(data) {
   return request({
-    url: '/system/post',
-    method: 'put',
+    url: '/system/post/put',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +38,7 @@ export function updatePost(data) {
 // 删除岗位
 export function delPost(id) {
   return request({
-    url: '/system/post/' + id,
-    method: 'delete'
+    url: '/system/post/delete/' + id,
+    method: 'get'
   })
 }

src/api/system/role.js

@@ -38,8 +38,8 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/system/role',
-    method: 'put',
+    url: '/system/role/put',
+    method: 'post',
     data: data
   })
 }
@@ -47,8 +47,8 @@ export function updateRole(data) {
 // 角色数据权限
 export function dataScope(data) {
   return request({
-    url: '/system/role/dataScope',
-    method: 'put',
+    url: '/system/role/dataScope/put',
+    method: 'post',
     data: data
   })
 }
@@ -61,7 +61,7 @@ export function changeRoleStatus(id, status) {
   }
   return request({
     url: '/system/role/changeStatus',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -69,8 +69,7 @@ export function changeRoleStatus(id, status) {
 // 删除角色
 export function delRole(id) {
   return request({
-    url: '/system/role/' + id,
-    method: 'delete'
+    url: '/system/role/delete/' + id,
+    method: 'get'
   })
 }
-

src/api/system/time.js

@@ -48,8 +48,8 @@ export function addInfo(data) {
 // 修改疫苗信息
 export function updateInfo(data) {
   return request({
-    url: '/boman-web-core/core/info',
-    method: 'put',
+    url: '/boman-web-core/core/info/put',
+    method: 'post',
     data: data
   })
 }
@@ -57,8 +57,8 @@ export function updateInfo(data) {
 // 删除疫苗信息
 export function delInfo(id) {
   return request({
-    url: '/boman-web-core/core/info/' + id,
-    method: 'delete'
+    url: '/boman-web-core/core/info/delete/' + id,
+    method: 'get'
   })
 }
 

src/api/system/tongj.js

@@ -41,8 +41,8 @@ export function addPost(data) {
 // 修改岗位
 export function updatePost(data) {
   return request({
-    url: '/system/post',
-    method: 'put',
+    url: '/system/post/put',
+    method: 'post',
     data: data
   })
 }
@@ -50,7 +50,7 @@ export function updatePost(data) {
 // 删除岗位
 export function delPost(id) {
   return request({
-    url: '/system/post/' + id,
-    method: 'delete'
+    url: '/system/post/delete/' + id,
+    method: 'get'
   })
 }

src/api/system/user.js

@@ -61,8 +61,8 @@ export function addUser(data) {
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/system/user',
-    method: 'put',
+    url: '/system/user/put',
+    method: 'post',
     data: data
   })
 }
@@ -70,8 +70,8 @@ export function updateUser(data) {
 // 删除用户
 export function delUser(id) {
   return request({
-    url: '/system/user/' + id,
-    method: 'delete'
+    url: '/system/user/delete/' + id,
+    method: 'get'
   })
 }
 
@@ -83,7 +83,7 @@ export function resetUserPwd(id, password) {
   }
   return request({
     url: '/system/user/resetPwd',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -96,7 +96,7 @@ export function changeUserStatus(id, status) {
   }
   return request({
     url: '/system/user/changeStatus',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -112,8 +112,8 @@ export function getUserProfile() {
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
+    url: '/system/user/profile/put',
+    method: 'post',
     data: data
   })
 }
@@ -126,7 +126,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   }
   return request({
     url: '/system/user/profile/updatePwd',
-    method: 'put',
+    method: 'post',
     params: data
   })
 }
@@ -140,7 +140,7 @@ export function updateUserPwds(oldPassword, newPassword,userName) {
   }
   return request({
     url: '/system/user/resetPwdLogin',
-    method: 'put',
+    method: 'post',
     params: data
   })
 }

src/api/tool/gen.js

@@ -11,16 +11,16 @@ export function addGenTable(data) {
 // 修改关联表
 export function setGenTable(data) {
   return request({
-    url: '/boman-gen/genTableRelation',
-    method: 'put',
+    url: '/boman-gen/genTableRelation/put',
+    method: 'post',
     data
   })
 }
 // 删除关联表
 export function delGenTable(tableId) {
   return request({
-    url: '/boman-gen/genTableRelation/' + tableId,
-    method: 'delete',
+    url: '/boman-gen/genTableRelation/delete/' + tableId,
+    method: 'get',
   })
 }
 // 查看关联表
@@ -93,8 +93,8 @@ export function genTableColumnList(query) {
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
-    url: '/code/gen',
-    method: 'put',
+    url: '/code/gen/put',
+    method: 'post',
     data: data
   })
 }
@@ -119,15 +119,15 @@ export function previewTable(tableId) {
 // 删除表数据
 export function delTable(tableId) {
   return request({
-    url: '/code/gen/' + tableId,
-    method: 'delete'
+    url: '/code/gen/delete/' + tableId,
+    method: 'get'
   })
 }
 // 删除
 export function delPost(id) {
   return request({
-    url: '/genTableColumn/columnIds/' + id,
-    method: 'delete'
+    url: '/genTableColumn/columnIds/delete/' + id,
+    method: 'get'
   })
 }
 
@@ -181,15 +181,15 @@ export function addGenTableColumn(data) {
 // 删除字段信息
 export function delGenTableColumn(id) {
   return request({
-    url: '/boman-gen/genTableColumn/' + id,
-    method: 'delete',
+    url: '/boman-gen/genTableColumn/delete/' + id,
+    method: 'get',
   })
 }
 // 修改字段信息
 export function setGenTableColumn(data) {
   return request({
-    url: '/boman-gen/genTableColumn',
-    method: 'put',
+    url: '/boman-gen/genTableColumn/put',
+    method: 'post',
     data
   })
 }

src/components/RightToolbars/index.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="top-right-btn">
+    <el-row class="cfg">
+      <!-- <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
+        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
+      </el-tooltip>
+      <div>2</div> -->
+     <el-tooltip class="item " effect="dark" content="常见问题" placement="top">
+       <div class="ft">
+         <el-button class="nse" style="margin-right: 10px; position: relative;" size="mini" circle  @click="refresh()">
+         <img src="../../assets/images/wh.png" alt="" class="nske">
+         </el-button>
+       </div>
+
+      </el-tooltip>
+      <!-- <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
+        <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
+      </el-tooltip> -->
+    </el-row>
+    <!-- <el-dialog :title="title" :visible.sync="open" append-to-body>
+      <el-transfer
+        :titles="['显示', '隐藏']"
+        v-model="value"
+        :data="columns"
+        @change="dataChange"
+      ></el-transfer>
+    </el-dialog> -->
+  </div>
+</template>
+<script>
+export default {
+  name: "RightToolbar",
+  data() {
+    return {
+      // 显隐数据
+      value: [],
+      // 弹出层标题
+      title: "显示/隐藏",
+      // 是否显示弹出层
+      open: false,
+    };
+  },
+  props: {
+    showSearch: {
+      type: Boolean,
+      default: true,
+    },
+    columns: {
+      type: Array,
+    },
+  },
+
+  methods: {
+    // 搜索
+    toggleSearch() {
+      this.$emit("update:showSearch", !this.showSearch);
+    },
+    // 刷新
+    refresh() {
+      // this.$emit("queryTable");
+      // 五保户信息
+      this.$router.push({path: "/business/contraindication"});
+    },
+    // 右侧列表元素变化
+    dataChange(data) {
+      for (var item in this.columns) {
+        const key = this.columns[item].key;
+        this.columns[item].visible = !data.includes(key);
+      }
+    },
+    // 打开显隐列dialog
+    showColumn() {
+      this.open = true;
+    },
+  },
+};
+</script>
+<style type="text/css" lang="scss">
+  .cfg{
+    // .el-button--mini{
+    //   font-size: 20px !important;
+    // }
+  }
+  .ft{
+    .el-button--mini.is-circle{
+      padding: 13px;
+    }
+  }
+</style>
+<style lang="scss" scoped>
+::v-deep .el-transfer__button {
+  border-radius: 50%;
+  padding: 12px;
+  display: block;
+  margin-left: 0px;
+}
+::v-deep .el-transfer__button:first-child {
+  margin-bottom: 10px;
+}
+.ft{
+  position: relative;
+  width: 28px;
+  height: 28px;
+  margin-right: 10px;
+  .nske{
+    position: absolute;
+  }
+}
+.nse{
+  position: relative;
+  img{
+    width: 12px;
+    height: 13px;
+    position: absolute;
+    top:50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+
+  }
+}
+
+</style>

src/main.js

@@ -35,6 +35,7 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+import RightToolbars from "@/components/RightToolbars"
 import DynamicForm from "@/components/DynamicForm"
 import DynamicForms from "@/components/DynamicForms"
 import DynamicFormsteo from "@/components/DynamicFormsteo"
@@ -78,6 +79,7 @@ Vue.use(directive)
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
+Vue.component('RightToolbars', RightToolbars)
 Vue.component('DynamicForm', DynamicForm)
 Vue.component('DynamicForms', DynamicForms)
 Vue.component('DynamicFormsteo', DynamicFormsteo)

src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: '潜山市人口信息平台',
   // urls: `http://192.168.101.110:8090`,
-  // urls: `http://192.168.101.11:8090`,
-  urls: `http://192.168.101.168:8090`,
+  urls: `http://192.168.101.11:8090`,
+  // urls: `http://192.168.101.168:8090`,
    // urls: `https://qsfy.qs163.cn`,
 
   /**

src/views/bdc/marriageNew/index.vue

@@ -149,7 +149,6 @@ export default {
 			rules: {
 				idCard: [{ required: true, message: '身份证号码不能为空', trigger: 'blur' }],
 				userName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-				// villageTowns:[{ required: true, message: '户籍地址不能为空或不能只选潜山市', trigger: 'blur' }],
         houseType:[{ required: true, message: '请选择是否户主', trigger: 'blur' }],
         code:[{ required: true, message: '请输入户编号信息', trigger: 'blur' }],
         yhzgx:[{ required: true, message: '请选择与户主关系', trigger: 'blur' }],
@@ -157,36 +156,6 @@ export default {
 
 			selected: [],
 			selectedtwo: [],
-			statusOptions: [
-				{
-					dictValue: '女',
-					dictLabel: '女'
-				},
-				{
-					dictValue: '男',
-					dictLabel: '男'
-				}
-			],
-			statusOptionstue: [
-				{
-					dictValue: '已完成',
-					dictLabel: '已完成'
-				},
-				{
-					dictValue: '未完成',
-					dictLabel: '未完成'
-				}
-			],
-			typeOptionshuuj: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			deptOptionstwo: [],
 			options: [],
       optionss:[],

src/views/bdc/social/index.vue

@@ -178,36 +178,6 @@ export default {
 
 			selected: [],
 			selectedtwo: [],
-			statusOptions: [
-				{
-					dictValue: '女',
-					dictLabel: '女'
-				},
-				{
-					dictValue: '男',
-					dictLabel: '男'
-				}
-			],
-			statusOptionstue: [
-				{
-					dictValue: '已完成',
-					dictLabel: '已完成'
-				},
-				{
-					dictValue: '未完成',
-					dictLabel: '未完成'
-				}
-			],
-			typeOptionshuuj: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			deptOptionstwo: [],
 			options: [],
       optionss:[],

src/views/bdc/unit/index.vue

@@ -52,215 +52,7 @@
 		</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="opens" width="1240px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-row>
-					<el-col :span="8" v-if="shouwef">
-						<el-form-item label="身份证号" prop="idCard"><el-input v-model="form.idCard" placeholder="请输入身份证号码" @blur="idcde"  /></el-form-item>
-					</el-col>
-					<el-col :span="8" v-if="shouwef">
-						<el-form-item label="姓名" prop="userName"><el-input v-model="form.userName" placeholder="请输入姓名" /></el-form-item>
-					</el-col>
-					<el-col :span="8" v-if="shouwef">
-						<el-form-item label="性别" prop="gender">
-
-							<!-- <el-input v-model="form.gender" placeholder="请输入性别" /> -->
-
-							<el-select v-model="form.gender" placeholder="性别" clearable style="width: 100%;">
-								<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="shouwef">
-						<el-row>
-							<el-col :span="8">
-								<el-form-item label="联系号码" prop="phoneNum"><el-input v-model="form.phoneNum" placeholder="请输入联系号码" /></el-form-item>
-							</el-col>
-							<el-col :span="8">
-								<el-form-item label="人员分类" prop="keyIndustries">
-									<el-select v-model="form.keyIndustries" placeholder="人员分类" clearable style="width: 100%;">
-										<el-option v-for="dict in typeOptionsname" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-									</el-select>
-								</el-form-item>
-
-							</el-col>
-							<el-col :span="8">
-								<el-form-item label="年龄" prop="age"><el-input v-model="form.age" placeholder="请输入年龄" /></el-form-item>
-							</el-col>
-						</el-row>
-					</el-col>
-          <el-col :span="24">
-          	<el-row>
-          		<el-col :span="12" style="position: relative;">
-                <span style="position: absolute;top:5px; color: red;left:25px;">*</span>
-          			<el-form-item label="户籍地址" style="margin-bottom: 5px;" >
-          				<!-- <el-input v-model="form.villageTowns" type="textarea" placeholder="请输入内容" /> -->
-          				<!-- <treeselect v-model="form.parentId" :options="deptOptionstwo" :normalizer="normalizer" :flat="true" :maxHeight="150" @select="djieskle" :multiple=true placeholder="点击选择户籍地" /> -->
-          				<el-cascader
-                  v-if="nhyesfx"
-          					:placeholder="nhdyesfgh"
-          					:options="optionsLists"
-          					:filterable="true"
-          					separator="/"
-          					@change="chahe"
-          					:props="optionPropsss"
-          					style="width: 100%;"
-          					ref="myCascader"
-                    @active-item-change="handleItemChanges"
-                    :class="[nhdyesfgh == '点击选择户籍地址' ? '' : 'placf']"
-          				></el-cascader>
-                  <!-- @click.native="clicks"
-                  :popper-class="'cascader' + id" -->
-                  <!-- <el-cascader
-                  	:placeholder="nhdyesfgh"
-                  	:options="optionsList"
-                  	:filterable="true"
-                  	separator="/"
-                  	@change="chahe(index)"
-                  	v-model="selected"
-                  	:props="optionPropsss"
-                  	style="width: 100%;"
-                  	ref="myCascader"
-                    @active-item-change="handleItemChange"
-                    :class="[nhdyesfgh == '点击选择居住地址' ? '' : 'placf']"
-                  ></el-cascader> -->
-                  <p style="line-height: 20px; font-size: 12px;color: red;">点击小圆圈一级一级选择</p>
-          			</el-form-item>
-          		</el-col>
 
-          		<el-col :span="12">
-          			<el-form-item label="详细地址" prop="nowIn"><el-input v-model="form.nowIn" type="input" placeholder="请输入户籍详细地址" /></el-form-item>
-          		</el-col>
-          	</el-row>
-          </el-col>
-
-					<el-col :span="24" v-for="(item, index) in form.czrkJzdzList" :key="index" v-show="senlsduea == false || index !== 0">
-            <el-col :span="12">
-            	<el-form-item label="居住地址" prop="province" style="margin-bottom: 5px;">
-                <el-cascader
-                	:placeholder="item.plaed"
-                	:options="item.optiodne"
-                	:filterable="true"
-                	separator="/"
-                	@change="onSelected(index)"
-                	:props="optionPropsss"
-                	style="width: 100%;"
-                	:ref="'myCascaderf' + '' + index"
-                  v-model="item.seleted"
-                  @active-item-change="handleItemChange"
-                  :class="[item.plaed == '请选择居住地址' ? '' : 'placf']"
-                ></el-cascader>
-                <!-- :popper-class="'cascader' + idsg"
-                @click.native="click(index)" -->
-                 <!-- @active-item-change="handleItemChange" v-if = 'nhdyesku' -->
-                 <p style="line-height: 20px; font-size: 12px;color: red;">点击小圆圈一级一级选择</p>
-            	</el-form-item>
-              <!-- :key="cascaderKey"  seleted -->
-
-            </el-col>
-            <el-col :span="11">
-            	<el-form-item label="详细地址" prop="nowIn"><el-input v-model="item.nowIn" type="input" placeholder="请输入内容" /></el-form-item>
-            </el-col>
-            <el-col :span="1">
-              <div class="hyeoa" style="margin-top: 10px;">
-              	 <el-tooltip class="item" effect="dark" content="新增居住地址信息,请慎重操作" placement="top-start">
-              	      <img src="../../../assets/images/icon_tc_add.png" alt="" class="hueyde" @click="tijea(index)" />
-              	    </el-tooltip>
-              		<el-tooltip class="item" effect="dark" content="删除无法恢复,请慎重操作" placement="top-start">
-              		     <img src="../../../assets/images/delei.png" alt="" class="hueydele" @click="naeyrfakjf(index, item)" />
-              		   </el-tooltip>
-              </div>
-            </el-col>
-          </el-col>
-
-					<el-col :span="24" >
-						<el-col :span="12">
-							<el-form-item label="户主" prop="houseType">
-								<el-select v-model="form.houseType" placeholder="户主" clearable style="width: 100%;"  @change="changese">
-									<el-option v-for="dict in typeOptionshuuj" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="户编号" prop="code">
-							<el-input  v-model="form.code" placeholder="请输入户主编号"/>
-              <!-- :disabled="nhe" -->
-							</el-form-item>
-						</el-col>
-					</el-col>
-          <el-col :span="24" >
-            <el-col :span="12" >
-                <el-form-item label="与户主关系" prop="yhzgx">
-                	<el-select v-model="form.yhzgx" placeholder="与户主关系" clearable style="width: 100%;">
-                		<el-option v-for="dict in typeOptionstyzandeh" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
-                	</el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-            	<el-form-item label="网格" prop="houseTyper">
-            		<el-cascader
-            			:placeholder="ndhesdweaf"
-            			:options="optionsListwg"
-            			filterable
-            			@change="chahetwoswge"
-            			:props="optionPropsssdwg"
-            			style="width: 100%;"
-            			@keyup.enter.native="handleQuery"
-                  :key="nhduesw"
-            		  ref = "cddfr"
-            		  @active-item-change="handleItemChangefrwg"
-                  :class="[ndhesdweaf == '点击选择网格' ? '' : 'placf']"
-            		></el-cascader>
-            	</el-form-item>
-            </el-col>
-          </el-col>
-          <el-col :span="24">
-              <el-form-item label="备注" prop="remark">
-              	<el-input v-model="form.remark" type="input" placeholder="请输入户籍详细地址" />
-              </el-form-item>
-          </el-col>
-				</el-row>
-			</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 :close-on-click-modal="false" title="变更原因" :visible.sync="imashow" width="800px" append-to-body >
-      <el-form ref="formgt" :model="formgt" :rules="ruleshy" label-width="100px" style="padding-bottom: 30px;">
-      <el-form-item label="变更:" prop="houseType">
-      	<el-select v-model="formgt.houseType" placeholder="请选择变更原因" clearable style="width: 100%;">
-      		<el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-      	</el-select>
-      </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-      	<el-button type="primary" @click="submitFormfr">确 定</el-button>
-      	<el-button @click="cancel">取 消</el-button>
-      </div>
-		</el-dialog>
-
-    <el-dialog :close-on-click-modal="false" title="查看信息" :visible.sync="jiezhong" width="1100px" append-to-body class="ojhgy">
-    	<el-table :data="jiezheList" stripe style="width: 100%">
-    		<el-table-column type="selection" width="55" align="center" />
-    			<el-table-column label="姓名" align="center" prop="userName" fixed  width="100"/>
-          <el-table-column label="与户主关系" align="center" prop="yhzgx" fixed  width="100"/>
-    			<el-table-column label="联系方式" align="center" prop="phoneNum" width="110" />
-    			<el-table-column label="身份证号码" align="center" prop="idCard" width="180" />
-    			<el-table-column label="户籍地址" align="center" prop="domicileSelect" width="250" />
-    		  <!-- nowInSelect -->
-    			<el-table-column label="居住地址" align="center" prop="nowInSelect" />
-    		  <!-- <el-table-column label="是否户主" align="center" prop="houseType" width="90" /> -->
-          <el-table-column v-if="nhyesoder !== 3" label="操作人" align="center" prop="updateBy" width="90" />
-          <el-table-column v-if="nhyesoder !== 3" label="创建时间" align="center" prop="createTime"  />
-    		</el-table>
-    	</el-table>
-      <pagination v-show="totalfr > 0" :total="totalfr" :page.sync="ndhuwosdjh.pageNum" :limit.sync="ndhuwosdjh.pageSize" @pagination="chakei"  />
-    </el-dialog>
 	</div>
 </template>
 
@@ -375,84 +167,12 @@ export default {
 
 			selected: [],
 			selectedtwo: [],
-			statusOptions: [
-				{
-					dictValue: '女',
-					dictLabel: '女'
-				},
-				{
-					dictValue: '男',
-					dictLabel: '男'
-				}
-			],
-			statusOptionstue: [
-				{
-					dictValue: '已完成',
-					dictLabel: '已完成'
-				},
-				{
-					dictValue: '未完成',
-					dictLabel: '未完成'
-				}
-			],
-			typeOptionshuuj: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			deptOptionstwo: [],
 			options: [],
       optionss:[],
       optionsList: [],
-			optionProps: {
-				value: 'areaId',
-				label: 'name',
-				checkStrictly: true,
-			},
-      optionPropsssd:{
-        value: 'areaId',
-        label: 'name',
-        checkStrictly: true,
-        lazy: true,
-        lazyLoad: this.lazyLoads,
-        leaf: "leaf"
-      },
-      optionPropsss: {
-      	value: 'areaId',
-      	label: 'name',
-      	checkStrictly: true,
-      },
-      optionPropsssdwg:{
-        value: 'id',
-        label: 'areaName',
-        checkStrictly: true,
-      },
-			optionPropstwo: {
-				value: 'id',
-				label: 'label',
-				children: 'children',
-				checkStrictly: true
-			},
-			heuiq: [],
-			typeOptions: [],
-			typeOptionsty: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			typeOptionstyzandeh:[],
 			angesList: [
-
 			],
 			typeOptionsname: [],
 			typeOptionstimes: [],
@@ -460,25 +180,6 @@ export default {
 			typeOptionscont: [],
 			typeOptionscontty: [],
 			typeOptionscontqit:[],
-			// 剂次
-			typeOptionstimesgt: [
-				{
-					dictValue: '1',
-					dictLabel: '1'
-				},
-				{
-					dictValue: '2',
-					dictLabel: '2'
-				},
-				{
-					dictValue: '3',
-					dictLabel: '3'
-				},
-				{
-					dictValue: '加强针',
-					dictLabel: '加强针'
-				}
-			],
 			imashow: false,
 			naneme: false,
 			shouwes: false,
@@ -522,16 +223,6 @@ export default {
 	},
 	created() {
 		// this.getList();
-
-		// this.form.province = this.selected[0];
-		// this.form.city = this.selected[1];
-		// this.form.region = this.selected[2];
-		console.log(this.selected,456)
-    console.log(this.cascaderKey,347)
-		// this.queryParams.province = this.selectedtwo[0];
-		// this.queryParams.city = this.selectedtwo[1];
-		// this.queryParams.region = this.selectedtwo[2];
-		// this.naiseurya = this.form.province + this.form.city + this.form.region;
     window.onresize = () => {
                     this.changeTableMaxHeight()
                   }

src/views/bdc/verification/index.vue

@@ -163,81 +163,12 @@ export default {
 
 			selected: [],
 			selectedtwo: [],
-			statusOptions: [
-				{
-					dictValue: '女',
-					dictLabel: '女'
-				},
-				{
-					dictValue: '男',
-					dictLabel: '男'
-				}
-			],
-			statusOptionstue: [
-				{
-					dictValue: '已完成',
-					dictLabel: '已完成'
-				},
-				{
-					dictValue: '未完成',
-					dictLabel: '未完成'
-				}
-			],
-			typeOptionshuuj: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			deptOptionstwo: [],
 			options: [],
       optionss:[],
       optionsList: [],
-			optionProps: {
-				value: 'areaId',
-				label: 'name',
-				checkStrictly: true,
-			},
-      optionPropsssd:{
-        value: 'areaId',
-        label: 'name',
-        checkStrictly: true,
-        lazy: true,
-        lazyLoad: this.lazyLoads,
-        leaf: "leaf"
-      },
-      optionPropsss: {
-      	value: 'areaId',
-      	label: 'name',
-      	checkStrictly: true,
-      },
-      optionPropsssdwg:{
-        value: 'id',
-        label: 'areaName',
-        checkStrictly: true,
-      },
-			optionPropstwo: {
-				value: 'id',
-				label: 'label',
-				children: 'children',
-				checkStrictly: true
-			},
 			heuiq: [],
 			typeOptions: [],
-			typeOptionsty: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			typeOptionstyzandeh:[],
 			angesList: [
 
@@ -249,24 +180,6 @@ export default {
 			typeOptionscontty: [],
 			typeOptionscontqit:[],
 			// 剂次
-			typeOptionstimesgt: [
-				{
-					dictValue: '1',
-					dictLabel: '1'
-				},
-				{
-					dictValue: '2',
-					dictLabel: '2'
-				},
-				{
-					dictValue: '3',
-					dictLabel: '3'
-				},
-				{
-					dictValue: '加强针',
-					dictLabel: '加强针'
-				}
-			],
 			imashow: false,
 			naneme: false,
 			shouwes: false,

src/views/bdc/verificationNew/index.vue

@@ -168,84 +168,14 @@ export default {
 
 			selected: [],
 			selectedtwo: [],
-			statusOptions: [
-				{
-					dictValue: '女',
-					dictLabel: '女'
-				},
-				{
-					dictValue: '男',
-					dictLabel: '男'
-				}
-			],
-			statusOptionstue: [
-				{
-					dictValue: '已完成',
-					dictLabel: '已完成'
-				},
-				{
-					dictValue: '未完成',
-					dictLabel: '未完成'
-				}
-			],
-			typeOptionshuuj: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			deptOptionstwo: [],
 			options: [],
       optionss:[],
       optionsList: [],
-			optionProps: {
-				value: 'areaId',
-				label: 'name',
-				checkStrictly: true,
-			},
-      optionPropsssd:{
-        value: 'areaId',
-        label: 'name',
-        checkStrictly: true,
-        lazy: true,
-        lazyLoad: this.lazyLoads,
-        leaf: "leaf"
-      },
-      optionPropsss: {
-      	value: 'areaId',
-      	label: 'name',
-      	checkStrictly: true,
-      },
-      optionPropsssdwg:{
-        value: 'id',
-        label: 'areaName',
-        checkStrictly: true,
-      },
-			optionPropstwo: {
-				value: 'id',
-				label: 'label',
-				children: 'children',
-				checkStrictly: true
-			},
 			heuiq: [],
 			typeOptions: [],
-			typeOptionsty: [
-				{
-					dictValue: '是',
-					dictLabel: '是'
-				},
-				{
-					dictValue: '否',
-					dictLabel: '否'
-				}
-			],
 			typeOptionstyzandeh:[],
 			angesList: [
-
 			],
 			typeOptionsname: [],
 			typeOptionstimes: [],
@@ -253,25 +183,6 @@ export default {
 			typeOptionscont: [],
 			typeOptionscontty: [],
 			typeOptionscontqit:[],
-			// 剂次
-			typeOptionstimesgt: [
-				{
-					dictValue: '1',
-					dictLabel: '1'
-				},
-				{
-					dictValue: '2',
-					dictLabel: '2'
-				},
-				{
-					dictValue: '3',
-					dictLabel: '3'
-				},
-				{
-					dictValue: '加强针',
-					dictLabel: '加强针'
-				}
-			],
 			imashow: false,
 			naneme: false,
 			shouwes: false,

src/views/monitor/job/index.vue

@@ -116,7 +116,7 @@
             type="text"
             icon="el-icon-caret-right"
             @click="handleRun(scope.row)"
-            v-hasPermi="['monitor:job:changeStatus']"
+            v-hasPermi="['monitor:job:run']"
           >执行一次</el-button>
           <el-button
             size="mini"

src/views/sendSms/sendSms/index.vue

@@ -98,6 +98,16 @@
           @click="handleImportss"
         >导入多线下发中考通知</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+         type="info"
+         plain
+         icon="el-icon-upload2"
+         size="mini"
+          @click="handleImportssd"
+        >导入中考学科成绩</el-button>
+      </el-col>
+
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -319,6 +329,35 @@
       </div>
     </el-dialog>
 
+    <el-dialog :close-on-click-modal="false" :title="uploadssd.title" :visible.sync="uploadssd.open" width="400px" append-to-body>
+      <el-upload
+        ref="uploadssd"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="uploadssd.headers"
+        :action="uploadssd.url"
+        :disabled="uploadssd.isUploading"
+        :on-progress="handleFileUploadProgressssd"
+        :on-success="handleFileSuccessssd"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <!-- <el-link type="info" style="font-size:12px" @click="importTemplatess">下载模板</el-link> -->
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileFormssd">确 定</el-button>
+        <el-button @click="uploadssd.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -451,6 +490,20 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/boman-web-core/sendSms/importDataNoticeMore"
       },
+      uploadssd:{
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/boman-web-core/sendSms/importScore"
+      },
       roleOptions:[]
     };
   },
@@ -466,6 +519,11 @@ export default {
       this.loading = true;
       listSendSms(this.queryParams).then(response => {
         this.sendSmsList = response.rows;
+        this.sendSmsList.filter(rou=>{
+          rou.phone = JSON.parse(rou.phone)
+          rou.phone = rou.phone.join(',')
+        })
+        console.log(this.sendSmsList,1)
         this.total = response.total;
         this.loading = false;
       });
@@ -613,10 +671,18 @@ export default {
       this.uploads.title = "导入数据";
       this.uploads.open = true;
     },
+
     handleImportss(){
       this.uploadss.title = "导入数据";
       this.uploadss.open = true;
     },
+
+    // 导入中考各课成绩
+    handleImportssd(){
+    this.uploadssd.title = "导入数据";
+      this.uploadssd.open = true;
+    },
+
     /** 下载模板操作 */
     importTemplate() {
       // this.download('system/user/importTemplate', {
@@ -647,6 +713,11 @@ export default {
     handleFileUploadProgressss(event, file, fileList) {
       this.uploadss.isUploading = true;
     },
+    // 文件上传中处理
+    handleFileUploadProgressssd(event, file, fileList) {
+      this.uploadssd.isUploading = true;
+    },
+
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.open = false;
@@ -671,6 +742,14 @@ export default {
       this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
       this.getList();
     },
+    // 文件上传成功处理
+    handleFileSuccessssd(response, file, fileList) {
+      this.uploadssd.open = false;
+      this.uploadssd.isUploading = false;
+      this.$refs.uploadssd.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
@@ -683,6 +762,10 @@ export default {
     submitFileFormss() {
       this.$refs.uploadss.submit();
     },
+    // 提交上传文件
+    submitFileFormssd() {
+      this.$refs.uploadssd.submit();
+    },
 
   }
 };

src/views/system/menudict/contraindication/index.vue

@@ -1,19 +1,28 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="字典标签" prop="dictLabel">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="问题标题" prop="noticeTitle">
         <el-input
-          v-model="queryParams.dictLabel"
-          placeholder="请输入字典标签"
+          v-model="queryParams.noticeTitle"
+          placeholder="请输入问题标题"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
+<!--      <el-form-item label="操作人员" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入操作人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="类型" prop="noticeType">
+        <el-select v-model="queryParams.noticeType" placeholder="问题类型" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
+            v-for="dict in typeOptions"
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
@@ -34,7 +43,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
+          v-hasPermi="['system:notice:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -45,7 +54,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
+          v-hasPermi="['system:notice:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -56,34 +65,42 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
+          v-hasPermi="['system:notice: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>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="id" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel" />
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <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 label="序号" align="center" prop="id" width="100" /> -->
+      <el-table-column
+        label="问题标题"
+        align="center"
+        prop="noticeTitle"
+        :show-overflow-tooltip="true"
+        width="440"
+      />
+      <el-table-column
+        label="问题类型"
+        align="center"
+        prop="noticeType"
+        :formatter="typeFormat"
+
+      />
+
+      <!-- <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :formatter="statusFormat"
+        width="100"
+      /> -->
+      <el-table-column label="创建者" align="center" prop="createBy"  />
+      <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="100"> -->
+        <!-- <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template> -->
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -92,14 +109,20 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
+            v-hasPermi="['system:notice:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdates(scope.row)"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
+            v-hasPermi="['system:notice:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -113,208 +136,247 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典类型">
-          <el-input v-model="form.dictType" :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="dictSort">
-          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in statusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</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-row>
+          <el-col :span="12">
+            <el-form-item label="问题标题" prop="noticeTitle">
+              <el-input v-model="form.noticeTitle" placeholder="请输入问题标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="问题类型" prop="noticeType">
+              <el-select v-model="form.noticeType" placeholder="请选择">
+                <el-option
+                  v-for="dict in typeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="内容">
+              <editor v-model="form.noticeContent" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </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 :close-on-click-modal="false" title="查看详情" :visible.sync="opens" width="780px" append-to-body>
+      <p style="font-size: 18px; text-align: center; margin-bottom: 20px;">{{ckxq.noticeTitle}}</p>
+      <div v-html="ckxq.noticeContent"></div>
+     </el-dialog>
   </div>
 </template>
 
 <script>
-  import { listData, getData, delData, addData, updateData } from "@/api/system/dict/menuDict";
-  import { listType } from "@/api/system/dict/type";
+import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
+import Editor from '@/components/Editor';
 
-  export default {
-    name: "Data",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 字典表格数据
-        dataList: [],
-        // 默认字典类型
-        defaultDictType: "",
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 状态数据字典
-        statusOptions: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          dictName: undefined,
-          dictType: "contraindication",
-          status: undefined
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          dictLabel: [
-            { required: true, message: "数据标签不能为空", trigger: "blur" }
-          ],
-          dictValue: [
-            { required: true, message: "数据键值不能为空", trigger: "blur" }
-          ],
-          dictSort: [
-            { required: true, message: "数据顺序不能为空", trigger: "blur" }
-          ]
-        }
+export default {
+  name: "Notice",
+  components: {
+    Editor
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公告表格数据
+      noticeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      opens:false,
+      // 类型数据字典
+      statusOptions: [],
+      // 状态数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        noticeTitle: undefined,
+        createBy: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        noticeTitle: [
+          { required: true, message: "公告标题不能为空", trigger: "blur" }
+        ],
+        noticeType: [
+          { required: true, message: "公告类型不能为空", trigger: "blur" }
+        ]
+      },
+      ckxq:{}
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_notice_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_notice_type").then(response => {
+      this.typeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      listNotice(this.queryParams).then(response => {
+        this.noticeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 公告状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 公告状态字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.noticeType);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        noticeTitle: undefined,
+        noticeType: undefined,
+        noticeContent: undefined,
+        status: "0"
       };
+      this.resetForm("form");
     },
-    created() {
-      const dictId = this.$route.params && this.$route.params.dictId;
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
-      });
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-    methods: {
-      /** 查询字典数据列表 */
-      getList() {
-        this.loading = true;
-        listData(this.queryParams).then(response => {
-          this.dataList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 数据状态字典翻译
-      statusFormat(row, column) {
-        return this.selectDictLabel(this.statusOptions, row.status);
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: undefined,
-          dictLabel: undefined,
-          dictValue: undefined,
-          dictSort: 0,
-          status: "0",
-          remark: undefined
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
+    /** 重置按钮操作 */
+    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
+      getNotice(id).then(response => {
+        this.form = response.data;
         this.open = true;
-        this.title = "添加字典数据";
-        this.form.dictType = this.queryParams.dictType;
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!=1
-        this.multiple = !selection.length
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getData(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改字典数据";
-        });
-      },
-      /** 提交按钮 */
-      submitForm: function() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != undefined) {
-              updateData(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addData(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
+        this.title = "修改公告";
+      });
+    },
+    // 查看
+    handleUpdates(row) {
+      // this.reset();
+      const id = row.id || this.ids
+      getNotice(id).then(response => {
+        this.ckxq = response.data;
+        this.opens = true;
+        // this.title = "修改公告";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateNotice(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addNotice(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除字典编码为"' + ids + '"的数据项?', "警告", {
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$confirm('是否确认删除公告编号为"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return delData(ids);
+          return delNotice(ids);
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
         })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('system/dict/data/export', {
-          ...this.queryParams
-        }, `data_${new Date().getTime()}.xlsx`)
-      }
     }
-  };
+  }
+};
 </script>
-<strong></strong>
+<style type="text/css" >
+  .nhliew{
+    p{
+      width: 100%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      span{
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+</style>

src/views/system/residentss/index.vue

@@ -66,7 +66,7 @@
 						</el-col>
             <el-col :span="6">
             	<el-form-item label="年龄阶段" >
-            		<el-select v-model="queryParams.params.age" placeholder="年龄阶段" style="width:150px;" clearable>
+            		<el-select v-model="queryParams.params.age" placeholder="年龄阶段" style="width:180px;" clearable>
             			<el-option v-for="dict in angesList" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
             		</el-select>
             	</el-form-item>
@@ -163,10 +163,10 @@
       <el-col :span="1.5">
       	<el-button type="primary" :disabled="multiple" :plain="nhyki" icon="el-icon-view" size="mini"  @click="hsxx" >批量修改全员核酸信息</el-button>
       </el-col>
-
 
 
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbars :showSearch.sync="showSearch" ></right-toolbars>
 		</el-row>
      <div class="bghks">
        <!-- v-if="nbdgywkajs == true" -->
@@ -226,7 +226,7 @@
              <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="ncoming(scope.row)" v-if="queryParams.queryType !== 'hj'">核酸信息</el-button> -->
        			<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDelete(scope.row)" class="hueya" v-if="queryParams.queryType == 'hj'" >变更</el-button>
              <el-button size="mini" type="text" icon="el-icon-edit" @click="chajndsls(scope.row)" class="hueya"  v-if="queryParams.queryType == 'hj'">变更历史</el-button>
-             <el-button v-if="scope.row.houseType == '是'"  size="mini" type="text" icon="el-icon-edit" @click="handleDeletefamide(scope.row)" class="hueya" >查看家庭成员</el-button>
+             <el-button   size="mini" type="text" icon="el-icon-edit" @click="handleDeletefamide(scope.row)" class="hueya" >查看家庭成员</el-button>
              <el-button v-if="scope.row.houseType == '是'" size="mini" type="text" icon="el-icon-plus"   @click="handleAdd(scope.row)" class="hueya" >添加家庭成员</el-button>
        		</template>
        	</el-table-column>
@@ -495,7 +495,7 @@
 
     <el-dialog :close-on-click-modal="false" title="查看信息" :visible.sync="jiezhong" :width="nhyesoder == 3 ? '97%' : '87%'" append-to-body class="ojhgy">
       <el-row :gutter="10" class="mb8" v-if="nhyesoder == 3">
-      	<el-col :span="1.5"><el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd(bhdes)" >新增</el-button></el-col>
+      	<el-col :span="1.5" v-if="ishz==true"><el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd(bhdes)" >新增</el-button></el-col>
         <el-col :span="1.5"><el-button type="primary" plain  size="mini" @click="xinxtb" >与户主户籍同步</el-button></el-col>
         <el-button type="success" size="mini" plain @click="xinxiheu" >一键确认信息无误</el-button>
       </el-row>
@@ -1064,7 +1064,7 @@ export default {
       user:{},
       qyhs:[],
       isNucleicflag:false,//全员核酸禁用
-
+      ishz:false
 		};
 	},
 	created() {
@@ -2956,12 +2956,19 @@ export default {
              this.download('boman-web-core/core/czrk/exportTownHj',{...queryParams},  `只填写到镇数据表格.xlsx`)
     },
     handleExporttezh(){
-      let nh = {}
+      var nh = {
+                      tableName: "vaccine_info",
+                      empty: false,
+                      condition: {}
+                  }
+                  var that=this;
+           nh.condition = this.queryParams
+      			const queryParams = this.queryParams
+            queryParams.pageNum = undefined
+            queryParams.pageSize= undefined
      if(this.queryParams.queryType == 'cz'){
-
              this.download('boman-web-core/core/jzdz/exportQianShanCz', {...nh}, `只填写到潜山市数据表格.xlsx`)
      }else if(this.queryParams.queryType == 'hj'){
-
              this.download('boman-web-core/core/czrk/exportQianShanHj',{...nh},  `只填写到潜山市数据表格.xlsx`)
      }
     },
@@ -3019,6 +3026,11 @@ export default {
     if(row.code == ''){
       this.msgSuccess('无户编号信息,无法查看家庭成员信息');
       return  false
+    }
+    if(this.bhdes.houseType == '是'){
+      this.ishz = true
+    }else{
+      this.ishz = false
     }
 	  this.jiezhong = true;
     listInfotjjsfaml(row.code).then(response => {