Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-08 5c5712ee7cc9065b8257681c7ec5d92534166aac

 src/views/systemSetting/baseSetting/user/components/main/index.vue

@@ -2,27 +2,39 @@
    <main>
        <div class="mainContent">
            <!-- 数据展示 -->
            <el-table ref="multipleTable"
                :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','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
        ref="multipleTable"
        :header-cell-style="{
          background: '#06122c',
          'font-size': '12px',
          color: '#4b9bb7',
          'font-weight': '650',
          '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 label="用户ID" min-width="6">
                    <template slot-scope="scope">{{ scope.row.id }}</template>
                </el-table-column>
                <el-table-column prop="nickName" label="用户名称" min-width="10">
        <el-table-column prop="nickName" label="用户名称" min-width="8">
                </el-table-column>
                <el-table-column prop="username" label="所属姓名" min-width="8">
        <el-table-column prop="username" label="所属姓名" min-width="6">
                </el-table-column>
                <el-table-column prop="mobile" label="联系方式" min-width="7">
                </el-table-column>
                <el-table-column prop="note" label="所属角色" min-width="8">
        <el-table-column prop="note" label="所属角色" min-width="10">
                    <template slot-scope="scope">
                        <span>{{filterRole(scope.row.roles)}}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="departName" label="所属部门" min-width="8">
        <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>
@@ -34,8 +46,13 @@
                <el-table-column prop="status" label="启用" min-width="5">
                    <template slot-scope="scope">
                        <!-- @change="handleChangeStatus(scope.row)" -->
                        <el-switch class="switchStyle" v-model="scope.row.status"
                            active-color="#3fef9a" inactive-color="#000212" disabled>
            <el-switch
              class="switchStyle"
              v-model="scope.row.status"
              active-color="#3fef9a"
              inactive-color="#000212"
              disabled
            >
                        </el-switch>
                    </template>
                </el-table-column>
@@ -46,27 +63,53 @@
                            <span class="line">|</span>
                            <span @click="handleFind(scope.row)">查看</span>
                            <span class="line">|</span>
                            <span @click="handleChangeRole(scope.row,'password')">修改密码</span>
              <span @click="handleChangeRole(scope.row, 'password')"
                >修改密码</span
              >
                            <span class="line">|</span>
                            <span @click="handleDelete(scope.row)">删除</span>
                            <span class="line">|</span>
                            <span @click="handleChangeRole(scope.row,'depart')">修改部门</span>
              <span @click="handleChangeRole(scope.row, 'depart')"
                >修改部门</span
              >
                        </div>
                    </template>
                </el-table-column>
            </el-table>
            <!-- 查看页面 -->
            <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
                title="查看用户信息">
                <MyView :userInfo=userInfo></MyView>
      <el-dialog
        :visible.sync="dialogView"
        width="45%"
        v-if="dialogView"
        title="查看用户信息"
      >
        <MyView :userInfo="userInfo"></MyView>
            </el-dialog>
            <!-- 修改页面 -->
            <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
                :title="updateFlag ? flag.role ? '修改用户角色信息' : flag.depart ? '修改用户部门信息': '修改用户密码' :''"
                :before-close="handleClose">
                <updateUser :updateFlag="updateFlag" :userInfo=userInfo :flag=flag @closeDialog="closeDialog"
                    :getUserList="getUserList" v-if="!flag.password" />
                <MyPwd v-else :userInfo=userInfo @closeDialog="closeDialog"></MyPwd>
      <el-dialog
        :visible.sync="dialogUpdate"
        width="45%"
        v-if="dialogUpdate"
        :title="
          updateFlag
            ? flag.role
              ? '修改用户角色信息'
              : flag.depart
              ? '修改用户部门信息'
              : '修改用户密码'
            : ''
        "
        :before-close="handleClose"
      >
        <updateUser
          :updateFlag="updateFlag"
          :userInfo="userInfo"
          :flag="flag"
          @closeDialog="closeDialog"
          :getUserList="getUserList"
          v-if="!flag.password"
        />
        <MyPwd v-else :userInfo="userInfo" @closeDialog="closeDialog"></MyPwd>
            </el-dialog>
            <!-- tools -->
            <div class="tools">
@@ -75,20 +118,38 @@
                        <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>
            <el-checkbox v-model="unsame" @change="disSame(tableData)"
              >反选</el-checkbox
            >
                    </div>
                    <div class="funsItem">
                        <el-select v-model="myIdx" placeholder="批量操作" @change="selectChange">
                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
                                :disabled="item.disabled">
            <el-select
              v-model="myIdx"
              placeholder="批量操作"
              @change="selectChange"
            >
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
                :disabled="item.disabled"
              >
                            </el-option>
                        </el-select>
                    </div>
                </div>
                <div class="pagination">
                    <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
                        :page-size="pageSize" @current-change="changeCurrentPage" @prev-click="handlePrev"
                        @next-click="handleNext">
          <el-pagination
            background
            :current-page="currentPage"
            layout="prev, pager, next"
            :total="totalNum"
            :page-size="pageSize"
            @current-change="changeCurrentPage"
            @prev-click="handlePrev"
            @next-click="handleNext"
          >
                    </el-pagination>
                </div>
            </div>
@@ -96,13 +157,15 @@
    </main>
</template>
<script>
import helper from '@/utils/mydate'
import updateUser from '../updateUser';
import MyPwd from '../password'
import MyView from '../myView'
import helper from "@/utils/mydate";
import updateUser from "../updateUser";
import MyPwd from "../password";
import MyView from "../myView";
export default {
    components: {
        updateUser, MyPwd,MyView
    updateUser,
    MyPwd,
    MyView,
    },
    data() {
        return {
@@ -111,7 +174,7 @@
            dialogUpdate: false,
            dialogView:false,
            updateFlag: false,
            userInfo: '',
      userInfo: "",
            totalNum: 0,
            pageSize: 10,
            currentPage: 1,
@@ -128,24 +191,24 @@
            options: [
                {
                    value: 0,
                    label: '批量操作',
          label: "批量操作",
                    disabled: true,
                },
                {
                    value: 1,
                    label: '批量启用',
          label: "批量启用",
                },
                {
                    value: 2,
                    label: '批量禁用',
          label: "批量禁用",
                },
                {
                    value: 3,
                    label: '批量删除',
                }
          label: "批量删除",
        },
            ],
            tempList: []
        }
      tempList: [],
    };
    },
    created() {
        this.getUserList();
@@ -166,75 +229,82 @@
            } else {
                this.myIdx = this.preMyIdx;
                this.$message({
                    type: 'warning',
                    message: '您还没选中任何数据',
                })
          type: "warning",
          message: "您还没选中任何数据",
        });
            }
        },
        tableChange(list) {
            this.tempList = [];
            list.forEach(item => {
      list.forEach((item) => {
                this.tempList.push(item.id);
            })
      });
            if (list.length === this.tableData.length) {
                this.all = true;
            } else {
                this.all = false
        this.all = false;
            }
        },
        // 批量删除用户信息
        mulDelte(idArr) {
            console.log(idArr);
            this.$confirm("您确定要进行批量删除用户吗?")
                .then(_ => {
        .then((_) => {
                    this.$axios({
                        method: 'post',
                        url: 'sccg/admin/deleteBatch?ids=' + idArr,
                    })
                        .then(res => {
            method: "post",
            url: "sccg/admin/deleteBatch?ids=" + idArr,
          }).then((res) => {
                            if (res.code === 200) {
                                this.$message({
                                    type: 'success',
                                    message: '删除用户信息成功',
                                })
                type: "success",
                message: "删除用户信息成功",
              });
                                this.getUserList();
                            } else {
                                this.$message({
                                    type: 'error',
                                    message: res.message
                                })
                type: "error",
                message: res.message,
              });
                            }
                            console.log(res);
          });
                        })
                })
                .catch(err => { console.log(err) })
        .catch((err) => {
          console.log(err);
        });
        },
        // 批量修改账号
        mulUpdateStatus(idArr, flag) {
            console.log(flag);
            this.$confirm(flag === 1 ? "您确定要进行批量启用用户吗?" : '您确定要进行批量禁用用户吗?')
                .then(_ => {
      this.$confirm(
        flag === 1
          ? "您确定要进行批量启用用户吗?"
          : "您确定要进行批量禁用用户吗?"
      )
        .then((_) => {
                    this.$axios({
                        method: 'post',
                        url: 'sccg/admin/updateStatusBatch?ids=' + idArr + '&status=' + flag,
                    })
                        .then(res => {
            method: "post",
            url:
              "sccg/admin/updateStatusBatch?ids=" + idArr + "&status=" + flag,
          }).then((res) => {
                            if (res.code === 200) {
                                this.$message({
                                    type: 'success',
                                    message: '更改用户状态成功',
                                })
                type: "success",
                message: "更改用户状态成功",
              });
                                this.getUserList();
                            } else {
                                this.$message({
                                    type: 'error',
                                    message: res.message
                                })
                type: "error",
                message: res.message,
              });
                            }
                            console.log(res);
          });
                        })
                })
                .catch(err => { console.log(err) })
        .catch((err) => {
          console.log(err);
        });
        },
        changeTime({ createTime }) {
            return helper(createTime);
@@ -243,25 +313,27 @@
            this.$refs.multipleTable.toggleAllSelection();
        },
        disSame(list) {
            list.forEach(row => {
                this.$refs.multipleTable.toggleRowSelection(row)
            })
      list.forEach((row) => {
        this.$refs.multipleTable.toggleRowSelection(row);
      });
        },
        // 删除用户
        handleDelete({ id }) {
            this.$confirm('确认删除？').then(_ => {
      this.$confirm("确认删除？")
        .then((_) => {
                this.$axios({
                    method: 'post',
                    url: 'sccg/admin/delete/' + id,
                }).then(res => {
            method: "post",
            url: "sccg/admin/delete/" + id,
          }).then((res) => {
                    console.log(res);
                    this.$message({
                        message: res.message,
                        type: 'success'
                    })
              type: "success",
            });
                    this.getUserList();
          });
                })
            }).catch(_ => { })
        .catch((_) => {});
        },
        closeDialog({ flag }) {
            this.dialogUpdate = flag;
@@ -269,13 +341,13 @@
        },
        handleClose(done) {
            if (this.updateFlag) {
                this.$confirm('确认关闭？')
                    .then(_ => {
        this.$confirm("确认关闭？")
          .then((_) => {
                        this.dialogUpdate = false;
                        this.updateFlag = false;
                        done();
                    })
                    .catch(_ => { });
          .catch((_) => {});
            }else{
                done();
            }
@@ -311,26 +383,32 @@
        // 修改用户状态
        handleChangeStatus(obj) {
            let { id, status } = obj;
            status == true ? status = 1 : status = 0;
            this.$axios.post(`sccg/admin/updateStatus/` + id + '?status=' + status).then(res => {
      status == true ? (status = 1) : (status = 0);
      this.$axios
        .post(`sccg/admin/updateStatus/` + id + "?status=" + status)
        .then((res) => {
                console.log(res);
            })
        });
        },
        // 获取用户列表
        getUserList() {
            const that = this;
            const { currentPage, pageSize, search } = this;
            // 获取所有用户信息、用户查询(暂时支持电话号码)
            this.$axios.get(`sccg/admin/list?keyword=${search}&current=${currentPage}&pageSize=${pageSize}`).then(res => {
      this.$axios
        .get(
          `sccg/admin/list?keyword=${search}&current=${currentPage}&pageSize=${pageSize}`
        )
        .then((res) => {
                if (res.code === 200) {
                    res.data.records.forEach(item => {
                        item.status == 1 ? item.status = true : item.status = false;
                    })
            res.data.records.forEach((item) => {
              item.status == 1 ? (item.status = true) : (item.status = false);
            });
                    that.totalNum = res.data.total;
                    that.tableData = res.data.records;
                    this.renderFlag = true;
                }
            })
        });
        },
        // 查看用户信息(不可修改)
        handleFind(rowData) {
@@ -340,48 +418,65 @@
        // 设置表格斑马纹
        tableRowClassName({ row, rowIndex }) {
            if ((rowIndex + 1) % 2 == 0) {
                return 'warning-row';
        return "warning-row";
            } else {
                return 'success-row';
        return "success-row";
            }
            return '';
      return "";
        },
        // 处理用户所属角色
    // 处理用户所属部门
        filterRole(arr){
            let str = '';
      let str = "";
            if(arr.length === 0){
                return;
            }
            arr.forEach((item,index)=>{
                if(item!==null){
                    if(index<arr.length-1){
                        str+=item.name +',';
            str += item.name + ",";
                    }else{
                        str+=item.name;
                    }
                }
            })
      });
            return str;
        }
    },
    props: ['refresh', 'keyword', 'resetFresh'],
    // 处理用户所属部门
    filterDepart(arr) {
      let str = "";
      if (arr.length === 0) {
        return;
      }
      arr.forEach((item, index) => {
        if (item !== null) {
          if (index < arr.length - 1) {
            str += item.departName + ",";
          } else {
            str += item.departName;
          }
        }
      });
      return str;
    },
  },
  props: ["refresh", "keyword", "resetFresh"],
    watch: {
        refresh: {
            handler(newValue, oldValue) {
                if (newValue == true) {
                    this.search = '';
                    if (this.keyword != '') {
          this.search = "";
          if (this.keyword != "") {
                        this.search = this.keyword;
                    }
                    this.currentPage = 1;
                    this.getUserList();
                    this.$emit('resetFresh', { flag: false })
          this.$emit("resetFresh", { flag: false });
                }
            },
            immediate: true
        }
    }
}
      immediate: true,
    },
  },
};
</script>
<style lang="scss" scoped>
main {
@@ -435,7 +530,6 @@
                    color: #4b9bb7;
                }
            }

        }

        .pagination {
@@ -445,7 +539,6 @@
            justify-content: center;

            .el-pagination {

                &::v-deep li,
                &::v-deep .btn-prev,
                &::v-deep .btn-next {