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

liuyg

2021-11-08 1e66dbf8da3bf8929a93e42e9217eae35f60237c

 src/views/dispatch/dispatchChildoperable.vue

@@ -20,7 +20,7 @@
      </avue-crud>
    </div>
  </basic-container>
</template> 
</template>

<script>
import {
@@ -29,8 +29,9 @@
  update1,
  remove1,
  getDispatcherUnitByDeptId,
  overDispatcher,
} from "@/api/dispatch/dispatch";
import { getListByDeptId } from "@/api/system/user";
import { update, getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";

export default {
@@ -136,7 +137,8 @@
              label: "realName",
              value: "id",
            },
            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
@@ -155,11 +157,11 @@
            addDisplay: false,
            editDisplay: false,
            // hide: true,
            props: {
              label: "realName",
              value: "id",
            },
            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
            // props: {
            //   label: "realName",
            //   value: "id",
            // },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
@@ -273,15 +275,32 @@
          },
        ],
      },
      useifid: 266,
    };
  },
  created() {
    var that = this;
    if (this.userInfo.role_name == "保安公司管理员") {
      const deptColumn = this.findObject(this.option1.column, "deptId");
      deptColumn.search = false;
    }else{
      const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
      deptColumn.hide = true;
      this.useifid = this.userInfo.dept_id;
    } else {
      const deptColumn = this.findObject(
        this.option1.column,
        "dispatcherUnitId"
      );
      deptColumn.search = false;
    }

    //公安局进入
    if (this.userInfo.role_name == "公安管理员") {
      that.option1.column[1].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
        that.userInfo.jurisdiction;
    } else {
      that.option1.column[1].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
    }
  },
  computed: {
@@ -309,7 +328,6 @@
        // this.onLoad(this.page);
      } else if (column.prop == "tab2") {
        // this.loading = false;
        console.log(document.getElementsByClassName("el-card__body")[0]);
        this.onLoad1(this.page1); //第二个表格不会自动执行
      }
      // this.$message.success(JSON.stringify(column));
@@ -332,7 +350,9 @@
      //   const userColumn = this.findObject(this.option1.column, "userIds");
      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
      // }

      if (this.useifid != 266) {
        form["deptId"] = this.useifid;
      }
      adddata1(form).then(
        (res) => {
          this.onLoad1(this.page1);
@@ -364,6 +384,9 @@
      //   const userColumn = this.findObject(this.option1.column, "userIds");
      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
      // }
      if (this.useifid != 266) {
        row["deptId"] = this.useifid;
      }
      update1(row).then(
        () => {
          this.onLoad1(this.page1);
@@ -380,13 +403,13 @@
      );
    },
    rowDel1(row) {
      this.$confirm("确定将选择数据删除?", {
      this.$confirm("确定结束当前派遣?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          return remove1(row.id);
          return overDispatcher(row);
        })
        .then(() => {
          this.onLoad1(this.page1);
@@ -398,10 +421,8 @@
    },
    selectionChange1(list) {
      this.selectionList1 = list;
      // console.log(this.selectionList1.length);
    },
    handleDelete1() {
      console.log(this.selectionList1);
      if (this.selectionList1.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
@@ -424,20 +445,10 @@
        });
    },
    refreshChange1() {
      // console.log(4534)
      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();
    },
@@ -465,8 +476,9 @@
    //
    onLoad1(page, params = {}) {
      this.loading1 = true;
      var that = this;
      var values;
      //默认查询已派遣的，派遣结束，未派遣的不显示
      params["dispatch"] = 0;
      const { releaseTimeRange } = this.query1;
      if (releaseTimeRange) {
        values = {
@@ -492,7 +504,13 @@
      } else {
        this.initData(1);
      }

      if (this.useifid != 266) {
        values["deptId"] = this.useifid;
      }
      //公安局进入
      if (this.userInfo.role_name == "公安管理员") {
        values["jurisdiction"] = this.userInfo.jurisdiction;
      }
      getdata1(
        page.currentPage,
        page.pageSize,
@@ -504,7 +522,6 @@
        this.data1 = data.records;
        this.loading1 = false;
        // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
        console.log(this.form, 111111);
      });
    },
    initData(type) {
@@ -515,7 +532,6 @@
            this.option1.column,
            "dispatcherUnitId"
          );
          console.log(res.data.data,111);
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
      }
@@ -527,7 +543,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;
        });
@@ -539,7 +555,6 @@
  //   //   this.initData();
  //   // }
  //   deps(){
  //     console.log(this.deps,5646646)
  //   }
  // },
  mounted() {
@@ -558,4 +573,4 @@
.el-collapse-item {
  padding-top: 15px !important;
}
</style>
</style>