更改人员请假审批页面显示不全单位人名问题，更改单位管理中新增营级还是连级字段

src/api/access/accessControl.js

@@ -17,3 +17,12 @@ export function attendancerecordList(query) {
     params: query
   })
 }
+
+// 查询获取考勤记录的IP地址配置列表
+export function listIpaddressconfig(query) {
+  return request({
+    url: '/grassrootsregistration/ipaddressconfig/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/peopleChuRu/bdglLeave.js

@@ -83,4 +83,20 @@ export function getBdglList(id) {
     url: '/system/user/list',
     method: 'get'
   })
-}
+}
+
+// 审批获取所有单位
+export function getAllDept() {
+  return request({
+    url: 'grassrootsregistration/common/getAllDept',
+    method: 'get'
+  })
+}
+
+// 获取所有人员列表
+export function getAll(query) {
+  return request({
+    url: '/system/user/lists',
+    method: 'get',
+  })
+}

src/views/access/Renaccess/index.vue

@@ -7,6 +7,21 @@
       v-show="showSearch"
       label-width="68px"
     >
+      <el-form-item prop="offduty">
+        <el-select v-model="ipDi" placeholder="请选择考勤地址" clearable>
+          <el-option
+            v-for="item in ipList"
+            :key="item.id"
+            :label="item.ip"
+            :value="item.ip"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
       <vue-horizontal-calendar
         :minDate="starttimes"
         :maxDate="endtimes"
@@ -80,6 +95,7 @@ import axios from "axios";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listIpaddressconfig } from "@/api/access/accessControl";
 //日期
 import VueHorizontalCalendar from "vue-horizontal-calendar";
 export default {
@@ -131,13 +147,26 @@ export default {
       xinDate: null,
       // length
       length: 0,
+      // 考勤机ipList
+      ipList: [],
+      ipDi: null,
+      qian:null,
+      hou:null
     };
   },
   created() {
     // // 获取列表
     this.getTiem();
+    listIpaddressconfig().then((res) => {
+      this.ipList = res.rows;
+    });
   },
   methods: {
+    // 重置
+    resetQuery() {
+      // this.getTiem();
+      this.ipDi = null;
+    },
     dateChange2(day) {
       this.year = [];
       let date = new Date(day.timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
@@ -159,6 +188,7 @@ export default {
       this.xinDate = qian;
       // console.log(qian);
       var hou = Y + M + D + "23:59:59";
+      this.hou=hou
       this.yearFn();
       this.getList(qian, hou);
     },
@@ -208,12 +238,16 @@ export default {
       }
       return newArray;
     },
+    // 点击搜索
+    handleQuery() {
+      this.getList(this.xinDate, this.hou);
+    },
     // 获取列表
     getList(starttime, endtime, number) {
       this.loading = true;
       axios
         .post(
-          "http://192.168.5.188:85/api/v2/transaction/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
+          `http://${this.ipDi}/api/v2/transaction/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a`,
           {
             starttime,
             endtime,

src/views/access/renInformation/index.vue

@@ -8,6 +8,17 @@
       label-width="68px"
     >
       <el-form-item prop="offduty">
+        <el-select v-model="ipDi" placeholder="请选择考勤地址" clearable>
+          <el-option
+            v-for="item in ipList"
+            :key="item.id"
+            :label="item.ip"
+            :value="item.ip"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item prop="offduty">
         <el-select
           v-model="queryParams.offduty"
           placeholder="请选择是否在职"
@@ -21,8 +32,9 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
+        <el-button size="btr" @click="handleQuery">搜索</el-button>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -66,83 +78,13 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <!-- 修改人员对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="500px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        inline
-      >
-        <div class="jiben">基本信息</div>
-        <el-form-item label="人员编号" prop="pin">
-          <el-input v-model="form.pin" placeholder="" />
-        </el-form-item>
-        <el-form-item label="单位" prop="deptnumber">
-          <treeselect
-            v-model="form.deptnumber"
-            :options="deptOptions"
-            placeholder=""
-          />
-        </el-form-item>
-
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="" />
-        </el-form-item>
-        <el-form-item label="性别" prop="leaveType">
-          <el-select v-model="form.leaveReason" placeholder="" clearable>
-            <el-option
-              v-for="item in sixList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="手机号码" prop="mobile">
-          <el-input v-model="form.mobile" placeholder="" />
-        </el-form-item>
-        <el-form-item label="办公电话" prop="telephone">
-          <el-input v-model="form.telephone" placeholder="" />
-        </el-form-item>
-        <el-form-item label="人员卡号" prop="Card">
-          <el-input v-model="form.Card" placeholder="" />
-        </el-form-item>
-        <el-form-item label="邮箱" prop="email">
-          <el-input v-model="form.email" placeholder="" />
-        </el-form-item>
-        <el-form-item label="是否在职" prop="status">
-          <el-select v-model="form.status" placeholder="" clearable>
-            <el-option
-              v-for="item in renLiList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
-  
   <script>
 import axios from "axios";
 import { getDicts } from "@/api/system/dict/data";
 import { getDept } from "@/api/grassrootsregistration/bdglmeeting";
+import { listIpaddressconfig } from "@/api/access/accessControl";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -186,28 +128,10 @@ export default {
       },
       // 树形结构列表
       deptOptions: [],
-      //人员离职列表
-      renLiList: [
-        {
-          name: "在职",
-          id: 0,
-        },
-        {
-          name: "离职",
-          id: 1,
-        },
-      ],
-      //性别列表
-      sixList: [
-        {
-          id: "M",
-          name: "男",
-        },
-        {
-          id: "F",
-          name: "女",
-        },
-      ],
+      // 考勤机ipList
+      ipList: [],
+      ipDi: null,
+      // 192.168.5.188:85
     };
   },
   created() {
@@ -217,6 +141,9 @@ export default {
     getDicts("sys_zai").then((res) => {
       this.renList = res.data;
     });
+    listIpaddressconfig().then((res) => {
+      this.ipList = res.rows;
+    });
   },
   methods: {
     // 表单重置
@@ -227,30 +154,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset()
-    },
-    /** 提交按钮 */
-    submitForm() {
-      var arr = [];
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.form.cardno = this.form.Card;
-          arr.push(this.form);
-          axios
-            .post(
-              "http://192.168.5.188:85/api/v2/employee/update/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
-              arr
-            )
-            .then((res) => {
-              this.$message.success("修改成功");
-              this.getTiem();
-              this.open = false;
-            })
-            .catch(function (error) {
-              this.$message.error(error);
-            });
-        }
-      });
+      this.reset();
     },
     // 获取部门列表
     getBuMeng() {
@@ -258,46 +162,24 @@ export default {
         this.deptOptions = res.data;
       });
     },
-    // 修改人员信息弹出框
-    handleUpdate(row) {
-      var pin = row.pin;
-      var cardno = "";
-      this.getBuMeng();
-      axios
-        .post(
-          "http://192.168.5.188:85/api/v2/employee/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
-          {
-            pinlist: pin,
-          }
-        )
-        .then((res) => {
-          this.form = res.data.data.items[0];
-          this.open = true;
-          this.title = "修改人员信息";
-        });
-    },
     //   获取人员
     getTiem() {
       this.getList(this.queryParams.number);
     },
+    // 点击搜索
     handleQuery() {
-      this.getList(
-        this.queryParams.starttime,
-        this.queryParams.endtime,
-        this.queryParams.number
-      );
+      this.getList(this.queryParams.number);
     },
     // 重置
     resetQuery() {
-      this.getTiem();
-      this.queryParams.starttime = "";
-      this.queryParams.endtime = "";
+      // this.getTiem();
+      this.ipDi=null;
     },
     getList(number) {
       this.loading = true;
       axios
         .post(
-          "http://192.168.5.188:85/api/v2/employee/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
+          `http://${this.ipDi}/api/v2/employee/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a`,
           {
             number,
           }
@@ -308,31 +190,6 @@ export default {
           this.total = res.data.data.items.length;
         });
     },
-    // 删除人员
-    handleChakan(row) {
-      var pin = row.pin;
-      axios
-        .post(
-          "http://192.168.5.188:85/api/v2/EnrollPic/delete/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
-          {
-            pin,
-          }
-        )
-        .then(() => {
-          this.$message.success("删除人员成功1");
-          axios
-            .post(
-              "http://192.168.5.188:85/api/v2/employee/delete/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
-              {
-                pin,
-              }
-            )
-            .then(() => {
-              this.$message.success("删除人员成功");
-              this.getTiem();
-            });
-        });
-    },
   },
 };
 </script>

src/views/peopleChuRu/bdglLeave/index.vue

@@ -349,7 +349,7 @@
             v-hasPermi="['peopleChuRu:bdglLeave:edit']"
             >审批</el-button
           >
-          
+
           <el-button
             v-else-if="scope.row.common == '2'"
             size="mini"
@@ -829,7 +829,7 @@
         <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
-            :options="deptOptions"
+            :options="shenAllList"
             placeholder="请选择单位"
             @select="selectPeo"
             @open="blurSelect"
@@ -918,7 +918,7 @@
             clearable
           >
             <el-option
-              v-for="(item, i) in lianJiRen"
+              v-for="(item, i) in shenAllRenList"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1053,7 +1053,7 @@
         <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
-            :options="deptOptions"
+            :options="shenAllList"
             placeholder="选择单位"
             @select="selectPeo"
             @open="blurSelect"
@@ -1136,7 +1136,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in lianJiRen"
+              v-for="(item, i) in shenAllRenList"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1154,7 +1154,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yingJiRen"
+              v-for="(item, i) in shenAllRenList"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1272,7 +1272,7 @@
         <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
-            :options="deptOptions"
+            :options="shenAllList"
             placeholder="请选择单位"
             @select="selectPeo"
             @open="blurSelect"
@@ -1361,7 +1361,7 @@
             clearable
           >
             <el-option
-              v-for="(item, i) in yingJiRen1"
+              v-for="(item, i) in shenAllRenList"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1382,7 +1382,7 @@
             clearable
           >
             <el-option
-              v-for="(item, i) in yingJiRen1"
+              v-for="(item, i) in shenAllRenList"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1402,7 +1402,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yingJiRen1"
+              v-for="(item, i) in shenAllRenList"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1500,6 +1500,8 @@ import {
   LIanJIUSer,
   ZhengZhiUSer,
   getBdglList,
+  getAllDept,
+  getAll
 } from "@/api/peopleChuRu/bdglLeave";
 
 import {
@@ -1656,6 +1658,10 @@ export default {
         two: null,
         there: null,
       },
+      // 审批单位所有列表
+      shenAllList: [],
+      // 审批获取所有人
+      shenAllRenList:[]
     };
   },
   created() {
@@ -1671,6 +1677,18 @@ export default {
     this.getBuMeng();
   },
   methods: {
+    // 获取所有审批人员
+    getShenRen(){
+      getAll().then(res=>{
+        this.shenAllRenList=res.rows
+      })
+    },
+    // 审批获取所有单位
+    getShenAll() {
+      getAllDept().then((res) => {
+        this.shenAllList = res.data;
+      });
+    },
     // 一级审批人清除按钮触发
     peopleIdOne() {
       this.form.peopleName1 = null;
@@ -1730,7 +1748,8 @@ export default {
     // // 特殊审批按钮触发
     handleUpdatess(row) {
       this.teShu = row;
-      this.getBuMeng();
+      this.getShenAll();
+      this.getShenRen()
       // 获取字典类型
       this.getdict();
       this.reset();
@@ -1750,7 +1769,8 @@ export default {
     // 审批按钮操作
     handleUpdates(row) {
       this.shenPis = row;
-      this.getBuMeng();
+      this.getShenAll();
+      this.getShenRen()
       // 获取字典类型
       this.getdict();
       this.reset();
@@ -1776,7 +1796,8 @@ export default {
     },
     // 重置表单人员
     ChongZhiRen() {
-      (this.form.peopleId = null), (this.form.peopleId1 = null);
+      this.form.peopleId = null;
+      this.form.peopleId1 = null;
       this.form.peopleId2 = null;
       this.form.peopleId3 = null;
       this.form.peopleId4 = null;
@@ -2021,7 +2042,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      (this.renYuan = []),
+      this.renYuan = [];
         // 获取单位树形
         this.getBuMeng();
       // 获取字典类型
@@ -2100,17 +2121,21 @@ export default {
     },
     // 点击查看按钮触发
     handleSee(row) {
+      this.oneShenPi = false;
+      this.twoShenPi = false;
+      this.thereShenPi = false;
       if (row.status1 == 3) {
         this.shenPiQuan.one = row.bdglLeaveFus[0].specialApproval;
         this.oneShenPi = true;
       } else if (row.status2 == 3) {
-        this.shenPiQuan.two = row.bdglLeaveFus[1].specialApproval;
+        this.shenPiQuan.two = row.bdglLeaveFus[0].specialApproval;
         this.twoShenPi = true;
       } else if (row.status3 == 3) {
-        this.shenPiQuan.there = row.bdglLeaveFus[3].specialApproval;
+        this.shenPiQuan.there = row.bdglLeaveFus[0].specialApproval;
         this.thereShenPi = true;
       }
-      this.getBuMeng();
+      this.getShenAll();
+      this.getShenRen()
       // 获取字典类型
       this.getdict();
       this.reset();

src/views/system/dept/index.vue

@@ -6,7 +6,7 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item prop="deptName" style="color=''">
+      <el-form-item prop="deptName" >
         <el-input
           v-model="queryParams.deptName"
           placeholder="请输入单位名称"
@@ -65,7 +65,7 @@
         @queryTable="getList"
       ></right-toolbar> -->
     </el-row>
-   <!-- @selection-change="handleSelectionChange" -->
+    <!-- @selection-change="handleSelectionChange" -->
     <el-table
       v-if="refreshTable"
       v-loading="loading"
@@ -74,7 +74,6 @@
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       :header-cell-style="{ background: '#003C69', color: 'white' }"
-     
     >
       <el-table-column type="selection" width="49"></el-table-column>
       <el-table-column
@@ -180,6 +179,19 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="单位级别">
+              <el-select v-model="form.type" clearable>
+                <el-option
+                  v-for="dict in yinLianList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                  class="input_xiala"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number
@@ -189,6 +201,8 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-input
@@ -198,8 +212,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
               <el-input
@@ -209,6 +221,8 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
               <el-input
@@ -218,8 +232,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="是否展示">
               <el-select v-model="form.isShow" clearable placeholder>
@@ -233,18 +245,18 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位状态">
-              <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-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="单位状态">
+            <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-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -326,6 +338,8 @@ export default {
       },
       //是否编制
       authorizedStrength: [],
+      // 是否营连级
+      yinLianList:[]
     };
   },
   created() {
@@ -334,6 +348,10 @@ export default {
     this.getDicts("sys_yes_no").then((response) => {
       this.authorizedStrength = response.data;
     });
+     //是否编制
+     this.getDicts("sys_types").then((response) => {
+      this.yinLianList = response.data;
+    });
   },
   methods: {
     /** 查询单位列表 */
@@ -409,6 +427,7 @@ export default {
       this.reset();
       getDept(row.deptId).then((response) => {
         this.form = response.data;
+        this.form.type=response.data.type+""
         this.open = true;
         this.title = "修改单位";
       });