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

Administrator

2021-08-11 f5d88e4f31bec1d77721c0795afde3f3a571e9aa

 src/views/dispatch/dispatchChildoperable.vue

@@ -200,8 +200,8 @@
          {
            label: "派遣单位",
            prop: "dispatcherCompany",
            addDisplay: false,
            editDisplay: false,
            // addDisplay: false,
            // editDisplay: false,
          },
          // {
          //   label: "派遣单位",
@@ -229,13 +229,9 @@
          {
            label: "保安公司",
            prop: "deptId",
            labelWidth: 120,
            search: true,
            overHidden: true,
            type: "tree",
            searchSpan: 4,
            cascaderItem: ["name"],
            // cascaderItem: ["city", "area"],
            type: "select",
            cascaderItem: ["securityName"],
            props: {
              label: "title",
              value: "id",
@@ -250,19 +246,17 @@
            ],
          },
          {
            width: 120,
            label: "保安员",
            prop: "name",
            labelWidth: 120,
            type: "tree",
            prop: "securityName",
            type: "select",
            search: true,
            searchSpan: 4,
            cell: true,
            // cell: true,
            // hide: true,
            props: {
              label: "realName",
              value: "id",
            },
            dicUrl: `/api/blade-user/page-security-unit?deptId={{deptId}}`,
            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
            rules: [
              {
                required: true,
@@ -271,6 +265,7 @@
              },
            ],
          },

          // {
          //   width: 120,
          //   label: "保安人名称",
@@ -767,8 +762,9 @@
        const data = res.data.data;
        this.page1.total = data.total;
        this.data1 = data.records;
        console.log(this.data1, 1);
        console.log(this.data1, 1111111111111111111111111);
        this.loading1 = false;
        this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
      });
    },
    //派遣记录