From 3b75798cc41993f9016610296907d2338545a345 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 16 八月 2024 15:43:01 +0800
Subject: [PATCH] Default Changelist
---
src/views/newSpecialWorkSystem/workTicket/wdsq/components/brokenDialog.vue | 119 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/wdsq/components/brokenDialog.vue b/src/views/newSpecialWorkSystem/workTicket/wdsq/components/brokenDialog.vue
index aa9da97..616cc6b 100644
--- a/src/views/newSpecialWorkSystem/workTicket/wdsq/components/brokenDialog.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/wdsq/components/brokenDialog.vue
@@ -12,13 +12,21 @@
</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="workDetail.involvedDepIds">
- <el-cascader style="width: 100%" v-model="form.workDetail.involvedDepIds" :props="depProps2" :options="lists.departList" :show-all-levels="false"/>
+ <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>
@@ -84,16 +92,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 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 label="涉及相关单位（部门）" prop="workDetail.involvedDepIds">
+ <el-cascader style="width: 100%" v-model="form.workDetail.involvedDepIds" :props="depProps2" :options="lists.departList" :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -291,8 +291,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"
@@ -330,19 +330,18 @@
</el-select>
</el-form-item>
</el-col>
- <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-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-form-item>-->
+<!-- </el-col>-->
</el-row>
</div>
</el-form>
@@ -376,6 +375,7 @@
depProps:{},
depProps2:{},
safetyMeasureBasicList: [],
+ zyList: []
fileList: Array<file>,
uploadUrl: string,
dialogVisible: Boolean,
@@ -398,6 +398,7 @@
showDialog: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
form: {
id: null,
workType: 5,
@@ -410,14 +411,14 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
@@ -440,6 +441,7 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
},
@@ -464,7 +466,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' }],
@@ -473,7 +475,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.involvedDepIds": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -485,16 +487,26 @@
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
- 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];
@@ -514,9 +526,9 @@
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
state.form.workDetail.involvedDepIds = row.workDetail.involvedDepIds.split(',').map(i=>Number(i))
state.fileList = row.workDetail.bcPath.split(',').map(item => {
return {
@@ -525,6 +537,12 @@
}
})
state.form.workDetail.bcPath = row.workDetail.bcPath.split(',').map(item => item.match(/specialWork9step\/(.*?)\?/)[1])
+ 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
}
@@ -541,14 +559,14 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
@@ -595,16 +613,16 @@
const res = await workApplyApi().getFormData(5)
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',
@@ -687,7 +705,7 @@
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().modBrokenApply(data)
if (res.data.code === '200') {
@@ -822,6 +840,7 @@
return {
renderMenu,
getBasicData,
+ getWorkerList,
getStartEndIds,
getSafetyIds,
isFirstRow,
--
Gitblit v1.9.2