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/zysq/components/space.vue | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue
index 8acd0fc..d026ece 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue
@@ -43,16 +43,16 @@
</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="headUids">
+ <el-select v-model="form.headUids" multiple :multiple-limit="1" 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>
@@ -70,21 +70,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="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>
@@ -250,8 +250,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"
@@ -276,21 +276,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">
@@ -315,6 +315,7 @@
interface stateType {
form: Object,
equipmentDialog: boolean,
+ zyList: []
props1:{},
depProps:{},
casProps:{}
@@ -335,6 +336,7 @@
tabLoading: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
+ zyList: [],
form: {
workType: 2,
workLevel: 0,
@@ -347,14 +349,14 @@
headUids: [],
analystUids: [],
guardianUids: [],
- workDepId: null,
+ workDepIds: [],
workContent: '',
workLocation: '',
riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
- acceptUid: null,
+ acceptUids: [],
lastApprover: null,
startOrEndUids: [],
cameraIds: [],
@@ -372,6 +374,7 @@
expandTrigger: 'hover',
label: 'depName',
value: 'depId',
+ multiple: true,
checkStrictly: true,
emitPath: false
},
@@ -503,7 +506,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' }],
@@ -512,7 +515,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.csName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -521,13 +524,21 @@
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
+ state.zyList = props.lists.spList.opList
getBasicData()
});
const openWorkSelect = ()=>{
workSelectRef.value.openDialog(state.form.involveOtherWork)
}
-
+ 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 getSelected = ()=>{
state.form.involveOtherWork = workSelectRef.value.selected
}
@@ -665,7 +676,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().submitSpaceApply(data)
if (res.data.code === '200') {
@@ -734,6 +745,7 @@
return {
renderMenu,
getBasicData,
+ getWorkerList,
getStartEndIds,
getSafetyIds,
isFirstRow,
--
Gitblit v1.9.2