Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-08-12 195c2e87ab1d456b1cbfd28057836c42152ce7de

 src/views/securityEquipment/gun.js

@@ -70,7 +70,7 @@
    },
    {
        label: "保安公司",
        prop: "tenantName",
        prop: "deptId",
        labelWidth: 160,
        rules: [{
            required: true,
@@ -112,7 +112,7 @@
        // search: true,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "timestamp",
        valueFormat: "yyyy-MM-dd",
        // width: 110,
        // overHidden: true,
        // search: true,
@@ -129,7 +129,7 @@
        // search: true,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "timestamp",
        valueFormat: "yyyy-MM-dd",
        searchSpan: 4,
        overHidden: true,
        rules: [{