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

Administrator

2021-07-14 f78a56ba2e2c3cf48a0809a824e306a578cefd00

 src/views/dispatch/dispatchChildoperable.vue

@@ -169,10 +169,55 @@
          //     // addDisplay: false
          // },
          {
            label: "保安公司",
            prop: "deptId",
            labelWidth: 120,
            searchLabelWidth: 120,
            searchSpan: 4,
            dicUrl:
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            props: {
              label: "title",
              value: "id",
            },
            search: true,
            overHidden: true,
            type: "select",
            rules: [
              {
                required: true,
                message: "请输入保安公司",
                trigger: "blur",
              },
            ],
          },
          {
            label: "派遣单位",
            prop: "id",
            labelWidth: 120,
            searchLabelWidth: 120,
            dicUrl: "/api/page-tree",
            props: {
              label: "name",
              value: "id",
            },
            searchSpan: 4,
            search: true,
            overHidden: true,
            type: "select",
            rules: [
              {
                required: true,
                message: "请输入保安公司",
                trigger: "blur",
              },
            ],
          },
          {
            label: "保安人名称",
            prop: "name",
            search: true,
            searchSpan: 5,
            searchSpan: 4,
            labelWidth: 120,
            searchLabelWidth: 120,
            // overHidden: true
@@ -206,37 +251,16 @@
          //     // searchSpan: 4,
          //     // overHidden: true
          // },
          {
            label: "保安公司",
            prop: "deptId",
            labelWidth: 120,
            searchLabelWidth: 120,
            dicUrl:
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            props: {
              label: "title",
              value: "id",
            },
            search: true,
            overHidden: true,
            type: "select",
            rules: [
              {
                required: true,
                message: "请输入保安公司",
                trigger: "blur",
              },
            ],
          },

          {
            label: "派遣时间",
            prop: "dispatchertime",
            type: "date",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "timestamp",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            labelWidth: 120,
            searchSpan: 4,
            search: true,
            searchSpan: 5,
            rules: [
              {
                required: true,
@@ -251,7 +275,7 @@
            prop: "endTime",
            type: "date",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "timestamp",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            labelWidth: 120,
            rules: [
              {