bug修改

zhanghua

2022-11-08 f66bea2df4423a5d595ce737c998af655e0c4919

bug修改

 src/components/filePictrue/index.vue

@@ -103,7 +103,7 @@
    .my-demo {
        position: relative;
        height: 159px;
        padding: 10px;
        margin: 10px;
    }

    .tip {

 src/views/operate/fivepack/shop/components/updateUser/index.vue

@@ -23,9 +23,9 @@
                        <el-input v-model="store.owner" placeholder="请填写店铺负责人名字"></el-input>
                    </el-form-item>
                    <!-- 店铺描述 -->
                    <el-form-item class="optionItem" label="店铺描述:" prop="storeDesc">
                    <el-form-item class="optionItem" label="店铺描述:" prop="description">
                        <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" maxlength="300" show-word-limit
                            v-model="store.storeDesc" placeholder="输入店铺描述"></el-input>
                            v-model="store.description" placeholder="输入店铺描述"></el-input>
                        <!-- <el-input type="textarea" v-model="user.storedesc" placeholder="输入部门描述"></el-input> -->
                    </el-form-item>
                    <!-- 联系方式 -->
@@ -129,7 +129,7 @@
                storeName: [
                    { required: true, trigger: "blur", validator: validateMail },
                ],
                storeDesc: [
                description: [
                    { required: false, trigger: "blur", validator: validateDesc },
                ],
            },

 src/views/operate/log/index.vue

@@ -81,7 +81,7 @@
            prop="createTime"
            label="日志时间"
            min-width="10"
            :sort-orders="['descending','ascending']"
            :sort-orders="['descending', 'ascending']"
            sortable="custom"
          >
            <template slot-scope="scope">
@@ -147,7 +147,7 @@
  </div>
</template>
<script>
import {getNowDate} from '@/utils/helper'
import { getNowDate } from "@/utils/helper";
import helper from "@/utils/mydate";
import { parseTime } from "@/utils/index";
import { createNamespacedHelpers } from "vuex";
@@ -209,7 +209,7 @@
        id: "",
        operationType: operationType === "全部" ? "" : operationType,
        portEquipment: "",
        size: pageSize,
        size: 50000,
        startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
        sort: mysort,
      });
@@ -223,7 +223,7 @@
      const href = window.URL.createObjectURL(blob);
      downloadElement.href = href;
      // // 下载后文件名
      downloadElement.download = fileName + '日志数据.xlsx';
      downloadElement.download = fileName + "日志数据.xlsx";
      document.body.appendChild(downloadElement);
      // 点击下载
      downloadElement.click();

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

@@ -1,508 +1,601 @@
<template>
    <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-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>
                <el-table-column prop="username" label="所属姓名" min-width="8">
                </el-table-column>
                <el-table-column prop="mobile" label="联系方式" min-width="7">
                </el-table-column>
                <el-table-column prop="note" label="所属角色" min-width="8">
                    <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>
                <el-table-column prop="jobTitle" label="所属职务" min-width="8">
                </el-table-column>
                <el-table-column prop="createTime" label="创建时间" min-width="10">
                    <template slot-scope="scope">
                        <span>{{changeTime(scope.row)}}</span>
                    </template>
                </el-table-column>
                <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>
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="操作" min-width="20">
                    <template slot-scope="scope">
                        <div class="operation">
                            <span @click="handleChangeRole(scope.row,'role')">修改角色</span>
                            <span class="line">|</span>
                            <span @click="handleFind(scope.row)">查看</span>
                            <span class="line">|</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>
                        </div>
                    </template>
                </el-table-column>
            </el-table>
            <!-- 查看页面 -->
            <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>
            <!-- tools -->
            <div class="tools">
                <div class="funs">
                    <div class="funsItem funs-sp">
                        <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>
                    </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-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>
                </div>
  <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-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="8">
        </el-table-column>
        <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="10">
          <template slot-scope="scope">
            <span>{{ filterRole(scope.row.roles) }}</span>
          </template>
        </el-table-column>
        <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">
          <template slot-scope="scope">
            <span>{{ changeTime(scope.row) }}</span>
          </template>
        </el-table-column>
        <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>
          </template>
        </el-table-column>
        <el-table-column prop="operation" label="操作" min-width="20">
          <template slot-scope="scope">
            <div class="operation">
              <span @click="handleChangeRole(scope.row, 'role')">修改角色</span>
              <span class="line">|</span>
              <span @click="handleFind(scope.row)">查看</span>
              <span class="line">|</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
              >
            </div>
          </template>
        </el-table-column>
      </el-table>
      <!-- 查看页面 -->
      <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>
      <!-- tools -->
      <div class="tools">
        <div class="funs">
          <div class="funsItem funs-sp">
            <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
            >
          </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-option>
            </el-select>
          </div>
        </div>
    </main>
        <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>
        </div>
      </div>
    </div>
  </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
    },
    data() {
        return {
            tableData: [],
            search: "",
            dialogUpdate: false,
            dialogView:false,
            updateFlag: false,
            userInfo: '',
            totalNum: 0,
            pageSize: 10,
            currentPage: 1,
            renderFlag: false,
            flag: {
                role: false,
                password: false,
                depart: false,
            },
            all: false,
            unsame: false,
            myIdx: 0,
            preMyIdx: 0,
            options: [
                {
                    value: 0,
                    label: '批量操作',
                    disabled: true,
                },
                {
                    value: 1,
                    label: '批量启用',
                },
                {
                    value: 2,
                    label: '批量禁用',
                },
                {
                    value: 3,
                    label: '批量删除',
                }
            ],
            tempList: []
  components: {
    updateUser,
    MyPwd,
    MyView,
  },
  data() {
    return {
      tableData: [],
      search: "",
      dialogUpdate: false,
      dialogView: false,
      updateFlag: false,
      userInfo: "",
      totalNum: 0,
      pageSize: 10,
      currentPage: 1,
      renderFlag: false,
      flag: {
        role: false,
        password: false,
        depart: false,
      },
      all: false,
      unsame: false,
      myIdx: 0,
      preMyIdx: 0,
      options: [
        {
          value: 0,
          label: "批量操作",
          disabled: true,
        },
        {
          value: 1,
          label: "批量启用",
        },
        {
          value: 2,
          label: "批量禁用",
        },
        {
          value: 3,
          label: "批量删除",
        },
      ],
      tempList: [],
    };
  },
  created() {
    this.getUserList();
  },
  methods: {
    async selectChange(list) {
      console.log(this.tempList);
      if (this.tempList.length !== 0) {
        this.preMyIdx = list;
        if (list === 3) {
          await this.mulDelte(this.tempList);
        } else if (list === 2) {
          await this.mulUpdateStatus(this.tempList, 0);
        } else {
          await this.mulUpdateStatus(this.tempList, 1);
        }
        this.myIdx = 0;
      } else {
        this.myIdx = this.preMyIdx;
        this.$message({
          type: "warning",
          message: "您还没选中任何数据",
        });
      }
    },
    created() {
        this.getUserList();
    tableChange(list) {
      this.tempList = [];
      list.forEach((item) => {
        this.tempList.push(item.id);
      });
      if (list.length === this.tableData.length) {
        this.all = true;
      } else {
        this.all = false;
      }
    },
    methods: {
        async selectChange(list) {
            console.log(this.tempList);
            if (this.tempList.length !== 0) {
                this.preMyIdx = list;
                if (list === 3) {
                    await this.mulDelte(this.tempList);
                } else if (list === 2) {
                    await this.mulUpdateStatus(this.tempList, 0);
                } else {
                    await this.mulUpdateStatus(this.tempList, 1);
                }
                this.myIdx = 0;
    // 批量删除用户信息
    mulDelte(idArr) {
      console.log(idArr);
      this.$confirm("您确定要进行批量删除用户吗?")
        .then((_) => {
          this.$axios({
            method: "post",
            url: "sccg/admin/deleteBatch?ids=" + idArr,
          }).then((res) => {
            if (res.code === 200) {
              this.$message({
                type: "success",
                message: "删除用户信息成功",
              });
              this.getUserList();
            } else {
                this.myIdx = this.preMyIdx;
                this.$message({
                    type: 'warning',
                    message: '您还没选中任何数据',
                })
              this.$message({
                type: "error",
                message: res.message,
              });
            }
        },
        tableChange(list) {
            this.tempList = [];
            list.forEach(item => {
                this.tempList.push(item.id);
            })
            if (list.length === this.tableData.length) {
                this.all = true;
            console.log(res);
          });
        })
        .catch((err) => {
          console.log(err);
        });
    },
    // 批量修改账号
    mulUpdateStatus(idArr, flag) {
      console.log(flag);
      this.$confirm(
        flag === 1
          ? "您确定要进行批量启用用户吗?"
          : "您确定要进行批量禁用用户吗?"
      )
        .then((_) => {
          this.$axios({
            method: "post",
            url:
              "sccg/admin/updateStatusBatch?ids=" + idArr + "&status=" + flag,
          }).then((res) => {
            if (res.code === 200) {
              this.$message({
                type: "success",
                message: "更改用户状态成功",
              });
              this.getUserList();
            } else {
                this.all = false
              this.$message({
                type: "error",
                message: res.message,
              });
            }
        },
        // 批量删除用户信息
        mulDelte(idArr) {
            console.log(idArr);
            this.$confirm("您确定要进行批量删除用户吗?")
                .then(_ => {
                    this.$axios({
                        method: 'post',
                        url: 'sccg/admin/deleteBatch?ids=' + idArr,
                    })
                        .then(res => {
                            if (res.code === 200) {
                                this.$message({
                                    type: 'success',
                                    message: '删除用户信息成功',
                                })
                                this.getUserList();
                            } else {
                                this.$message({
                                    type: 'error',
                                    message: res.message
                                })
                            }
                            console.log(res);
                        })
                })
                .catch(err => { console.log(err) })
        },
        // 批量修改账号
        mulUpdateStatus(idArr, flag) {
            console.log(flag);
            this.$confirm(flag === 1 ? "您确定要进行批量启用用户吗?" : '您确定要进行批量禁用用户吗?')
                .then(_ => {
                    this.$axios({
                        method: 'post',
                        url: 'sccg/admin/updateStatusBatch?ids=' + idArr + '&status=' + flag,
                    })
                        .then(res => {
                            if (res.code === 200) {
                                this.$message({
                                    type: 'success',
                                    message: '更改用户状态成功',
                                })
                                this.getUserList();
                            } else {
                                this.$message({
                                    type: 'error',
                                    message: res.message
                                })
                            }
                            console.log(res);
                        })
                })
                .catch(err => { console.log(err) })
        },
        changeTime({ createTime }) {
            return helper(createTime);
        },
        selectAll() {
            this.$refs.multipleTable.toggleAllSelection();
        },
        disSame(list) {
            list.forEach(row => {
                this.$refs.multipleTable.toggleRowSelection(row)
            })
        },
        // 删除用户
        handleDelete({ id }) {
            this.$confirm('确认删除？').then(_ => {
                this.$axios({
                    method: 'post',
                    url: 'sccg/admin/delete/' + id,
                }).then(res => {
                    console.log(res);
                    this.$message({
                        message: res.message,
                        type: 'success'
                    })
                    this.getUserList();
                })
            }).catch(_ => { })
        },
        closeDialog({ flag }) {
            this.dialogUpdate = flag;
            console.log(res);
          });
        })
        .catch((err) => {
          console.log(err);
        });
    },
    changeTime({ createTime }) {
      return helper(createTime);
    },
    selectAll() {
      this.$refs.multipleTable.toggleAllSelection();
    },
    disSame(list) {
      list.forEach((row) => {
        this.$refs.multipleTable.toggleRowSelection(row);
      });
    },
    // 删除用户
    handleDelete({ id }) {
      this.$confirm("确认删除？")
        .then((_) => {
          this.$axios({
            method: "post",
            url: "sccg/admin/delete/" + id,
          }).then((res) => {
            console.log(res);
            this.$message({
              message: res.message,
              type: "success",
            });
            this.getUserList();
        },
        handleClose(done) {
            if (this.updateFlag) {
                this.$confirm('确认关闭？')
                    .then(_ => {
                        this.dialogUpdate = false;
                        this.updateFlag = false;
                        done();
                    })
                    .catch(_ => { });
            }else{
                done();
            }
        },
        // 当前页改变触发事件
        changeCurrentPage(page) {
            this.currentPage = page;
            this.getUserList();
        },
        // 上一页点击事件
        handlePrev(page) {
            this.currentPage = page;
            this.getUserList();
        },
        // 下一页点击事件
        handleNext(page) {
            this.currentPage = page;
            this.getUserList();
        },
        // 修改角色
        handleChangeRole(obj, mykey) {
            this.dialogUpdate = true;
            this.updateFlag = true;
            for (let key in this.flag) {
                if (key == mykey) {
                    this.flag[key] = true;
                } else {
                    this.flag[key] = false;
                }
            }
            this.userInfo = obj;
        },
        // 修改用户状态
        handleChangeStatus(obj) {
            let { id, status } = obj;
            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 => {
                if (res.code === 200) {
                    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) {
            this.dialogView = true;
            this.userInfo = rowData;
        },
        // 设置表格斑马纹
        tableRowClassName({ row, rowIndex }) {
            if ((rowIndex + 1) % 2 == 0) {
                return 'warning-row';
            } else {
                return 'success-row';
            }
            return '';
        },
        // 处理用户所属角色
        filterRole(arr){
            let str = '';
            if(arr.length === 0){
                return;
            }
            arr.forEach((item,index)=>{
                if(item!==null){
                    if(index<arr.length-1){
                        str+=item.name +',';
                    }else{
                        str+=item.name;
                    }
                }
            })
            return str;
          });
        })
        .catch((_) => {});
    },
    closeDialog({ flag }) {
      this.dialogUpdate = flag;
      this.getUserList();
    },
    handleClose(done) {
      if (this.updateFlag) {
        this.$confirm("确认关闭？")
          .then((_) => {
            this.dialogUpdate = false;
            this.updateFlag = false;
            done();
          })
          .catch((_) => {});
      } else {
        done();
      }
    },
    // 当前页改变触发事件
    changeCurrentPage(page) {
      this.currentPage = page;
      this.getUserList();
    },
    // 上一页点击事件
    handlePrev(page) {
      this.currentPage = page;
      this.getUserList();
    },
    // 下一页点击事件
    handleNext(page) {
      this.currentPage = page;
      this.getUserList();
    },
    // 修改角色
    handleChangeRole(obj, mykey) {
      this.dialogUpdate = true;
      this.updateFlag = true;
      for (let key in this.flag) {
        if (key == mykey) {
          this.flag[key] = true;
        } else {
          this.flag[key] = false;
        }
      }
      this.userInfo = obj;
    },
    props: ['refresh', 'keyword', 'resetFresh'],
    watch: {
        refresh: {
            handler(newValue, oldValue) {
                if (newValue == true) {
                    this.search = '';
                    if (this.keyword != '') {
                        this.search = this.keyword;
                    }
                    this.currentPage = 1;
                    this.getUserList();
                    this.$emit('resetFresh', { flag: false })
                }
            },
            immediate: true
    // 修改用户状态
    handleChangeStatus(obj) {
      let { id, status } = obj;
      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) => {
          if (res.code === 200) {
            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) {
      this.dialogView = true;
      this.userInfo = rowData;
    },
    // 设置表格斑马纹
    tableRowClassName({ row, rowIndex }) {
      if ((rowIndex + 1) % 2 == 0) {
        return "warning-row";
      } else {
        return "success-row";
      }
      return "";
    },
    // 处理用户所属部门
    filterRole(arr) {
      let str = "";
      if (arr.length === 0) {
        return;
      }
      arr.forEach((item, index) => {
        if (item !== null) {
          if (index < arr.length - 1) {
            str += item.name + ",";
          } else {
            str += item.name;
          }
        }
    }
}
      });
      return str;
    },
    // 处理用户所属部门
    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 = this.keyword;
          }
          this.currentPage = 1;
          this.getUserList();
          this.$emit("resetFresh", { flag: false });
        }
      },
      immediate: true,
    },
  },
};
</script>
<style lang="scss" scoped>
main {
    background-color: #09152f;
    margin-top: 20px;
    padding-bottom: 50px;
    border: 1pox solid #fff;
  background-color: #09152f;
  margin-top: 20px;
  padding-bottom: 50px;
  border: 1pox solid #fff;

    .mainTitle {
        line-height:60px;
    }
  .mainTitle {
    line-height: 60px;
  }

    .tools {
        display : flex;
        justify-content: space-between;
  .tools {
    display: flex;
    justify-content: space-between;
    align-items: center;
    padding: 0 20px;

    .funs {
      display: flex;
      .funs-sp {
        border: 1px solid #17324c;
      }
      .funsItem {
        line-height: 28px;
        display: flex;
        align-items: center;
        padding: 0 20px;
        border-radius: 4px;
        font-size: 12px;
        margin-left: 10px;

        .funs {
            display: flex;
            .funs-sp{
                border: 1px solid #17324c;
            }
            .funsItem {
                line-height: 28px;
                display: flex;
                align-items: center;
                border-radius: 4px;
                font-size: 12px;
                margin-left: 10px;

                .el-checkbox {
                    width: 80px;
                    padding: 0 10px;
                }

                .el-select {
                    width: 120px;
                }

                &::v-deep .el-input__inner {
                    border: none;
                    background-color: #09152f;
                }

                &:hover {
                    border: 1px solid #4b9bb7;
                }

                &:hover .el-checkbox {
                    color: #4b9bb7;
                }
            }

        .el-checkbox {
          width: 80px;
          padding: 0 10px;
        }

        .pagination {
            margin-top: 50px;
            display: flex;
            line-height: 50px;
            justify-content: center;

            .el-pagination {

                &::v-deep li,
                &::v-deep .btn-prev,
                &::v-deep .btn-next {
                    background-color: #071f39;
                    color: #4b9bb7;
                }

                &::v-deep .active {
                    background-color: #409eff;
                    color: #fff;
                }
            }
        .el-select {
          width: 120px;
        }

        &::v-deep .el-input__inner {
          border: none;
          background-color: #09152f;
        }

        &:hover {
          border: 1px solid #4b9bb7;
        }

        &:hover .el-checkbox {
          color: #4b9bb7;
        }
      }
    }

    .el-table {
        color: #4b9bb7;
        font-size: 10px;
        .operation {
            display: flex;
            font-size: 10px;
            .line {
                padding: 0 1px;
            }
    .pagination {
      margin-top: 50px;
      display: flex;
      line-height: 50px;
      justify-content: center;

            span:hover {
                cursor: pointer;
            }
      .el-pagination {
        &::v-deep li,
        &::v-deep .btn-prev,
        &::v-deep .btn-next {
          background-color: #071f39;
          color: #4b9bb7;
        }

        &::v-deep .active {
          background-color: #409eff;
          color: #fff;
        }
      }
    }
    // &::v-deep .switchStyle .el-switch__label {
    //     position: absolute;
    //     display: none;
    //     color: #fff;
    // }
  }

    // &::v-deep .el-switch__core {
    //     background-color: rgba(166, 166, 166, 1);
    // }
  .el-table {
    color: #4b9bb7;
    font-size: 10px;
    .operation {
      display: flex;
      font-size: 10px;
      .line {
        padding: 0 1px;
      }

    // &::v-deep .switchStyle .el-switch__label--left {
    //     z-index: 9;
    //     left: 20px;
    // }
      span:hover {
        cursor: pointer;
      }
    }
  }
  // &::v-deep .switchStyle .el-switch__label {
  //     position: absolute;
  //     display: none;
  //     color: #fff;
  // }

    // &::v-deep .switchStyle .el-switch__label--right {
    //     z-index: 9;
    //     left: 4px;
    // }
  // &::v-deep .el-switch__core {
  //     background-color: rgba(166, 166, 166, 1);
  // }

    // &::v-deep .switchStyle .el-switch__label.is-active {
    //     display: block;
    // }
  // &::v-deep .switchStyle .el-switch__label--left {
  //     z-index: 9;
  //     left: 20px;
  // }

    // &::v-deep .switchStyle.el-switch .el-switch__core,
    // &::v-deep .el-switch .el-switch__label {
    //     width: 56px !important;
    // }
  // &::v-deep .switchStyle .el-switch__label--right {
  //     z-index: 9;
  //     left: 4px;
  // }

  // &::v-deep .switchStyle .el-switch__label.is-active {
  //     display: block;
  // }

  // &::v-deep .switchStyle.el-switch .el-switch__core,
  // &::v-deep .el-switch .el-switch__label {
  //     width: 56px !important;
  // }
}
</style>

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

@@ -1,202 +1,276 @@
<template>
    <div class="updateUser">
        <main>
            <div class="mainContent">
                <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
                    label-position="right">
                    <!-- 用户名称 -->
                    <el-form-item class="optionItem" label="用户名称:" prop="username">
                        <el-input v-model="user.username" placeholder="填写用户名称" disabled></el-input>
                    </el-form-item>
                    <!-- 用户密码 -->
                    <el-form-item class="optionItems" label="用户密码:" prop="password">
                        <el-input v-model="user.password" type="password" placeholder="请输入用户密码" disabled>
                        </el-input>
                    </el-form-item>
                    <!-- 所属用户姓名 -->
                    <el-form-item class="optionItem" label="所属用户姓名:" prop="nickName">
                        <el-input v-model="user.nickName" placeholder="请填写用户姓名" disabled></el-input>
                    </el-form-item>
                    <!-- 性别 -->
                    <el-form-item class="optionItem" label="性别:" prop="sex">
                        <el-radio-group v-model="user.sex" disabled>
                            <el-radio :label="1">男</el-radio>
                            <el-radio :label="0">女</el-radio>
                        </el-radio-group>
                    </el-form-item>
                    <!-- 是否党员 -->
                    <el-form-item class="optionItem" label="是否党员:" prop="isDy">
                        <el-radio-group v-model="user.isDy" disabled>
                            <el-radio :label="1">是</el-radio>
                            <el-radio :label="0">否</el-radio>
                        </el-radio-group>
                    </el-form-item>
                    <!-- 所属手机号码 -->
                    <el-form-item class="optionItem" label="所属手机号码:" prop="mobile">
                        <el-input v-model="user.mobile" placeholder="请填写手机号码" disabled></el-input>
                    </el-form-item>
                    <!-- 邮箱地址 -->
                    <el-form-item class="optionItem" label="邮箱地址:" prop="email">
                        <el-input v-model="user.email" placeholder="请填写邮箱地址" disabled></el-input>
                    </el-form-item>
                    <!-- 选择角色 -->
                    <el-form-item class="optionItem" label="选择角色:" prop="role">
                        <el-select v-model="user.role" placeholder="请选择所属角色" multiple collapse-tags
                        disabled>
                            <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id">
                            </el-option>
                        </el-select>
                    </el-form-item>
                    <!-- 用户类型 -->
                    <el-form-item class="optionItem" label="用户类型:" prop="userType">
                        <el-select v-model="user.userType" placeholder="请选择用户类型" disabled>
                            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
                            </el-option>
                        </el-select>
                    </el-form-item>
                    <!-- 所属部门 -->
                    <el-form-item class="optionItem" label="所属部门:" prop="departmentId">
                        <el-input  v-model="user.departName"></el-input>
                    </el-form-item>
                    <!-- 当前职务 -->
                    <el-form-item class="optionItem" label="当前职务:" prop="jobTitle">
                        <el-input v-model="user.jobTitle" placeholder="请输入当前职务" disabled></el-input>
                    </el-form-item>
                    <!-- 填写所属mac地址 -->
                    <el-form-item class="optionItem" label="填写所属mac地址:" prop="mac">
                        <el-input v-model="user.mac" placeholder="请填写所属mac地址" disabled></el-input>
                    </el-form-item>
                    <!-- 填写所属ip地址 -->
                    <el-form-item class="optionItem" label="填写所属ip地址:" prop="ip">
                        <el-input v-model="user.ip" placeholder="请填写所属ip地址" disabled></el-input>
                    </el-form-item>
                </el-form>
            </div>
        </main>
    </div>
  <div class="updateUser">
    <main>
      <div class="mainContent">
        <el-form
          ref="user"
          label-width="140px"
          autoComplete="on"
          :model="user"
          :rules="createUserRules"
          label-position="right"
        >
          <!-- 用户名称 -->
          <el-form-item class="optionItem" label="用户名称:" prop="username">
            <el-input
              v-model="user.username"
              placeholder="填写用户名称"
              disabled
            ></el-input>
          </el-form-item>
          <!-- 用户密码 -->
          <el-form-item class="optionItems" label="用户密码:" prop="password">
            <el-input
              v-model="user.password"
              type="password"
              placeholder="请输入用户密码"
              disabled
            >
            </el-input>
          </el-form-item>
          <!-- 所属用户姓名 -->
          <el-form-item
            class="optionItem"
            label="所属用户姓名:"
            prop="nickName"
          >
            <el-input
              v-model="user.nickName"
              placeholder="请填写用户姓名"
              disabled
            ></el-input>
          </el-form-item>
          <!-- 性别 -->
          <el-form-item class="optionItem" label="性别:" prop="sex">
            <el-radio-group v-model="user.sex" disabled>
              <el-radio :label="1">男</el-radio>
              <el-radio :label="0">女</el-radio>
            </el-radio-group>
          </el-form-item>
          <!-- 是否党员 -->
          <el-form-item class="optionItem" label="是否党员:" prop="isDy">
            <el-radio-group v-model="user.isDy" disabled>
              <el-radio :label="1">是</el-radio>
              <el-radio :label="0">否</el-radio>
            </el-radio-group>
          </el-form-item>
          <!-- 所属手机号码 -->
          <el-form-item class="optionItem" label="所属手机号码:" prop="mobile">
            <el-input
              v-model="user.mobile"
              placeholder="请填写手机号码"
              disabled
            ></el-input>
          </el-form-item>
          <!-- 邮箱地址 -->
          <el-form-item class="optionItem" label="邮箱地址:" prop="email">
            <el-input
              v-model="user.email"
              placeholder="请填写邮箱地址"
              disabled
            ></el-input>
          </el-form-item>
          <!-- 选择角色 -->
          <el-form-item class="optionItem" label="选择角色:" prop="role">
            <el-select
              v-model="user.role"
              placeholder="请选择所属角色"
              multiple
              collapse-tags
              disabled
            >
              <el-option
                v-for="item in roleList"
                :key="item.id"
                :label="item.name"
                :value="item.id"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <!-- 用户类型 -->
          <el-form-item class="optionItem" label="用户类型:" prop="userType">
            <el-select v-model="user.userType" placeholder="请选择用户类型">
              <el-option
                v-for="item in typeList"
                :key="item.id"
                :label="item.name"
                :value="item.id"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <!-- 所属部门 -->
          <el-form-item
            class="optionItem"
            label="所属部门:"
            prop="departmentId"
          >
            <el-input v-model="user.departName"></el-input>
          </el-form-item>
          <!-- 当前职务 -->
          <el-form-item class="optionItem" label="当前职务:" prop="jobTitle">
            <el-input
              v-model="user.jobTitle"
              placeholder="请输入当前职务"
              disabled
            ></el-input>
          </el-form-item>
          <!-- 填写所属mac地址 -->
          <el-form-item class="optionItem" label="填写所属mac地址:" prop="mac">
            <el-input
              v-model="user.mac"
              placeholder="请填写所属mac地址"
              disabled
            ></el-input>
          </el-form-item>
          <!-- 填写所属ip地址 -->
          <el-form-item class="optionItem" label="填写所属ip地址:" prop="ip">
            <el-input
              v-model="user.ip"
              placeholder="请填写所属ip地址"
              disabled
            ></el-input>
          </el-form-item>
        </el-form>
      </div>
    </main>
  </div>
</template>
<script>
import { getTypeList } from "@/utils/helper";
export default {
    data() {
        return {
            user: {
            },
            createUserRules: {
            },
            roleList: [
               
            ],
            typeList: [],
            departList: [],
  data() {
    return {
      user: {},
      createUserRules: {},
      roleList: [],
      typeList: [],
      departList: [],
    };
  },
  created() {
    const that = this;
    this.user = JSON.parse(JSON.stringify(that.userInfo));
    this.user.departName = "";
    if (this.user.depart.length > 0) {
      this.user.depart.forEach((item, index) => {
        if (item !== null) {
          if (index < this.user.depart.length - 1) {
            this.user.departName += item.departName + ",";
          } else {
            this.user.departName += item.departName;
          }
        }
      });
    } else {
      this.user.departName = "暂无所属部门";
    }
    // 获取所有角色列表
    this.getRoleList();
    // 获取当前用户角色列表
    this.getUserRole(this.user.id);
    // 获取全部部门列表
    this.$axios.get("/sccg/depart/tree").then((res) => {
      this.departList = res.data;
    });

    // 获取用户类型
    getTypeList(1, "07").then((data) => {
      this.typeList = data;
    });
  },
  methods: {
    // 获取角色列表
    getRoleList() {
      this.$axios({
        method: "get",
        url: "sccg/role/listAll",
      }).then((res) => {
        this.roleList = res.data;
      });
    },
    created() {
        const that = this;
        this.user = JSON.parse(JSON.stringify(that.userInfo));
        this.user.departName  = this.user.departName ? this.user.departName : '暂无所属部门'
        // 获取所有角色列表
        this.getRoleList();
        // 获取当前用户角色列表
        this.getUserRole(this.user.id)
        // 获取全部部门列表
        this.$axios.get('/sccg/depart/tree').then(res => {
            this.departList = res.data;
        })
    // 获取用户的角色列表
    getUserRole(id) {
      this.$axios({
        method: "get",
        url: `sccg/admin/role/${id}`,
      }).then((res) => {
        const arr = [];
        res.data.forEach((item) => {
          arr.push(item.id);
        });
        this.user.role = arr;
      });
    },
    methods: {
        // 获取角色列表
        getRoleList() {
            this.$axios({
                method: 'get',
                url: 'sccg/role/listAll',
            })
                .then(res => {
                    this.roleList = res.data;
                })
        },
        // 获取用户的角色列表
        getUserRole(id) {
            this.$axios({
                method: 'get',
                url: `sccg/admin/role/${id}`
            })
                .then(res => {
                    const arr = [];
                    res.data.forEach(item => {
                        arr.push(item.id);
                    })
                    this.user.role = arr;
                })
        },
    },
    props: ['userInfo']
}
  },
  props: ["userInfo"],
};
</script>
<style lang="scss" scoped>
.updateUser {
    border-radius: 1px;
  border-radius: 1px;
  background-color: #09152f;

  :deep(.el-tag) {
    background-color: #09152f;
  }

    :deep(.el-tag) {
        background-color: #09152f;
    }
  .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
    background-color: #09152f;
    color: #4b9bb7;
  }

    .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
        background-color: #09152f;
        color: #4b9bb7;
    }
  main {
    text-align: left;
    padding: 0 55px;
    background-color: #09152f;
    padding-bottom: 50px;

    main {
        text-align: left;
        padding: 0 55px;
        background-color: #09152f;
        padding-bottom: 50px;
    .mainContent {
      display: flex;
      justify-content: center;
      padding-top: 50px;

        .mainContent {
            display: flex;
            justify-content: center;
            padding-top: 50px;
      .el-form-item__content {
        width: 400px;

            .el-form-item__content {
                width: 400px;

                .el-select {
                    width: 100%;
                }
            }

            .optionHandleSp {
                display: flex;

                .areaNumber,
                .moreNumber {
                    flex: 1;
                }

                .telNumber {
                    flex: 2;
                }
            }

            .optionBtn {
                display: flex;
                margin-top: 20px;

                .btn {
                    padding: 12px 50px;
                }
            }

        .el-select {
          width: 100%;
        }
      }

      .optionHandleSp {
        display: flex;

        .areaNumber,
        .moreNumber {
          flex: 1;
        }

        .telNumber {
          flex: 2;
        }
      }

      .optionBtn {
        display: flex;
        margin-top: 20px;

        .btn {
          padding: 12px 50px;
        }
      }
    }
  }
}

.updateUser::v-deep .el-form-item__label {
    color: #4b9bb7;
  color: #4b9bb7;
}

.updateUser::v-deep .el-input__inner {
    background-color: #09152f;
    border: 1px solid #17324c;
  background-color: #09152f;
  border: 1px solid #17324c;
}
</style>