|
|
@@ -118,6 +118,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-dialog
|
|
|
+ class="dialog-footer-center"
|
|
|
append-to-body
|
|
|
title="新增电签配置信息"
|
|
|
:visible.sync="addDialogVisible"
|
|
|
@@ -127,6 +128,7 @@
|
|
|
<el-table
|
|
|
:data="tableData1"
|
|
|
style="width: 100%"
|
|
|
+ max-height="500"
|
|
|
>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -169,14 +171,14 @@
|
|
|
label="元素来源"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-link type="primary" @click="eleCheck(scope.row,scope.$index)">请选择</el-link>
|
|
|
+ <el-link type="warning" @click="eleCheck(scope.row,scope.$index)">请选择</el-link>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="address"
|
|
|
label="绑定岗位"
|
|
|
> <template slot-scope="scope">
|
|
|
- <el-link type="primary" @click="selectPost(scope.row,scope.$index)">请选择</el-link>
|
|
|
+ <el-link type="warning" :underline="true" @click="selectPost(scope.row,scope.$index)">请选择</el-link>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -196,20 +198,20 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="addDialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="saveBatch" :loading="saveBatchLoading">确 定</el-button>
|
|
|
+
|
|
|
+ <el-button type="primary" @click="saveBatch" :loading="saveBatchLoading">保存并生效</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<!-- 选择元素来源 -->
|
|
|
<el-dialog
|
|
|
+ class="dialog-footer-center"
|
|
|
append-to-body
|
|
|
-
|
|
|
- title="选择元素来源"
|
|
|
+ title="元素来源"
|
|
|
:visible.sync="sourceDialogVisible"
|
|
|
width="50%"
|
|
|
:close="handleSourceClose">
|
|
|
<div>
|
|
|
- <p class="tip-text" >
|
|
|
+ <p class="tip-text" v-if="!isEleView" >
|
|
|
提示：配置之后会把所有元素表该元素字段都自动配置电签岗位对应关系。
|
|
|
</p>
|
|
|
<div class="source-radio-group">
|
|
|
@@ -220,7 +222,13 @@
|
|
|
</div>
|
|
|
<!-- 并行显示的下拉框 -->
|
|
|
<div v-if="selectedSourceOption === 1&&!isEleView" class="dropdown-container">
|
|
|
- <el-select v-model="elementCategorySelect" placeholder="请选择表分类" style="flex: 1; margin-right: 10px;" clearable @change="changeSelect" >
|
|
|
+ <el-select
|
|
|
+ v-model="elementCategorySelect"
|
|
|
+ placeholder="请选择表分类"
|
|
|
+ style="flex: 1; margin-right: 10px;"
|
|
|
+ clearable @change="changeSelect"
|
|
|
+
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="item in elementCategoryOptions"
|
|
|
:key="item.value"
|
|
|
@@ -234,6 +242,8 @@
|
|
|
placeholder="请输入元素表名称进行模糊检索"
|
|
|
style="flex: 1;"
|
|
|
filterable clearable multiple
|
|
|
+ class="custom-multi-select"
|
|
|
+
|
|
|
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -258,10 +268,13 @@
|
|
|
v-if="selectedSourceOption === 1&&isEleView"
|
|
|
:data="elementList1"
|
|
|
border
|
|
|
- style="width: 100%;margin-top: 20px;">
|
|
|
+ style="width: 100%;margin-top: 20px;"
|
|
|
+ :header-cell-style="{ background: '#A0B7E2', color: 'black' }"
|
|
|
+ >
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
label="元素表名称"
|
|
|
+ align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -275,6 +288,7 @@
|
|
|
</el-dialog>
|
|
|
<!-- 绑定岗位弹窗 -->
|
|
|
<el-dialog
|
|
|
+ class="dialog-footer-center"
|
|
|
append-to-body
|
|
|
title="绑定岗位"
|
|
|
:visible.sync="bindPostDialogVisible"
|
|
|
@@ -291,7 +305,7 @@
|
|
|
:value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="positionNameSelect" filterable multiple placeholder="请输入岗位名称进行模糊检索" style="flex: 1;" v-loading="positionNameLoading">
|
|
|
+ <el-select v-model="positionNameSelect" filterable multiple placeholder="请输入岗位名称进行模糊检索" class="custom-multi-select" style="flex: 1;" v-loading="positionNameLoading">
|
|
|
|
|
|
<el-option
|
|
|
v-for="item in positionNameOptions"
|
|
|
@@ -317,16 +331,19 @@
|
|
|
v-if="isPosView"
|
|
|
:data="positionList1"
|
|
|
border
|
|
|
+ :header-cell-style="{ background: '#A0B7E2', color: 'black' }"
|
|
|
style="width: 100%;margin-top: 20px;">
|
|
|
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
label="所属方"
|
|
|
+ align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
label="岗位名称"
|
|
|
+ align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -441,8 +458,7 @@ import { log } from "@antv/g2plot/lib/utils";
|
|
|
|
|
|
if (newVal) {
|
|
|
let arr=[];
|
|
|
- console.log(newVal,'newVal');
|
|
|
- console.log(this.allPositionNameOptions,'this.allPositionNameOptions');
|
|
|
+
|
|
|
this.allPositionNameOptions.forEach(item => {
|
|
|
newVal.forEach(roleName => {
|
|
|
if (item.value === roleName) {
|
|
|
@@ -679,8 +695,7 @@ import { log } from "@antv/g2plot/lib/utils";
|
|
|
},
|
|
|
//选择元素来源
|
|
|
eleCheck(row,index,type) {
|
|
|
- console.log(row,'row');
|
|
|
- console.log(type,'type');
|
|
|
+
|
|
|
this.getAllElements()
|
|
|
this.eleCheckRow=row;
|
|
|
this.eleIndex=index;
|
|
|
@@ -1153,7 +1168,7 @@ import { log } from "@antv/g2plot/lib/utils";
|
|
|
}
|
|
|
}
|
|
|
.tip-text {
|
|
|
-margin-top: -20px;
|
|
|
+margin-top: -30px;
|
|
|
color: red;
|
|
|
|
|
|
}
|
|
|
@@ -1192,7 +1207,7 @@ margin-top: -20px;
|
|
|
}
|
|
|
|
|
|
.position-list-container {
|
|
|
- border: 1px solid #e4e7ed;
|
|
|
+ // border: 1px solid #e4e7ed;
|
|
|
border-radius: 4px;
|
|
|
padding: 10px;
|
|
|
height: 300px;
|
|
|
@@ -1215,5 +1230,26 @@ margin-top: -20px;
|
|
|
}
|
|
|
</style>
|
|
|
<style lang="scss" >
|
|
|
+/* 限制已选标签容器高度并启用滚动 */
|
|
|
+.custom-multi-select .el-select__tags {
|
|
|
+ max-height: 60px; /* 控制高度 */
|
|
|
+ overflow-y: auto; /* 启用滚动 */
|
|
|
+ white-space: normal; /* 允许换行（可选） */
|
|
|
+}
|
|
|
+
|
|
|
+/* 调整折叠标签的显示样式 */
|
|
|
+.custom-multi-select .el-tag {
|
|
|
+ margin: 2px 4px 2px 0;
|
|
|
+}
|
|
|
+
|
|
|
+/* 可选：隐藏原生滚动条（更美观） */
|
|
|
+.custom-multi-select .el-select__tags::-webkit-scrollbar {
|
|
|
+ width: 0;
|
|
|
+}
|
|
|
+.dialog-footer-center {
|
|
|
+ .el-dialog__footer {
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
+}
|
|
|
+</style>
|
|
|
|
|
|
-</style>
|
