From 8318a0e79e3b5a2d55d342b6e37df69dbb5c2077 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 10 Jul 2021 17:43:33 +0800
Subject: [PATCH] 细节修改
---
src/views/securityGuard/securityGuardDetail.vue | 16 +-
src/views/dispatchChild/data.js | 66 ++++++--
src/views/securityUnit/index.vue | 29 ++-
public/index.html | 6
src/views/recruitmentManagement/index.vue | 16 +-
src/views/securityUnitChild/index.vue | 43 +++--
src/views/dispatch/data.js | 11 +
src/views/securityGuard/securityGuardRegistration.vue | 16 +-
src/views/dispatch/index.vue | 24 ++-
src/views/securityUnit/data.js | 19 +
src/views/dispatchChild/index.vue | 59 +++-----
src/views/securityUnitChild/data.js | 99 ++++++++++----
12 files changed, 248 insertions(+), 156 deletions(-)
diff --git a/public/index.html b/public/index.html
index ed2065d..395b3a5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,7 @@
<script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.png">
- <!-- <title>Saber企业级开发平台</title> -->
+ <title>保安服务企业管理</title>
<style>
html,
body,
@@ -96,8 +96,8 @@
</div>
</div>
<div class="avue-home__footer">
- <a href="https://bladex.vip" target="_blank">
- https://bladex.vip </a>
+ <!-- <a href="https://bladex.vip" target="_blank">
+ https://bladex.vip </a> -->
</div>
</div>
</div>
diff --git a/src/views/dispatch/data.js b/src/views/dispatch/data.js
index 08f3ee3..cf5e06a 100644
--- a/src/views/dispatch/data.js
+++ b/src/views/dispatch/data.js
@@ -37,6 +37,9 @@
}],
labelWidth: 110,
width: 200,
+ editDisplay: false,
+ addDisplay: false,
+ hide: true,
// span: 11,
},
{
@@ -66,6 +69,14 @@
// // }],
},
{
+ label: "行政区",
+ prop: "addresss",
+ labelWidth: 110,
+ search: true,
+ // width: 110,
+ // overHidden: true
+ },
+ {
label: "详细地址",
prop: "address",
labelWidth: 110,
diff --git a/src/views/dispatch/index.vue b/src/views/dispatch/index.vue
index 2fd5dfc..68e5295 100644
--- a/src/views/dispatch/index.vue
+++ b/src/views/dispatch/index.vue
@@ -110,10 +110,11 @@
query: {},
data: [],
option: {
- card: true,
+ tip: false,
+ // card: true,
searchSize: "mini",
searchMenuSpan: 6,
- height: 547,
+ height: 623,
menuWidth: 160,
align: "center",
selection: true,
@@ -317,7 +318,7 @@
path: "/dispatchChild",
// redirect: { name: "foo" },
// query: { row: row },
- query: { rowdispatch: "fromDispatch"},
+ query: { rowdispatch: "fromDispatch" },
// params: { row: row.identificationnumber },
});
},
@@ -482,12 +483,15 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-card__body {
- padding-bottom: 5px !important;
-}
-.avue-crud__tip,
-.el-tag,
-.el-tag--light {
- padding: 0 !important;
+// .el-card__body {
+// padding-bottom: 5px !important;
+// }
+// .avue-crud__tip,
+// .el-tag,
+// .el-tag--light {
+// padding: 0 !important;
+// }
+.el-collapse-item {
+ padding-top: 15px !important;
}
</style>
\ No newline at end of file
diff --git a/src/views/dispatchChild/data.js b/src/views/dispatchChild/data.js
index d173500..8630d5b 100644
--- a/src/views/dispatchChild/data.js
+++ b/src/views/dispatchChild/data.js
@@ -16,7 +16,7 @@
prop: "title",
span: 24,
styles: {
- fontSize: '24px'
+ fontSize: '10px'
}
},
{
@@ -26,13 +26,31 @@
labelWidth: 130,
disabled: true,
},
- {
- label: "保安公司",
- prop: "tenantName",
- span: 11,
- labelWidth: 130,
- disabled: true,
- },
+ // {
+ // label: "保安公司",
+ // prop: "tenantName",
+ // // type: "tree",
+ // // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ // // props: {
+ // // label: "title",
+ // // value: "id"
+ // // },
+ // // hide: !website.tenantMode,
+ // // addDisplay: website.tenantMode,
+ // // editDisplay: website.tenantMode,
+ // // viewDisplay: website.tenantMode,
+ // // rules: [{
+ // // required: true,
+ // // message: "请输入所属保安单位",
+ // // trigger: "click"
+ // // }],
+ // span: 11,
+ // labelWidth: 130,
+ // // editDisplay: false,
+ // // addDisplay: false,
+ // // hide: true,
+ // disabled: true,
+ // },
{
label: "联系人",
prop: "linkman",
@@ -82,8 +100,9 @@
{
label: "保安人名称",
prop: "name",
- // search: true,
- // searchSpan: 4,
+ search: true,
+ searchSpan: 5,
+ searchLabelWidth: 120
// overHidden: true
}, {
label: "身份证",
@@ -91,20 +110,31 @@
// search: true,
// searchSpan: 4,
// overHidden: true
- }, {
- label: "派遣人",
- prop: "dispatcher",
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- }, {
+ },
+ // {
+ // label: "派遣人",
+ // prop: "dispatcher",
+ // // search: true,
+ // // searchSpan: 4,
+ // // overHidden: true
+ // },
+ {
label: "派遣时间",
prop: "dispatchertime",
type: "date",
format: "yyyy-MM-dd hh:mm:ss",
valueFormat: "timestamp",
+ search: true,
+ searchSpan: 5,
+ // overHidden: true
+ }, {
+ label: "结束时间",
+ prop: "dispatchertime",
+ type: "date",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
// search: true,
- // searchSpan: 4,
+ // searchSpan: 5,
// overHidden: true
}, {
label: "派遣地址",
diff --git a/src/views/dispatchChild/index.vue b/src/views/dispatchChild/index.vue
index 8c36729..ce20d84 100644
--- a/src/views/dispatchChild/index.vue
+++ b/src/views/dispatchChild/index.vue
@@ -49,7 +49,7 @@
@selection-change="selectionChange1"
@refresh-change="refreshChange1"
>
- <template slot="menuLeft">
+ <!-- <template slot="menuLeft">
<el-button
type="danger"
size="small"
@@ -58,7 +58,7 @@
@click="handleDelete1"
>删 除
</el-button>
- </template>
+ </template> -->
</avue-crud>
</span>
<!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
@@ -106,7 +106,7 @@
//基本信息
//保安单位信息表单
obj0: {
- title: "我是头部标题",
+ // title: "我是头部标题",
},
option0: {
emptyBtn: false,
@@ -144,14 +144,19 @@
query1: {},
data1: [],
option1: {
- card: true,
+ // card: true,
+ tip: false,
+ index: true,
+ menu: false,
searchSize: "mini",
- searchMenuSpan: 6,
- height: 547,
- menuWidth: 160,
+ searchMenuSpan: 8,
+ height: 563,
+ // menuWidth: 160,
align: "center",
- selection: true,
+ // selection: true,
column: column1,
+ cellBtn: false,
+ addBtn: false,
},
};
},
@@ -179,6 +184,7 @@
// this.onLoad(this.page);
} else if (column.prop == "tab2") {
// this.loading = false;
+ console.log(document.getElementsByClassName("el-card__body")[0]);
this.onLoad1(this.page1); //第二个表格不会自动执行
}
// this.$message.success(JSON.stringify(column));
@@ -456,33 +462,15 @@
},
},
mounted() {
- // this.typeTABS = this.optionTABS.column[0];
- // // console.log(typeof this.$route.query.row, 15315);
- // if (typeof this.$route.query.row == "object") {
- // var row = this.$route.query.row;
- // for (var k in row) {
- // this.obj0[k] = row[k];
- // }
- // this.obj0.title = row.name + "基本信息";
- // // console.log(row);
- // this.id = row.id;
- // this.saveLock("paqiandata", JSON.stringify(row));
- // } else {
- // var row = JSON.parse(this.readLock("paqiandata"));
- // // console.log(row);
- // this.obj0.title = row.name + "基本信息";
- // for (var k in row) {
- // this.obj0[k] = row[k];
- // }
- // }
this.typeTABS = this.optionTABS.column[0];
var row = {};
if (this.readLock("paqiandata") != null) {
row = JSON.parse(this.readLock("paqiandata"));
- this.obj0.title = row.name + " 基本信息";
+ this.obj0.name = row.name;
for (var k in row) {
this.obj0[k] = row[k];
}
+ console.log(this.obj0, 11111111);
this.id = row.id;
if (this.readLock("paqiandataS") != null) {
var b = JSON.parse(this.readLock("paqiandataS"));
@@ -498,32 +486,27 @@
// console.log("已删除");
this.obj0 = {};
- this.obj0.title = row.name + " 该派遣单位已删除";
+ this.obj0.name = row.name + " 该派遣单位已删除";
window.localStorage.removeItem("paqiandata");
this.id = 1244241;
}
}
} else {
// console.log("no");
- this.obj0.title = " 未选择派遣单位";
+ this.obj0.name = " 未选择派遣单位";
}
},
};
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.dispatch {
width: 100%;
height: 100%;
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-card__body {
- padding-bottom: 5px !important;
-}
-.avue-crud__tip,
-.el-tag,
-.el-tag--light {
- padding: 0 !important;
+.el-collapse-item{
+ padding-top: 15px !important;
}
</style>
\ No newline at end of file
diff --git a/src/views/recruitmentManagement/index.vue b/src/views/recruitmentManagement/index.vue
index 723e6dc..325d3fd 100644
--- a/src/views/recruitmentManagement/index.vue
+++ b/src/views/recruitmentManagement/index.vue
@@ -211,12 +211,12 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-card__body {
- padding-bottom: 5px !important;
-}
-.avue-crud__tip,
-.el-tag,
-.el-tag--light {
- padding: 0 !important;
-}
+// .el-card__body {
+// padding-bottom: 5px !important;
+// }
+// .avue-crud__tip,
+// .el-tag,
+// .el-tag--light {
+// padding: 0 !important;
+// }
</style>
\ No newline at end of file
diff --git a/src/views/securityGuard/securityGuardDetail.vue b/src/views/securityGuard/securityGuardDetail.vue
index 1478c21..a40bf80 100644
--- a/src/views/securityGuard/securityGuardDetail.vue
+++ b/src/views/securityGuard/securityGuardDetail.vue
@@ -185,12 +185,12 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-card__body {
- padding-bottom: 5px !important;
-}
-.avue-crud__tip,
-.el-tag,
-.el-tag--light {
- padding: 0 !important;
-}
+// .el-card__body {
+// padding-bottom: 5px !important;
+// }
+// .avue-crud__tip,
+// .el-tag,
+// .el-tag--light {
+// padding: 0 !important;
+// }
</style>
\ No newline at end of file
diff --git a/src/views/securityGuard/securityGuardRegistration.vue b/src/views/securityGuard/securityGuardRegistration.vue
index 4e6e4e3..949ae36 100644
--- a/src/views/securityGuard/securityGuardRegistration.vue
+++ b/src/views/securityGuard/securityGuardRegistration.vue
@@ -416,20 +416,20 @@
<style scope>
.box {
- height: 850px;
+ height: 800px;
}
-.el-card__body {
- margin-bottom: 30px !important;
-}
+/* .el-card__body {
+ margin-bottom: 0px !important;
+} */
-.el-scrollbar {
+/* .el-scrollbar {
height: 100%;
-}
+} */
-.box .el-scrollbar__wrap {
+/* .box .el-scrollbar__wrap {
overflow: scroll;
-}
+} */
/* .el-form-item__content{
margin-left: 0px !important;
diff --git a/src/views/securityUnit/data.js b/src/views/securityUnit/data.js
index a570cee..28f0ce7 100644
--- a/src/views/securityUnit/data.js
+++ b/src/views/securityUnit/data.js
@@ -19,7 +19,8 @@
{
label: "统一社会信用代码",
prop: "creditcode",
- width: 140
+ width: 140,
+ hide: true,
// hide: true,
// editDisplay: false,
// addDisplay: false
@@ -138,6 +139,7 @@
label: "实缴资本(万元人民币)",
prop: "capital",
width: 85,
+ hide: true,
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -200,11 +202,13 @@
label: "注册地址",
prop: "address",
// search: true,
+ hide: true,
},
{
label: "经营范围",
prop: "business",
// search: true,
+ hide: true,
width: 110,
overHidden: true
},
@@ -221,11 +225,13 @@
// search: true,
// width: 88,
overHidden: true,
+ hide: true,
},
{
label: "所属行业",
prop: "industry",
+ hide: true,
// search: true,
// width: 88,
},
@@ -645,10 +651,11 @@
prop: "cell2",
labelWidth: w,
span: s
- }, {
- label: "持股比例(%)",
- prop: "shareholdingratio2",
- labelWidth: w,
- span: s
}
+ // , {
+ // label: "持股比例(%)",
+ // prop: "shareholdingratio2",
+ // labelWidth: w,
+ // span: s
+ // }
]
diff --git a/src/views/securityUnit/index.vue b/src/views/securityUnit/index.vue
index caa4d7d..5caeb70 100644
--- a/src/views/securityUnit/index.vue
+++ b/src/views/securityUnit/index.vue
@@ -213,10 +213,11 @@
data: [],
option: {
addBtn: false,
- card: true,
+ // card: true,
+ tip: false,
searchSize: "mini",
searchMenuSpan: 6,
- height: 547,
+ height: 623,
menuWidth: 160,
align: "center",
selection: true,
@@ -565,14 +566,14 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-card__body {
- padding-bottom: 5px !important;
-}
-.avue-crud__tip,
-.el-tag,
-.el-tag--light {
- padding: 0 !important;
-}
+// .el-card__body {
+// padding-bottom: 5px !important;
+// }
+// .avue-crud__tip,
+// .el-tag,
+// .el-tag--light {
+// padding: 0 !important;
+// }
.lod {
position: absolute;
@@ -597,8 +598,16 @@
.lod-in {
width: 70%;
height: auto;
+ background-color: transparent;
// padding: 10px 0 0 0;
}
+
+ .el-collapse-item {
+ padding-top: 15px !important;
+ }
+}
+.el-collapse {
+ border-top: 1px solid transparent !important;
}
</style>
\ No newline at end of file
diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index e93de06..7c4e691 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -7,7 +7,8 @@
value: 2,
}
]
-
+var w = 160
+ , s = 12;
export var column = [
{
label: "",
@@ -20,15 +21,15 @@
}
},
{
- label: "统一社会信用代码",
- prop: "creditcode",
+ label: "企业名称",
+ prop: "enterprisename",
span: 11,
labelWidth: 130,
disabled: true,
},
{
- label: "企业名称",
- prop: "enterprisename",
+ label: "统一社会信用代码",
+ prop: "creditcode",
span: 11,
labelWidth: 130,
disabled: true,
@@ -104,15 +105,6 @@
// search: true,
},
{
- label: "经营范围",
- prop: "business",
- span: 11,
- labelWidth: 130,
- width: 110,
- overHidden: true,
- disabled: true,
- },
- {
label: "所属地区",
prop: "region",
span: 11,
@@ -122,20 +114,34 @@
disabled: true,
},
{
- label: "登记机关",
- prop: "registration",
- span: 11,
- labelWidth: 130,
- disabled: true,
- },
-
- {
label: "所属行业",
prop: "industry",
span: 11,
labelWidth: 130,
disabled: true,
+ },
+ {
+ label: "经营范围",
+ prop: "business",
+ span: 24,
+ labelWidth: 130,
+ width: 110,
+ // overHidden: true,
+ type: 'textarea',
+ showWordLimit: true,
+ disabled: true,
+ },
+ {
+ label: "登记机关",
+ prop: "registration",
+ // span: 11,
+ labelWidth: 130,
+ type: 'textarea',
+ disabled: true,
+ maxRows: 10,
+ span: 24,
}
+
]
export var column1 = [
@@ -144,13 +150,19 @@
prop: "id",
hide: true,
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+
}, {
label: "股东",
prop: "shareholder",
+ search: true,
+ labelWidth: w,
+ span: s,
}, {
label: "持股比例(%)",
prop: "shareholdingratio",
+ labelWidth: w,
+ span: s,
},
// {
// label: "最终受益股份",
@@ -159,23 +171,34 @@
{
label: "出资金额(万元)",
prop: "capital",
+ labelWidth: w,
+ span: s,
}, {
label: "出资时间",
prop: "capitaltime",
type: "date",
format: "yyyy-MM-dd hh:mm:ss",
valueFormat: "timestamp",
+ labelWidth: w,
+ span: s,
}, {
label: "身份证",
prop: "cardid",
+ labelWidth: w,
+ span: s,
}, {
label: "联系电话",
prop: "cell",
+ labelWidth: w,
+ span: s,
}, {
label: "统一社会信用代码",
prop: "creditcode",
+ hide: true,
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ labelWidth: w,
+ span: s,
},
]
@@ -183,28 +206,46 @@
{
label: "统一社会信用代码",
prop: "creditcode",
+ hide: true,
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ labelWidth: w,
+ span: s,
}, {
label: "id",
prop: "id",
hide: true,
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ labelWidth: w,
+ span: s,
}, {
label: "姓名",
prop: "name",
+ search: true,
+ labelWidth: w,
+ span: s,
}, {
label: "职务",
prop: "post",
+ search: true,
+ labelWidth: w,
+ span: s,
}, {
label: "身份证",
prop: "cardid",
+ labelWidth: w,
+ span: s,
}, {
label: "联系电话",
prop: "cell",
- }, {
- label: "持股比例(%)",
- prop: "shareholdingratio",
+ labelWidth: w,
+ span: s,
}
+ // , {
+ // label: "持股比例(%)",
+ // prop: "shareholdingratio",
+ // labelWidth: w,
+ // span: s,
+ // }
]
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index 9fa5108..3864f4a 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -182,7 +182,7 @@
creditcode: "",
//保安单位信息表单
obj0: {
- title: "我是头部标题",
+ // title: "我是头部标题",
},
option0: {
emptyBtn: false,
@@ -201,10 +201,11 @@
query1: {},
data1: [],
option1: {
- card: true,
+ // card: true,
+ tip: false,
searchSize: "mini",
- searchMenuSpan: 6,
- height: 547,
+ searchMenuSpan: 8,
+ height: 563,
menuWidth: 200,
align: "center",
selection: true,
@@ -221,11 +222,13 @@
query2: {},
data2: [],
option2: {
- card: true,
+ // card: true,
+ tip: false,
searchSize: "mini",
- searchMenuSpan: 6,
- height: 547,
+ searchMenuSpan: 8,
+ height: 563,
menuWidth: 200,
+ menuAlign: "center",
align: "center",
selection: true,
column: column2,
@@ -688,7 +691,7 @@
var row = {};
if (this.readLock("danweidata") != null) {
row = JSON.parse(this.readLock("danweidata"));
- this.obj0.title = row.enterprisename + "基本信息";
+ // this.obj0.title = row.enterprisename;
for (var k in row) {
this.obj0[k] = row[k];
}
@@ -707,14 +710,14 @@
// console.log("已删除");
this.obj0 = {};
- this.obj0.title = row.enterprisename + "该公司已删除";
+ this.obj0.enterprisename = row.enterprisename + "该公司已删除";
window.localStorage.removeItem("danweidata");
- this.creditcode = '';
+ this.creditcode = "";
}
}
} else {
// console.log("no");
- this.obj0.title = "未选择查询单位";
+ this.obj0.enterprisename = "未选择查询单位";
}
},
watch: {
@@ -732,12 +735,16 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-card__body {
- padding-bottom: 5px !important;
-}
-.avue-crud__tip,
-.el-tag,
-.el-tag--light {
- padding: 0 !important;
+// .el-card__body {
+// padding-bottom: 5px !important;
+// }
+// .avue-crud__tip,
+// .el-tag,
+// .el-tag--light {
+// padding: 0 !important;
+// }
+
+.el-collapse-item{
+ padding-top: 15px !important;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3