修改

src/api/bdglregular/regularcountinfo.js

@@ -39,3 +39,12 @@ export function getRegularinfo(id) {
     method: 'get'
   })
 }
+
+// 查询部门 
+export function getDeptss(query) {
+  return request({
+    url: '/grassrootsregistration/common/getDept',
+    method: 'get',
+    params: query
+  })
+}

src/views/bdglregular/regularcountinfo/index.vue

@@ -120,6 +120,7 @@ import {
 } from "@/api/bdglregular/regularcountinfo";
 import * as echarts from "echarts";
 import Cookies from "js-cookie";
+
 export default {
   data() {
     return {
@@ -415,11 +416,11 @@ export default {
       }
     },
     // 整体情况跳转
-    eConsole1() {
+    eConsole1(param) {
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
-          query: {},
+          query: {obj:param.data},
         })
         .catch(() => {});
     },

src/views/bdglregular/regularinfo/index.vue

@@ -172,6 +172,7 @@
         </el-radio-group>
       </el-col>
     </el-row>
+
     <hr />
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -243,6 +244,42 @@
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar> -->
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item prop="inspectedUnitId">
+          <treeselect
+            v-model="queryParams.inspectedUnitId"
+            :options="deptOptions"
+            placeholder="请选择受检单位"
+            @select="selectPeos"
+          />
+        </el-form-item>
+        <el-form-item prop="currentState">
+          <el-select
+            v-model="queryParams.currentState"
+            placeholder="请选择状态"
+            clearable
+            size="small"
+            @change="handleQuery"
+            class="states"
+          >
+            <el-option
+              v-for="item in statelist"
+              :key="item"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="btr" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-table
@@ -254,7 +291,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
-        :label="queryParams.caoZuoType == 0?'受检单位':'单位'"
+        :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
         align="center"
         key="inspectedUnit"
         prop="inspectedUnit"
@@ -426,7 +463,11 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0"> 
+        <el-form-item
+          label="检查单位"
+          prop="unitCheck"
+          v-if="queryParams.caoZuoType == 0"
+        >
           <el-select
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
@@ -442,12 +483,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="queryParams.caoZuoType == 0?'受检单位':'单位'" prop="inspectedUnit">
+        <el-form-item
+          :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
+          prop="inspectedUnit"
+        >
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            :placeholder="queryParams.caoZuoType == 0?'请选择受检单位':'请选择单位'"
+            :placeholder="
+              queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'
+            "
             :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
@@ -473,7 +519,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="inspectionTime" >
+        <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
             size="small"
@@ -619,7 +665,11 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0">
+        <el-form-item
+          label="检查单位"
+          prop="unitCheck"
+          v-if="queryParams.caoZuoType == 0"
+        >
           <el-select
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
@@ -635,12 +685,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="queryParams.caoZuoType == 0?'受检单位':'单位'" prop="inspectedUnit">
+        <el-form-item
+          :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
+          prop="inspectedUnit"
+        >
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-             :placeholder="queryParams.caoZuoType == 0?'请选择受检单位':'请选择单位'"
+            :placeholder="
+              queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'
+            "
             :disabled="disabled"
           >
             <el-option
@@ -666,7 +721,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="inspectionTime" >
+        <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
             size="small"
@@ -740,7 +795,11 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0">
+        <el-form-item
+          label="检查单位"
+          prop="unitCheck"
+          v-if="queryParams.caoZuoType == 0"
+        >
           <el-select
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
@@ -756,12 +815,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="queryParams.caoZuoType == 0?'受检单位':'单位'" prop="inspectedUnit">
+        <el-form-item
+          :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
+          prop="inspectedUnit"
+        >
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-             :placeholder="queryParams.caoZuoType == 0?'请选择受检单位':'请选择单位'"
+            :placeholder="
+              queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'
+            "
             :disabled="disabled"
           >
             <el-option
@@ -787,7 +851,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="inspectionTime" >
+        <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
             size="small"
@@ -948,12 +1012,24 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
+  getDeptss,
   listRegularinfos,
 } from "@/api/bdglregular/regularinfo";
 import { getUserProfile } from "@/api/system/user";
+// 查询字典
+import { getDicts } from "@/api/system/dict/data";
+// import {
+//   getDept
+// } from "@/api/grassrootsregistration/bdglmeeting";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Regularinfo",
   dicts: ["inspectionType"],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -1033,6 +1109,8 @@ export default {
       },
       //单位
       unitId: [],
+      // 树形结构列表
+      deptOptions: [],
       //检查类型
       inspectionType: [],
       //调动人员对象
@@ -1050,6 +1128,7 @@ export default {
       sp: null,
       open3: false,
       url: process.env.VUE_APP_BASE_API,
+      statelist: ["未通过", "待处理", "待验收", "已通过", "已逾期"],
     };
   },
   created() {
@@ -1095,8 +1174,9 @@ export default {
       this.inspectionType = response.data;
     });
     if (this.$route.query.obj) {
-      this.queryParams.inspectedUnitId =this.$route.query.obj.id
-      listRegularinfos( this.queryParams).then((res) => {
+      this.queryParams.inspectedUnitId = this.$route.query.obj.id;
+      this.queryParams.currentState = this.$route.query.obj.name;
+      listRegularinfos(this.queryParams).then((res) => {
         this.regularinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -1104,9 +1184,11 @@ export default {
     } else {
       this.getList();
     }
+    // 获取单位树形
+    this.getBuMeng();
   },
   watch: {
-      $route(to, from) {
+    $route(to, from) {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -1130,8 +1212,8 @@ export default {
         documentProof: null,
         caoZuoType: 0,
       };
-       if (to.query.obj) {
-        this.queryParams.inspectedUnitId = to.query.obj.id ;
+      if (to.query.obj) {
+        this.queryParams.inspectedUnitId = to.query.obj.id;
         this.queryParams.currentState = to.query.obj.name;
         listRegularinfos(this.queryParams).then((res) => {
           this.regularinfoList = res.rows;
@@ -1148,6 +1230,16 @@ export default {
     // this.danWiess()
   },
   methods: {
+    selectPeos(data) {
+      this.queryParams.inspectedUnitId = data.id;
+      this.getList();
+    },
+    // 获取单位列表
+    getBuMeng() {
+      getDeptss().then((res) => {
+        this.deptOptions = res.data;
+      });
+    },
     danWiess() {
       // 获取当前用户接口
       getUserProfile().then((response) => {
@@ -1219,7 +1311,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      console.log(this.queryParams.caoZuoType)
       this.reset();
       this.open = true;
       this.title = "经常性检查";
@@ -1454,6 +1545,20 @@ export default {
 };
 </script>
 <style scoped>
+/* 选择状态样式 */
+::v-deep .states .el-input .el-input__inner{
+  background-color: transparent !important;
+}
+/* 树形样式 */
+::v-deep .vue-treeselect {
+  width: 220px;
+}
+::v-deep .vue-treeselect__control {
+  background-color: transparent;
+}
+::v-deep .vue-treeselect__single-value {
+  color: #fff;
+}
 ::v-deep .el-dialog {
   width: 1030px !important;
   background-color: #004d86;

src/views/bdglregular/specialcountinfo/index.vue

@@ -413,7 +413,7 @@ export default {
         this.$router
           .push({
             path: "/bdglregular/specialinfo",
-            query: {},
+            query: {obj: param.data},
           })
           .catch(() => {});
       }

src/views/bdglregular/specialinfo/index.vue

@@ -162,6 +162,42 @@
           >删除</el-button
         >
       </el-col>
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item prop="inspectedUnitId">
+          <treeselect
+            v-model="queryParams.inspectedUnitId"
+            :options="deptOptions"
+            placeholder="请选择受检单位"
+            @select="selectPeos"
+          />
+        </el-form-item>
+        <el-form-item prop="currentState">
+          <el-select
+            v-model="queryParams.currentState"
+            placeholder="请选择状态"
+            clearable
+            size="small"
+            @change="handleQuery"
+            class="states"
+          >
+            <el-option
+              v-for="item in statelist"
+              :key="item"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="btr" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
       <!-- <el-col :span="1.5">
         <el-button
           type="primary"
@@ -393,7 +429,11 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheckName" v-if="queryParams.caoZuoType == 0"> 
+        <el-form-item
+          label="检查单位"
+          prop="unitCheckName"
+          v-if="queryParams.caoZuoType == 0"
+        >
           <el-select
             v-model="form.unitCheckName"
             @change="unitCheckIdfun"
@@ -417,7 +457,9 @@
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            :placeholder="queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'"
+            :placeholder="
+              queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'
+            "
             :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
@@ -590,7 +632,11 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0"> 
+        <el-form-item
+          label="检查单位"
+          prop="unitCheck"
+          v-if="queryParams.caoZuoType == 0"
+        >
           <el-select
             v-model="form.unitCheckName"
             @change="unitCheckIdfun"
@@ -614,7 +660,9 @@
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            :placeholder="queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'"
+            :placeholder="
+              queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'
+            "
             :disabled="disabled"
           >
             <el-option
@@ -850,10 +898,16 @@ import {
   bumenlist,
   listSpecialinfos,
 } from "@/api/bdglregular/specialinfo";
-
+import { getDeptss } from "@/api/bdglregular/regularinfo";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Specialinfo",
   dicts: ["inspectionType"],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -942,6 +996,9 @@ export default {
       open3: false,
       isActive: null,
       url: process.env.VUE_APP_BASE_API,
+      // 树形结构列表
+      deptOptions: [],
+      statelist: ["未通过", "待处理", "待验收", "已通过", "已逾期"],
     };
   },
   created() {
@@ -988,6 +1045,7 @@ export default {
       });
     } else if (this.$route.query.obj) {
       this.queryParams.inspectedUnitId = this.$route.query.obj.id;
+      this.queryParams.currentState = this.$route.query.obj.name;
       listSpecialinfos(this.queryParams).then((res) => {
         this.specialinfoList = res.rows;
         this.total = res.total;
@@ -996,6 +1054,7 @@ export default {
     } else {
       this.getList();
     }
+    this.getBuMeng();
   },
   watch: {
     $route(to, from) {
@@ -1037,12 +1096,21 @@ export default {
     },
   },
   methods: {
+    selectPeos(data) {
+      this.queryParams.inspectedUnitId = data.id;
+      this.getList();
+    },
+    // 获取单位列表
+    getBuMeng() {
+      getDeptss().then((res) => {
+        this.deptOptions = res.data;
+      });
+    },
     /** 查询专项检查列表 */
     getList() {
       this.loading = true;
       listSpecialinfo(this.queryParams).then((response) => {
         this.specialinfoList = response.rows;
-        console.log(this.specialinfoList)
         this.total = response.total;
         this.loading = false;
       });
@@ -1224,7 +1292,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.documentProof) {
@@ -1287,7 +1354,7 @@ export default {
     //检查单位
     unitCheckIdfun(val) {
       this.form.unitCheckId = val.deptId;
-      this.form.unitCheckName= val.deptName;
+      this.form.unitCheckName = val.deptName;
     },
     //受检单位
     inspectedUnitfun(val) {
@@ -1311,6 +1378,20 @@ export default {
 };
 </script>
 <style scoped>
+/* 选择状态样式 */
+::v-deep .states .el-input .el-input__inner {
+  background-color: transparent !important;
+}
+/* 树形样式 */
+::v-deep .vue-treeselect {
+  width: 220px;
+}
+::v-deep .vue-treeselect__control {
+  background-color: transparent;
+}
+::v-deep .vue-treeselect__single-value {
+  color: #fff;
+}
 ::v-deep .el-dialog {
   width: 1030px !important;
   background-color: #004d86;

src/views/medicalhealth/recuperate/index.vue

@@ -216,6 +216,27 @@
           >
         </template>
       </el-table-column>
+      <el-table-column
+        label="人员状态"
+        align="center"
+        prop="peopleState1"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.peopleState1 == '1'" style="color: #13ce66"
+            >归队</span
+          >
+          <span
+            v-if="scope.row.peopleState1 == '2'"
+            style="color: #00eaff"
+            :title="scope.row.reasons"
+            >疗养中</span
+          >
+          <span v-if="scope.row.peopleState1 == '0'" style="color: #ffba00"
+            >在位</span
+          >
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="申请时间" align="center" prop="peopleId2" /> -->
       <!-- <el-table-column label="更新时间" align="center" prop="peopleId3" /> -->
       <!-- <el-table-column label="整体审批状态" align="center" prop="status" /> -->

src/views/system/user/index.vue

@@ -461,6 +461,8 @@
                 style="width: 200px"
                 placeholder="请选择权限"
                 clearable
+                multiple
+                @change="quanxian()"
               >
                 <el-option
                   v-for="dict in permissionslist"
@@ -727,7 +729,6 @@ export default {
     });
     //权限
     this.getDicts("sys_permissions").then((response) => {
-      console.log(response.data);
       this.permissionslist = response.data;
     });
   },
@@ -851,6 +852,10 @@ export default {
       const userId = row.userId || this.ids;
       getUser(userId).then((response) => {
         this.form = response.data;
+        if (this.form.permissions) {
+          this.form.permissions = this.form.permissions.split(",");
+        }
+
         // if(this.form.permissions){
         //   this.form.permissions = this.form.permissions.split(",");
         // }
@@ -888,6 +893,12 @@ export default {
     /** 提交按钮 */
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
+        if (this.form.permissions == "") {
+          this.form.permissions = null;
+        } else if (this.form.permissions) {
+          this.form.permissions = this.form.permissions.toString();
+        }
+
         if (valid) {
           // this.form.permissions = this.form.permissions.join(",");
           if (this.form.userId != undefined) {
@@ -996,7 +1007,6 @@ export default {
     },
     //获取相关信息
     unitNamechange(val) {
-      console.log(val);
       this.form.phonenumber = val.phone;
       this.form.sex = val.sex;
       this.form.nickName = val.name;