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

liuyg

2021-08-21 3d3d1d6b4909b3c454a0a877e73fb51103e82b99

 src/views/dispatch/data.js

@@ -14,34 +14,40 @@
        prop: "name",
        search: true,
        searchLabelWidth: 110,
        searchSpan: 4,
        // span: 12,
        labelWidth: 110,
    },
    {
        label: "保安公司",
        prop: "tenantName",
        prop: "deptId",
        type: "tree",
        dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        props: {
            label: "title",
            value: "id"
        },
        // hide: true,
        // hide: !website.tenantMode,
        // addDisplay: website.tenantMode,
        // editDisplay: website.tenantMode,
        // viewDisplay: website.tenantMode,
        rules: [{
            required: true,
            message: "请输入所属保安单位",
            message: "请选择保安公司",
            trigger: "click"
        }],
        labelWidth: 110,
        width: 200,
        editDisplay: false,
        addDisplay: false,
        hide: true,
        searchLabelWidth: 110,
        search: true,
        searchSpan: 4,
        // editDisplay: false,
        // addDisplay: false,
        // hide: true,
        // span: 11,
    },

    {
        label: " 联系人",
        prop: "linkman",
@@ -54,7 +60,7 @@
        // addDisplay: true,
        // editDisplay: true,
        // viewDisplay: true,
        // searchSpan: 5,
        // searchSpan: 4,
        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
        // props: {
        //     label: "dictValue",
@@ -68,29 +74,61 @@
        // //     trigger: "blur"
        // // }],
    },
    // {
    //     label: "行政区",
    //     prop: "addresss",
    //     labelWidth: 110,
    //     search: true,
    //     // width: 110,
    //     // overHidden: true
    // },
    // {
    //     label: "所属辖区",
    //     prop: "jurisdiction",
    //     // multiple: true,
    //     labelWidth: 110,
    //     type: "tree",
    //     dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
    //     props: {
    //         label: "title",
    //         value: "id",
    //     },
    //     checkStrictly: true,
    //     slot: true,
    //     rules: [
    //         {
    //             required: true,
    //             message: "请选择所属行政区",
    //             trigger: "click",
    //         },
    //     ],
    // },
    // {
    //     label: "详细地址",
    //     prop: "address",
    //     labelWidth: 110,
    //     // search: true,
    //     // width: 110,
    //     // overHidden: true
    // },
    {
        label: "行政区",
        prop: "addresss",
        labelWidth: 110,
        search: true,
        // width: 110,
        // overHidden: true
    },
    {
        label: "详细地址",
        prop: "address",
        labelWidth: 110,
        // search: true,
        // width: 110,
        // overHidden: true
    },
    {
        label: "创建时间",
        prop: "createTime",
        label: "合同生效时间",
        prop: "startTime",
        labelWidth: 110,
        type: "date",
        format: "yyyy-MM-dd hh:mm:ss",
        valueFormat: "timestamp",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        // search: true,
        // searchSpan: 4,
        // overHidden: true
    },
    {
        label: "合同到期时间",
        prop: "endTime",
        labelWidth: 110,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        // search: true,
        // searchSpan: 4,
        // overHidden: true