Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-13 b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1

 src/views/dispatch/dispatchChildoperable.vue

@@ -138,7 +138,7 @@
              value: "id",
            },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
@@ -434,19 +434,10 @@
      this.onLoad1(this.page1, this.query1);
    },

    // beforeOpen(done, type) {
    //   var that = this;
    //   if (["add", "edit", "view"].includes(type)) {
    //     if (this.userInfo.role_name == "保安公司管理员") {
    //       getListByDeptId(that.userInfo.dept_id).then((res) => {
    //         const userColumn = that.findObject(this.option1.column, "userIds");
    //         userColumn.dicData = res.data.data;
    //       });
    //     }
    //   }
    //   this.initFlag = true;
    //   done();
    // },
    beforeOpen(done, type) {
      this.initFlag = true;
      done();
    },

    getStartTime() {
      if (
@@ -534,7 +525,7 @@
          );
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
        getListByDeptId(that.userInfo.dept_id).then((res) => {
        getListByDeptId(that.userInfo.dept_id,1).then((res) => {
          const userIdsColumn = that.findObject(this.option1.column, "userIds");
          userIdsColumn.dicData = res.data.data;
        });