From baf475f44f0a940bbdc2dde36fff9cdf97da58bc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Thu, 17 Aug 2023 16:43:28 +0800
Subject: [PATCH] 证书修改
---
src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue | 291 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 239 insertions(+), 52 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue
index 015562c..e1d3000 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue
@@ -21,15 +21,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="作业人及证件编号" prop="operatorUids">
- <el-select v-model="form.operatorUids" multiple clearable>
- <el-option
- v-for="item in spList.opList"
- :key="item.uid"
- :label="item.realName"
- :value="item.uid"
- />
- </el-select>
+ <el-form-item label="作业人" prop="operatorUids">
+<!-- <el-select v-model="form.operatorUids" 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="spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>
</el-form-item>
</el-col>
</el-row>
@@ -41,14 +42,15 @@
</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-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-form-item>
</el-col>
</el-row>
@@ -83,14 +85,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-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="spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -206,14 +209,15 @@
<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-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-form-item>
</el-col>
</el-row>
@@ -268,26 +272,28 @@
<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-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-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-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-form-item>
</el-col>
</el-row>
@@ -329,11 +335,16 @@
import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
import workSelect from "/@/views/newSpecialWorkSystem/workTicket/zysq/components/workSelect.vue";
import axios from "axios";
+ import {userApi} from "/@/api/systemManage/user";
interface stateType {
form: Object,
equipmentDialog: boolean,
props:{},
depProps:{},
+ casProps:{}
+ cas2Props: {}
+ cas3Props: {}
+ cas4Props: {}
safetyMeasureBasicList: [],
fileList: Array<file>,
uploadUrl: string,
@@ -392,6 +403,122 @@
value: 'depId',
checkStrictly: true,
emitPath: false
+ },
+ casProps: {
+ value: 'uid',
+ label: 'username',
+ multiple: true,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.workerList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ username: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ cas2Props: {
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ checkStrictly: false,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.spList.opList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ cas3Props: {
+ value: 'uid',
+ label: 'realName',
+ multiple: true,
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.spList.jhList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
+ },
+ cas4Props: {
+ value: 'uid',
+ label: 'username',
+ lazy: true,
+ async lazyLoad(node, resolve){
+ const { value, level } = node
+ let nodes = []
+ if(value == 0){
+ nodes = props.workerList
+ }else{
+ let res = await userApi().getCtf({uid: value})
+ if(res.data.code == 200){
+ nodes = res.data.data
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ })
+ }
+ }
+ nodes=nodes.map(item => ({
+ uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName,
+ username: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')',
+ leaf: level >= 1
+ }))
+ resolve(nodes)
+ }
},
fileList: [],
imgLimit: 3,
@@ -459,9 +586,22 @@
}
};
- const getStartEndIds = ()=>{
+ 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
+ }
state.form.startOrEndUids = state.form.headUids
- state.form.approvalDepBasicList[0].approvalUids = state.form.headUids
+ state.form.approvalDepBasicList[0].approvalUids = [...new Set(state.form.headUids.map((i)=>i[0]))]
}
const getSafetyIds = ()=>{
@@ -470,6 +610,45 @@
const isFirstRow = (index)=> {
return index === 0;
+ }
+
+ const transformArr = (arr: Array<any>)=>{
+ return arr.map((i)=>{
+ return {
+ uid: i[0],
+ certificate: i[1].split(',')[0],
+ certExpiredAt: i[1].split(',')[1],
+ certTypeName: i[1].split(',')[2]
+ }
+ })
+ }
+
+ const transform2Obj = (arr: Array<any>)=>{
+ return {
+ uid: arr[0],
+ certificate: arr[1].split(',')[0],
+ certExpiredAt: arr[1].split(',')[1],
+ certTypeName: arr[1].split(',')[2]
+ }
+ }
+
+ const singleSelect=(value,type)=>{
+ 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)
+ }
+ }
+ if(type == '作业人'){state.form.operatorUids = temp}
+ if(type == '监护人'){state.form.guardianUids = temp}
+ if(type == '确认人'){state.form.safetyMeasureUids = temp}
+ if(type == '结束人'){state.form.startOrEndUids = temp}
+ }
}
const submitForm = async (formEl: FormInstance | undefined) => {
@@ -489,7 +668,14 @@
state.form.involveOtherWork = state.form.involveOtherWork.join(',')
}
state.form.workDetail.gbPath = state.form.workDetail.gbPath.join(',')
- const res = await workApplyApi().submitGroundApply(state.form)
+ const data = state.form
+ data.operatorUids = transformArr(data.operatorUids)
+ data.headUids = transformArr(data.headUids)
+ data.guardianUids = transformArr(data.guardianUids)
+ data.safetyMeasureUids = transformArr(data.safetyMeasureUids)
+ data.startOrEndUids = transformArr(data.startOrEndUids)
+ data.acceptUid = transform2Obj(data.acceptUid)
+ const res = await workApplyApi().submitGroundApply(data)
if (res.data.code === '200') {
ElMessage({
type: 'success',
@@ -656,6 +842,7 @@
beforeRemove,
openWorkSelect,
getSelected,
+ singleSelect,
workSelectRef,
Search,
ruleFormRef,
--
Gitblit v1.9.2