From 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 18:04:10 +0800
Subject: [PATCH] +解决和冲突合并，加上适应1366*768分辨率
---
src/views/securityCompany/column.js | 608 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 570 insertions(+), 38 deletions(-)
diff --git a/src/views/securityCompany/column.js b/src/views/securityCompany/column.js
index 2d61872..6bc5477 100644
--- a/src/views/securityCompany/column.js
+++ b/src/views/securityCompany/column.js
@@ -1,3 +1,178 @@
+//保安公司详情基本信息列
+export var basecolumn = [{
+ label: "",
+ labelWidth: 20,
+ type: 'title',
+ prop: "title",
+ span: 24,
+ styles: {
+ fontSize: '24px'
+ }
+ },
+ {
+ label: "企业名称",
+ prop: "enterprisename",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请输入企业名称",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ //父节点不能选
+ parent: false,
+ type: "tree",
+ dicUrl: "/api//jurisdiction/lazy-trees",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ span: 12,
+ labelWidth: 145,
+ width: 110,
+ overHidden: true,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请选择所属辖区",
+ trigger: "click",
+ }, ],
+ },
+ {
+ label: "法定代表人",
+ prop: "representative",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请输入法定代表人",
+ trigger: "blur",
+ }, ],
+ }, {
+ label: "法定代表人电话",
+ prop: "representativecell",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请输入法定代表人电话",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "联系人",
+ prop: "contacts",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ }, ],
+ }, {
+ label: "联系电话",
+ prop: "contactscell",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请输入联系电话",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "企业属性",
+ prop: "stats",
+ type: "tree",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请输入企业属性",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "注册地址",
+ prop: "address",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ // search: true,
+ rules: [{
+ required: true,
+ message: "请输入注册地址",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "办公地址",
+ prop: "industry",
+ span: 12,
+ labelWidth: 145,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请选择办公地址",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "服务区域",
+ labelWidth: 145,
+ prop: "fregion",
+ display: false,
+ rules: [{
+ required: true,
+ message: "请输入服务区域",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "服务时间",
+ labelWidth: 145,
+ prop: "ftime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ display: false,
+ rules: [{
+ required: true,
+ message: "请选择服务时间",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "登记机关",
+ prop: "registration",
+ // span: 11,
+ labelWidth: 145,
+ disabled: true,
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请输入登记机关",
+ trigger: "blur",
+ }, ],
+ },
+
+]
export var companyColimn = [{
label: "统一社会信用代码",
prop: "creditcode",
@@ -14,10 +189,9 @@
label: "企业名称",
prop: "enterprisename",
search: true,
- minWidth: 150,
+ width: 260,
searchSpan: 4,
labelWidth: 160,
- // width: 130,
overHidden: true
},
@@ -32,7 +206,6 @@
label: "dictValue",
value: "dictKey"
},
- width: 130,
rules: [{
required: true,
message: "请选择企业类型",
@@ -40,29 +213,54 @@
}, ],
},
{
+ label: "所属辖区",
+ prop: "jurisdiction",
+ labelWidth: 160,
+ // width: 110,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // search: true,
+ overHidden: true
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdictionName",
+ hide: true,
+ overHidden: true
+ },
+ {
label: "法定代表人",
labelWidth: 160,
prop: "representative",
- minWidth: 65,
search: true,
- searchSpan: 4,
searchLabelWidth: 100
},
{
label: "法定代表人电话",
labelWidth: 160,
prop: "representativecell",
- width: 120,
- // search: true,
searchSpan: 4,
searchLabelWidth: 100
},
-
+ {
+ label: "联系人",
+ prop: "contacts",
+ labelWidth: 160,
+ hide: true,
+ }, {
+ label: "联系电话",
+ prop: "contactscell",
+ labelWidth: 160,
+ hide: true,
+ },
{
label: "保安人数",
labelWidth: 160,
prop: "znum",
- width: 73,
// search: true,
searchSpan: 4,
searchLabelWidth: 100
@@ -71,7 +269,6 @@
label: "派遣人数",
labelWidth: 160,
prop: "pnum",
- width: 73,
// search: true,
searchSpan: 4,
searchLabelWidth: 100
@@ -80,7 +277,6 @@
label: "持证人数",
labelWidth: 160,
prop: "cnum",
- width: 73,
// search: true,
searchSpan: 4,
searchLabelWidth: 100
@@ -89,7 +285,6 @@
label: "注册时间",
prop: "establishtime",
labelWidth: 160,
- width: 90,
overHidden: true,
type: "date",
format: "yyyy-MM-dd",
@@ -102,19 +297,8 @@
hide: true,
labelWidth: 160,
// search: true,
- width: 80,
},
- {
- label: "联系人",
- prop: "contacts",
- labelWidth: 160,
- width: 75,
- }, {
- label: "联系电话",
- prop: "contactscell",
- labelWidth: 160,
- width: 110,
- },
+
{
label: "注册地址",
@@ -132,20 +316,7 @@
// width: 110,
overHidden: true
},
- {
- label: "所属辖区",
- prop: "jurisdiction",
- labelWidth: 160,
- // width: 110,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree",
- props: {
- label: "title",
- value: "id",
- },
- // search: true,
- overHidden: true
- },
+
{
label: "登记机关",
prop: "registration",
@@ -164,4 +335,365 @@
// search: true,
// width: 88,
},
+ {
+ label: "服务区域",
+ labelWidth: 110,
+ prop: "fregion",
+ hide: true,
+ },
+ {
+ label: "服务时间",
+ labelWidth: 110,
+ prop: "ftime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ },
+]
+
+export var confessColumn = [{
+ label: "统一社会信用代码",
+ prop: "creditcode",
+ width: 140,
+ hide: true,
+
+ labelWidth: 160,
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ },
+
+ {
+ label: "企业名称",
+ prop: "enterprisename",
+ search: true,
+ width: 260,
+ searchSpan: 4,
+ labelWidth: 160,
+ overHidden: true
+ },
+
+ {
+ label: "企业类型",
+ prop: "stats",
+ type: "tree",
+ hide: true,
+ labelWidth: 160,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ rules: [{
+ required: true,
+ message: "请选择企业类型",
+ trigger: "click",
+ }, ],
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ labelWidth: 160,
+ // width: 110,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // search: true,
+ overHidden: true
+ },
+ {
+ label: "法定代表人",
+ labelWidth: 160,
+ prop: "representative",
+ search: true,
+ searchLabelWidth: 100
+ },
+ {
+ label: "法定代表人电话",
+ labelWidth: 160,
+ prop: "representativecell",
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "联系人",
+ prop: "contacts",
+ labelWidth: 160,
+ hide: true,
+ }, {
+ label: "联系电话",
+ prop: "contactscell",
+ labelWidth: 160,
+ hide: true,
+ },
+ {
+ label: "保安人数",
+ labelWidth: 160,
+ prop: "znum",
+ // search: true,
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "派遣人数",
+ labelWidth: 160,
+ prop: "pnum",
+ // search: true,
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "持证人数",
+ labelWidth: 160,
+ prop: "cnum",
+ // search: true,
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "注册时间",
+ prop: "establishtime",
+ labelWidth: 160,
+ overHidden: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "timestamp",
+
+ },
+ {
+ label: "注册资本",
+ prop: "registeredcapital",
+ hide: true,
+ labelWidth: 160,
+ // search: true,
+ },
+
+
+ {
+ label: "注册地址",
+ prop: "address",
+ labelWidth: 160,
+ // search: true,
+ hide: true,
+ },
+ {
+ label: "经营范围",
+ prop: "business",
+ // search: true,
+ labelWidth: 160,
+ hide: true,
+ // width: 110,
+ overHidden: true
+ },
+
+ {
+ label: "登记机关",
+ prop: "registration",
+ // search: true,
+ labelWidth: 160,
+ // width: 88,
+ overHidden: true,
+ hide: true,
+ },
+
+ {
+ label: "所属行业",
+ prop: "industry",
+ labelWidth: 160,
+ hide: true,
+ // search: true,
+ // width: 88,
+ },
+ {
+ label: "服务区域",
+ labelWidth: 110,
+ prop: "fregion",
+ hide: true,
+ },
+ {
+ label: "服务时间",
+ labelWidth: 110,
+ prop: "ftime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ },
+]
+
+export var crossColumn = [{
+ label: "统一社会信用代码",
+ prop: "creditcode",
+ width: 140,
+ hide: true,
+
+ labelWidth: 160,
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ },
+
+ {
+ label: "企业名称",
+ prop: "enterprisename",
+ search: true,
+ width: 260,
+ searchSpan: 4,
+ labelWidth: 160,
+ overHidden: true
+ },
+
+ {
+ label: "企业类型",
+ prop: "stats",
+ type: "tree",
+ hide: true,
+ labelWidth: 160,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ rules: [{
+ required: true,
+ message: "请选择企业类型",
+ trigger: "click",
+ }, ],
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ labelWidth: 160,
+ // width: 110,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // search: true,
+ overHidden: true
+ },
+ {
+ label: "法定代表人",
+ labelWidth: 160,
+ prop: "representative",
+ search: true,
+ searchLabelWidth: 100
+ },
+ {
+ label: "法定代表人电话",
+ labelWidth: 160,
+ prop: "representativecell",
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "联系人",
+ prop: "contacts",
+ labelWidth: 160,
+ hide: true,
+ }, {
+ label: "联系电话",
+ prop: "contactscell",
+ labelWidth: 160,
+ hide: true,
+ },
+ {
+ label: "保安人数",
+ labelWidth: 160,
+ prop: "znum",
+ // search: true,
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "派遣人数",
+ labelWidth: 160,
+ prop: "pnum",
+ // search: true,
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "持证人数",
+ labelWidth: 160,
+ prop: "cnum",
+ // search: true,
+ searchSpan: 4,
+ searchLabelWidth: 100
+ },
+ {
+ label: "注册时间",
+ prop: "establishtime",
+ labelWidth: 160,
+ overHidden: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "timestamp",
+
+ },
+ {
+ label: "注册资本",
+ prop: "registeredcapital",
+ hide: true,
+ labelWidth: 160,
+ // search: true,
+ },
+
+
+ {
+ label: "注册地址",
+ prop: "address",
+ labelWidth: 160,
+ // search: true,
+ hide: true,
+ },
+ {
+ label: "经营范围",
+ prop: "business",
+ // search: true,
+ labelWidth: 160,
+ hide: true,
+ // width: 110,
+ overHidden: true
+ },
+
+ {
+ label: "登记机关",
+ prop: "registration",
+ // search: true,
+ labelWidth: 160,
+ // width: 88,
+ overHidden: true,
+ hide: true,
+ },
+
+ {
+ label: "所属行业",
+ prop: "industry",
+ labelWidth: 160,
+ hide: true,
+ // search: true,
+ // width: 88,
+ },
+ {
+ label: "服务区域",
+ labelWidth: 110,
+ prop: "fregion",
+ hide: true,
+ },
+ {
+ label: "服务时间",
+ labelWidth: 110,
+ prop: "ftime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ },
]
--
Gitblit v1.9.3