From 15315b1772036eb5168792aac0121f6e9005b11e Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 08 Jan 2024 10:16:26 +0800
Subject: [PATCH] Default Changelist
---
src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue | 242 ++++++++++++++++++++++++++++-------------------
1 files changed, 144 insertions(+), 98 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue
index df2e3bd..3ceadc7 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/space.vue
@@ -4,8 +4,8 @@
<div class="homeCard">
<el-row>
<el-col :span="12">
- <el-form-item label="作业申请单位" prop="applyDepId">
- <el-cascader style="width: 100%" v-model="form.applyDepId" :options="departList2" :props="props" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/>
+ <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-form-item>
</el-col>
</el-row>
@@ -46,13 +46,13 @@
<el-form-item label="作业人" prop="operatorUids">
<!-- <el-select v-model="form.operatorUids" filterable multiple clearable>-->
<!-- <el-option-->
-<!-- v-for="item in spList.opList"-->
+<!-- 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="spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" 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>
@@ -71,41 +71,41 @@
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDepId">
- <el-cascader style="width: 100%" v-model="form.workDepId" :props="depProps" :options="departList" :show-all-levels="false"/>
+ <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-option-->
-<!-- v-for="item in workerList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.username"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.headUids" :options="workerList" :props="casProps" @change="getStartEndIds" filterable :show-all-levels="false"/>
+ <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" 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.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="analystUids">
-<!-- <el-select v-model="form.analystUids" filterable multiple clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in workerList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.username"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.analystUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'分析人')" :show-all-levels="false"/>
+ <el-select v-model="form.analystUids" filterable multiple 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.analystUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'分析人')" :show-all-levels="false"/>-->
</el-form-item>
</el-col>
<el-col :span="12" class="valueSelect">
<el-form-item label="关联其他特殊作业">
<el-select v-model="form.involveOtherWork" multiple clearable :teleported="false" @click="openWorkSelect">
- <el-option v-for="item in otherWorks" :key="item.workApplyId" :label="item.workContent" :value="item.workApplyId">
+ <el-option v-for="item in lists.otherWorks" :key="item.workApplyId" :label="item.workContent" :value="item.workApplyId">
</el-option>
</el-select>
</el-form-item>
@@ -116,20 +116,20 @@
<el-form-item label="监护人" prop="guardianUids">
<!-- <el-select v-model="form.guardianUids" multiple filterable @change="getSafetyIds" clearable>-->
<!-- <el-option-->
-<!-- v-for="item in spList.jhList"-->
+<!-- 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="spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/>
+ <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">
<el-form-item label="绑定执法仪" prop="cameraIds">
<el-select v-model="form.cameraIds" multiple clearable>
<el-option
- v-for="item in deviceList"
+ v-for="item in lists.deviceList"
:key="item.id"
:label="item.name"
:value="item.id"
@@ -198,7 +198,7 @@
</el-col>
</el-row>
<el-row style="display: flex;justify-content: center">
- <el-table :data="safetyMeasureBasicList" style="width: 90%" border>
+ <el-table :data="safetyMeasureBasicList" style="width: 90%" border v-loading="tabLoading">
<el-table-column type="index" label="序号" width="100px" align="center"/>
<el-table-column prop="measureContent" label="安全措施"/>
</el-table>
@@ -206,20 +206,20 @@
<el-row>
<el-col :span="12">
<el-form-item label="安全措施确认人" prop="safetyMeasureUids">
-<!-- <el-select v-model="form.safetyMeasureUids" filterable multiple clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in workerList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.username"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.safetyMeasureUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'确认人')" :show-all-levels="false"/>
+ <el-select v-model="form.safetyMeasureUids" filterable multiple 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.safetyMeasureUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'确认人')" :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
<el-row style="display: flex;justify-content: center">
- <el-table :data="form.approvalDepBasicList" style="width: 90%" border>
+ <el-table :data="form.approvalDepBasicList" style="width: 90%" border v-loading="tabLoading">
<el-table-column prop="content" label="审批签字项目" align="center"/>
<el-table-column prop="approvalType" label="是否必签" align="center">
<template #default="scope">
@@ -236,7 +236,7 @@
<template #default="scope">
<el-select v-model="scope.row.approvalUids" filterable multiple :disabled="isFirstRow(scope.$index)" clearable>
<el-option
- v-for="item in workerList"
+ v-for="item in lists.workerList"
:key="item.uid"
:label="item.username"
:value="item.uid"
@@ -249,28 +249,43 @@
<el-row>
<el-col :span="12">
<el-form-item label="完工验收" prop="acceptUid">
-<!-- <el-select v-model="form.acceptUid" filterable clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in workerList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.username"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.acceptUid" :options="workerList" :props="cas4Props" filterable :show-all-levels="false"/>
+ <el-select v-model="form.acceptUid" 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.acceptUid" :options="lists.workerList" :props="cas4Props" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="现场开始结束确认人" prop="startOrEndUids">
-<!-- <el-select v-model="form.startOrEndUids" filterable multiple clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in workerList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.username"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.startOrEndUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'结束人')" :show-all-levels="false"/>
+ <el-select v-model="form.startOrEndUids" filterable multiple 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.startOrEndUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'结束人')" :show-all-levels="false"/>-->
+ </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-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>
@@ -298,27 +313,30 @@
interface stateType {
form: Object,
equipmentDialog: boolean,
- props:{},
+ props1:{},
depProps:{},
casProps:{}
cas2Props: {}
cas3Props: {}
cas4Props: {}
safetyMeasureBasicList: []
+ tabLoading: boolean
}
export default defineComponent({
name: 'spaceForm',
components: {workSelect},
- props:['departList','departList2','workerList','deviceList', 'otherWorks','spList'],
+ props:['lists'],
setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
+ tabLoading: false,
equipmentDialog: false,
safetyMeasureBasicList: [],
form: {
workType: 2,
workLevel: 0,
+ depIdList: [],
applyDepId: null,
seDepId: null,
expStartTime: '',
@@ -335,6 +353,7 @@
safetyMeasureUids: [],
approvalDepBasicList: [],
acceptUid: null,
+ lastApprover: null,
startOrEndUids: [],
cameraIds: [],
workDetail: {
@@ -342,11 +361,10 @@
csOriginalName: ''
}
},
- props:{
+ props1:{
expandTrigger: 'hover',
label: 'depName',
- value: 'depId',
- emitPath: false
+ value: 'depId'
},
depProps:{
expandTrigger: 'hover',
@@ -356,6 +374,7 @@
emitPath: false
},
casProps: {
+ expandTrigger: 'hover',
value: 'uid',
label: 'username',
multiple: true,
@@ -363,8 +382,8 @@
async lazyLoad(node, resolve){
const { value, level } = node
let nodes = []
- if(value == 0){
- nodes = props.workerList
+ if(level == 0){
+ nodes = props.lists.workerList
}else{
let res = await userApi().getCtf({uid: value})
if(res.data.code == 200){
@@ -385,6 +404,7 @@
}
},
cas2Props: {
+ expandTrigger: 'hover',
value: 'uid',
label: 'realName',
multiple: true,
@@ -393,8 +413,8 @@
async lazyLoad(node, resolve){
const { value, level } = node
let nodes = []
- if(value == 0){
- nodes = props.spList.opList
+ if(level == 0){
+ nodes = props.lists.spList.opList
}else{
let res = await userApi().getCtf({uid: value})
if(res.data.code == 200){
@@ -415,6 +435,7 @@
}
},
cas3Props: {
+ expandTrigger: 'hover',
value: 'uid',
label: 'realName',
multiple: true,
@@ -422,8 +443,8 @@
async lazyLoad(node, resolve){
const { value, level } = node
let nodes = []
- if(value == 0){
- nodes = props.spList.jhList
+ if(level == 0){
+ nodes = props.lists.spList.jhList
}else{
let res = await userApi().getCtf({uid: value})
if(res.data.code == 200){
@@ -444,14 +465,15 @@
}
},
cas4Props: {
+ expandTrigger: 'hover',
value: 'uid',
label: 'username',
lazy: true,
async lazyLoad(node, resolve){
const { value, level } = node
let nodes = []
- if(value == 0){
- nodes = props.workerList
+ if(level == 0){
+ nodes = props.lists.workerList
}else{
let res = await userApi().getCtf({uid: value})
if(res.data.code == 200){
@@ -474,7 +496,7 @@
});
const ruleFormRef = ref<FormInstance>()
const applyRules = reactive<FormRules>({
- applyDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ depIdList: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -489,6 +511,7 @@
expEndTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
safetyMeasureUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
acceptUid: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ lastApprover: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
startOrEndUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.csName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.csOriginalName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
@@ -496,7 +519,7 @@
const workSelectRef = ref()
// 页面载入时执行方法
onMounted(() => {
-
+ getBasicData()
});
const openWorkSelect = ()=>{
@@ -508,11 +531,13 @@
}
const findParent = ()=>{
- state.form.seDepId = findNearestDepLevel2DepId(props.departList2,state.form.applyDepId)
+ state.form.applyDepId = state.form.depIdList[state.form.depIdList.length - 1]
+ state.form.seDepId = state.form.depIdList[0]
}
// 获取基础数据
const getBasicData = async ()=>{
+ state.tabLoading = true
const res = await workApplyApi().getFormData(2)
if (res.data.code === '200') {
state.safetyMeasureBasicList = JSON.parse(JSON.stringify(res.data.data.safetyMeasureBasicList))
@@ -532,24 +557,27 @@
message: res.data.msg
});
}
+ state.tabLoading = false
};
const getStartEndIds = (value)=>{
- let selected = value
- if(selected.length>1){
- const temp = []
- for(let i of selected){
- const index = temp.findIndex(item => item[0] === i[0]);
- if (index !== -1) {
- temp[index] = i
- }else{
- temp.push(i)
- }
- }
- state.form.headUids = temp
- }
+ // let selected = value
+ // if(selected.length>1){
+ // const temp = []
+ // for(let i of selected){
+ // const index = temp.findIndex(item => item[0] === i[0]);
+ // if (index !== -1) {
+ // temp[index] = i
+ // }else{
+ // temp.push(i)
+ // }
+ // }
+ // state.form.headUids = temp
+ // }
+ // state.form.startOrEndUids = state.form.headUids
+ // state.form.approvalDepBasicList[0].approvalUids = [...new Set(state.form.headUids.map((i)=>i[0]))]
state.form.startOrEndUids = state.form.headUids
- state.form.approvalDepBasicList[0].approvalUids = [...new Set(state.form.headUids.map((i)=>i[0]))]
+ state.form.approvalDepBasicList[0].approvalUids = state.form.headUids
}
const getSafetyIds = ()=>{
@@ -571,12 +599,23 @@
})
}
- const transform2Obj = (arr: Array<any>)=>{
+ const transform2Arr = (arr: Array<any>)=>{
+ return arr.map((i)=>{
+ return {
+ uid: i,
+ certificate: '',
+ certExpiredAt: '',
+ certTypeName: ''
+ }
+ })
+ }
+
+ const transform2Obj = (id:any)=>{
return {
- uid: arr[0],
- certificate: arr[1].split(',')[0],
- certExpiredAt: arr[1].split(',')[1],
- certTypeName: arr[1].split(',')[2]
+ uid: id,
+ certificate: '',
+ certExpiredAt: '',
+ certTypeName: ''
}
}
@@ -593,7 +632,7 @@
}
}
if(type == '作业人'){state.form.operatorUids = temp}
- if(type == '分析人'){state.form.analystUids = 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}
@@ -616,14 +655,15 @@
// if(Array.isArray(state.form.involveOtherWork)){
// state.form.involveOtherWork = state.form.involveOtherWork.join('，')
// }
- const data = state.form
+ const {depIdList,...data} = state.form
data.operatorUids = transformArr(data.operatorUids)
- data.headUids = transformArr(data.headUids)
- data.analystUids = transformArr(data.analystUids)
+ data.headUids = transform2Arr(data.headUids)
+ // data.analystUids = transformArr(data.analystUids)
data.guardianUids = transformArr(data.guardianUids)
- data.safetyMeasureUids = transformArr(data.safetyMeasureUids)
- data.startOrEndUids = transformArr(data.startOrEndUids)
+ data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
+ data.startOrEndUids = transform2Arr(data.startOrEndUids)
data.acceptUid = transform2Obj(data.acceptUid)
+ data.lastApprover = transform2Obj(data.lastApprover)
const res = await workApplyApi().submitSpaceApply(data)
if (res.data.code === '200') {
ElMessage({
@@ -631,6 +671,8 @@
message: '提交成功！'
});
formEl.resetFields()
+ state.form.guardianUids = []
+ state.form.involveOtherWork = []
getBasicData()
} else {
ElMessage({
@@ -641,6 +683,10 @@
}
} else {
console.log('error submit!', fields)
+ ElMessage({
+ type: 'warning',
+ message: '有表单内容未完成，请再次检查完善'
+ })
}
})
}
--
Gitblit v1.9.2