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

shuishen

2021-11-12 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906

 src/views/dispatch/dispatchChildoperable.vue

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

<script>
import {
  getdata1,
  adddata1,
  update1,
  saveDispatcher,
  updateDispatcher,
  remove1,
  getDispatcherUnitByDeptId,
  overDispatcher,
} from "@/api/dispatch/dispatch";
import { update, getListByDeptId } from "@/api/system/user";
import { update, getSecurityDispatcherTree } from "@/api/system/user";
import { mapState } from "vuex";

export default {
@@ -39,7 +39,6 @@
    return {
      deptCategory: "",
      deptId: "",

      loading1: true, //派遣记录
      selectionList1: [],
      page1: {
@@ -130,16 +129,22 @@
            type: "tree",
            width: 70,
            labelWidth: 120,
            searchSpan: 3,
            search: true,
            hide: true,
            defaultExpandAll:true,
            // props: {
            //   label: "realName",
            //   value: "id",
            // },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/security-dispatcher-tree?deptId={{key}}`,
            dicData: [],
            props: {
              label: "realName",
              label: "name",
              value: "id",
            },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
            dicData: [],
            //不包含父节点值
            leafOnly:true,
            multiple: true,
            rules: [
              {
                required: true,
@@ -151,8 +156,10 @@
          {
            label: "保安员",
            prop: "securityName",
            type: "tree",
            // type: "tree",
            width: 70,
            searchSpan: 4,
            search: true,
            labelWidth: 120,
            addDisplay: false,
            editDisplay: false,
@@ -162,14 +169,13 @@
            //   value: "id",
            // },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
                required: true,
                message: "请选择保安",
                trigger: "blur",
              },
            ],
            // rules: [
            //   {
            //     required: true,
            //     message: "请选择保安",
            //     trigger: "blur",
            //   },
            // ],
          },

          {
@@ -275,19 +281,32 @@
          },
        ],
      },
      useifid: 266,
    };
  },
  created() {
    var that = this;
    if (this.userInfo.role_name == "保安公司管理员") {
      console.log("保安公司管理员登入");
      const deptColumn = this.findObject(this.option1.column, "deptId");
      deptColumn.search = false;
      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: {
@@ -315,7 +334,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));
@@ -338,8 +356,14 @@
      //   const userColumn = this.findObject(this.option1.column, "userIds");
      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
      // }

      adddata1(form).then(
      if (this.useifid != 266) {
        form["deptId"] = this.useifid;
      }
      console.log(form,123456);
      form["ids"] = form.userIds.join(","),
      delete form.userIds; 
      console.log(form,321);
      saveDispatcher(form).then(
        (res) => {
          this.onLoad1(this.page1);
          this.$message({
@@ -362,7 +386,7 @@
      done();
    },
    searchReset1() {
      this.query = {};
      this.query1 = {};
      this.onLoad1(this.page1);
    },
    rowUpdate1(row, index, done, loading) {
@@ -370,7 +394,10 @@
      //   const userColumn = this.findObject(this.option1.column, "userIds");
      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
      // }
      update1(row).then(
      if (this.useifid != 266) {
        row["deptId"] = this.useifid;
      }
      updateDispatcher(row).then(
        () => {
          this.onLoad1(this.page1);
          this.$message({
@@ -404,10 +431,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;
@@ -430,12 +455,22 @@
        });
    },
    refreshChange1() {
      // console.log(4534)
      this.onLoad1(this.page1, this.query1);
    },

    beforeOpen(done, type) {
    beforeOpen(done, type,row) {
      this.initFlag = true;
      if(type=="edit"){
        console.log(row,123);
        const userColumn = this.findObject(this.option1.column, "userIds");
        userColumn.multiple = false;
        userColumn.dicUrl = "/api/blade-user/security-dispatcher-tree?deptId="+this.userInfo.dept_id+"&id="+this.form.userIds+"&realName="+this.form.securityName;
      }
      if(type=="add"){
        const userColumn = this.findObject(this.option1.column, "userIds");
        userColumn.multiple = true;
        userColumn.dicUrl = "/api/blade-user/security-dispatcher-tree?deptId="+this.userInfo.dept_id;
      }
      done();
    },

@@ -471,13 +506,13 @@
          ...params,
          beginTime: releaseTimeRange[0],
          overTime: releaseTimeRange[1],
          ...this.query,
          ...this.query1,
        };
        values.releaseTimeRange = null;
      } else {
        values = {
          ...params,
          ...this.query,
          ...this.query1,
        };
      }

@@ -490,7 +525,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,
@@ -502,7 +543,6 @@
        this.data1 = data.records;
        this.loading1 = false;
        // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
        console.log(this.form, 111111);
      });
    },
    initData(type) {
@@ -513,7 +553,6 @@
            this.option1.column,
            "dispatcherUnitId"
          );
          // console.log(res.data.data, 111);
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
      }
@@ -525,7 +564,7 @@
          );
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
        getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
        getSecurityDispatcherTree(that.userInfo.dept_id, 1).then((res) => {
          const userIdsColumn = that.findObject(this.option1.column, "userIds");
          userIdsColumn.dicData = res.data.data;
        });
@@ -537,7 +576,6 @@
  //   //   this.initData();
  //   // }
  //   deps(){
  //     console.log(this.deps,5646646)
  //   }
  // },
  mounted() {
@@ -556,4 +594,4 @@
.el-collapse-item {
  padding-top: 15px !important;
}
</style>
</style>