zhanghua
2023-03-23 394e444b3d6f20da250f89a5bc72c8ce782d5528
账号增加时间限制
4个文件已修改
190 ■■■■ 已修改文件
src/views/layout/components/Header/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/user/components/createUser/index.vue 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/user/components/header/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/user/components/main/index.vue 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/layout/components/Header/index.vue
@@ -228,7 +228,7 @@
            break;
          }
        }
        console.log(that.menuLinkLists)
        // console.log(that.menuLinkLists)
        // this.menuLinkList = res
      });
src/views/systemSetting/baseSetting/user/components/createUser/index.vue
@@ -29,7 +29,7 @@
            <div class="item-right"></div>
          </div>
          <!-- 用户密码 -->
          <div class="user-item">
                    <div v-if="!user.id" class="user-item">
            <div class="item-left">
              <el-form-item
                class="optionItems"
@@ -66,7 +66,11 @@
          <!-- 性别 -->
          <div class="user-item">
            <div class="item-left">
              <el-form-item class="optionItem" label="性别:" prop="sex">
                            <el-form-item
                                class="optionItem"
                                label="性别:"
                                prop="sex"
                            >
                <el-radio-group v-model="user.sex">
                  <el-radio :label="1">男</el-radio>
                  <el-radio :label="0">女</el-radio>
@@ -78,7 +82,11 @@
          <!-- 是否党员 -->
          <div class="user-item">
            <div class="item-left">
              <el-form-item class="optionItem" label="是否党员:" prop="isDy">
                            <el-form-item
                                class="optionItem"
                                label="是否党员:"
                                prop="isDy"
                            >
                <el-radio-group v-model="user.isDy">
                  <el-radio :label="1">是</el-radio>
                  <el-radio :label="0">否</el-radio>
@@ -107,7 +115,11 @@
          <!-- 邮箱地址 -->
          <div class="user-item">
            <div class="item-left">
              <el-form-item class="optionItem" label="邮箱地址:" prop="email">
                            <el-form-item
                                class="optionItem"
                                label="邮箱地址:"
                                prop="email"
                            >
                <el-input
                  v-model="user.email"
                  placeholder="请填写邮箱地址"
@@ -119,7 +131,11 @@
          <!-- 选择角色 -->
          <div class="user-item">
            <div class="item-left">
              <el-form-item class="optionItem" label="选择角色:" prop="role">
                            <el-form-item
                                class="optionItem"
                                label="选择角色:"
                                prop="role"
                            >
                <el-select
                  v-model="user.role"
                  placeholder="请选择所属角色"
@@ -146,7 +162,10 @@
                label="用户类型:"
                prop="userType"
              >
                <el-select v-model="user.userType" placeholder="请选择用户类型">
                                <el-select
                                    v-model="user.userType"
                                    placeholder="请选择用户类型"
                                >
                  <el-option
                    v-for="item in typeList"
                    :key="item.id"
@@ -163,15 +182,24 @@
          <div class="user-item sp-item">
            <div class="item-left">
              <el-form-item label="座机/分机:" prop="zjarea">
                <el-input v-model="user.zjarea" placeholder="电话区号">
                                <el-input
                                    v-model="user.zjarea"
                                    placeholder="电话区号"
                                >
                </el-input>
              </el-form-item>
              <el-form-item prop="zjnumber" class="left-px">
                <el-input v-model="user.zjnumber" placeholder="电话号码">
                                <el-input
                                    v-model="user.zjnumber"
                                    placeholder="电话号码"
                                >
                </el-input>
              </el-form-item>
              <el-form-item prop="zjother" class="left-px">
                <el-input v-model="user.zjother" placeholder="分机号码">
                                <el-input
                                    v-model="user.zjother"
                                    placeholder="分机号码"
                                >
                </el-input>
              </el-form-item>
            </div>
@@ -241,6 +269,55 @@
            </div>
            <div class="item-right"></div>
          </div>
                    <div class="user-item sp-item">
                        <div class="item-left">
                            <el-form-item
                                class="optionItem"
                                label="账号有效期:"
                                prop="days"
                            >
                                <el-input
                                    v-model="user.days"
                                    placeholder="请填写账号有效期天数"
                                ></el-input>
                            </el-form-item>
                            <el-form-item class="left-px">
                                <span
                                    style="
                                        margin: 0 20px 0 10px;
                                        font-size: 18px;
                                    "
                                    >天</span
                                >
                            </el-form-item>
                            <el-form-item class="left-px">
                                <el-checkbox
                                    label="长期"
                                    v-model="user.dayCheck"
                                    @change="dayaCheck"
                                ></el-checkbox>
                            </el-form-item>
                        </div>
                        <!-- <div class="item-left">
                            <el-form-item label="座机/分机:" prop="zjarea">
                                <el-input
                                    v-model="user.zjarea"
                                    placeholder="电话区号"
                                >
                                </el-input>
                            </el-form-item>
                            <el-form-item prop="zjother" class="left-px">
                                <el-input
                                    v-model="user.zjother"
                                    placeholder="分机号码"
                                >
                                </el-input>
                            </el-form-item>
                        </div> -->
                        <div class="item-right"></div>
                    </div>
          <el-form-item>
            <div class="optionBtn">
              <el-button
@@ -249,7 +326,9 @@
                @click.native.prevent="handleUser"
                >提交
              </el-button>
              <el-button class="btn reset" @click.native.prevent="resetForm"
                            <el-button
                                class="btn reset"
                                @click.native.prevent="resetForm"
                >重置</el-button
              >
            </div>
@@ -444,17 +523,30 @@
    this.getRoleList();
    // 获取用户类型
    this.getUserTypeList();
        if (this.userInfo) {
            this.user = this.userInfo
            this.user.role = this.userInfo.roles.map(o => o.id)
            if (this.userInfo.depart && this.userInfo.depart.length > 0) {
                this.userDepart = this.userInfo.depart[this.userInfo.depart.length - 1]
                this.user.departmentId = this.userInfo.depart[this.userInfo.depart.length - 1].id
            }
            if (!this.userInfo.expirationDate || this.userInfo.expirationDate == '2199-12-31') {
                this.userInfo.dayCheck = true
            }
        }
  },
  methods: {
    // 提交注册
    handleUser() {
      this.$refs["user"].validate((valid) => {
        console.log(valid);
        if (valid) {
          const { user } = this;
          console.log(user);
          this.$axios
            .post("sccg/admin/register", {
                            id: user.id,
              departmentId: user.departmentId,
              email: user.email,
              icon: "",
@@ -470,6 +562,7 @@
              username: user.username,
              zj: user.zjarea + `${user.zjnumber}` + user.zjother,
              nickName: user.nickName,
                            days: user.days
              // departName:user.departName,
            })
            .then((res) => {
@@ -506,6 +599,12 @@
        this.roleList = res.data;
      });
    },
        dayaCheck(e) {
            if (e) {
                this.user.days = null
            }
            this.user.dayCheck = e
        },
    // 重置表单
    resetForm() {
      this.$refs["user"].resetFields();
@@ -529,7 +628,7 @@
      }
    },
  },
  props: ["sendDialog"],
    props: ["sendDialog", "userInfo"],
};
</script>
<style lang="scss" scoped>
src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -6,7 +6,7 @@
                <el-input placeholder="请输入内容" v-model="search"></el-input>
                <div class="findBtn">
                    <el-button class="find-Btn" type="primary" @click="setSearch">查询</el-button>
                  <el-upload
                  <el-upload style="margin-top: -5px;"
                      class="department-margin-left10"
                      action=""
                      ref="uploadFile"
src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -10,14 +10,15 @@
          background: '#F5F5F5',
          'font-size': '14px',
          'font-weight': '650',
          'line-height': '45px',
                    'line-height': '45px'
        }"
        :data="tableData"
        style="width: 100%"
        :row-class-name="tableRowClassName"
        @selection-change="tableChange"
      >
        <el-table-column type="selection" min-width="5"> </el-table-column>
                <el-table-column type="selection" min-width="5">
                </el-table-column>
        <el-table-column label="用户ID" min-width="6">
          <template slot-scope="scope">{{ scope.row.id }}</template>
        </el-table-column>
@@ -32,14 +33,22 @@
            <span>{{ filterRole(scope.row.roles) }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="departName" label="所属部门" min-width="10">
                <el-table-column
                    prop="departName"
                    label="所属部门"
                    min-width="10"
                >
          <template slot-scope="scope">
            <span>{{ filterDepart(scope.row.depart) }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="jobTitle" label="所属职务" min-width="8">
        </el-table-column>
        <el-table-column prop="createTime" label="创建时间" min-width="10">
                <el-table-column
                    prop="createTime"
                    label="创建时间"
                    min-width="10"
                >
          <template slot-scope="scope">
            <span>{{ changeTime(scope.row) }}</span>
          </template>
@@ -60,11 +69,12 @@
        <el-table-column prop="operation" label="操作" min-width="20">
          <template slot-scope="scope">
            <div class="operation">
              <span @click="handleChangeRole(scope.row, 'role')">修改角色</span>
                            <span @click="handleChange(scope.row)">修改</span>
              <span class="line">|</span>
              <span @click="handleFind(scope.row)">查看</span>
              <span class="line">|</span>
              <span @click="handleChangeRole(scope.row, 'password')"
                            <span
                                @click="handleChangeRole(scope.row, 'password')"
                >修改密码</span
              >
              <span class="line">|</span>
@@ -75,7 +85,7 @@
              >
              <span class="line">|</span>
              <span @click="handleChangeStatus(scope.row)">{{
                scope.row.status === true ? "停用" : "启用"
                                scope.row.status === true ? '停用' : '启用'
              }}</span>
            </div>
          </template>
@@ -114,16 +124,34 @@
          :getUserList="getUserList"
          v-if="!flag.password"
        />
        <MyPwd v-else :userInfo="userInfo" @closeDialog="closeDialog"></MyPwd>
                <MyPwd
                    v-else
                    :userInfo="userInfo"
                    @closeDialog="closeDialog"
                ></MyPwd>
            </el-dialog>
            <el-dialog
                :visible.sync="dialogCreate"
                title="新增账户"
                width="800px"
                v-if="dialogCreate"
                :before-close="handleClose"
            >
                <createUser @sendDialog="sendDialog" :userInfo="userInfo" />
      </el-dialog>
      <!-- tools -->
      <div class="tools">
        <div class="funs">
          <div class="funsItem funs-sp">
            <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox>
                        <el-checkbox v-model="all" @change="selectAll()"
                            >全选</el-checkbox
                        >
          </div>
          <div class="funsItem funs-sp">
            <el-checkbox v-model="unsame" @change="disSame(tableData)"
                        <el-checkbox
                            v-model="unsame"
                            @change="disSame(tableData)"
              >反选</el-checkbox
            >
          </div>
@@ -164,11 +192,13 @@
</template>
<script>
import helper from "@/utils/mydate";
import createUser from "../createUser";
import updateUser from "../updateUser";
import MyPwd from "../password";
import MyView from "../myView";
export default {
  components: {
        createUser,
    updateUser,
    MyPwd,
    MyView,
@@ -177,6 +207,7 @@
    return {
      tableData: [],
      search: "",
            dialogCreate: false,
      dialogUpdate: false,
      dialogView: false,
      updateFlag: false,
@@ -221,7 +252,6 @@
  },
  methods: {
    async selectChange(list) {
      console.log(this.tempList);
      if (this.tempList.length !== 0) {
        this.preMyIdx = list;
        if (list === 3) {
@@ -253,7 +283,6 @@
    },
    // 批量删除用户信息
    mulDelte(idArr) {
      console.log(idArr);
      this.$confirm("您确定要进行批量删除用户吗?")
        .then((_) => {
          this.$axios({
@@ -281,7 +310,6 @@
    },
    // 批量修改账号
    mulUpdateStatus(idArr, flag) {
      console.log(flag);
      this.$confirm(
        flag === 1
          ? "您确定要进行批量启用用户吗?"
@@ -339,6 +367,10 @@
        })
        .catch((_) => {});
    },
        sendDialog(flag) {
            this.dialogCreate = flag.flag;
            this.$emit('setDialog', { flag: true })
        },
    closeDialog({ flag }) {
      this.dialogUpdate = flag;
      this.getUserList();
@@ -372,6 +404,11 @@
      this.getUserList();
    },
    // 修改角色
        handleChange(obj) {
            this.dialogCreate = true;
            this.userInfo = obj;
        },
        // 修改角色
    handleChangeRole(obj, mykey) {
      this.dialogUpdate = true;
      this.updateFlag = true;