From 20b0ce2db27b64a60de60aee05dedd448099e330 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 08 七月 2024 10:12:16 +0800
Subject: [PATCH] xiugai
---
src/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue b/src/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue
index f05b607..03b1c55 100644
--- a/src/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue
@@ -79,36 +79,36 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="作业人" prop="operatorUids">
- <el-select v-model="form.operatorUids" filterable multiple clearable>
+ <el-form-item label="作业负责人" prop="headUids">
+ <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable>
<el-option
- v-for="item in lists.spList.opList"
+ v-for="item in lists.workerList"
:key="item.uid"
- :label="item.realName"
+ :label="item.username"
: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-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="workDepId">
- <el-cascader style="width: 100%" v-model="form.workDepId" :props="depProps" :options="lists.departList" :show-all-levels="false"/>
+ <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="headUids">
- <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable>
+ <el-form-item label="作业人" prop="operatorUids">
+ <el-select v-model="form.operatorUids" filterable multiple clearable>
<el-option
- v-for="item in lists.workerList"
+ v-for="item in zyList"
:key="item.uid"
- :label="item.username"
+ :label="item.realName"
: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.operatorUids" :options="lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
@@ -382,6 +382,7 @@
props1:{},
depProps:{},
safetyMeasureBasicList: []
+ zyList: []
tabLoading: boolean
}
export default defineComponent({
@@ -396,6 +397,7 @@
equipmentDialog: false,
showDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
form: {
id: null,
workType: 7,
@@ -408,7 +410,7 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
@@ -437,6 +439,7 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
}
@@ -448,7 +451,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' }],
@@ -468,15 +471,26 @@
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
- getBasicData()
+ // getBasicData()
});
const openWorkSelect = ()=>{
workSelectRef.value.openDialog(state.form.involveOtherWork)
+ }
+ const getWorkerList = ()=>{
+ 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 getSelected = ()=>{
state.form.involveOtherWork = workSelectRef.value.selected
}
const openDialog = (row)=>{
+ 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];
@@ -500,6 +514,12 @@
state.form.acceptUid = row.acceptUser.userId
state.form.startOrEndUids = row.startOrEndList.map(i=>i.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)
+ }
+ getWorkerList()
state.showDialog = true
}
@@ -516,7 +536,7 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
@@ -569,16 +589,16 @@
const res = await workApplyApi().getFormData(7)
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',
@@ -703,6 +723,7 @@
return {
renderMenu,
getBasicData,
+ getWorkerList,
getStartEndIds,
getSafetyIds,
isFirstRow,
--
Gitblit v1.9.2