冲突

liuyg

2021-11-10 61a386154bb1f5bab87d1e05de92316a53b5d6cf

 src/views/system/user.vue

@@ -189,6 +189,7 @@
  getUserPlatform,
  remove,
  update,
  updateUser,
  updatePlatform,
  add,
  grant,
@@ -330,43 +331,6 @@
            width: 130,
            display: false,
          },
          // {
          //   label: "所属部门",
          //   prop: "deptName",
          //   slot: true,
          //   display: false
          // },
          // {
          //   label: "用户平台",
          //   prop: "userTypeName",
          //   addDisplay:false,
          //   viewDisplay:false,
          //   editDisplay:false,
          //   slot: true,
          //   display: false
          // },
          // {
          //   label: "用户平台",
          //   type: "select",
          //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
          //   props: {
          //     label: "dictValue",
          //     value: "dictKey"
          //   },
          //   dataType: "number",
          //   search: true,
          //   hide: true,
          //   addDisplay:false,
          //   viewDisplay:false,
          //   editDisplay:false,
          //   display: false,
          //   prop: "userType",
          //   rules: [{
          //     required: true,
          //     message: "请选择用户平台",
          //     trigger: "blur"
          //   }]
          // },
        ],
        group: [
          {
@@ -395,7 +359,7 @@
                    trigger: "click",
                  },
                ],
                span: 24,
                span: 12,
              },
              {
                label: "登录账号",
@@ -408,23 +372,6 @@
                  },
                ],
              },
              // {
              //   label: "用户平台",
              //   type: "select",
              //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              //   props: {
              //     label: "dictValue",
              //     value: "dictKey"
              //   },
              //   dataType: "number",
              //   slot: true,
              //   prop: "userType",
              //   rules: [{
              //     required: true,
              //     message: "请选择用户平台",
              //     trigger: "blur"
              //   }]
              // },
              {
                label: "密码",
                prop: "password",
@@ -432,6 +379,7 @@
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                span: 12,
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
@@ -441,6 +389,7 @@
                prop: "password2",
                type: "password",
                hide: true,
                span: 12,
                editDisplay: false,
                viewDisplay: false,
                rules: [
@@ -456,18 +405,6 @@
            icon: "el-icon-s-order",
            column: [
              {
                label: "用户昵称",
                prop: "name",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入用户昵称",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "用户姓名",
                prop: "realName",
                rules: [
@@ -482,70 +419,6 @@
                    message: "姓名长度在2到5个字符",
                  },
                ],
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true,
              },
              {
                label: "电子邮箱",
                prop: "email",
                hide: true,
                overHidden: true,
              },
              {
                label: "用户性别",
                prop: "sex",
                type: "select",
                dicData: [
                  {
                    label: "男",
                    value: 1,
                  },
                  {
                    label: "女",
                    value: 2,
                  },
                  // {
                  //   label: "未知",
                  //   value: 3,
                  // },
                ],
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请选择性别",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "用户生日",
                type: "date",
                prop: "birthday",
                format: "yyyy-MM-dd hh:mm:ss",
                valueFormat: "yyyy-MM-dd hh:mm:ss",
                hide: true,
              },
              {
                label: "账号状态",
                prop: "statusName",
                hide: true,
                display: false,
              },
            ],
          },
          {
            label: "职责信息",
            labelWidth: "110",
            prop: "dutyInfo",
            icon: "el-icon-s-custom",
            column: [
              {
                label: "用户编号",
                prop: "code",
              },
              {
                label: "所属角色",
@@ -566,39 +439,59 @@
                  },
                ],
              },
              // {
              //   label: "所属部门",
              //   prop: "deptId",
              //   type: "tree",
              //   multiple: true,
              //   dicData: [],
              //   props: {
              //     label: "title"
              //   },
              //   checkStrictly: true,
              //   slot: true,
              //   rules: [{
              //     required: true,
              //     message: "请选择所属部门",
              //     trigger: "click"
              //   }]
              // },
              {
                label: "所属岗位",
                prop: "postId",
                type: "tree",
                multiple: true,
                dicData: [],
                props: {
                  label: "postName",
                  value: "id",
                },
                // rules: [{
                //   required: true,
                //   message: "请选择所属岗位",
                //   trigger: "click"
                // }],
                label: "警号",
                prop: "code",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入警号",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "身份证号码",
                prop: "cardid",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入身份证号码",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true,
              },
              {
                label: "用户性别",
                prop: "sex",
                type: "select",
                dicData: [
                  {
                    label: "男",
                    value: 1,
                  },
                  {
                    label: "女",
                    value: 2,
                  },
                ],
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请选择性别",
                    trigger: "blur",
                  },
                ],
              },
              
            ],
          },
        ],
@@ -857,10 +750,10 @@
        const column = this.findObject(this.option.group, "deptId");
        column.dicData = res.data.data;
      });
      getPostList(tenantId).then((res) => {
        const column = this.findObject(this.option.group, "postId");
        column.dicData = res.data.data;
      });
      // getPostList(tenantId).then((res) => {
      //   const column = this.findObject(this.option.group, "postId");
      //   column.dicData = res.data.data;
      // });
    },
    submitRole() {
      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -876,14 +769,12 @@
    rowSave(row, done, loading) {
      row.deptId = row.deptId;
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      console.log(row, "row");
      var params = {
        deptname: row.$deptId,
      };
      getJurisdiction(params).then((res) => {
        // console.log(res.data.data);
        // return;
        console.log(res.data,123);
        console.log(res.data.data,1234);
        if (res.data.msg != "暂无承载数据") {
          row.jurisdiction = res.data.data;
        } else {
@@ -910,8 +801,9 @@
    rowUpdate(row, index, done, loading) {
      row.deptId = row.deptId;
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      update(row).then(
      // row.postId = row.postId.join(",");
      delete row.postId;
      updateUser(row).then(
        () => {
          this.initFlag = false;
          this.onLoad(this.page);
@@ -1055,6 +947,11 @@
    },
    beforeOpen(done, type) {
      if (["edit", "view"].includes(type)) {
        if(this.userInfo.role_name!="公安管理员"){
          const column = this.findObject(this.option.group, "code");
          column.display = false;
        }
        
        getUser(this.form.id).then((res) => {
          this.form = res.data.data;
          if (this.form.hasOwnProperty("deptId")) {
@@ -1068,6 +965,12 @@
          }
        });
      }
      if (["add"].includes(type)) {
        if(this.userInfo.role_name!="公安管理员"){
          const column = this.findObject(this.option.group, "code");
          column.display = false;
        }
      }
      this.initFlag = true;
      done();
    },