From 15315b1772036eb5168792aac0121f6e9005b11e Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 08 Jan 2024 10:16:26 +0800
Subject: [PATCH] Default Changelist
---
src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue | 440 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 326 insertions(+), 114 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
index 24af233..36c0196 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
@@ -4,8 +4,8 @@
<div class="homeCard">
<el-row>
<el-col :span="12">
- <el-form-item label="作业申请单位" prop="applyDepId">
- <el-cascader style="width: 100%" v-model="form.applyDepId" :options="departList2" :props="props" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/>
+ <el-form-item label="作业申请单位" prop="depIdList">
+ <el-cascader style="width: 100%" v-model="form.depIdList" :options="lists.departList2" :props="props1" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -55,59 +55,58 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="作业人及证件编号" prop="operatorUids">
- <el-select v-model="form.operatorUids" multiple clearable>
- <el-option
- v-for="item in workerList"
- :key="item.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+ <el-form-item label="作业人" prop="operatorUids">
+<!-- <el-select v-model="form.operatorUids" filterable multiple clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in spList.opList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.realName"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.operatorUids" :options="lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDepId">
- <el-cascader style="width: 100%" v-model="form.workDepId" :props="depProps" :options="departList" :show-all-levels="false"/>
+ <el-cascader style="width: 100%" v-model="form.workDepId" :props="depProps" :options="lists.departList" :show-all-levels="false"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="作业负责人" prop="headUids">
- <el-select v-model="form.headUids" multiple @change="getStartEndIds" clearable>
+ <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
/>
</el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.headUids" :options="lists.workerList" :props="casProps" @change="getStartEndIds" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="分析人" prop="analystUids">
- <el-select v-model="form.analystUids" multiple clearable>
+ <el-select v-model="form.analystUids" filterable multiple clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
/>
</el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.analystUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'分析人')" :show-all-levels="false"/>-->
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="关联其他特殊作业" prop="involveOtherWork">
- <el-select v-model="form.involveOtherWork" multiple clearable>
- <el-option
- v-for="item in otherWorkList"
- :key="item.value"
- :label="item.label"
- :value="item.label"
- />
+ <el-col :span="12" class="valueSelect">
+ <el-form-item label="关联其他特殊作业">
+ <el-select v-model="form.involveOtherWork" multiple clearable :teleported="false" @click="openWorkSelect">
+ <el-option v-for="item in lists.otherWorks" :key="item.workApplyId" :label="item.workContent" :value="item.workApplyId">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -115,21 +114,22 @@
<el-row>
<el-col :span="12">
<el-form-item label="监护人" prop="guardianUids">
- <el-select v-model="form.guardianUids" multiple @change="getSafetyIds" clearable>
- <el-option
- v-for="item in workerList"
- :key="item.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+<!-- <el-select v-model="form.guardianUids" filterable multiple @change="getSafetyIds" clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in spList.jhList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.realName"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.guardianUids" :options="lists.spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="绑定执法仪" prop="cameraIds">
<el-select v-model="form.cameraIds" multiple clearable>
<el-option
- v-for="item in deviceList"
+ v-for="item in lists.deviceList"
:key="item.id"
:label="item.name"
:value="item.id"
@@ -198,9 +198,9 @@
</el-col>
</el-row>
<el-row style="display: flex;justify-content: center">
- <el-table :data="safetyMeasureBasicList" style="width: 90%" border>
+ <el-table :data="safetyMeasureBasicList" style="width: 90%" border v-loading="tabLoading">
<el-table-column type="index" label="序号" width="100px" align="center"/>
- <el-table-column prop="measureContent" label="安全措施" align="center"/>
+ <el-table-column prop="measureContent" label="安全措施"/>
<!-- <el-table-column prop="address" label="确认人">-->
<!-- <template #default="scope">-->
@@ -216,14 +216,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="安全措施确认人" prop="safetyMeasureUids">
- <el-select v-model="form.safetyMeasureUids" multiple clearable>
+ <el-select v-model="form.safetyMeasureUids" filterable multiple clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
/>
</el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.safetyMeasureUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'确认人')" :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
@@ -248,7 +249,7 @@
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style="display: flex;justify-content: center">
- <el-table :data="form.approvalDepBasicList" style="width: 90%" border>
+ <el-table :data="form.approvalDepBasicList" style="width: 90%" border v-loading="tabLoading">
<el-table-column prop="content" label="审批签字项目" align="center"/>
<el-table-column prop="approvalType" label="是否必签" align="center">
<template #default="scope">
@@ -263,9 +264,9 @@
</el-table-column>
<el-table-column prop="approvalUids" label="审批人" align="center">
<template #default="scope">
- <el-select v-model="scope.row.approvalUids" multiple :disabled="isFirstRow(scope.$index)" clearable>
+ <el-select v-model="scope.row.approvalUids" filterable multiple :disabled="isFirstRow(scope.$index)" clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
@@ -278,39 +279,57 @@
<el-row>
<el-col :span="12">
<el-form-item label="完工验收" prop="acceptUid">
- <el-select v-model="form.acceptUid" clearable>
+ <el-select v-model="form.acceptUid" filterable clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
/>
</el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.acceptUid" :options="lists.workerList" :props="cas4Props" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="现场开始结束确认人" prop="startOrEndUids">
- <el-select v-model="form.startOrEndUids" multiple clearable>
+ <el-select v-model="form.startOrEndUids" filterable multiple clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
/>
</el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.startOrEndUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'结束人')" :show-all-levels="false"/>-->
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="最终审批人" prop="lastApprover">
+ <el-select v-model="form.lastApprover" filterable clearable>
+ <el-option
+ v-for="item in lists.workerList"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
+ />
+ </el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.lastApprover" :options="lists.workerList" :props="cas4Props" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<div class="applyBtn">
- <el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">提交申报</el-button>
+ <el-button type="primary" size="large" plain v-throttle @click="submitForm(ruleFormRef)">提交申报</el-button>
</div>
+ <work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select>
</div>
</template>
<script lang="ts">
- import { toRefs, reactive, defineComponent, ref, defineAsyncComponent, onMounted } from 'vue';
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent, onMounted, onUpdated } from 'vue';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
import {useUserInfo} from "/@/stores/userInfo";
@@ -319,28 +338,36 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+ import workSelect from "/@/views/newSpecialWorkSystem/workTicket/zysq/components/workSelect.vue";
+ import {userApi} from "/@/api/systemManage/user";
interface stateType {
form: Object,
workLevelList: Array<any>,
- otherWorkList: Array<any>,
equipmentDialog: boolean,
- props:{},
- depProps:{},
+ tabLoading: boolean
+ props1:{}
+ depProps:{}
+ casProps:{}
+ cas2Props: {}
+ cas3Props: {}
+ cas4Props: {}
safetyMeasureBasicList: []
}
export default defineComponent({
name: 'fireForm',
- components: {},
- props:['departList','departList2','workerList','deviceList'],
+ components: {workSelect},
+ props:['lists'],
setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
+ tabLoading: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
form: {
workType: 1,
workLevel: null,
+ depIdList: [],
applyDepId: null,
seDepId: null,
expStartTime: '',
@@ -353,10 +380,11 @@
workContent: '',
workLocation: '',
riskIdentification: '',
- involveOtherWork: '',
+ involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
acceptUid: null,
+ lastApprover: null,
startOrEndUids: [],
cameraIds: [],
workDetail: {
@@ -377,45 +405,130 @@
value: 3
}
],
- otherWorkList: [
- {
- label: "动火作业",
- value: 1
- },
- {
- label: "受限空间作业",
- value: 2
- },
- {
- label: "吊装作业",
- value: 3
- },
- {
- label: "动土作业",
- value: 4
- },
- {
- label: "断路作业",
- value: 5
- },
- {
- label: "高处作业",
- value: 6
- },
- {
- label: "临时用电作业",
- value: 7
- },
- {
- label: "盲板抽堵作业",
- value: 8
- }
- ],
- props:{
+ casProps: {
+ expandTrigger: 'hover',
+ value: 'uid',
+ label: 'username',
+ multiple: true,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(level == 0){
+ nodes = props.lists.workerList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ username: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ cas2Props: {
+ expandTrigger: 'hover',
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ checkStrictly: false,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(level == 0){
+ nodes = props.lists.spList.opList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ cas3Props: {
+ expandTrigger: 'hover',
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(level == 0){
+ nodes = props.lists.spList.jhList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ cas4Props: {
+ expandTrigger: 'hover',
+ value: 'uid',
+ label: 'username',
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(level == 0){
+ nodes = props.lists.workerList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ username: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ props1:{
expandTrigger: 'hover',
label: 'depName',
- value: 'depId',
- emitPath: false
+ value: 'depId'
},
depProps:{
expandTrigger: 'hover',
@@ -427,7 +540,7 @@
});
const ruleFormRef = ref<FormInstance>()
const applyRules = reactive<FormRules>({
- applyDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ depIdList: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -435,7 +548,6 @@
workDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
headUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
analystUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
- involveOtherWork: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
guardianUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
riskIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
cameraIds: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -443,22 +555,38 @@
expEndTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
safetyMeasureUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
acceptUid: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ lastApprover: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
startOrEndUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.workMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
+ const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
getBasicData()
- });
+ })
+
+ onUpdated(()=>{
+ console.log('false loading')
+ })
+
+ const openWorkSelect = ()=>{
+ workSelectRef.value.openDialog(state.form.involveOtherWork)
+ }
+
+ const getSelected = ()=>{
+ state.form.involveOtherWork = workSelectRef.value.selected
+ }
const findParent = ()=>{
- state.form.seDepId = findNearestDepLevel2DepId(props.departList2,state.form.applyDepId)
- console.log(state.form.seDepId,'state.form.seDepId')
+ state.form.applyDepId = state.form.depIdList[state.form.depIdList.length - 1]
+ state.form.seDepId = state.form.depIdList[0]
+ // state.form.seDepId = findNearestDepLevel2DepId(props.lists.departList2,state.form.applyDepId)
}
// 获取基础数据
const getBasicData = async ()=>{
+ state.tabLoading = true
const res = await workApplyApi().getFormData(1)
if (res.data.code === '200') {
state.safetyMeasureBasicList = JSON.parse(JSON.stringify(res.data.data.safetyMeasureBasicList))
@@ -478,9 +606,25 @@
message: res.data.msg
});
}
+ state.tabLoading = false
};
- const getStartEndIds = ()=>{
+ const getStartEndIds = (value)=>{
+ // let selected = value
+ // if(selected.length>1){
+ // const temp = []
+ // for(let i of selected){
+ // const index = temp.findIndex(item => item[0] === i[0]);
+ // if (index !== -1) {
+ // temp[index] = i
+ // }else{
+ // temp.push(i)
+ // }
+ // }
+ // state.form.headUids = temp
+ // }
+ // state.form.startOrEndUids = state.form.headUids
+ // state.form.approvalDepBasicList[0].approvalUids = [...new Set(state.form.headUids.map((i)=>i[0]))]
state.form.startOrEndUids = state.form.headUids
state.form.approvalDepBasicList[0].approvalUids = state.form.headUids
}
@@ -491,6 +635,56 @@
const isFirstRow = (index)=> {
return index === 0;
+ }
+
+ const transformArr = (arr: Array<any>)=>{
+ return arr.map((i)=>{
+ return {
+ uid: i[0],
+ certificate: i[1].split(',')[0],
+ certExpiredAt: i[1].split(',')[1],
+ certTypeName: i[1].split(',')[2]
+ }
+ })
+ }
+
+ const transform2Arr = (arr: Array<any>)=>{
+ return arr.map((i)=>{
+ return {
+ uid: i,
+ certificate: '',
+ certExpiredAt: '',
+ certTypeName: ''
+ }
+ })
+ }
+ const transform2EObj = (id: any)=>{
+ return {
+ uid: id,
+ certificate: '',
+ certExpiredAt: '',
+ certTypeName: ''
+ }
+ }
+
+ const singleSelect=(value,type)=>{
+ let selected = value
+ if(selected.length>1){
+ const temp = []
+ for(let i of selected){
+ const index = temp.findIndex(item => item[0] === i[0]);
+ if (index !== -1) {
+ temp[index] = i
+ }else{
+ temp.push(i)
+ }
+ }
+ if(type == '作业人'){state.form.operatorUids = temp}
+ // if(type == '分析人'){state.form.analystUids = temp}
+ if(type == '监护人'){state.form.guardianUids = temp}
+ if(type == '确认人'){state.form.safetyMeasureUids = temp}
+ if(type == '结束人'){state.form.startOrEndUids = temp}
+ }
}
const submitForm = async (formEl: FormInstance | undefined) => {
@@ -506,38 +700,51 @@
return
}
}
- if(Array.isArray(state.form.involveOtherWork)){
- state.form.involveOtherWork = state.form.involveOtherWork.join(',')
- }
- const res = await workApplyApi().submitFireApply(state.form)
+ // if(Array.isArray(state.form.involveOtherWork)){
+ // state.form.involveOtherWork = state.form.involveOtherWork.join(',')
+ // }
+ const {depIdList,...data} = state.form
+ data.operatorUids = transformArr(data.operatorUids)
+ data.headUids = transform2Arr(data.headUids)
+ // data.analystUids = transformArr(data.analystUids)
+ data.guardianUids = transformArr(data.guardianUids)
+ data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
+ data.startOrEndUids = transform2Arr(data.startOrEndUids)
+ data.acceptUid = transform2EObj(data.acceptUid)
+ data.lastApprover = transform2EObj(data.lastApprover)
+ const res = await workApplyApi().submitFireApply(data)
if (res.data.code === '200') {
ElMessage({
type: 'success',
message: '提交成功！'
});
formEl.resetFields()
+ state.form.guardianUids = []
+ state.form.involveOtherWork = []
getBasicData()
} else {
ElMessage({
type: 'warning',
message: res.data.msg
- });
- state.form.involveOtherWork = state.form.involveOtherWork.split(',')
+ })
+ // state.form.involveOtherWork = state.form.involveOtherWork.split(',')
}
} else {
console.log('error submit!', fields)
+ ElMessage({
+ type: 'warning',
+ message: '有表单内容未完成，请再次检查完善'
+ })
}
})
}
const findNearestDepLevel2DepId = (data, targetDepId) => {
let nearestDepId = null;
-
const traverseTree = (node) => {
if (node.depId === targetDepId) {
return true;
}
-
if (node.children && node.children.length > 0) {
for (const child of node.children) {
const found = traverseTree(child);
@@ -549,14 +756,11 @@
}
}
}
-
return false;
};
-
for (const root of data) {
traverseTree(root);
}
-
return nearestDepId;
};
@@ -574,6 +778,10 @@
isFirstRow,
submitForm,
findParent,
+ openWorkSelect,
+ getSelected,
+ workSelectRef,
+ singleSelect,
Search,
ruleFormRef,
applyRules,
@@ -588,9 +796,12 @@
width: 100%;
height: 100vh;
overflow: hidden;
- position: relative;
overflow-y: scroll;
- padding: 0 0 120px;
+ &::-webkit-scrollbar{
+ width: 0;
+ background-color: transparent;
+ }
+
.homeCard{
width: 100%;
padding: 20px;
@@ -598,12 +809,9 @@
background: #fff;
border-radius: 4px;
margin-bottom: 20px;
+ position: relative;
}
.applyBtn{
- position: fixed;
- left: 0;
- bottom: 0;
- z-index: 999;
width: 100%;
background: #fff;
padding: 20px 0;
@@ -631,7 +839,11 @@
width: 100% !important;
}
}
-
+ .valueSelect{
+ ::v-deep(.el-popper){
+ display: none !important;
+ }
+ }
.tab-i{
margin-bottom: 15px;
--
Gitblit v1.9.2