From 624a145dcb9959e769fa635a4b9e2fe4758772ed Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期一, 22 八月 2022 18:39:32 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workTicket/myApproval/components/hoistLog.vue | 146 ++++
src/views/specialWorkSystem/workTicket/myApproval/index.vue | 794 ++++++++++++++++++++++
src/views/specialWorkSystem/workTicket/myApproval/components/brokenLog.vue | 149 ++++
src/api/specialWorkSystem/workApproval/index.ts | 41 +
src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue | 149 ++++
src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue | 149 ++++
src/views/specialWorkSystem/workTicket/myJobApply/index.vue | 38
src/api/specialWorkSystem/workApply/index.ts | 2
src/views/specialWorkSystem/workTicket/myApproval/components/fireLog.vue | 137 +++
src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue | 23
src/views/specialWorkSystem/workTicket/myApproval/components/powerLog.vue | 149 ++++
src/views/specialWorkSystem/workTicket/myApproval/components/heightLog.vue | 146 ++++
src/views/specialWorkSystem/workTicket/myApproval/components/plateLog.vue | 167 ++++
13 files changed, 2,068 insertions(+), 22 deletions(-)
diff --git a/src/api/specialWorkSystem/workApply/index.ts b/src/api/specialWorkSystem/workApply/index.ts
index ae453fc..1df392e 100644
--- a/src/api/specialWorkSystem/workApply/index.ts
+++ b/src/api/specialWorkSystem/workApply/index.ts
@@ -3,7 +3,7 @@
export function workApplyApi() {
return {
// 分页获取申请列表
- getApplyListtPage: (data: object) => {
+ getApplyListPage: (data: object) => {
return request({
url: import.meta.env.VITE_API_URL + `/work/apply/applying/page/list`,
method: 'post',
diff --git a/src/api/specialWorkSystem/workApproval/index.ts b/src/api/specialWorkSystem/workApproval/index.ts
new file mode 100644
index 0000000..2365cee
--- /dev/null
+++ b/src/api/specialWorkSystem/workApproval/index.ts
@@ -0,0 +1,41 @@
+import request from '/@/utils/request';
+
+export function workApprovalApi() {
+ return {
+ // 分页获取审批列表
+ getApprovalListPage: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/work/apply/pending/page/list`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ // 获取当前层级审批数据
+ getApprovalData: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/work/approval/pending/data`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ // 获取当前层级审批进度
+ getApprovalStatus: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/work/apply/approver/approved/view`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ // 终止当前审批进度
+ postAbord: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/work/apply/abord`,
+ method: 'post',
+ data: data
+ });
+ }
+ };
+}
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
index 5618f5e..9f39eca 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
@@ -38,10 +38,26 @@
<el-tabs class="active" v-model="activeName">
<el-tab-pane label="巡检链" name="inspectChain">
<el-table :data="inspectTaskForm.points" fit style="width: 100%">
- <el-table-column type="index" label="序号" width="60" />
- <el-table-column prop="region" label="巡检点" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column type="index" label="序号"/>
+ <el-table-column prop="point" label="巡检点" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="region" label="所属设备" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="rfid" label="RFID" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="quotaContent" label="指标作业" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="secondReferenceResult" label="记录值" show-overflow-tooltip align="center">
+ <template #default="scope">
+ <div :style="{ color: scope.row.reportResult == 1 ? '#ff0000' : '#409eff' }">
+ {{ scope.row.dataReportType == 1 ? '无' : scope.row.secondReferenceResult }}
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="quotaUnit" label="指标单位" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="reportResult" label="结果" show-overflow-tooltip align="center">
+ <template #default="scope">
+ <div :style="{ color: scope.row.reportResult == 1 ? '#ff0000' : '#409eff' }">
+ {{ scope.row.reportResult == 0 ? '正常' : scope.row.reportResult == 1 ? '存在异常' : '无' }}
+ </div>
+ </template>
+ </el-table-column>
<!-- <el-table-column label="操作" width="150" align="center">-->
<!-- <template #default="scope">-->
<!-- <el-button size="small" text type="danger" @click="onDelCheckUnit(scope.$index, scope.row)">删除</el-button>-->
@@ -49,6 +65,9 @@
<!-- </el-table-column>-->
</el-table>
</el-tab-pane>
+ <el-tab-pane label="统计数据" name="allData">
+ alldata
+ </el-tab-pane>
</el-tabs>
</div>
<div align="right" v-show="inspectPointConfirm">
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/brokenLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/brokenLog.vue
new file mode 100644
index 0000000..d3dc352
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/brokenLog.vue
@@ -0,0 +1,149 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业单位ID">
+ <el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="断路原因">
+ <el-input v-model="details.workDetail.bcReason" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="断路地段说明">
+ <el-input v-model="details.workDetail.bcExplain" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="涉及相关部门">
+ <el-input v-model="details.workDetail.involvedDepIds" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/fireLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/fireLog.vue
new file mode 100644
index 0000000..ed30241
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/fireLog.vue
@@ -0,0 +1,137 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业方式">
+ <el-input v-model="details.workDetail.hotMethod" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'fire',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue
new file mode 100644
index 0000000..fba344f
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue
@@ -0,0 +1,149 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业单位ID">
+ <el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="范围">
+ <el-input v-model="details.workDetail.gbScope" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="动土方式">
+ <el-input v-model="details.workDetail.gbMethod" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/heightLog.vue
new file mode 100644
index 0000000..0fb8a7a
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/heightLog.vue
@@ -0,0 +1,146 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业单位ID">
+ <el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业高度">
+ <el-input v-model="details.workDetail.operationHeight" readonly type="textarea"><template #append>米(m)</template></el-input>
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/hoistLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/hoistLog.vue
new file mode 100644
index 0000000..3b4dc2a
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/hoistLog.vue
@@ -0,0 +1,146 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="吊装工具名称">
+ <el-input v-model="details.workDetail.hoistingToolName" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="起吊物体重量">
+ <el-input v-model="details.workDetail.weightMass" readonly type="textarea"><template #append>吨(t)</template></el-input>
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/plateLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/plateLog.vue
new file mode 100644
index 0000000..0cf0716
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/plateLog.vue
@@ -0,0 +1,167 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="盲板编号">
+ <el-input v-model="details.workDetail.bpCode" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="主要介质">
+ <el-input v-model="details.workDetail.mainMedia" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="温度">
+ <el-input v-model="details.workDetail.temperature" readonly type="textarea"><template #append>摄氏度(℃)</template></el-input>
+ </el-form-item>
+ <el-form-item label="压力">
+ <el-input v-model="details.workDetail.pressure" readonly type="textarea"><template #append>千帕(kPa)</template></el-input>
+ </el-form-item>
+ <el-form-item label="盲板材质">
+ <el-input v-model="details.workDetail.bpMaterialQuality" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="盲板规格">
+ <el-input v-model="details.workDetail.bpSpecification" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="盲板位置">
+ <el-input v-model="details.workDetail.bpLocation" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="装盲板时间">
+ <el-input v-model="details.workDetail.installBpTime" readonly/>
+ </el-form-item>
+ <el-form-item label="拆盲板时间">
+ <el-input v-model="details.workDetail.uninstallBpTime" readonly/>
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/powerLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/powerLog.vue
new file mode 100644
index 0000000..f3c893c
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/powerLog.vue
@@ -0,0 +1,149 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="电源接入点">
+ <el-input v-model="details.workDetail.powerAccessPoint" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="工作电压">
+ <el-input v-model="details.workDetail.workingVoltage" readonly type="textarea"><template #append>伏特(v)</template></el-input>
+ </el-form-item>
+ <el-form-item label="用电设备及功率">
+ <el-input v-model="details.workDetail.equipmentAndPower" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue
new file mode 100644
index 0000000..1359a65
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue
@@ -0,0 +1,149 @@
+<template>
+ <div style="height: 100%">
+ <el-form :model="details" label-width="150px">
+ <el-form-item label="作业申请单号">
+ <el-input v-model="details.workPermitNo" readonly />
+ </el-form-item>
+ <el-form-item label="申请人">
+ <el-input v-model="details.applyUname" readonly />
+ </el-form-item>
+ <el-form-item label="部门名称">
+ <el-input v-model="details.depName" readonly />
+ </el-form-item>
+ <el-form-item label="作业人">
+ <el-input v-model="details.operators" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业类型">
+ <el-input v-model="details.workTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业等级">
+ <el-input v-model="details.workLevelDesc" readonly />
+ </el-form-item>
+ <el-form-item label="作业内容">
+ <el-input v-model="details.workContent" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业地址">
+ <el-input v-model="details.workLocation" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="受限空间所属单位ID">
+ <el-input v-model="details.workDetail.csDepId" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="受限空间名称">
+ <el-input v-model="details.workDetail.csName" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="空间原有介质名称">
+ <el-input v-model="details.workDetail.csOriginalName" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="关联其他作业">
+ <el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="期望开始时间">
+ <el-input v-model="details.expStartTime" readonly />
+ </el-form-item>
+ <el-form-item label="期望结束时间">
+ <el-input v-model="details.expEndTime" readonly />
+ </el-form-item>
+ <el-form-item label="申请时间">
+ <el-input v-model="details.applyTime" readonly />
+ </el-form-item>
+<!-- <el-form-item label="当前层级">-->
+<!-- <el-input v-model="details.stepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="上一层级">-->
+<!-- <el-input v-model="details.preStepId" readonly />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="下一层级">-->
+<!-- <el-input v-model="details.nextStepId" readonly />-->
+<!-- </el-form-item>-->
+ <el-form-item label="层级审批类型">
+ <el-input v-model="details.stepTypeDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepSerial && details.stepSerial!=null" label="层级排序号">
+ <el-input v-model="details.stepSerial" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepStartApprovalTime && details.stepStartApprovalTime!=null" label="层级预期开始审批时间">
+ <el-input v-model="details.stepStartApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepFinishApprovalTime && details.stepFinishApprovalTime!=null" label="层级预期结束审批时间">
+ <el-input v-model="details.stepFinishApprovalTime" readonly />
+ </el-form-item>
+ <el-form-item label="审批人姓名">
+ <el-input v-model="details.unitApprovalUname" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalStartTime && details.unitApprovalStartTime!=null" label="单元审批开始时间">
+ <el-input v-model="details.unitApprovalStartTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitApprovalEndTime && details.unitApprovalEndTime!=null" label="单元审批结束时间">
+ <el-input v-model="details.unitApprovalEndTime" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.unitResultDesc && details.unitResultDesc!=null" label="单元审批结果">
+ <el-input v-model="details.unitResultDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.statusDesc && details.statusDesc!=null" label="当前状态">
+ <el-input v-model="details.statusDesc" readonly />
+ </el-form-item>
+ <el-form-item v-if="details.stepApprovalResultDesc && details.stepApprovalResultDesc!=null" label="审批结果">
+ <el-input v-model="details.stepApprovalResultDesc" readonly />
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script lang="ts">
+ import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
+ import type { FormInstance, FormRules } from 'element-plus'
+ import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+
+
+ interface stateType {
+ form: Object,
+ workerList: Array<any>,
+ workTypeList: Array<any>,
+ workLevelList: Array<any>,
+ otherWorkList: Array<any>
+ }
+ export default defineComponent({
+ name: 'space',
+ components: {},
+ props:['details'],
+ setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ return {
+ Search
+ };
+ },
+ });
+</script>
+
+<style scoped lang="scss">
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+ .el-row{
+ margin-bottom: 20px;
+ }
+ .el-row:last-child {
+ margin-bottom: 0;
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+ .el-cascader{
+ width: 100% !important;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/index.vue b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
new file mode 100644
index 0000000..38ae370
--- /dev/null
+++ b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -0,0 +1,794 @@
+<template>
+ <div class="home-container">
+<!-- <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">-->
+<!-- <el-tab-pane label="申请中" name="1">-->
+ <div style="height: 100%">
+ <el-row class="homeCard">
+ <el-col :span="8">
+ <div class="grid-content topInfo">
+ <el-select v-model="searchWord">
+ <el-option
+ v-for="item in workType"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ <el-button type="primary" @click="searchRecord">查询</el-button>
+ <el-button plain @click="clearSearch">重置</el-button>
+ </div>
+ </el-col>
+ </el-row>
+ <div class="homeCard">
+ <div class="main-card">
+ <el-row class="cardTop">
+ <el-col :span="12" class="mainCardBtn">
+ <el-button type="primary" :icon="Plus" size="default" @click="toApply()">申请</el-button>
+ <!-- <el-button type="danger" :icon="Delete" size="default">删除</el-button>-->
+ <!-- <el-button type="success" size="default">设置分类</el-button>-->
+ </el-col>
+ <el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
+ </el-row>
+ <el-table ref="multipleTableRef" :data="applyData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
+ <el-table-column property="applyUname" label="申请人" />
+ <el-table-column property="depName" label="部门名称" />
+ <el-table-column property="operators" label="作业人" />
+ <el-table-column property="workTypeDesc" label="作业类型" />
+ <el-table-column property="workLevelDesc" label="作业等级" />
+ <el-table-column property="applyTime" label="申请时间" width="180" />
+ <el-table-column label="申请状态" width="180">
+ <template #default="scope">
+ <el-tag type="success">{{ scope.row.statusDesc }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" label="操作" align="center" width="250">
+ <template #default="scope">
+ <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
+ <el-button link type="success" size="small" :icon="Finished" @click="viewStatus(scope.row)">进度</el-button>
+ <el-button link type="warning" size="small" :icon="Delete" @click="deleteRecordBtn(scope.row)">终止</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div class="pageBtn">
+ <el-pagination v-model:currentPage="pageIndex1" v-model:page-size="pageSize1" :page-sizes="[10, 15]" small="false" background layout="total, sizes, prev, pager, next, jumper" :total="totalSize1" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <el-dialog v-model="dialogDetails" title="作业审批详情" center>
+ <fire v-if="dialogType == 1" :details = details></fire>
+ <space v-else-if="dialogType == 2" :details = details></space>
+ <hoist v-else-if="dialogType == 3" :details = details></hoist>
+ <ground v-else-if="dialogType == 4" :details = details></ground>
+ <broken v-else-if="dialogType == 5" :details = details></broken>
+ <height v-else-if="dialogType == 6" :details = details></height>
+ <power v-else-if="dialogType == 7" :details = details></power>
+ <plate v-else :details = details></plate>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button type="primary" @click="dialogDetails = false"
+ >确认</el-button
+ >
+ </span>
+ </template>
+ </el-dialog>
+ <el-dialog v-model="dialogStatus" title="作业审批进度" center width="60%">
+ <el-form v-if="approveInfo.operators.length > 0" style="margin-bottom: 40px">
+ <el-form-item label="申请作业人">
+ <el-input v-model="approveInfo.operators" readonly type="textarea" />
+ </el-form-item>
+ </el-form>
+ <div style="display: flex; flex-direction: column-reverse">
+ <div v-for="(item, index) in approveInfo.approvalSteps" class="stepItem">
+ <div class="stepNum">{{ item.stepSerial }}</div>
+ <div class="stepCard">
+ <el-card class="box-card" shadow="always">
+ <div class="text">
+ 审批结果：<span>{{ item.approvalResultDesc }}</span>
+ </div>
+ <div class="text">
+ 审批类型：<span>{{ item.typeDesc }}</span>
+ </div>
+ <div class="text" v-show="item.startApprovalTime != null">
+ 开始时间：<span>{{ item.startApprovalTime }}</span>
+ </div>
+ <div class="approveUnit">
+ <div class="item-tit"><span>审批人</span><span>审批状态</span></div>
+ <div class="item-cont" v-for="i in item.stepUnits">
+ <span>{{ i.approvalUname }}</span
+ ><span>{{ i.resultDesc }}</span>
+ </div>
+ </div>
+ <div class="approveItem">
+ <div class="item-tit">
+ <span>审批项目</span>
+<!-- <span>类型</span>-->
+ <div>措施标准</div>
+ </div>
+ <div class="item-cont" v-for="i in item.stepItems">
+ <span>{{ i.itemName }}</span>
+<!-- <span>{{ i.typeDesc }}</span>-->
+ <div v-if="i.measure !== null">
+ <div>
+ <span>作业类型：</span><span>{{ i.measure.workTypeDesc }}</span>
+ </div>
+ <div>
+ <span>措施内容：</span><span>{{ i.measure.context }}</span>
+ </div>
+ </div>
+ <div v-if="i.stand !== null">
+ <div>
+ <span>标题名称：</span><span>{{ i.stand.title }}</span>
+ </div>
+ <div>
+ <span>标准内容：</span><span>{{ i.stand.typeDesc }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="text" v-show="item.expFinishApprovalTime != null">
+ 期望结束时间：<span>{{ item.expFinishApprovalTime }}</span>
+ </div>
+ <div class="text" v-show="item.finishApprovalTime != null">
+ 结束时间：<span>{{ item.finishApprovalTime }}</span>
+ </div>
+ </el-card>
+ </div>
+ </div>
+ </div>
+ </el-dialog>
+ <el-dialog v-model="deleteDialog" title="提示" width="30%" center @close="indexClear">
+ <span>您确定要终止该条审批吗？</span>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="deleteDialog = false" size="default">取消</el-button>
+ <el-button type="primary" @click="conFirmDelete" size="default">确认</el-button>
+ </span>
+ </template>
+ </el-dialog>
+<!-- </el-tab-pane>-->
+<!-- <el-tab-pane label="已通过" name="2">-->
+<!-- <div style="height: 100%">-->
+<!-- <el-row class="homeCard">-->
+<!-- <el-col :span="8">-->
+<!-- <div class="grid-content topInfo">-->
+<!-- <el-input v-model="searchWord" placeholder="作业证名称"></el-input>-->
+<!-- <el-button type="primary">查询</el-button>-->
+<!-- <el-button plain>重置</el-button>-->
+<!-- </div>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <div class="homeCard">-->
+<!-- <div class="main-card">-->
+<!-- <el-table ref="multipleTableRef" :data="passedData" style="width: 100%" height="calc(100% - 48px)" :header-cell-style="{ background: '#fafafa' }" @selection-change="handleSelectionChange">-->
+<!-- <el-table-column type="selection" width="55" />-->
+<!-- <el-table-column type="index" label="编号" width="200" />-->
+<!-- <el-table-column property="level" label="作业证等级" width="180" sortable />-->
+<!-- <el-table-column property="applyDate" label="申请日期" sortable />-->
+<!-- <el-table-column property="name" label="申请人" width="180" />-->
+<!-- <el-table-column property="department" label="申请部门" width="180" />-->
+<!-- <el-table-column label="申请状态" width="180">-->
+<!-- <template #default="scope">-->
+<!-- <el-tag type="success">{{ scope.row.status }}</el-tag>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+<!-- <div class="pageBtn">-->
+<!-- <el-pagination v-model:currentPage="pageIndex2" v-model:page-size="pageSize2" :page-sizes="[10, 15]" small="false" background layout="total, sizes, prev, pager, next, jumper" :total="totalSize2" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </el-tab-pane>-->
+<!-- </el-tabs>-->
+ </div>
+</template>
+
+<script lang="ts">
+import {toRefs, reactive, defineComponent, ref, onMounted, defineAsyncComponent} from 'vue';
+import { storeToRefs } from 'pinia';
+import { initBackEndControlRoutes } from '/@/router/backEnd';
+import { useUserInfo } from '/@/stores/userInfo';
+import { Session } from '/@/utils/storage';
+import { useRouter } from 'vue-router';
+import { Edit, View, Plus, Delete, Refresh, Search, Finished } from '@element-plus/icons-vue';
+import { ElTable } from 'element-plus';
+import { FormInstance, FormRules, ElMessage } from 'element-plus';
+import { workApprovalApi } from '/@/api/specialWorkSystem/workApproval';
+import type { TabsPaneContext } from 'element-plus';
+import {teamManageApi} from "/@/api/systemManage/basicDateManage/personShiftManage/teamManage";
+
+// 定义接口来定义对象的类型
+interface stateType {
+ applyData: Array<string>;
+ workTimeList: Array<string>;
+ multipleSelection: Array<any>;
+ deleteArr: Array<any>;
+ approveInfo: Object;
+ dialogDetails: boolean;
+ dialogStatus: boolean;
+ deleteDialog: boolean;
+ pageIndex1: number;
+ pageSize1: number;
+ chosenIndex: null | number;
+ deleteId: null | number;
+ searchWord: string;
+ totalSize1: number;
+ activeName: string;
+ addRecord: {};
+ details: {};
+ statusInfo: {};
+ workType: Array<type>;
+ dialogType: number | null;
+ departmentList: Array<any>;
+ departmentRecursionList: Array<DepartmentState>;
+}
+interface type {
+ id: number;
+ name: string;
+}
+interface DepartmentState {
+ depId: number;
+ depName: string;
+}
+export default defineComponent({
+ name: 'myApproval',
+ components: {
+ fire: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/fireLog.vue')),
+ space: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/spaceLog.vue')),
+ hoist: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/hoistLog.vue')),
+ ground: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/groundLog.vue')),
+ broken: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/brokenLog.vue')),
+ height: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/heightLog.vue')),
+ power: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/powerLog.vue')),
+ plate: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/myApproval/components/plateLog.vue'))
+ },
+ setup() {
+ const userInfo = useUserInfo();
+ const { userInfos } = storeToRefs(userInfo);
+ const router = useRouter();
+ const state = reactive<stateType>({
+ pageIndex1: 1,
+ pageSize1: 10,
+ totalSize1: 0,
+ dialogType: null,
+ activeName: '1',
+ departmentList: [],
+ departmentRecursionList: [],
+ chosenIndex: null,
+ searchWord: '',
+ applyData: [],
+ workTimeList: [],
+ multipleSelection: [],
+ approveInfo: {
+ approvalSteps: [],
+ operators: []
+ },
+ dialogDetails: false,
+ dialogStatus: false,
+ deleteDialog: false,
+ addRecord: {},
+ details: {},
+ statusInfo: {},
+ deleteId: null,
+ deleteArr: [],
+ workType: [
+ { id: 1, name: '动火作业' },
+ { id: 2, name: '受限空间作业' },
+ { id: 3, name: '吊装作业' },
+ { id: 4, name: '动土作业' },
+ { id: 5, name: '断路作业' },
+ { id: 6, name: '高处作业' },
+ { id: 7, name: '临时用电作业' },
+ { id: 8, name: '盲板抽堵作业' }
+ ]
+ });
+ interface User {
+ name: string;
+ list: [];
+ info: string;
+ }
+
+ // 刷新
+ const reLoadData = async () => {
+ getListByPage();
+ };
+
+ // 填写表单
+ const toApply = () => {
+ router.push({
+ path: 'workApply'
+ });
+ };
+
+ const handleClick = (tab: TabsPaneContext, event: Event) => {
+ console.log(tab, event);
+ };
+
+ // 获取部门列表
+ const getAllDepartment = async () => {
+ let res = await teamManageApi().getAllDepartment();
+ if (res.data.code === '200') {
+ state.departmentList = JSON.parse(JSON.stringify(res.data.data))
+ recursion(state.departmentList);
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ // 获取层级审批数据
+ // const getApprovalData = async (id) => {
+ // let res = await workApprovalApi().getApprovalData({workApplyId: id});
+ // if (res.data.code === '200') {
+ // console.log(res.data.data,'层级数据')
+ // // state.departmentList = JSON.parse(JSON.stringify(res.data.data))
+ // // recursion(state.departmentList);
+ // } else {
+ // ElMessage({
+ // type: 'warning',
+ // message: res.data.msg
+ // });
+ // }
+ // };
+
+ const recursion = (value: any) => {
+ for (let i of value) {
+ if (i.children.length !== 0) {
+ state.departmentRecursionList.push(i);
+ recursion(i.children);
+ } else {
+ state.departmentRecursionList.push(i);
+ }
+ }
+ };
+
+ // 分页获取工作时间组列表
+ const getListByPage = async () => {
+ const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord } };
+ let res = await workApprovalApi().getApprovalListPage(data);
+ if (res.data.code === '200') {
+ console.log(res.data.data,'approval')
+ state.applyData = JSON.parse(JSON.stringify(res.data.data));
+ state.applyData = state.applyData.map((item) => {
+ if (item.operators == null || item.operators == []) {
+ item.operators = [];
+ } else {
+ item.operators = Array.from(item.operators, ({ operatorUname }) => operatorUname);
+ }
+ return item;
+ });
+ state.totalSize1 = res.data.total;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ // 关键词查询记录
+ const searchRecord = async () => {
+ if (state.searchWord == '') {
+ ElMessage({
+ type: 'warning',
+ message: '请输入查询关键词'
+ });
+ } else {
+ getListByPage();
+ }
+ };
+ // 重置搜索
+ const clearSearch = async () => {
+ state.searchWord = '';
+ getListByPage();
+ };
+
+ // 查看进度
+ const viewStatus = (row) => {
+ getStatus({ workApplyId: row.workApplyId });
+ state.dialogStatus = true;
+ };
+
+ // 查询进度方法
+ const getStatus = async (data: any) => {
+ let res = await workApprovalApi().getApprovalStatus(data);
+ if (res.data.code === '200') {
+ state.approveInfo = JSON.parse(JSON.stringify(res.data.data));
+ state.approveInfo.operators = Array.from(state.approveInfo.operators, ({ operatorUname }) => operatorUname);
+ console.log(state.approveInfo, '我的审批');
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ const deleteRecordBtn = (row) => {
+ state.deleteId = row.workApplyId;
+ state.deleteDialog = true;
+ };
+
+ // 取消申请方法
+ const deleteRecord = async (data: any) => {
+ let res = await workApprovalApi().postAbord(data);
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ message: res.data.msg
+ });
+ getListByPage();
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ const conFirmDelete = () => {
+ deleteRecord({ workApplyId: state.deleteId });
+ state.deleteDialog = false;
+ };
+
+ const handleSizeChange1 = (val: number) => {
+ state.pageSize1 = val;
+ getListByPage();
+ };
+ const handleCurrentChange1 = (val: number) => {
+ state.pageIndex1 = val;
+ getListByPage();
+ };
+
+ // 查看记录
+ const viewRecord = (row: any) => {
+ state.dialogType = row.workType
+ state.details = JSON.parse(JSON.stringify(row));
+ console.log(state.details,'details')
+ // getApprovalData(state.details.workApplyId)
+ if(state.details.workDetail.otherSpecialWork == '' || !state.details.workDetail.otherSpecialWork){
+ state.details.workDetail.otherSpecialWork=[]
+ }
+ else {
+ console.log(state.details.workDetail.otherSpecialWork,'split')
+ const a = state.details.workDetail.otherSpecialWork
+ state.details.workDetail.otherSpecialWork = a.split(',').map((item) => {
+ return state.workType.find((i: { id: number }) => i.id === Number(item))?.name;
+ });
+ }
+ if(state.details.workDetail.involvedDepIds == '' || !state.details.workDetail.involvedDepIds){
+ state.details.workDetail.involvedDepIds=[]
+ }
+ else {
+ const a = state.details.workDetail.involvedDepIds
+ state.details.workDetail.involvedDepIds = a.split(',').map((item) => {
+ return state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(item))?.depName;
+ });
+ }
+ state.dialogDetails = true;
+ };
+
+ // 折线图
+ const renderMenu = async (value: string) => {
+ Session.set('projectId', value);
+ userInfos.value.projectId = value;
+ await initBackEndControlRoutes();
+ };
+
+ // 页面载入时执行方法
+ onMounted(() => {
+ getListByPage();
+ getAllDepartment()
+ });
+
+ return {
+ View,
+ Edit,
+ Delete,
+ Refresh,
+ Plus,
+ Finished,
+ reLoadData,
+ toApply,
+ handleClick,
+ searchRecord,
+ clearSearch,
+ viewRecord,
+ viewStatus,
+ deleteRecordBtn,
+ conFirmDelete,
+ getListByPage,
+ handleSizeChange1,
+ handleCurrentChange1,
+ ...toRefs(state)
+ };
+ }
+});
+</script>
+
+<style scoped lang="scss">
+$homeNavLengh: 8;
+.home-container {
+ height: calc(100vh - 144px);
+ box-sizing: border-box;
+ overflow: hidden;
+ .demo-tabs {
+ width: 100%;
+ height: 100%;
+
+ &::v-deep(.el-tabs__content) {
+ height: calc(100% - 60px);
+ }
+
+ .el-tab-pane {
+ height: 100%;
+ }
+ }
+ .homeCard {
+ width: 100%;
+ padding: 20px;
+ box-sizing: border-box;
+ background: #fff;
+ border-radius: 4px;
+
+ .main-card {
+ width: 100%;
+ height: 100%;
+ .cardTop {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn {
+ margin: 0;
+ }
+ }
+ .pageBtn {
+ height: 60px;
+ display: flex;
+ align-items: center;
+ justify-content: right;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ &:last-of-type {
+ height: calc(100% - 100px);
+ }
+ }
+ .stepItem {
+ display: flex;
+ align-items: flex-start;
+ margin-top: 30px;
+ margin-left: 30px;
+ padding-bottom: 30px;
+ padding-left: 40px;
+ border-left: 1px solid #a0cfff;
+ position: relative;
+ &:first-of-type {
+ margin-top: 30px;
+ }
+ &:first-of-type {
+ margin-bottom: 0;
+ border-left: none;
+ }
+ .stepNum {
+ position: absolute;
+ width: 40px;
+ height: 40px;
+ border-radius: 20px;
+ box-sizing: border-box;
+ font-size: 18px;
+ color: #333;
+ border: 1px solid #a0cfff;
+ line-height: 38px;
+ text-align: center;
+ left: -20px;
+ top: -30px;
+ background: #d9ecff;
+ }
+ .stepCard {
+ width: 100%;
+ margin-top: -30px;
+
+ .box-card {
+ width: 100%;
+
+ .card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ span {
+ font-weight: bold;
+ margin-left: 10px;
+ }
+ }
+
+ .text {
+ width: 100%;
+ font-size: 14px;
+ margin-bottom: 10px;
+ padding-left: 10px;
+
+ span {
+ font-weight: bolder;
+ color: #409eff;
+ }
+
+ &:last-of-type {
+ margin-bottom: 0;
+ }
+ }
+ .approveUnit {
+ width: 100%;
+ font-size: 14px;
+ margin-bottom: 20px;
+ padding: 10px 15px;
+ border: 1px solid #fff;
+ background: #ecf8ff;
+ border-radius: 6px;
+ .item-tit {
+ width: 100%;
+ display: flex;
+ color: #409eff;
+ align-items: flex-start;
+ justify-content: space-between;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #a0cfff;
+
+ & > span {
+ flex: 1;
+ &:last-of-type{
+ text-align: center;
+ }
+ }
+ & > div {
+ flex: 1;
+ text-align: center;
+ }
+ }
+ .item-cont {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 10px 0;
+ border-bottom: 1px solid #c6e2ff;
+
+ & > span {
+ flex: 1;
+ &:last-of-type{
+ text-align: center;
+ }
+ }
+ & > div {
+ flex: 1;
+ text-align: center;
+
+ & > div {
+ text-align: left;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ span {
+ width: 45%;
+ &:first-of-type {
+ width: 30%;
+ }
+ }
+ }
+ }
+ &:last-of-type {
+ border-bottom: 0;
+ }
+ }
+ }
+ .approveItem {
+ width: 100%;
+ font-size: 14px;
+ margin-bottom: 20px;
+ padding: 10px 15px;
+ background: #ecf8ff;
+ border: 1px solid #fff;
+ border-radius: 6px;
+ .item-tit {
+ width: 100%;
+ display: flex;
+ color: #409eff;
+ align-items: flex-start;
+ justify-content: space-between;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #a0cfff;
+
+ & > span {
+ flex: 1;
+ }
+ & > div {
+ flex: 2;
+ text-align: center;
+ }
+ }
+ .item-cont {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 10px 0;
+ border-bottom: 1px solid #c6e2ff;
+
+ & > span {
+ flex: 1;
+ }
+ & > div {
+ flex: 2;
+ text-align: center;
+
+ & > div {
+ text-align: left;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: flex-start;
+ margin-bottom: 10px;
+ span {
+ width: 50%;
+ &:first-of-type {
+ width: 25%;
+ }
+ }
+ }
+ }
+ &:last-of-type {
+ border-bottom: 0;
+ }
+ }
+ }
+ }
+ }
+ &:hover .card-header {
+ color: #0098f5;
+ }
+ &:hover .stepNum {
+ border: 2px solid #0098f5;
+ color: #0098f5;
+ }
+ }
+ .el-row {
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .grid-content {
+ align-items: center;
+ min-height: 36px;
+ }
+
+ .topInfo {
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ font-weight: bold;
+
+ & > div {
+ white-space: nowrap;
+ margin-right: 20px;
+ }
+ }
+ }
+ .el-card {
+ border: 0;
+ }
+}
+</style>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index 741d565..0a00e50 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -73,7 +73,7 @@
</span>
</template>
</el-dialog>
- <el-dialog v-model="dialogStatus" title="作业申请进度">
+ <el-dialog v-model="dialogStatus" title="作业申请进度" width="60%">
<el-form v-if="approveInfo.operators.length > 0" style="margin-bottom: 40px">
<el-form-item label="申请作业人">
<el-input v-model="approveInfo.operators" readonly type="textarea" />
@@ -102,12 +102,13 @@
</div>
<div class="approveItem">
<div class="item-tit">
- <span>审批项目</span><span>类型</span>
+ <span>审批项目</span>
+<!-- <span>类型</span>-->
<div>措施标准</div>
</div>
<div class="item-cont" v-for="i in item.stepItems">
- <span>{{ i.itemName }}</span
- ><span>{{ i.typeDesc }}</span>
+ <span>{{ i.itemName }}</span>
+<!-- <span>{{ i.typeDesc }}</span>-->
<div v-if="i.measure !== null">
<div>
<span>作业类型：</span><span>{{ i.measure.workTypeDesc }}</span>
@@ -219,7 +220,6 @@
details: {};
statusInfo: {};
workType: Array<type>;
- depType: Array<type>;
dialogType: number | null;
departmentList: Array<any>;
departmentRecursionList: Array<DepartmentState>;
@@ -282,12 +282,6 @@
{ id: 6, name: '高处作业' },
{ id: 7, name: '临时用电作业' },
{ id: 8, name: '盲板抽堵作业' }
- ],
- depType: [
- { id: 1, name: '部门一' },
- { id: 2, name: '部门二' },
- { id: 3, name: '部门三' },
- { id: 4, name: '部门四' }
]
});
interface User {
@@ -304,7 +298,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workTicket'
+ path: 'workApply'
});
};
@@ -318,7 +312,6 @@
if (res.data.code === '200') {
state.departmentList = JSON.parse(JSON.stringify(res.data.data))
recursion(state.departmentList);
- console.log(state.departmentRecursionList,'99999999999')
} else {
ElMessage({
type: 'warning',
@@ -341,7 +334,7 @@
// 分页获取工作时间组列表
const getListByPage = async () => {
const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord } };
- let res = await workApplyApi().getApplyListtPage(data);
+ let res = await workApplyApi().getApplyListPage(data);
if (res.data.code === '200') {
state.applyData = JSON.parse(JSON.stringify(res.data.data));
state.applyData = state.applyData.map((item) => {
@@ -656,9 +649,12 @@
& > span {
flex: 1;
+ &:last-of-type{
+ text-align: center;
+ }
}
& > div {
- flex: 2;
+ flex: 1;
text-align: center;
}
}
@@ -672,9 +668,12 @@
& > span {
flex: 1;
+ &:last-of-type{
+ text-align: center;
+ }
}
& > div {
- flex: 2;
+ flex: 1;
text-align: center;
& > div {
@@ -741,11 +740,12 @@
width: 100%;
display: flex;
justify-content: center;
- align-items: center;
+ align-items: flex-start;
+ margin-bottom: 10px;
span {
- width: 45%;
+ width: 50%;
&:first-of-type {
- width: 30%;
+ width: 25%;
}
}
}
--
Gitblit v1.9.2