From 20b0ce2db27b64a60de60aee05dedd448099e330 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 08 Jul 2024 10:12:16 +0800
Subject: [PATCH] xiugai
---
src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue | 196 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 144 insertions(+), 52 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
index 36c0196..e715770 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue
@@ -45,33 +45,15 @@
</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-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 label="动火方式" prop="workDetail.methodList">
+ <el-select v-model="form.workDetail.methodList" filterable multiple clearable>
+ <el-option
+ v-for="item in fireWorkList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -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="lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
@@ -114,15 +128,15 @@
<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 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">
@@ -178,12 +192,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">
@@ -253,7 +269,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>
@@ -343,6 +359,8 @@
interface stateType {
form: Object,
workLevelList: Array<any>,
+ fireWorkList: Array<any>,
+ zyList: Array<any>,
equipmentDialog: boolean,
tabLoading: boolean
props1:{}
@@ -364,6 +382,7 @@
tabLoading: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
form: {
workType: 1,
workLevel: null,
@@ -376,10 +395,10 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
- riskIdentification: '',
+ riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
@@ -388,8 +407,11 @@
startOrEndUids: [],
cameraIds: [],
workDetail: {
- workMethod: ''
- }
+ workMethod: '',
+ methodList: [],
+ other: ''
+ },
+ remark: ''
},
workLevelList: [
{
@@ -405,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',
@@ -534,6 +602,7 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
}
@@ -545,7 +614,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' }],
analystUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
guardianUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -557,18 +626,29 @@
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' }]
+ "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 = (val)=>{
+ const filteredList = props.lists.spList.opList.filter(i => state.form.workDepIds.includes(i.depId));
+ if(filteredList && filteredList.length>0){
+ state.zyList = filteredList
+ }else{
+ state.zyList = props.lists.spList.opList
+ }
+ }
const openWorkSelect = ()=>{
workSelectRef.value.openDialog(state.form.involveOtherWork)
@@ -684,10 +764,12 @@
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) {
@@ -703,11 +785,19 @@
// 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.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.headUids = transform2Arr(data.headUids)
// data.analystUids = transformArr(data.analystUids)
- data.guardianUids = transformArr(data.guardianUids)
+ data.guardianUids = transform2Arr(data.guardianUids)
data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
data.startOrEndUids = transform2Arr(data.startOrEndUids)
data.acceptUid = transform2EObj(data.acceptUid)
@@ -727,6 +817,7 @@
type: 'warning',
message: res.data.msg
})
+ state.form.riskIdentification = state.form.riskIdentification.split(',')
// state.form.involveOtherWork = state.form.involveOtherWork.split(',')
}
} else {
@@ -772,6 +863,7 @@
};
return {
renderMenu,
+ getWorkerList,
getBasicData,
getStartEndIds,
getSafetyIds,
--
Gitblit v1.9.2