Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-11-30 93b69073443d8b7ea2dfc93b1b8c4bb201f3d56d

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 src/views/dispatch/dispatch.vue

@@ -226,7 +226,7 @@
        column: [
          //派遣服务公司登记
          {
            label: "派遣企业名称",
            label: "派遣单位名称",
            prop: "name",
            search: true,
            searchLabelWidth: 110,
@@ -238,13 +238,13 @@
            rules: [
              {
                required: true,
                message: "请输入名称",
                message: "请输入派遣单位名称",
                trigger: "click",
              },
            ],
          },
          {
            label: "保安公司",
            label: "企业名称",
            prop: "deptId",
            type: "tree",
            overHidden: true,
@@ -261,7 +261,7 @@
            rules: [
              {
                required: true,
                message: "请选择保安公司",
                message: "请选择企业名称",
                trigger: "click",
              },
            ],
@@ -426,8 +426,37 @@
            // overHidden: true
          },
          {
            label: " 负责人",
            label: " 派遣单位联系人",
            prop: "linkman",
            labelWidth: 138,
            rules: [
              {
                required: true,
                message: "请输入派遣单位联系人",
                trigger: "click",
              },
            ],
          },
          {
            label: "派遣单位联系方式",
            prop: "phone",
            labelWidth: 138,
            width: 130,
            rules: [
              {
                required: true,
                message: "请输入联系方式",
                trigger: "click",
              },
              {
                validator: phones,
                trigger: ["change", "blur"],
              },
            ],
          },
          {
            label: " 负责人",
            prop: "securityLinkman",
            labelWidth: 138,
            rules: [
              {
@@ -439,7 +468,7 @@
          },
          {
            label: "负责人联系方式",
            prop: "phone",
            prop: "cell",
            labelWidth: 138,
            width: 110,
            rules: [
@@ -451,6 +480,21 @@
              {
                validator: phones,
                trigger: ["change", "blur"],
              },
            ],
          },
          {
            label: "派遣保安员数",
            prop: "num",
            type:"number",
            span:24,
            labelWidth: 138,
            width: 110,
            rules: [
              {
                required: true,
                message: "请输入派遣保安员数",
                trigger: "click",
              },
            ],
          },
@@ -690,6 +734,10 @@
        for (var k in this.data) {
          // this.data[k]["deptId"] = that.userInfo.dept_id;
          this.data[k]["tenantName"] = that.userInfo.user_name;
          console.log(this.data[k],123456);
          if(this.data[k].num==-1){
            this.data[k].num = null;
          }
        }
        window.localStorage.setItem("paqiandataS", JSON.stringify(this.data));
        this.loading = false;

 src/views/system/user.vue

@@ -792,7 +792,6 @@
      //公安局进入
      if (
        this.userInfo.role_name == "公安管理员"
        
      ) {
        var parentId = this.userInfo.dept_id;
        var userId = this.userInfo.Id;
@@ -800,11 +799,12 @@
          const column = this.findObject(this.option.group, "deptId");
          column.dicData = res.data.data;
        });
      } else {
        // getDeptLazyTree(0).then((res) => {
        //   const column = this.findObject(this.option.group, "deptId");
        //   column.dicData = res.data.data;
        // });
      } else if( this.userInfo.role_name == "administrator"){
        getDeptLazyTree(0).then((res) => {
          const column = this.findObject(this.option.group, "deptId");
          column.dicData = res.data.data;
        });
      }else {
        getSecurityDeptTree(null,null,this.userInfo.dept_id).then((res) => {
            const column = this.findObject(this.option.group, "deptId");
            column.dicData = res.data.data;