解决冲突

liuyg

2021-08-14 ff066fb8d926d9a75efdcfdfc1b37f890cd98d82

 src/views/securityUnit/data.js

@@ -57,7 +57,7 @@
        label: "企业名称",
        prop: "enterprisename",
        search: true,
        searchSpan: 6,
        searchSpan: 4,
        labelWidth: 160,
        // width: 130,
        overHidden: true
@@ -87,16 +87,25 @@
        prop: "representative",
        width: 80,
        search: true,
        searchSpan: 6,
        searchSpan: 4,
        searchLabelWidth: 100
    },
    {
        label: "代表人电话",
        labelWidth: 160,
        prop: "representativecell",
        width: 98,
        // search: true,
        searchSpan: 4,
        searchLabelWidth: 100
    },
    // {
    //     label: "登记状态",
    //     prop: "regstsat",
    //     // addDisplay: true, 
    //     // addDisplay: true,
    //     // editDisplay: true,
    //     // viewDisplay: true,
    //     // searchSpan: 5,
    //     // searchSpan: 4,
    //     // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
    //     // props: {
    //     //     label: "dictValue",
@@ -111,7 +120,7 @@
    //     // // }],
    // },
    {
        label: "成立日期",
        label: "注册时间",
        prop: "establishtime",
        labelWidth: 160,
        width: 130,
@@ -137,61 +146,70 @@
        // // }],
    },
    {
        label: "注册资本(万元人民币)",
        label: "注册资本",
        prop: "registeredcapital",
        labelWidth: 160,
        // search: true,
        width: 140,
        width: 80,
        // overHidden: true
    },
    {
        label: "实缴资本(万元人民币)",
        prop: "capital",
        label: "联系人",
        prop: "contacts",
        labelWidth: 160,
        // width: 85,
        hide: true,
        width: 85,
        // hide: true,
        // search: true,
        // searchSpan: 4,
        // overHidden: true
    }, {
        label: "联系电话",
        prop: "contactscell",
        labelWidth: 160,
        width: 95,
        // hide: true,
        // search: true,
        // searchSpan: 4,
        // overHidden: true
    },
    {
        label: "组织机构代码",
        labelWidth: 160,
        prop: "organizationcode",
        // width: 110,
        // search: true,
        // searchSpan: 4,
    },
    {
        label: "工商注册号",
        prop: "registrationnumber",
        labelWidth: 160,
        width: 120,
        // search: true,
        // searchSpan: 4,
    },
    {
        label: "纳税人识别号",
        prop: "identificationnumber",
        labelWidth: 160,
        width: 140,
        // addDisplay: true,
        // editDisplay: true,
        // viewDisplay: true,
        // searchSpan: 4,
        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsNatureType",
        // props: {
        //     label: "dictValue",
        //     value: "dictKey"
        // },
        // // search: true,
        // type: "select",
        // // rules: [{
        // //     required: false,
        // //     message: "请选择单位规模",
        // //     trigger: "blur"   
        // // }],
    },
    // {
    //     label: "组织机构代码",
    //     labelWidth: 160,
    //     prop: "organizationcode",
    //     // width: 110,
    //     // search: true,
    //     // searchSpan: 4,
    // },
    // {
    //     label: "工商注册号",
    //     prop: "registrationnumber",
    //     labelWidth: 160,
    //     width: 120,
    //     // search: true,
    //     // searchSpan: 4,
    // },
    // {
    //     label: "纳税人识别号",
    //     prop: "identificationnumber",
    //     labelWidth: 160,
    //     width: 140,
    //     // addDisplay: true,
    //     // editDisplay: true,
    //     // viewDisplay: true,
    //     // searchSpan: 4,
    //     // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsNatureType",
    //     // props: {
    //     //     label: "dictValue",
    //     //     value: "dictKey"
    //     // },
    //     // // search: true,
    //     // type: "select",
    //     // // rules: [{
    //     // //     required: false,
    //     // //     message: "请选择单位规模",
    //     // //     trigger: "blur"
    //     // // }],
    // },
    // {
    //     label: "企业类型",
    //     prop: "stats",
@@ -391,7 +409,7 @@
    //     }]
    // },
    {
        label: "成立日期",
        label: "注册时间",
        prop: "establishtime",
        labelWidth: w,
        span: s,
@@ -400,7 +418,7 @@
        valueFormat: "timestamp",
        rules: [{
            required: true,
            message: "请输入成立日期",
            message: "请输入注册时间",
            trigger: "blur"
        }]
    },
@@ -598,7 +616,7 @@
    //     prop: "beneficial",
    //     labelWidth: w,
    //     span: s
    // }, 
    // },
    {
        label: "出资金额",
        prop: "capital2",