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

shuishen

2021-12-04 48d34b0def9f848d1b7f9ddd2cd0861341fb208d

 src/views/securityCompany/column.js

@@ -14,7 +14,7 @@
    },

    {
        label: "企业名称",
        label: "单位名称",
        prop: "enterprisename",
        search: true,
        width: 260,
@@ -45,7 +45,7 @@
        ],
    },
    {
        label: "法定代表人",
        label: "法人姓名",
        labelWidth: 160,
        prop: "representative",
        width: 110,
@@ -192,6 +192,7 @@
        label: "处罚情况",
        prop: "punishreason",
        span: 24,
        search: false,
        labelWidth: 110,
        rules: [
            {
@@ -205,6 +206,7 @@
        label: "处罚结果",
        prop: "punishresult",
        span: 24,
        search: false,
        // type: "textarea",
        labelWidth: 110,
    },
@@ -212,6 +214,7 @@
        label: "处罚日期",
        prop: "punishtime",
        span: 24,
        search: false,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",