From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突
---
src/views/securityUnit/data.js | 237 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 169 insertions(+), 68 deletions(-)
diff --git a/src/views/securityUnit/data.js b/src/views/securityUnit/data.js
index a570cee..fd16b73 100644
--- a/src/views/securityUnit/data.js
+++ b/src/views/securityUnit/data.js
@@ -19,7 +19,10 @@
{
label: "统一社会信用代码",
prop: "creditcode",
- width: 140
+ width: 140,
+ hide: true,
+
+ labelWidth: 160,
// hide: true,
// editDisplay: false,
// addDisplay: false
@@ -54,12 +57,16 @@
label: "企业名称",
prop: "enterprisename",
search: true,
- width: 130,
+ searchSpan: 4,
+ labelWidth: 160,
+ // width: 130,
+ overHidden: true
},
{
label: "企业类型",
prop: "stats",
type: "tree",
+ labelWidth: 160,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
props: {
label: "dictValue",
@@ -76,19 +83,29 @@
},
{
label: "法定代表人",
+ labelWidth: 160,
prop: "representative",
width: 80,
search: true,
- searchSpan: 5,
+ 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",
@@ -103,8 +120,9 @@
// // // }],
// },
{
- label: "成立日期",
+ label: "注册时间",
prop: "establishtime",
+ labelWidth: 160,
width: 130,
overHidden: true,
type: "date",
@@ -128,53 +146,70 @@
// // }],
},
{
- label: "注册资本(万元人民币)",
+ label: "注册资本",
prop: "registeredcapital",
+ labelWidth: 160,
// search: true,
- width: 110,
+ width: 80,
// overHidden: true
},
{
- label: "实缴资本(万元人民币)",
- prop: "capital",
+ label: "联系人",
+ prop: "contacts",
+ labelWidth: 160,
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: "组织机构代码",
- prop: "organizationcode",
- width: 110,
- // search: true,
- // searchSpan: 4,
- },
- {
- label: "工商注册号",
- prop: "registrationnumber",
- // search: true,
- // searchSpan: 4,
- },
- {
- label: "纳税人识别号",
- prop: "identificationnumber",
- // 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",
@@ -199,19 +234,24 @@
{
label: "注册地址",
prop: "address",
+ labelWidth: 160,
// search: true,
+ hide: true,
},
{
label: "经营范围",
prop: "business",
// search: true,
- width: 110,
+ labelWidth: 160,
+ hide: true,
+ // width: 110,
overHidden: true
},
{
label: "所属地区",
prop: "region",
- width: 110,
+ labelWidth: 160,
+ // width: 110,
// search: true,
overHidden: true
},
@@ -219,13 +259,17 @@
label: "登记机关",
prop: "registration",
// search: true,
+ labelWidth: 160,
// width: 88,
overHidden: true,
+ hide: true,
},
{
label: "所属行业",
prop: "industry",
+ labelWidth: 160,
+ hide: true,
// search: true,
// width: 88,
},
@@ -272,11 +316,11 @@
},
{
label: "辖区",
- prop: "departmentid",
+ prop: "jurisdiction",
// type: "tree",
// disabled: true,
type: "tree",
- dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ dicUrl: "/api//jurisdiction/lazy-trees",
props: {
label: "title",
value: "id"
@@ -286,7 +330,7 @@
rules: [
{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属辖区",
trigger: "click",
},
],
@@ -365,7 +409,7 @@
// }]
// },
{
- label: "成立日期",
+ label: "注册时间",
prop: "establishtime",
labelWidth: w,
span: s,
@@ -374,7 +418,7 @@
valueFormat: "timestamp",
rules: [{
required: true,
- message: "请输入成立日期",
+ message: "请输入注册时间",
trigger: "blur"
}]
},
@@ -414,6 +458,7 @@
{
label: "工商注册号",
prop: "registrationnumber",
+
labelWidth: w,
span: s,
rules: [{
@@ -522,7 +567,7 @@
span: s,
rules: [{
required: true,
- message: "请输入法定代表人",
+ message: "请输入统一社会信用代码",
trigger: "blur"
}]
},
@@ -549,24 +594,39 @@
label: "股东",
prop: "shareholder",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入法定代表人",
+ trigger: "blur"
+ }]
}, {
label: "持股比例(%)",
prop: "shareholdingratio",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入持股比例",
+ trigger: "blur"
+ }]
},
// {
// label: "最终受益股份",
// prop: "beneficial",
// labelWidth: w,
// span: s
- // },
+ // },
{
label: "出资金额",
prop: "capital2",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入出资金额",
+ trigger: "blur"
+ }]
}, {
label: "出资时间",
prop: "capitaltime",
@@ -574,17 +634,32 @@
format: "yyyy-MM-dd",
valueFormat: "timestamp",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入法定代表人",
+ trigger: "blur"
+ }]
}, {
label: "身份证",
prop: "cardid",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入身份证",
+ trigger: "blur"
+ }]
}, {
label: "联系电话",
prop: "cell",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入联系电话",
+ trigger: "blur"
+ }]
},
]
@@ -604,7 +679,12 @@
prop: "creditcode",
disabled: true,
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入统一社会信用代码",
+ trigger: "blur"
+ }]
},
// {
// label: "部门",
@@ -629,26 +709,47 @@
label: "姓名",
prop: "name",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur"
+ }]
}, {
label: "职务",
prop: "post",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入职务",
+ trigger: "blur"
+ }]
}, {
label: "身份证",
prop: "cardid2",
labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入身份证",
+ trigger: "blur"
+ }]
}, {
label: "联系电话",
prop: "cell2",
labelWidth: w,
- span: s
- }, {
- label: "持股比例(%)",
- prop: "shareholdingratio2",
- labelWidth: w,
- span: s
+ span: s,
+ rules: [{
+ required: true,
+ message: "请输入联系电话",
+ trigger: "blur"
+ }]
}
+ // , {
+ // label: "持股比例(%)",
+ // prop: "shareholdingratio2",
+ // labelWidth: w,
+ // span: s
+ // }
]
--
Gitblit v1.9.3