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/fire.vue | 270 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 181 insertions(+), 89 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
index 6f9bb00..3b6a606 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.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">
@@ -45,38 +45,20 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="动火方式" prop="workDetail.workMethod">
- <el-input
- v-model="form.workDetail.workMethod"
- :autosize="{ minRows: 1 }"
- type="textarea"
- placeholder="请输入动火方式"
- />
- </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-form-item label="动火方式" prop="workDetail.methodList">
+ <el-select v-model="form.workDetail.methodList" filterable multiple clearable>
<el-option
- v-for="item in lists.spList.opList"
- :key="item.uid"
- :label="item.realName"
- :value="item.uid"
+ v-for="item in fireWorkList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
/>
</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" multiple filterable @change="getStartEndIds" clearable>
+ <el-select v-model="form.headUids" multiple :multiple-limit="1" filterable @change="getStartEndIds" clearable>
<el-option
v-for="item in lists.workerList"
:key="item.uid"
@@ -84,7 +66,39 @@
: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 v-if="form.workDetail.methodList.find(i=>i == '其他')">
+ <el-col :span="12">
+ <el-form-item label="其他方式" prop="workDetail.other">
+ <el-input
+ v-model="form.workDetail.other"
+ :autosize="{ minRows: 1 }"
+ type="textarea"
+ placeholder="请输入其他动火方式"
+ />
+ </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>
@@ -126,7 +140,7 @@
</el-form-item>
</el-col>
<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"
@@ -280,8 +294,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="完工验收" prop="acceptUid">
- <el-select v-model="form.acceptUid" filterable 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"
@@ -306,21 +320,21 @@
</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-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>
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
</div>
</el-form>
<div class="applyBtn">
@@ -331,7 +345,7 @@
</template>
<script lang="ts">
- import { toRefs, reactive, defineComponent, ref, defineAsyncComponent, onMounted, onUpdated } from 'vue';
+import {toRefs, reactive, defineComponent, ref, defineAsyncComponent, onMounted, onUpdated, nextTick} from 'vue';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
import {useUserInfo} from "/@/stores/userInfo";
@@ -345,6 +359,8 @@
interface stateType {
form: Object,
workLevelList: Array<any>,
+ fireWorkList: Array<any>,
+ zyList: Array<any>,
equipmentDialog: boolean,
tabLoading: boolean
props1:{}
@@ -366,6 +382,7 @@
tabLoading: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
form: {
workType: 1,
workLevel: null,
@@ -378,20 +395,23 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
workDetail: {
- workMethod: ''
- }
+ workMethod: '',
+ methodList: [],
+ other: ''
+ },
+ remark: ''
},
workLevelList: [
{
@@ -407,6 +427,52 @@
value: 3
}
],
+ fireWorkList: [
+ {
+ name: "电焊",
+ id: 1
+ },
+ {
+ name: "气割",
+ id: 2
+ },
+ {
+ name: "切割",
+ id: 3
+ },
+ {
+ name: "打磨",
+ id: 4
+ },
+ {
+ name: "钻孔",
+ id: 5
+ },
+ {
+ name: "喷灯",
+ id: 6
+ },
+ {
+ name: "烘烤",
+ id: 7
+ },
+ {
+ name: "喷砂",
+ id: 8
+ },
+ {
+ name: "破碎地面",
+ id: 9
+ },
+ {
+ name: "清洗机",
+ id: 10
+ },
+ {
+ name: "其他",
+ id: 11
+ }
+ ],
casProps: {
expandTrigger: 'hover',
value: 'uid',
@@ -438,35 +504,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',
@@ -491,8 +533,8 @@
}
}
nodes=nodes.map(item => ({
- uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
- realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ uid: item.certNo +','+ item.certExpiredAt,
+ realName: '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
leaf: level >= 1
}))
resolve(nodes)
@@ -536,6 +578,7 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
}
@@ -547,30 +590,72 @@
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' }],
analystUids: [{ 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.workMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
+ "workDetail.methodList": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ "workDetail.other": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
+ state.zyList = props.lists.spList.opList
getBasicData()
})
+
onUpdated(()=>{
console.log('false loading')
})
+
+ 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 openWorkSelect = ()=>{
workSelectRef.value.openDialog(state.form.involveOtherWork)
@@ -643,9 +728,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: ''
}
})
}
@@ -681,17 +766,15 @@
temp.push(i)
}
}
- if(type == '作业人'){state.form.operatorUids = temp}
+ 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}
- console.log(value,state.form.operatorUids,55)
}
}
const submitForm = async (formEl: FormInstance | undefined) => {
- console.log(state.form.operatorUids,666)
if (!formEl) return
await formEl.validate(async (valid, fields) => {
if (valid) {
@@ -709,13 +792,21 @@
// }
state.form.riskIdentification = state.form.riskIdentification.join(',')
const {depIdList,...data} = state.form
- data.operatorUids = transform2Arr(data.operatorUids)
+ data.workDetail.methodList = data.workDetail.methodList.map(item=>{
+ if(item == '其他'){
+ item = data.workDetail.other
+ }
+ return item
+ })
+ data.workDetail.workMethod = data.workDetail.methodList.join(',')
+ // data.operatorUids = transform2Arr(data.operatorUids)
+ data.operatorUids = transformArr(data.operatorUids)
data.headUids = transform2Arr(data.headUids)
// data.analystUids = transformArr(data.analystUids)
data.guardianUids = transform2Arr(data.guardianUids)
data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
data.startOrEndUids = transform2Arr(data.startOrEndUids)
- data.acceptUid = transform2EObj(data.acceptUid)
+ data.acceptUids = transform2Arr(data.acceptUids)
data.lastApprover = transform2EObj(data.lastApprover)
const res = await workApplyApi().submitFireApply(data)
if (res.data.code === '200') {
@@ -778,6 +869,7 @@
};
return {
renderMenu,
+ getWorkerList,
getBasicData,
getStartEndIds,
getSafetyIds,
--
Gitblit v1.9.2