From 26d2d33f15871687bee2d5729599cb325f864eaa Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Dec 2021 14:50:16 +0800
Subject: [PATCH] 主要管理人员修改
---
src/views/securityUnitChild/social.vue | 33 +---------------
src/views/securityUnitChild/index.vue | 18 +++++++--
src/views/dispatch/dispatch.vue | 49 ++++++++++++++++++------
3 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index cf18e89..b6364ff 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -241,6 +241,30 @@
],
},
{
+ label: "派遣单位类型",
+ prop: "district",
+ type: "select",
+ search: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=dispatcherUnitType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ searchLabelWidth: 110,
+ overHidden: true,
+ searchSpan: 4,
+ width: 100,
+ labelWidth: 138,
+ rules: [
+ {
+ required: true,
+ message: "请选择派遣单位类型",
+ trigger: "click",
+ },
+ ],
+ dataType: "number",
+ },
+ {
label: "企业名称",
prop: "deptId",
type: "tree",
@@ -258,12 +282,21 @@
},
],
labelWidth: 138,
- width: 230,
+ width: 180,
searchLabelWidth: 80,
search: true,
searchSpan: 4,
},
-
+ {
+ label: "保安服务类型",
+ prop: "serveType",
+ // search: true,
+ searchLabelWidth: 110,
+ searchSpan: 4,
+ overHidden: true,
+ // span: 12,
+ labelWidth: 138,
+ },
{
label: "合同生效时间",
prop: "releaseTimeRange",
@@ -323,6 +356,7 @@
viewDisplay: false,
overHidden: true,
labelWidth: 138,
+ width:100,
type: "tree",
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
@@ -425,16 +459,7 @@
// },
],
},
- {
- label: "保安服务类型",
- prop: "serveType",
- // search: true,
- searchLabelWidth: 110,
- searchSpan: 4,
- overHidden: true,
- // span: 12,
- labelWidth: 138,
- },
+
{
label: "派遣保安员数",
prop: "num",
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index cac55eb..8df4ec1 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -142,6 +142,7 @@
<!-- </span> -->
</el-tab-pane>
<!-- <span v-else-if="typeTABS.prop === 'tab2'" class="tab"> -->
+
<el-tab-pane
label="保安单位出资人员"
name="tab2"
@@ -149,9 +150,10 @@
$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
]"
>
+ <div class="manager">
<basic-container>
<avue-crud
- v-if="visible"
+ v-if="true"
:option="option1"
:data="data1"
:page.sync="page1"
@@ -186,8 +188,10 @@
</template>
</avue-crud>
</basic-container>
+ </div>
<!-- </span> -->
</el-tab-pane>
+
<!-- <span v-else-if="typeTABS.prop === 'tab3'" class="tab"> -->
<el-tab-pane
label="主要管理人员信息"
@@ -196,9 +200,10 @@
$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
]"
>
+ <div class="manager">
<basic-container>
<avue-crud
- v-if="visible"
+ v-if="true"
:option="option2"
:data="data2"
:page.sync="page2"
@@ -233,6 +238,7 @@
</template>
</avue-crud>
</basic-container>
+ </div>
<!-- </span> -->
</el-tab-pane>
<!-- <span v-else-if="typeTABS.prop === 'tab4'" class="tab"> -->
@@ -1126,8 +1132,8 @@
// },
windowHeight() {
// console.log(this.windowHeight, "windowHeight");
- this.option1.height = this.windowHeight - 320;
- this.option2.height = this.windowHeight - 320;
+ // this.option1.height = this.windowHeight + 100;
+ // this.option2.height = this.windowHeight - 320;
this.visible = false;
this.$nextTick(() => {
this.visible = true;
@@ -1169,4 +1175,8 @@
overflow: hidden;
top: -10px;
}
+
+.manager{
+ height: 755px;
+}
</style>
\ No newline at end of file
diff --git a/src/views/securityUnitChild/social.vue b/src/views/securityUnitChild/social.vue
index cd71fd1..223c8a0 100644
--- a/src/views/securityUnitChild/social.vue
+++ b/src/views/securityUnitChild/social.vue
@@ -233,8 +233,8 @@
prop: "residence",
labelWidth: 110,
overHidden: true,
- addDisabled: true,
- editDisabled: true,
+ addDisabled: false,
+ editDisabled: false,
rules: [
{
required: true,
@@ -333,33 +333,6 @@
tip: "请上传 .xls,.xlsx 标准格式文件",
action: "/api/social/import-user?deptid=" + deptid,
},
- // {
- // label: "数据覆盖",
- // prop: "isCovered",
- // type: "switch",
- // align: "center",
- // hide: true,
- // width: 80,
- // dicData: [
- // {
- // label: "否",
- // value: 0,
- // },
- // {
- // label: "是",
- // value: 1,
- // },
- // ],
- // value: 0,
- // slot: true,
- // rules: [
- // {
- // required: true,
- // message: "请选择是否覆盖",
- // trigger: "blur",
- // },
- // ],
- // },
{
label: "模板下载",
prop: "excelTemplate",
@@ -425,7 +398,7 @@
var d = res.data.data;
this.form.cardid = d.cardid;
this.form.telephone = d.phone;
- this.form.residence = d.nativeplace;
+ this.form.residence = d.registered;
this.form.address = d.address;
this.form.sex = d.sex;
this.form.nation = d.nation;
--
Gitblit v1.9.3