完善一期用户

src/api/system/dict/data.js

@@ -24,6 +24,13 @@ export function getDicts(dictType) {
     method: 'get'
   })
 }
+// 根据字典类型查询字典数据信息
+export function getYqDicts(dictType) {
+  return request({
+    url: '/yq/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
 
 // 新增字典数据
 export function addData(data) {

src/api/yiqi/user.js

@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/yq/gas/user/getList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(id) {
+  return request({
+    url: '/yq/gas/user/' + id,
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/yq/gas/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/yq/gas/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(id) {
+  return request({
+    url: '/yq/gas/user/' + id,
+    method: 'delete'
+  })
+}
+
+
+// 黑名单管理列表
+export function getBlacklist(query) {
+  return request({
+    url: '/yq/gas/user/getBlacklist',
+    method: 'get',
+    params: query
+  })
+}
+
+// 手机号验证
+export function getForPhone(value,id) {
+  return request({
+    url: '/yq/gas/user/getForPhone?phone='+value+'&id='+id,
+    method: 'get',
+  })
+}
+// 工号验证
+export function getForJobnum(value,id) {
+  return request({
+    url: '/yq/gas/user/getForJobnum?jobNum='+value+'&id='+id,
+    method: 'get',
+  })
+}

src/views/yiqi/user/index.vue

@@ -0,0 +1,410 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工号" prop="jobNum">
+        <el-input
+          v-model="queryParams.jobNum"
+          placeholder="请输入工号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['gas:user:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['gas:user:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['gas:user:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="工号" align="center" prop="jobNum" />
+      <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['gas:user:edit']"
+          >查看详情</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['gas:user:remove']"-->
+<!--          >删除</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改用户对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" disabled>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="工号" prop="jobNum">
+          <el-input v-model="form.jobNum" placeholder="请输入工号" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input type="password" v-model="form.password" placeholder="请输入密码" />
+        </el-form-item>
+
+
+        <el-form-item label="工程权限" prop="power">
+          <el-select
+            v-model="form.power"
+            placeholder="工程权限"
+            clearable
+            multiple
+            size="small"
+            style="width:100%"
+            @change="powerChange"
+          >
+            <el-option
+              v-for="dict in engineTypeList"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="民用内部权限" prop="civilPower" v-if="isCivilPower" v-show="isCivilPower">
+          <el-select
+            v-model="form.civilPower"
+            placeholder="民用内部权限"
+            clearable
+            multiple
+            size="small"
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in civilPowerUserList"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+<!--        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getForPhone,getForJobnum,getUser, delUser, addUser,updateUser } from "@/api/yiqi/user";
+import {getYqDicts} from "@/api/system/dict/data";
+
+export default {
+  name: "User",
+  dicts: ['user_type','engine_type','civil_power_user'],
+  data() {
+    // 手机号唯一性验证
+    let validateAnotherPhone = (rule, value, callback) => {
+      console.log(value)
+      console.log(rule)
+      console.log(this.form)
+      let PHONE_REG = /^((0\d{2,3}-{0,1}\d{7,8})|(1[3-9]\d{9}))$/;
+      if (value) {
+        if (!PHONE_REG.test(value)) {
+          callback(new Error('请输入有效的手机号'));
+          return;
+        }
+        getForPhone(value,this.form.id).then(res => {
+              if (res.data===false) {
+                callback('该手机号已存在');
+              } else {
+                callback();
+              }
+            }).catch(err => {
+              callback(new Error(err.data.msg));
+            });
+      } else {
+        callback();
+      }
+    };
+    // 工号唯一性验证
+    let validateAnother = (rule, value, callback) => {
+      if (value) {
+        getForJobnum(value,this.form.id).then(res => {
+              if (res.data===false) {
+                callback('该工号已存在');
+              } else {
+                callback();
+              }
+            }).catch(err => {
+              callback(new Error(err.data.msg));
+            });
+      } else {
+        callback();
+      }
+    };
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: [],
+      civilPowerUserList: [],
+      engineTypeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        jobNum: undefined,
+      },
+      // 工程权限集合
+      isCivilPower:false,
+
+      foremanList:[],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        jobNum: [
+          { required: true, message: "工号不能为空", trigger: "blur" },
+          { required: true, trigger: 'blur', validator: validateAnother }
+        ],
+
+      }
+    };
+  },
+  created() {
+    this.getYqDictsList();
+    this.getList();
+
+  },
+  methods: {
+    getYqDictsList(){
+      getYqDicts("engine_type").then(res => {
+        this.engineTypeList = res.data
+      })
+      getYqDicts("civil_power_user").then(res => {
+        this.civilPowerUserList = res.data
+      })
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    foreman(role){
+      if (role === "002"){
+        this.foremanForm=true;
+      }else {
+        this.foremanForm=false;
+        this.form.parentId = undefined;
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        jobNum: undefined,
+        phone: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        power: undefined,
+        civilPower: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getUser(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改用户";
+        this.form.power = response.data.power.split(",");
+        if(response.data.power.indexOf('001')!=-1){
+          this.isCivilPower=true;
+        }
+        this.form.civilPower = response.data.civilPower.split(",");
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(!this.isCivilPower){
+            this.form.civilPower=null;
+          }else {
+            this.form.civilPower = this.form.civilPower.toString();
+          }
+          this.form.power = this.form.power.toString();
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delUser(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+        this.$download.excel('/gas/user/export', this.queryParams);
+    },
+    powerChange(val){
+      if(val.indexOf("001") > -1){
+        this.isCivilPower=true;
+      }else{
+        this.isCivilPower=false;
+      }
+    }
+  }
+};
+</script>