From 1b9fea7d4af68d8f933b2dc42bf6084b9646f64c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 04 三月 2025 08:39:55 +0800
Subject: [PATCH] 修改作业等级名称
---
src/views/newSpecialWorkSystem/workTicket/wdsq/components/heightDialog.vue | 322 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 228 insertions(+), 94 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/wdsq/components/heightDialog.vue b/src/views/newSpecialWorkSystem/workTicket/wdsq/components/heightDialog.vue
index 40edfb2..3e83015 100644
--- a/src/views/newSpecialWorkSystem/workTicket/wdsq/components/heightDialog.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/wdsq/components/heightDialog.vue
@@ -1,12 +1,12 @@
<template>
- <div class="home-container">
- <el-dialog v-model="showDialog" title="修改申报" @close="clearFile()" width="80%" :close-on-click-modal="false">
- <el-form :model="form" label-width="180px" :rules="applyRules" ref="ruleFormRef">
+<!-- <div class="home-container">-->
+ <el-dialog v-model="showDialog" :title="title" @close="clearFile()" width="80%" :close-on-click-modal="false">
+ <el-form :model="form" label-width="180px" :disabled="isDisabled" :rules="applyRules" ref="ruleFormRef">
<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="lists.departList2" :props="props1" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/>
+ <el-cascader style="width: 100%" v-model="form.applyDepId" :options="lists.departList" :props="props1" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -55,26 +55,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="作业人" prop="operatorUids">
- <el-select v-model="form.operatorUids" filterable multiple clearable>
- <el-option
- v-for="item in lists.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="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" filterable multiple @change="getStartEndIds" clearable>
<el-option
@@ -84,7 +64,27 @@
: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-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="workDepIds">
+ <el-cascader style="width: 100%" v-model="form.workDepIds" :props="depProps" @change="getWorkerList" :options="lists.departList" :show-all-levels="false"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="作业人" prop="operatorUids">
+<!-- <el-select v-model="form.operatorUids" filterable multiple clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in zyList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.realName"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader style="width: 100%" v-model="form.operatorUids" :options="zyList?zyList:lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -189,8 +189,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="安全措施确认人" filterable prop="safetyMeasureUids">
- <el-select v-model="form.safetyMeasureUids" multiple clearable>
+ <el-form-item label="安全措施确认人" prop="safetyMeasureUids">
+ <el-select v-model="form.safetyMeasureUids" multiple filterable clearable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -216,9 +216,9 @@
</el-form-item>
</template>
</el-table-column>
- <el-table-column prop="approvalUids" filterable label="审批人" align="center">
+ <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" multiple filterable :disabled="isFirstRow(scope.$index)" clearable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -232,8 +232,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="完工验收" prop="acceptUid">
- <el-select v-model="form.acceptUid" clearable>
+ <el-form-item label="完工验收" prop="acceptUids">
+ <el-select v-model="form.acceptUids" clearable filterable multiple>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -245,8 +245,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="现场开始结束确认人" filterable prop="startOrEndUids">
- <el-select v-model="form.startOrEndUids" multiple clearable>
+ <el-form-item label="现场开始结束确认人" prop="startOrEndUids">
+ <el-select v-model="form.startOrEndUids" multiple clearable filterable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -258,29 +258,29 @@
</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" 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>
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="最终审批人" prop="lastApprover">-->
+<!-- <el-select v-model="form.lastApprover" clearable>-->
+<!-- <el-option-->
+<!-- v-for="item in lists.workerList"-->
+<!-- :key="item.uid"-->
+<!-- :label="item.username"-->
+<!-- :value="item.uid"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
</div>
</el-form>
<div class="applyBtn">
- <el-button type="primary" size="large" v-throttle plain @click="submitForm(ruleFormRef)">提交申报</el-button>
+ <el-button v-if="title == '修改'" type="primary" size="large" plain v-throttle @click="submitForm(ruleFormRef)">提交修改</el-button>
+ <el-button v-if="title == '续票'" type="primary" size="large" plain v-throttle @click="submitForm(ruleFormRef)">一键续票</el-button>
</div>
<work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select>
</el-dialog>
- </div>
+<!-- </div>-->
</template>
<script lang="ts">
@@ -297,12 +297,16 @@
import {userApi} from "/@/api/systemManage/user";
interface stateType {
form: Object,
+ isDisabled: boolean
+ title: string
workLevelList: Array<any>,
equipmentDialog: boolean,
showDialog: boolean
props1:{},
depProps:{},
+ cas2Props:{}
safetyMeasureBasicList: []
+ zyList: []
tabLoading: boolean
}
export default defineComponent({
@@ -317,6 +321,9 @@
showDialog: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
+ isDisabled: false,
+ title: '修改',
form: {
id: null,
workType: 6,
@@ -328,14 +335,14 @@
operatorUids: [],
headUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
@@ -358,7 +365,7 @@
value: 6
},
{
- label: "特级高处作业",
+ label: "四级高处作业",
value: 7
}
],
@@ -372,8 +379,16 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
+ },
+ cas2Props: {
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ checkStrictly: true,
+ children: 'certList'
}
});
const ruleFormRef = ref<FormInstance>()
@@ -383,7 +398,7 @@
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
- workDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ workDepIds: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
headUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
guardianUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
riskIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -391,7 +406,7 @@
expStartTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
expEndTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
safetyMeasureUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
- acceptUid: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ acceptUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
lastApprover: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
startOrEndUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.hight": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
@@ -399,22 +414,69 @@
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
- getBasicData()
+ // getBasicData()
});
const openWorkSelect = ()=>{
workSelectRef.value.openDialog(state.form.involveOtherWork)
}
+ const getWorkerList = ()=>{
+ let idList:Array<any> = []
+ for(let i of state.form.workDepIds){
+ idList = idList.concat(getListFromDep(getIdListsFormDepId(props.lists.departList,i)))
+ }
+ const depLists = [...new Set(idList)]
+ const filteredList = props.lists.spList.opList.filter(i => depLists.includes(i.depId));
+ if(filteredList && filteredList.length>0){
+ state.zyList = filteredList
+ }else{
+ state.zyList = props.lists.spList.opList
+ }
+ }
+ const getListFromDep = (dep) =>{
+ let depIds = []
+ depIds.push(dep.depId)
+ if (Array.isArray(dep.children)) {
+ for (let child of dep.children) {
+ depIds = depIds.concat(getListFromDep(child));
+ }
+ }
+ return depIds;
+ }
+
+ const getIdListsFormDepId=(DepList:Array<any>,id:number)=>{
+ for(const i of DepList){
+ if(i.depId === id){
+ return i
+ }
+ if(Array.isArray(i.children)){
+ const node:any = getIdListsFormDepId(i.children,id)
+ if(node){
+ return node
+ }
+ }
+ }
+ return null
+ }
const getSelected = ()=>{
state.form.involveOtherWork = workSelectRef.value.selected
}
- const openDialog = (row)=>{
+ const openDialog = (row,type)=>{
+ clearFile()
+ state.zyList = props.lists.spList.opList
+ getBasicData()
Object.keys(state.form).forEach(key => {
if (row.hasOwnProperty(key)) {
state.form[key] = JSON.parse(JSON.stringify(row))[key];
}
})
- state.form.operatorUids = row.operatorList.map(i=>i.userId)
+ state.form.operatorUids = row.operatorList.map(i=>{
+ if(i.certExpiredAt && i.certExpiredAt !==''){
+ return [i.userId,i.certificate + ',' + i.certExpiredAt]
+ }else{
+ return [i.userId]
+ }
+ })
state.form.headUids = row.headList.map(i=>i.userId)
state.form.analystUids = row.analystList.map(i=>i.userId)
state.form.guardianUids = row.guardianList.map(i=>i.userId)
@@ -428,9 +490,25 @@
approvalUids: item.approvalPersonList.filter(j=>j.type == 5).map(i=>i.userId),
approvalType: item.approvalType
}))
- state.form.acceptUid = row.acceptUser.userId
+ state.form.acceptUids = row.acceptUserList.map(i=>i.userId)
state.form.startOrEndUids = row.startOrEndList.map(i=>i.userId)
- state.form.lastApprover = row.lastApprover.userId
+ // state.form.lastApprover = row.lastApprover.userId
+ if(row.workDepList && row.workDepList.length>0){
+ state.form.workDepIds = row.workDepList.map(i=>i.workDepId)
+ }else{
+ state.form.workDepIds.push(row.workDepId)
+ }
+ if(type == 'edit'){
+ state.isDisabled = false
+ state.title = '修改'
+ }else{
+ if(!state.form.id){
+ state.form.id = row.workApplyId
+ }
+ state.isDisabled = true
+ state.title = '续票'
+ }
+ getWorkerList()
state.showDialog = true
}
@@ -446,14 +524,14 @@
operatorUids: [],
headUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
@@ -466,7 +544,7 @@
}
const findParent = ()=>{
- state.form.seDepId = findTopLevelId(props.lists.departList2,state.form.applyDepId)
+ state.form.seDepId = findTopLevelId(props.lists.departList,state.form.applyDepId)
}
function findTopLevelId(tree, targetId) {
@@ -496,16 +574,16 @@
const res = await workApplyApi().getFormData(6)
if (res.data.code === '200') {
state.safetyMeasureBasicList = JSON.parse(JSON.stringify(res.data.data.safetyMeasureBasicList))
- if(res.data.data.approvalDepBasicList && res.data.data.approvalDepBasicList.length>0){
- state.form.approvalDepBasicList = res.data.data.approvalDepBasicList.map(({id,content})=>({
- content,
- approvalDepBasicId: id,
- approvalUids: [],
- approvalType: null
- }))
- }else{
- state.form.approvalDepBasicList = []
- }
+ // if(res.data.data.approvalDepBasicList && res.data.data.approvalDepBasicList.length>0){
+ // state.form.approvalDepBasicList = res.data.data.approvalDepBasicList.map(({id,content})=>({
+ // content,
+ // approvalDepBasicId: id,
+ // approvalUids: [],
+ // approvalType: null
+ // }))
+ // }else{
+ // state.form.approvalDepBasicList = []
+ // }
} else {
ElMessage({
type: 'warning',
@@ -541,6 +619,37 @@
const isFirstRow = (index)=> {
return index === 0;
+ }
+
+ 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 = JSON.parse(JSON.stringify(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 transformArr = (arr: Array<any>)=>{
+ return arr.map((i)=>{
+ return {
+ uid: i[0],
+ certificate: i[1]?i[1].split(',')[0]:'',
+ certExpiredAt: i[1]?i[1].split(',')[1]:'',
+ certTypeName: ''
+ }
+ })
}
const transform2Arr = (arr: Array<any>)=>{
@@ -581,32 +690,55 @@
// }
state.form.riskIdentification = state.form.riskIdentification.join(',')
const {...data} = state.form
- data.operatorUids = transform2Arr(data.operatorUids)
+ data.operatorUids = transformArr(data.operatorUids)
data.headUids = transform2Arr(data.headUids)
data.guardianUids = transform2Arr(data.guardianUids)
data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
data.startOrEndUids = transform2Arr(data.startOrEndUids)
- data.acceptUid = transform2Obj(data.acceptUid)
+ data.acceptUids = transform2Arr(data.acceptUids)
data.lastApprover = transform2Obj(data.lastApprover)
- const res = await workApplyApi().modHeightApply(data)
- if (res.data.code === '200') {
- ElMessage({
- type: 'success',
- message: '提交成功！'
- });
- formEl.resetFields()
- state.form.guardianUids = []
- state.form.involveOtherWork = []
- getBasicData()
- clearFile()
- context.emit('refresh')
- } else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
- // state.form.involveOtherWork = state.form.involveOtherWork.split(',')
- state.form.riskIdentification = state.form.riskIdentification.split(',')
+ if(state.title == '修改'){
+ const res = await workApplyApi().modHeightApply(data)
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ message: '提交成功！'
+ });
+ formEl.resetFields()
+ state.form.guardianUids = []
+ state.form.involveOtherWork = []
+ getBasicData()
+ clearFile()
+ context.emit('refresh')
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ // state.form.involveOtherWork = state.form.involveOtherWork.split(',')
+ state.form.riskIdentification = state.form.riskIdentification.split(',')
+ }
+ }else{
+ const res = await workApplyApi().renewalHight(data)
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ message: '续票成功！'
+ });
+ formEl.resetFields()
+ state.form.guardianUids = []
+ state.form.involveOtherWork = []
+ getBasicData()
+ clearFile()
+ context.emit('refresh')
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ // state.form.involveOtherWork = state.form.involveOtherWork.split(',')
+ state.form.riskIdentification = state.form.riskIdentification.split(',')
+ }
}
} else {
console.log('error submit!', fields)
@@ -655,8 +787,10 @@
await initBackEndControlRoutes();
};
return {
+ singleSelect,
renderMenu,
getBasicData,
+ getWorkerList,
getStartEndIds,
getSafetyIds,
isFirstRow,
--
Gitblit v1.9.2