部门组件，bug修改

zhanghua

2023-02-09 7705cdd240ea1a07a5772ffb6ba0e1e4995bcc74

部门组件，bug修改

 src/components/Table/index.vue

@@ -243,11 +243,11 @@
    }

    &::v-deep .warning-row {
        background-color: #06122c;
        // background-color: #06122c;
    }

    &::v-deep .success-row {
        background-color: #071f39;
        // background-color: #071f39;
    }

    .operationBox {

 src/components/departTree/index.vue

@@ -1,5 +1,5 @@
<template>
  <el-select v-model="model.departName" placeholder="请选择所属部门">
  <el-select v-model="model.departName" placeholder="请选择部门">
    <el-option value="1">
      <el-tree
        ref="tree"

 src/views/operate/car/myIndex/create/law/index.vue

@@ -212,28 +212,6 @@
        this.car.departName = depart.departName;
      }
    },
    nodeClick(data, checked) {
      this.checkedId = data.comcode;
      this.$refs.tree.setCheckedNodes([data]);
      this.car.departId = data.id;
      this.car.departName = data.departName;
      this.selectOrg.orgsid = [];
      this.selectOrg.orgsid.push(data.id);
    },
    handleCheck(data, checked) {
      if (checked == true) {
        this.checkedId = data.comcode;
        this.$refs.tree.setCheckedNodes([data]);
        this.car.departId = data.id;
        this.car.departName = data.departName;
        this.selectOrg.orgsid = [];
        this.selectOrg.orgsid.push(data.id);
      } else {
        // 再次直接进行赋值为空操作
        this.selectOrg.orgsid = [];
        this.user.departmentId = "";
      }
    },
  },
  props: ["closeDialog"],
};

 src/views/operate/writManager/writ/index.vue

@@ -32,9 +32,9 @@
          </el-table-column>
          <el-table-column prop="writTypeName" label="文书种类" min-width="180">
          </el-table-column>
          <el-table-column prop="categoryName" label="违法类型" min-width="300">
          <el-table-column prop="categoryName" label="违法类型" min-width="80">
          </el-table-column>
          <el-table-column prop="eventCode" label="事件编号" width="160">
          <el-table-column prop="eventCode" label="事件编号"  min-width="100">
          </el-table-column>
          <el-table-column prop="sendTime" label="文书发放时间" min-width="120">
          </el-table-column>
@@ -63,7 +63,7 @@
            prop="state"
            :formatter="formatSate"
            label="状态"
            width="60"
             min-width="60"
          >
          </el-table-column>

@@ -187,7 +187,7 @@
    },
    handleDelete(row) {
      this.$confirm("确认删除？").then((_) => {
        this.deleteWrit(row.id).then((res) => {
        this.deleteWrit(row.baseCaseId).then((res) => {
          this.$message({
            type: "success",
            message: "删除成功！",

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

@@ -185,26 +185,10 @@
                label="所属部门:"
                prop="departmentId"
              >
                <el-select
                  v-model="user.departmentId"
                  placeholder="请选择所属部门"
                  @change="getDepartName"
                >
                  <el-option :value="mylabel">
                    <el-tree
                      ref="tree"
                      :check-strictly="true"
                      :data="departList"
                      :props="defaultProps"
                      show-checkbox
                      @check-change="handleCheck"
                      @node-click="nodeClick"
                      default-expand-all
                      node-key="id"
                    >
                    </el-tree>
                  </el-option>
                </el-select>
                <departTree
                  :depart="userDepart"
                  @selectDepart="selectDepart"
                ></departTree>
              </el-form-item>
            </div>
            <div class="item-right"></div>
@@ -277,7 +261,11 @@
</template>
<script>
import { getTypeList } from "@/utils/helper";
import departTree from "@/components/departTree/index.vue";
export default {
  components: {
    departTree,
  },
  data() {
    const validateNickname = (rule, value, callback) => {
      if (!value) {
@@ -407,6 +395,7 @@
        mac: "",
        ip: "",
      },
      userDepart: {},
      createUserRules: {
        nickName: [
          { required: true, trigger: "blur", validator: validateNickname },
@@ -448,9 +437,6 @@
          }
        },
      },
      selectOrg: {
        orgsid: [],
      },
    };
  },
  created() {
@@ -458,8 +444,6 @@
    this.getRoleList();
    // 获取用户类型
    this.getUserTypeList();
    // 获取部门
    this.getDepartList();
  },
  methods: {
    // 提交注册
@@ -467,11 +451,11 @@
      this.$refs["user"].validate((valid) => {
        console.log(valid);
        if (valid) {
          const { user, selectOrg } = this;
          const { user } = this;
          console.log(user);
          this.$axios
            .post("sccg/admin/register", {
              departmentId: selectOrg.orgsid[0],
              departmentId: user.departmentId,
              email: user.email,
              icon: "",
              isDy: `${user.isDy}`,
@@ -538,33 +522,10 @@
    async getUserTypeList() {
      this.typeList = await getTypeList(1, "07");
    },
    // 获取部门树
    getDepartList() {
      this.$axios({
        method: "get",
        url: "sccg/depart/tree",
      }).then((res) => {
        this.departList = res.data;
      });
    },
    nodeClick(data, checked) {
      this.checkedId = data.comcode;
      this.$refs.tree.setCheckedNodes([data]);
      this.user.departmentId = data.departName;
      this.selectOrg.orgsid = [];
      this.selectOrg.orgsid.push(data.id);
    },
    handleCheck(data, checked) {
      if (checked == true) {
        this.checkedId = data.comcode;
        this.$refs.tree.setCheckedNodes([data]);
        this.user.departmentId = data.departName;
        this.selectOrg.orgsid = [];
        this.selectOrg.orgsid.push(data.id);
      } else {
        // 再次直接进行赋值为空操作
        this.selectOrg.orgsid = [];
        this.user.departmentId = "";
    selectDepart(depart) {
      if (depart) {
        this.user.departmentId = depart.departId;
        this.user.departName = depart.departName;
      }
    },
  },

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

@@ -2,223 +2,229 @@
    <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
          ref="user"
          label-width="140px"
          autoComplete="on"
          :model="user"
          :rules="createUserRules"
          label-position="right"
        >
                    <!-- 选择角色 -->
                    <el-form-item class="optionItem" label="选择角色:" prop="role" v-if="flag.role">
                        <el-select v-model="user.role" placeholder="请选择所属角色" multiple collapse-tags>
                            <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id">
          <el-form-item
            class="optionItem"
            label="选择角色:"
            prop="role"
            v-if="flag.role"
          >
            <el-select
              v-model="user.role"
              placeholder="请选择所属角色"
              multiple
              collapse-tags
            >
              <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="departmentId" v-else>
                        <el-select v-model="user.departName" placeholder="请选择所属部门" :disabled="!flag.depart">
                            <el-option :value="mylabel">
                                <el-tree ref="tree" :check-strictly="true" :data="departList" :props="defaultProps"
                                    show-checkbox @check-change="handleCheck"
                                    :default-checked-keys="[selectOrg.orgsid[0],]" default-expand-all node-key="id">
                                </el-tree>
                            </el-option>
                        </el-select>
          <el-form-item
            class="optionItem"
            label="所属部门:"
            prop="departmentId"
            v-else
          >
            <departTree
              :depart="userDepart"
              @selectDepart="selectDepart"
            ></departTree>
                    </el-form-item>
                    <el-form-item>
                        <div class="optionBtn">
                            <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">提交
              <el-button
                type="primary"
                class="btn submit"
                @click.native.prevent="handleUser"
                >提交
                            </el-button>
                        </div>
                    </el-form-item>
                </el-form>

            </div>
        </main>
    </div>
</template>
<script>
import departTree from "@/components/departTree/index.vue";
export default {
  components: {
    departTree,
  },
    data() {
        return {
            user: {
            },
            createUserRules: {
            },
            roleList: [

            ],
      user: {},
      userDepart: {},
      createUserRules: {},
      roleList: [],
            departList: [],
            mylabel: "",
            defaultProps: {
                children: "children",
                label: "departName",
            },
            selectOrg: {
                orgsid: [],
            },
            tempName: '',
            tempRole: []
        }
      tempName: "",
      tempRole: [],
    };
    },
    created() {
        this.user = JSON.parse(JSON.stringify(this.userInfo));
        this.tempName = this.user.depart[0].departName;
        this.selectOrg.orgsid.push(this.user.depart[0].id);

    this.userDepart = {
      departId: this.user.depart[0].departId,
      departName: this.user.depart[0].departName,
    };
        // 获取所有角色列表
        this.getRoleList();
        // 获取当前用户角色列表
        this.getUserRole(this.user.id)
        // 获取全部部门列表
        this.$axios.get('/sccg/depart/tree').then(res => {
            this.departList = res.data;
        })
    this.getUserRole(this.user.id);
    },
    methods: {
        // 修改部门
        changeDepart(data) {
            this.departList.forEach(item => {
      this.departList.forEach((item) => {
                if (item.id === data) {
                    this.user.departName = item.departName;
                }
            })
      });
        },
        // 修改用户信息
        handleUser() {
            const { flag, user, tempName, selectOrg, tempRole, isArraySame } = this;
            let umsDepartManage = { userId: user.id, departId: selectOrg.orgsid[0] }
      const { flag, user, tempName, tempRole, isArraySame } = this;
      let umsDepartManage = { userId: user.id, departId: user.departId };
            this.$refs.user.validate((valid) => {
                if (valid) {
                    user.isDy = `${user.isDy}`;
                    if (flag.depart) {
                        if (tempName === user.departName) {
                            this.$message({
                                type: 'warning',
                                message: '您的部门还未更改'
                            })
                type: "warning",
                message: "您的部门还未更改",
              });
                        } else {
                            if (user.departName) {
                                this.$axios({
                                    method: 'put',
                                    url: `/sccg/depart/user_update_depart?userId=` + user.id + '&departId=' + selectOrg.orgsid[0]
                                })
                                    .then(res => {
                  method: "put",
                  url:
                    `/sccg/depart/user_update_depart?userId=` +
                    user.id +
                    "&departId=" +
                    user.departId,
                }).then((res) => {
                                        this.$message({
                                            type: res.code === 200 ? 'success' : 'warning',
                    type: res.code === 200 ? "success" : "warning",
                                            message: res.message,
                                        })
                  });
                                        this.getUserList();
                                        this.$emit('closeDialog', { flag: false });
                                    })
                  this.$emit("closeDialog", { flag: false });
                });
                            } else {
                                this.$message({
                                    type: 'warning',
                                    message: '用户部门不能为空'
                                })
                  type: "warning",
                  message: "用户部门不能为空",
                });
                            }
                        }

                    } else {
                        if (user.role.length === 0) {
                            this.$message({
                                type: 'warning',
                                message: '用户角色不能为空',
                            })
                        }
                        else if (isArraySame(tempRole, user.role) && tempRole.length === user.role.length) {
                type: "warning",
                message: "用户角色不能为空",
              });
            } else if (
              isArraySame(tempRole, user.role) &&
              tempRole.length === user.role.length
            ) {
                            this.$message({
                                type: 'warning',
                                message: '您还未更改角色',
                            })
                        }
                        else {
                type: "warning",
                message: "您还未更改角色",
              });
            } else {
                            this.$axios({
                                method: 'put',
                                url: 'sccg/depart/user_update_Role?id=' + user.id + '&roles=' + user.role,
                            })
                                .then(res => {
                method: "put",
                url:
                  "sccg/depart/user_update_Role?id=" +
                  user.id +
                  "&roles=" +
                  user.role,
              }).then((res) => {
                                    this.$message({
                                        type: res.code === 200 ? 'success' : 'warning',
                  type: res.code === 200 ? "success" : "warning",
                                        message: res.message,
                                    })
                });
                                    this.getUserList();
                                    this.$emit('closeDialog', { flag: false });
                                })
                this.$emit("closeDialog", { flag: false });
              });
                        }
                    }
                } else {
                    return false;
                }
            })
      });
        },
        // 获取角色列表
        getRoleList() {
            this.$axios({
                method: 'get',
                url: 'sccg/role/listAll',
            })
                .then(res => {
        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 => {
        method: "get",
        url: `sccg/admin/role/${id}`,
      }).then((res) => {
                    const arr = [];
                    res.data.forEach(item => {
        res.data.forEach((item) => {
                        arr.push(item.id);
                    })
        });
                    this.user.role = arr;
                    this.tempRole = arr;
                })
        },
        // 部门修改
        handleCheck(data, checked) {
            this.user.departName = data.departName;
            // 获取当前选择的id在数组中的索引
            const indexs = this.selectOrg.orgsid.indexOf(data.id);
            // 如果不存在数组中，并且数组中已经有一个id并且checked为true的时候，代表不能再次选择。
            if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
                this.$message({
                    message: "只能选择一个部门！",
                    type: "warning",
                    showClose: true,
                });
                // 设置已选择的节点为false 很重要
                this.$refs.tree.setChecked(data, false);
            } else if (this.selectOrg.orgsid.length === 0 && checked) {
                // 发现数组为空 并且是已选择
                // 防止数组有值，首先清空，再push
                this.selectOrg.orgsid = [];
                this.selectOrg.orgsid.push(data.id);
            } else if (
                indexs >= 0 &&
                this.selectOrg.orgsid.length === 1 &&
                !checked
            ) {
                // 再次直接进行赋值为空操作
                this.selectOrg.orgsid = [];
                this.user.departName = ''
    },

    selectDepart(depart) {
      if (depart) {
        this.user.departId = depart.departId;
        this.user.departName = depart.departName;
            }
        },

        // 判断数组是否相等
        isArraySame(arr1, arr2) {
            let flag = true
            arr1.sort((a, b) => a - b)
            arr2.sort((a, b) => a - b)
            arr1.forEach(item => {
                arr2.forEach(child => {
      let flag = true;
      arr1.sort((a, b) => a - b);
      arr2.sort((a, b) => a - b);
      arr1.forEach((item) => {
        arr2.forEach((child) => {
                    if (item !== child) {
                        flag = false
            flag = false;
                    }
                })
            })
            return flag
        }
        });
      });
      return flag;
    },
    props: ['userInfo', 'flag', 'closeDialog', 'getUserList']
}
  },
  props: ["userInfo", "flag", "closeDialog", "getUserList"],
};
</script>
<style lang="scss" scoped>
.updateUser {
@@ -274,7 +280,6 @@
                    padding: 12px 50px;
                }
            }

        }
    }
}

 src/views/systemSetting/device/grid/components/createUser/index.vue

@@ -2,13 +2,27 @@
    <div class="createUser">
        <main>
            <div class="mainContent">
                <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
                    label-position="right">
        <el-form
          ref="user"
          label-width="140px"
          autoComplete="on"
          :model="user"
          :rules="createUserRules"
          label-position="right"
        >
                    <!-- 用户名称 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="用户名称:" prop="username">
                                <el-input v-model="user.username" placeholder="填写用户名称" autoComplete="new-username">
              <el-form-item
                class="optionItem"
                label="用户名称:"
                prop="username"
              >
                <el-input
                  v-model="user.username"
                  placeholder="填写用户名称"
                  autoComplete="new-username"
                >
                                </el-input>
                            </el-form-item>
                        </div>
@@ -17,9 +31,17 @@
                    <!-- 用户密码 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItems" label="用户密码:" prop="password">
                                <el-input v-model="user.password" type="password" autoComplete="new-password"
                                    placeholder="请输入用户密码"></el-input>
              <el-form-item
                class="optionItems"
                label="用户密码:"
                prop="password"
              >
                <el-input
                  v-model="user.password"
                  type="password"
                  autoComplete="new-password"
                  placeholder="请输入用户密码"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -28,8 +50,15 @@
                    <!-- 所属用户姓名 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="所属用户姓名:" prop="nickName">
                                <el-input v-model="user.nickName" placeholder="请填写用户姓名"></el-input>
              <el-form-item
                class="optionItem"
                label="所属用户姓名:"
                prop="nickName"
              >
                <el-input
                  v-model="user.nickName"
                  placeholder="请填写用户姓名"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -61,8 +90,16 @@
                    <!-- 所属手机号码 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="所属手机号码:" prop="mobile">
                                <el-input v-model="user.mobile" maxlength="11" placeholder="请填写手机号码"></el-input>
              <el-form-item
                class="optionItem"
                label="所属手机号码:"
                prop="mobile"
              >
                <el-input
                  v-model="user.mobile"
                  maxlength="11"
                  placeholder="请填写手机号码"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -71,7 +108,10 @@
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="邮箱地址:" prop="email">
                                <el-input v-model="user.email" placeholder="请填写邮箱地址"></el-input>
                <el-input
                  v-model="user.email"
                  placeholder="请填写邮箱地址"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -80,9 +120,18 @@
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="选择角色:" prop="role">
                                <el-select v-model="user.role" placeholder="请选择所属角色" multiple collapse-tags>
                                    <el-option v-for="item in roleList" :key="item.id" :label="item.name"
                                        :value="item.id">
                <el-select
                  v-model="user.role"
                  placeholder="请选择所属角色"
                  multiple
                  collapse-tags
                >
                  <el-option
                    v-for="item in roleList"
                    :key="item.id"
                    :label="item.name"
                    :value="item.id"
                  >
                                    </el-option>
                                </el-select>
                            </el-form-item>
@@ -92,10 +141,18 @@
                    <!-- 用户类型 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="用户类型:" prop="userType">
              <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
                    v-for="item in typeList"
                    :key="item.id"
                    :label="item.name"
                    :value="item.id"
                  >
                                    </el-option>
                                </el-select>
                            </el-form-item>
@@ -123,15 +180,12 @@
                    <!-- 所属部门 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="所属部门:" prop="departmentId">
                                <el-select v-model="user.departmentId" placeholder="请选择所属部门" @change="getDepartName">
                                    <el-option :value="mylabel">
                                        <el-tree ref="tree" :check-strictly="true" :data="departList"
                                            :props="defaultProps" show-checkbox @check-change="handleCheck"
                                            default-expand-all node-key="id">
                                        </el-tree>
                                    </el-option>
                                </el-select>
              <el-form-item
                class="optionItem"
                label="所属部门:"
                prop="departmentId"
              >
                <departTree @selectDepart="selectDepart"></departTree>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -139,8 +193,15 @@
                    <!-- 当前职务 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="当前职务:" prop="jobTitle">
                                <el-input v-model="user.jobTitle" placeholder="请输入当前职务"></el-input>
              <el-form-item
                class="optionItem"
                label="当前职务:"
                prop="jobTitle"
              >
                <el-input
                  v-model="user.jobTitle"
                  placeholder="请输入当前职务"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -148,8 +209,15 @@
                    <!-- 填写所属mac地址 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="填写所属mac地址:" prop="mac">
                                <el-input v-model="user.mac" placeholder="请填写所属mac地址"></el-input>
              <el-form-item
                class="optionItem"
                label="填写所属mac地址:"
                prop="mac"
              >
                <el-input
                  v-model="user.mac"
                  placeholder="请填写所属mac地址"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
@@ -157,28 +225,44 @@
                    <!-- 填写所属ip地址 -->
                    <div class="user-item">
                        <div class="item-left">
                            <el-form-item class="optionItem" label="填写所属ip地址:" prop="ip">
                                <el-input v-model="user.ip" placeholder="请填写所属ip地址"></el-input>
              <el-form-item
                class="optionItem"
                label="填写所属ip地址:"
                prop="ip"
              >
                <el-input
                  v-model="user.ip"
                  placeholder="请填写所属ip地址"
                ></el-input>
                            </el-form-item>
                        </div>
                        <div class="item-right"></div>
                    </div>
                    <el-form-item>
                        <div class="optionBtn">
                            <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">提交
              <el-button
                type="primary"
                class="btn submit"
                @click.native.prevent="handleUser"
                >提交
                            </el-button>
                            <el-button class="btn reset" @click.native.prevent="resetForm">重置</el-button>
              <el-button class="btn reset" @click.native.prevent="resetForm"
                >重置</el-button
              >
                        </div>
                    </el-form-item>
                </el-form>

            </div>
        </main>
    </div>
</template>
<script>
import { getTypeList } from '@/utils/helper'
import { getTypeList } from "@/utils/helper";
import departTree from "@/components/departTree/index.vue";
export default {
  components: {
    departTree,
  },
    data() {
        const validateNickname = (rule, value, callback) => {
            if (!value) {
@@ -193,7 +277,9 @@
            } else {
                const rep = /^\w+$/;
                if (!rep.test(value)) {
                    callback(new Error("密码只能是以数字、26个英文字母或者下划线组成的字符串"));
          callback(
            new Error("密码只能是以数字、26个英文字母或者下划线组成的字符串")
          );
                } else {
                    callback();
                }
@@ -210,7 +296,7 @@
            if (!value) {
                callback(new Error("手机号码不能为空"));
            } else {
                const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
        const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
                if (!rep.test(value)) {
                    callback("请输入正确的手机号码");
                } else {
@@ -220,9 +306,10 @@
        };
        const validateMail = (rule, value, callback) => {
            if (value) {
                const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
        const rep =
          /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
                if (!rep.test(value)) {
                    callback(new Error("请输入正确的邮箱"))
          callback(new Error("请输入正确的邮箱"));
                } else {
                    callback();
                }
@@ -234,21 +321,21 @@
            if (!value) {
                callback(new Error("所属角色不能为空"));
            } else {
                callback()
        callback();
            }
        };
        const validateType = (rule, value, callback) => {
            if (!value) {
                callback(new Error("用户类型不能为空"));
            } else {
                callback()
        callback();
            }
        };
        const validateDepartment = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请选择用户部门"));
            } else {
                callback()
        callback();
            }
        };
        const validateWork = (rule, value, callback) => {
@@ -262,34 +349,34 @@
            if (value) {
                callback();
            } else {
                callback()
        callback();
            }
        };
        const validateIp = (rule, value, callback) => {
            if (value) {
                callback();
            } else {
                callback()
        callback();
            }
        };
        return {
            user: {
                nickName: '',
                password: '',
                username: '',
        nickName: "",
        password: "",
        username: "",
                sex: 1,
                isDy: 0,
                mobile: '',
                email: '',
        mobile: "",
        email: "",
                role: null,
                userType: null,
                zjarea: '',
                zjnumber: '',
                zjother: '',
        zjarea: "",
        zjnumber: "",
        zjother: "",
                departmentId: null,
                jobTitle: null,
                mac: '',
                ip: '',
        mac: "",
        ip: "",
            },
            createUserRules: {
                nickName: [
@@ -301,86 +388,62 @@
                username: [
                    { required: true, trigger: "blur", validator: validateTruename },
                ],
                sex: [
                    { required: true, trigger: "blur" },
                ],
                isDy: [
                    { required: true, trigger: "blur" },
                ],
                mobile: [
                    { required: true, trigger: "blur", validator: validatePhone },
                ],
                email: [
                    { required: true, trigger: "blur", validator: validateMail },
                ],
                role: [
                    { required: true, trigger: "change", validator: validateRole },
                ],
        sex: [{ required: true, trigger: "blur" }],
        isDy: [{ required: true, trigger: "blur" }],
        mobile: [{ required: true, trigger: "blur", validator: validatePhone }],
        email: [{ required: true, trigger: "blur", validator: validateMail }],
        role: [{ required: true, trigger: "change", validator: validateRole }],
                userType: [
                    { required: true, trigger: "change", validator: validateType },
                ],
                zj: [
                    { required: false, trigger: "blur" },
                ],
        zj: [{ required: false, trigger: "blur" }],
                departmentId: [
                    { required: true, trigger: "change", validator: validateDepartment },
                ],
                jobTitle: [
                    { required: true, trigger: "blur", validator: validateWork },
                ],
                mac: [
                    { required: false, trigger: "blur", validator: validateMac },
                ],
                ip: [
                    { required: false, trigger: "blur", validator: validateIp },
                ],
        mac: [{ required: false, trigger: "blur", validator: validateMac }],
        ip: [{ required: false, trigger: "blur", validator: validateIp }],
            },
            roleList: [

            ],
            typeList: [

            ],
      roleList: [],
      typeList: [],
            departList: [],
            mylabel: '',
      mylabel: "",
            defaultProps: {
                children: 'children',
                label: 'departName',
        children: "children",
        label: "departName",
                disabled: (data, node) => {
                    if (node.level === 1 && node.childNodes.length !== 0) {
                        return !data.leaf
                    }
            return !data.leaf;
                }
            },
            selectOrg: {
                orgsid: []
            },
        }
    };
    },
    created() {
        // 获取角色列表
        this.getRoleList();
        // 获取用户类型
        this.getUserTypeList();
        // 获取部门
        this.getDepartList();
    },
    methods: {
        // 提交注册
        handleUser() {
            this.$refs['user'].validate((valid) => {
      this.$refs["user"].validate((valid) => {
                console.log(valid);
                if (valid) {
                    const { user, selectOrg } = this;
          const { user } = this;
                    console.log(user);
                    this.$axios.post('sccg/admin/register', {
                        departmentId: selectOrg.orgsid[0],
          this.$axios
            .post("sccg/admin/register", {
              departmentId: user.departmentId,
                        email: user.email,
                        icon: '',
              icon: "",
                        isDy: `${user.isDy}`,
                        jobTitle: user.jobTitle,
                        mobile: user.mobile,
                        note: '',
              note: "",
                        roleIds: user.role,
                        // nickName: user.nickName,
                        sex: `${user.sex}`,
@@ -388,100 +451,69 @@
                        userType: user.userType,
                        username: user.username,
                        zj: user.zjarea + `${user.zjnumber}` + user.zjother,
                        nickName: user.nickName
              nickName: user.nickName,
                        // departName:user.departName,
                    }).then(res => {
            })
            .then((res) => {
                        if (res.code === 200) {
                            console.log(1);
                            this.$message({
                                type: 'success',
                  type: "success",
                                message: res.message,
                            })
                            this.$emit('sendDialog', { flag: false });
                });
                this.$emit("sendDialog", { flag: false });
                        } else if (res.code === 500 && res.message === "操作失败") {
                            this.$message({
                                type: 'warning',
                                message: '该用户已注册'
                            })
                  type: "warning",
                  message: "该用户已注册",
                });
                        } else {
                            this.$message({
                                type: 'warning',
                                message: res.message
                            })
                  type: "warning",
                  message: res.message,
                });
                        }
                    })
            });
                } else {
                    return false
          return false;
                }
            })
      });
        },
        // 获取角色列表
        getRoleList() {
            this.$axios({
                method: 'get',
                url: 'sccg/role/listAll',
            })
                .then(res => {
        method: "get",
        url: "sccg/role/listAll",
      }).then((res) => {
                    this.roleList = res.data;
                })
      });
        },
        // 重置表单
        resetForm() {
            this.$refs['user'].resetFields();
      this.$refs["user"].resetFields();
        },
        // 获得部门名称
        getDepartName(data) {
            this.departList.forEach(item => {
      this.departList.forEach((item) => {
                if (item.id === data) {
                    this.user.departName = item.departName
          this.user.departName = item.departName;
                }
            })
      });
        },
        // 获取用户类型
        async getUserTypeList() {
            this.typeList = await getTypeList(1, '07');
      this.typeList = await getTypeList(1, "07");
        },
        // 获取部门树
        getDepartList() {
            this.$axios({
                method: 'get',
                url: 'sccg/depart/tree'
            })
                .then(res => {
                    this.departList = res.data;
                })
        },
        handleCheck(data, checked) {
            this.user.departmentId = data.departName;
            // 获取当前选择的id在数组中的索引
            const indexs = this.selectOrg.orgsid.indexOf(data.id)
            // 如果不存在数组中，并且数组中已经有一个id并且checked为true的时候，代表不能再次选择。
            if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
                this.$message({
                    message: '只能选择一个部门！',
                    type: 'warning',
                    showClose: true
                })
                // 设置已选择的节点为false 很重要
                this.$refs.tree.setChecked(data, false)
            } else if (this.selectOrg.orgsid.length === 0 && checked) {
                // 发现数组为空 并且是已选择
                // 防止数组有值，首先清空，再push
                this.selectOrg.orgsid = []
                this.selectOrg.orgsid.push(data.id)
            } else if (
                indexs >= 0 &&
                this.selectOrg.orgsid.length === 1 &&
                !checked
            ) {
                // 再次直接进行赋值为空操作
                this.selectOrg.orgsid = []
                this.user.departmentId = '';

    selectDepart(depart) {
      if (depart) {
        this.user.departmentId = depart.departId;
        this.user.departName = depart.departName;
            }
        },
    },
    props: ['sendDialog']
}
  props: ["sendDialog"],
};
</script>
<style lang="scss" scoped>
.createUser {
@@ -548,7 +580,6 @@
                    padding: 12px 50px;
                }
            }

        }
    }
}

 src/views/systemSetting/device/handheldTerminal/components/dialogForm.vue

@@ -40,21 +40,10 @@
          </el-form-item>
          <!-- 部门 -->
          <el-form-item class="optionItems" label="所属部门:" prop="departId">
            <el-select v-model="form.departName" placeholder="请输入所属部门">
              <el-option :value="mylabel">
                <el-tree
                  ref="tree"
                  :check-strictly="true"
                  :data="departList"
                  :props="defaultProps"
                  show-checkbox
                  @check-change="handleCheck"
                  default-expand-all
                  node-key="id"
                >
                </el-tree>
              </el-option>
            </el-select>
            <departTree
              :depart="userDepart"
              @selectDepart="selectDepart"
            ></departTree>
          </el-form-item>
          <el-form-item>
            <div class="optionBtn">
@@ -76,8 +65,11 @@

import { createNamespacedHelpers } from "vuex";
const { mapActions } = createNamespacedHelpers("handheldTerminal");

import departTree from "@/components/departTree/index.vue";
export default {
  components: {
    departTree,
  },
  data() {
    const checkName = (rule, value, callback) => {
      if (value) {
@@ -177,9 +169,7 @@
        //     }
        // ]
      },
      selectOrg: {
        orgsid: [],
      },
      userDepart: {},
      mylabel: "",
      departList: [],
      defaultProps: {
@@ -189,14 +179,15 @@
    };
  },
  created() {
    const { getDepartTree } = this;
    // 初始化部门树
    getDepartTree();
    // 初始化数据
    this.form = this.info;
    if (!this.form.departName) {
      this.form.departName = this.form.pdepartName;
    }
    this.userDepart = {
      departId: this.form.departId,
      departName: this.form.departName,
    };
  },

  watch: {
@@ -233,41 +224,12 @@
        }
      });
    },
    // 部门修改
    handleCheck(data, checked) {
      this.form.departId = data.id;
      this.form.departName = data.departName;
      // 获取当前选择的id在数组中的索引
      const indexs = this.selectOrg.orgsid.indexOf(data.id);
      // 如果不存在数组中，并且数组中已经有一个id并且checked为true的时候，代表不能再次选择。
      if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
        this.$message({
          message: "只能选择一个部门！",
          type: "warning",
          showClose: true,
        });
        // 设置已选择的节点为false 很重要
        this.$refs.tree.setChecked(data, false);
      } else if (this.selectOrg.orgsid.length === 0 && checked) {
        // 发现数组为空 并且是已选择
        // 防止数组有值，首先清空，再push
        this.selectOrg.orgsid = [];
        this.selectOrg.orgsid.push(data.id);
      } else if (
        indexs >= 0 &&
        this.selectOrg.orgsid.length === 1 &&
        !checked
      ) {
        // 再次直接进行赋值为空操作
        this.selectOrg.orgsid = [];
        this.form.departName = "";

    selectDepart(depart) {
      if (depart) {
        this.form.departId = depart.departId;
        this.form.departName = depart.departName;
      }
    },
    // 获取部门树
    getDepartTree() {
      this.$axios.get("/sccg/depart/tree").then((res) => {
        this.departList = res.data;
      });
    },
  },
  props: ["info", "closeDialog"],