冲突

liuyg

2021-11-10 61a386154bb1f5bab87d1e05de92316a53b5d6cf

 src/views/dispatch/dispatchChildoperable.vue

@@ -25,13 +25,13 @@
<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",
            //   },
            // ],
          },

          {
@@ -353,7 +359,11 @@
      if (this.useifid != 266) {
        form["deptId"] = this.useifid;
      }
      adddata1(form).then(
      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({
@@ -376,7 +386,7 @@
      done();
    },
    searchReset1() {
      this.query = {};
      this.query1 = {};
      this.onLoad1(this.page1);
    },
    rowUpdate1(row, index, done, loading) {
@@ -387,7 +397,7 @@
      if (this.useifid != 266) {
        row["deptId"] = this.useifid;
      }
      update1(row).then(
      updateDispatcher(row).then(
        () => {
          this.onLoad1(this.page1);
          this.$message({
@@ -448,8 +458,19 @@
      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();
    },

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

@@ -543,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;
        });