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/zysq/components/height.vue | 226 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 125 insertions(+), 101 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
index e8815a0..edc93bf 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<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-cascader style="width: 100%" v-model="form.depIdList" :options="lists.departList" :props="props1" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -54,28 +54,8 @@
</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 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-select v-model="form.headUids" filterable multiple :multiple-limit="1" @change="getStartEndIds" clearable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -83,22 +63,42 @@
: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>
<el-row>
<el-col :span="12">
<el-form-item label="监护人" prop="guardianUids">
-<!-- <el-select v-model="form.guardianUids" filterable multiple @change="getSafetyIds" clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in lists.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-select v-model="form.guardianUids" filterable multiple clearable>
+ <el-option
+ v-for="item in lists.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" class="valueSelect">
@@ -120,7 +120,7 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="绑定执法仪" prop="cameraIds">
+ <el-form-item label="绑定执法仪">
<el-select v-model="form.cameraIds" multiple clearable>
<el-option
v-for="item in lists.deviceList"
@@ -159,12 +159,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="风险辨识" prop="riskIdentification">
- <el-input
- v-model="form.riskIdentification"
- :autosize="{ minRows: 1 }"
- type="textarea"
- placeholder="请输入风险辨识"
- />
+ <el-select v-model="form.riskIdentification" multiple clearable>
+ <el-option
+ v-for="item in lists.riskList"
+ :key="item.id"
+ :label="item.content"
+ :value="item.content"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -186,8 +188,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 clearable filterable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -204,7 +206,7 @@
<el-table-column prop="content" label="审批签字项目" align="center"/>
<el-table-column prop="approvalType" label="是否必签" align="center">
<template #default="scope">
- <el-form-item label="" prop="acceptUid">
+ <el-form-item label="" prop="acceptUid" label-width="0">
<el-radio-group v-model="scope.row.approvalType">
<el-radio :label="0">所有必签</el-radio>
<el-radio :label="1">任一</el-radio>
@@ -213,9 +215,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"
@@ -229,8 +231,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" filterable multiple clearable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -242,8 +244,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" filterable multiple clearable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -255,25 +257,25 @@
</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-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-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" v-throttle plain @click="submitForm(ruleFormRef)">提交申报</el-button>
</div>
<work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select>
</div>
@@ -295,6 +297,7 @@
form: Object,
workLevelList: Array<any>,
equipmentDialog: boolean,
+ zyList: []
props1:{},
depProps:{},
casProps:{}
@@ -315,6 +318,7 @@
tabLoading: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
form: {
workType: 6,
workLevel: null,
@@ -326,14 +330,14 @@
operatorUids: [],
headUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
- riskIdentification: '',
+ riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
@@ -355,7 +359,7 @@
value: 6
},
{
- label: "特级高处作业",
+ label: "四级高处作业",
value: 7
}
],
@@ -395,35 +399,11 @@
}
},
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)
- }
+ checkStrictly: true,
+ children: 'certList'
},
cas3Props: {
expandTrigger: 'hover',
@@ -488,6 +468,7 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
}
@@ -499,15 +480,14 @@
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' }],
- cameraIds: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
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' }]
@@ -515,10 +495,51 @@
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
+ state.zyList = props.lists.spList.opList
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 = ()=>{
@@ -586,9 +607,9 @@
return arr.map((i)=>{
return {
uid: i[0],
- certificate: i[1].split(',')[0],
- certExpiredAt: i[1].split(',')[1],
- certTypeName: i[1].split(',')[2]
+ certificate: i[1]?i[1].split(',')[0]:'',
+ certExpiredAt: i[1]?i[1].split(',')[1]:'',
+ certTypeName: ''
}
})
}
@@ -648,13 +669,14 @@
// if(Array.isArray(state.form.involveOtherWork)){
// state.form.involveOtherWork = state.form.involveOtherWork.join(',')
// }
+ state.form.riskIdentification = state.form.riskIdentification.join(',')
const {depIdList,...data} = state.form
data.operatorUids = transformArr(data.operatorUids)
data.headUids = transform2Arr(data.headUids)
- data.guardianUids = transformArr(data.guardianUids)
+ 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().submitHeightApply(data)
if (res.data.code === '200') {
@@ -672,6 +694,7 @@
message: res.data.msg
});
// state.form.involveOtherWork = state.form.involveOtherWork.split(',')
+ state.form.riskIdentification = state.form.riskIdentification.split(',')
}
} else {
console.log('error submit!', fields)
@@ -722,6 +745,7 @@
return {
renderMenu,
getBasicData,
+ getWorkerList,
getStartEndIds,
getSafetyIds,
isFirstRow,
--
Gitblit v1.9.2