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

Administrator

2021-07-15 957ef82a3cf13bf29076e3e892de0328dc993fed

 src/views/dispatch/dispatchChildoperable.vue

@@ -77,6 +77,7 @@
  update1,
  remove1,
} from "@/api/dispatch/dispatch";
import { getDept } from "@/api/system/dept";

export default {
  data() {
@@ -133,6 +134,8 @@
      //   selection: true,
      //   column: column,
      // },
      deptCategory: "",
      deptId: "",

      loading1: true, //派遣记录
      selectionList1: [],
@@ -150,7 +153,7 @@
        // menu: false,
        searchSize: "mini",
        searchMenuSpan: 8,
        height: 563,
        height: 623,
        cellBtn: false,
        // addBtn: false,
        // menuWidth: 160,
@@ -193,18 +196,25 @@
          },
          {
            label: "派遣单位",
            prop: "id",
            prop: "dispatcherCompany",
            addDisplay: false,
            editDisplay: false,
          },
          {
            label: "派遣单位",
            prop: "dispatcherUnitId",
            labelWidth: 120,
            searchLabelWidth: 120,
            dicUrl: "/api/page-tree",
            dicUrl: "/api/dispatcherUnit/page-tree",
            props: {
              label: "name",
              value: "id",
            },
            hide: true,
            searchSpan: 4,
            search: true,
            overHidden: true,
            type: "select",
            type: "tree",
            rules: [
              {
                required: true,
@@ -233,6 +243,7 @@
            label: "身份证",
            prop: "cardid",
            labelWidth: 120,
            overHidden: true,
            rules: [
              {
                required: true,
@@ -261,6 +272,7 @@
            labelWidth: 120,
            searchSpan: 4,
            search: true,
            overHidden: true,
            rules: [
              {
                required: true,
@@ -277,6 +289,7 @@
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            labelWidth: 120,
            overHidden: true,
            rules: [
              {
                required: true,
@@ -668,6 +681,27 @@
    //   this.obj0.name = " 未选择派遣单位";
    // }
  },
  // onLoad(page, params = {}) {
  //   this.deptId = JSON.parse(
  //       window.localStorage.getItem("saber-userInfo")
  //     ).content.dept_id;

  //     //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
  //     var that = this;
  //     getDept(this.deptId).then((res) => {
  //       var deptCategory = res.data.data.deptCategory;
  //       deptCategory == 1
  //         ? (that.deptCategory = true)
  //         : (that.deptCategory = false);

  //       if (that.deptCategory) {
  //         params["deptId"] = this.deptId;
  //       }
  //       let values = {
  //         ...params,
  //       };
  //    })
  // }
};
</script>