From baf475f44f0a940bbdc2dde36fff9cdf97da58bc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Thu, 17 Aug 2023 16:43:28 +0800
Subject: [PATCH] 证书修改
---
src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue | 400 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 284 insertions(+), 116 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
index eb3e76d..48bf616 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
@@ -54,15 +54,16 @@
</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="spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -74,39 +75,45 @@
</el-col>
<el-col :span="12">
<el-form-item label="作业负责人" prop="headUids">
- <el-select v-model="form.headUids" multiple @change="getStartEndIds" clearable>
- <el-option
- v-for="item in workerList"
- :key="item.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+<!-- <el-select v-model="form.headUids" filterable multiple @change="getStartEndIds" clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in workerList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.username"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.headUids" :options="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="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="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="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>-->
+<!-- <el-option-->
+<!-- v-for="item in otherWorkList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-select v-model="form.involveOtherWork" multiple clearable :teleported="false" @click="openWorkSelect">
+ <el-option v-for="item in otherWorks" :key="item.workApplyId" :label="item.workContent" :value="item.workApplyId">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -174,20 +181,21 @@
<el-row style="display: flex;justify-content: center">
<el-table :data="safetyMeasureBasicList" style="width: 90%" border>
<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>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="安全措施确认人" prop="safetyMeasureUids">
- <el-select v-model="form.safetyMeasureUids" multiple clearable>
- <el-option
- v-for="item in workerList"
- :key="item.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+ <el-form-item label="安全措施确认人" filterable prop="safetyMeasureUids">
+<!-- <el-select v-model="form.safetyMeasureUids" multiple clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in workerList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.username"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.safetyMeasureUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'确认人')" :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -205,7 +213,7 @@
</el-form-item>
</template>
</el-table-column>
- <el-table-column prop="approvalUids" label="审批人" align="center">
+ <el-table-column prop="approvalUids" filterable label="审批人" align="center">
<template #default="scope">
<el-select v-model="scope.row.approvalUids" multiple :disabled="isFirstRow(scope.$index)" clearable>
<el-option
@@ -222,26 +230,28 @@
<el-row>
<el-col :span="12">
<el-form-item label="完工验收" prop="acceptUid">
- <el-select v-model="form.acceptUid" clearable>
- <el-option
- v-for="item in workerList"
- :key="item.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+<!-- <el-select v-model="form.acceptUid" clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in workerList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.username"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.acceptUid" :options="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-option
- v-for="item in workerList"
- :key="item.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+ <el-form-item label="现场开始结束确认人" filterable prop="startOrEndUids">
+<!-- <el-select v-model="form.startOrEndUids" multiple clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in workerList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.username"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.startOrEndUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'结束人')" :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -250,6 +260,7 @@
<div class="applyBtn">
<el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">提交申报</el-button>
</div>
+ <work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select>
</div>
</template>
@@ -263,19 +274,24 @@
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:{},
+ casProps:{}
+ cas2Props: {}
+ cas3Props: {}
+ cas4Props: {}
safetyMeasureBasicList: []
}
export default defineComponent({
name: 'heightForm',
- components: {},
- props:['departList','departList2','workerList','deviceList'],
+ components: {workSelect},
+ props:['departList','departList2','workerList','deviceList','otherWorks','spList'],
setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -296,7 +312,7 @@
workContent: '',
workLocation: '',
riskIdentification: '',
- involveOtherWork: '',
+ involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
acceptUid: null,
@@ -324,45 +340,127 @@
value: 7
}
],
- 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:{
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
emitPath: false
+ },
+ casProps: {
+ value: 'uid',
+ label: 'username',
+ multiple: true,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.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: {
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ checkStrictly: false,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.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: {
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.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: {
+ value: 'uid',
+ label: 'username',
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.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)
+ }
},
depProps:{
expandTrigger: 'hover',
@@ -381,7 +479,6 @@
operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
headUids: [{ 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' }],
@@ -392,12 +489,18 @@
startOrEndUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.hight": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
-
+ const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
});
+ 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)
}
@@ -425,9 +528,22 @@
}
};
- 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 = state.form.headUids
+ state.form.approvalDepBasicList[0].approvalUids = [...new Set(state.form.headUids.map((i)=>i[0]))]
}
const getSafetyIds = ()=>{
@@ -436,6 +552,45 @@
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 transform2Obj = (arr: Array<any>)=>{
+ return {
+ uid: arr[0],
+ certificate: arr[1].split(',')[0],
+ certExpiredAt: arr[1].split(',')[1],
+ certTypeName: arr[1].split(',')[2]
+ }
+ }
+
+ 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.guardianUids = temp}
+ if(type == '确认人'){state.form.safetyMeasureUids = temp}
+ if(type == '结束人'){state.form.startOrEndUids = temp}
+ }
}
const submitForm = async (formEl: FormInstance | undefined) => {
@@ -451,10 +606,17 @@
return
}
}
- if(Array.isArray(state.form.involveOtherWork)){
- state.form.involveOtherWork = state.form.involveOtherWork.join(',')
- }
- const res = await workApplyApi().submitHeightApply(state.form)
+ // if(Array.isArray(state.form.involveOtherWork)){
+ // state.form.involveOtherWork = state.form.involveOtherWork.join(',')
+ // }
+ const data = state.form
+ data.operatorUids = transformArr(data.operatorUids)
+ data.headUids = transformArr(data.headUids)
+ data.guardianUids = transformArr(data.guardianUids)
+ data.safetyMeasureUids = transformArr(data.safetyMeasureUids)
+ data.startOrEndUids = transformArr(data.startOrEndUids)
+ data.acceptUid = transform2Obj(data.acceptUid)
+ const res = await workApplyApi().submitHeightApply(data)
if (res.data.code === '200') {
ElMessage({
type: 'success',
@@ -467,7 +629,7 @@
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)
@@ -519,6 +681,10 @@
isFirstRow,
submitForm,
findParent,
+ openWorkSelect,
+ getSelected,
+ singleSelect,
+ workSelectRef,
Search,
ruleFormRef,
applyRules,
@@ -533,9 +699,11 @@
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;
@@ -545,10 +713,6 @@
margin-bottom: 20px;
}
.applyBtn{
- position: fixed;
- left: 0;
- bottom: 0;
- z-index: 999;
width: 100%;
background: #fff;
padding: 20px 0;
@@ -576,7 +740,11 @@
width: 100% !important;
}
}
-
+ .valueSelect{
+ ::v-deep(.el-popper){
+ display: none !important;
+ }
+ }
.tab-i{
margin-bottom: 15px;
--
Gitblit v1.9.2