From 6af4a424032b4c6889a153d3517b2d82ea023c52 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期四, 29 九月 2022 14:58:39 +0800
Subject: [PATCH] Default Changelist

---
 src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue |   12 ++
 src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue   |   12 ++
 src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue  |   12 ++
 src/views/specialWorkSystem/workTicket/workApply/components/broken.vue     |   12 +
 src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue |   12 ++
 /dev/null                                                                  |  113 ------------------
 src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue  |   12 ++
 src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue      |   12 +
 src/views/specialWorkSystem/workTicket/workApply/components/plate.vue      |   12 +
 src/views/specialWorkSystem/workTicket/workApply/components/space.vue      |   12 +
 src/views/specialWorkSystem/workTicket/myJobApply/index.vue                |    7 
 src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue |   12 ++
 src/views/specialWorkSystem/workTicket/workApply/components/power.vue      |   12 +
 src/views/specialWorkSystem/workTicket/workApply/components/height.vue     |   12 +
 src/views/specialWorkSystem/workTicket/workApply/components/fire.vue       |   11 +
 src/views/specialWorkSystem/workTicket/allApplys/index.vue                 |    2 
 src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue  |   14 ++
 src/views/specialWorkSystem/workTicket/workApply/components/ground.vue     |   10 +
 src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue  |   12 ++
 19 files changed, 178 insertions(+), 135 deletions(-)

diff --git a/src/views/specialWorkSystem/workTicket/allApplys/components/brokenLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/brokenLog.vue
deleted file mode 100644
index b87725d..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/brokenLog.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<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.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-image v-for="item in details.workDetail.bcPath" :preview-src-list="details.workDetail.bcPath" style="width: 150px; height: 150px;margin-right: 50px;margin-bottom: 20px" :src="item" fit="cover" />
-			</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.statusDesc" 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/allApplys/components/fireLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/fireLog.vue
deleted file mode 100644
index 5bf55f2..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/fireLog.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<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.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.statusDesc" 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/allApplys/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/groundLog.vue
deleted file mode 100644
index e05a39b..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/groundLog.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<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.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-image v-for="item in details.workDetail.gbPath" :preview-src-list="details.workDetail.gbPath" style="width: 150px; height: 150px;margin-right: 50px;margin-bottom: 20px" :src="item" fit="cover" />
-			</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.statusDesc" 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/allApplys/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/heightLog.vue
deleted file mode 100644
index 179d224..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/heightLog.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<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.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.statusDesc" 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/allApplys/components/hoistLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/hoistLog.vue
deleted file mode 100644
index 0e4e53b..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/hoistLog.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<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.statusDesc" 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/allApplys/components/plateLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/plateLog.vue
deleted file mode 100644
index 142b69d..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/plateLog.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<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-image v-for="item in details.workDetail.bpLocationMapPath" :preview-src-list="details.workDetail.bpLocationMapPath" style="width: 150px; height: 150px;margin-right: 50px;margin-bottom: 20px" :src="item" fit="cover" />
-			</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.statusDesc" 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/allApplys/components/powerLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/powerLog.vue
deleted file mode 100644
index 7c3b754..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/powerLog.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<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.statusDesc" 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/allApplys/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/allApplys/components/spaceLog.vue
deleted file mode 100644
index 4b65d15..0000000
--- a/src/views/specialWorkSystem/workTicket/allApplys/components/spaceLog.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<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.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.statusDesc" 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/allApplys/index.vue b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
index 3923822..baea648 100644
--- a/src/views/specialWorkSystem/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
@@ -67,7 +67,7 @@
                                     <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="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出</el-button>
+                                        <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
index b87725d..70b06f9 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
@@ -40,6 +40,18 @@
 			<el-form-item label="图片">
 				<el-image v-for="item in details.workDetail.bcPath" :preview-src-list="details.workDetail.bcPath" style="width: 150px; height: 150px;margin-right: 50px;margin-bottom: 20px" :src="item" fit="cover" />
 			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="期望开始时间">
 				<el-input v-model="details.expStartTime" readonly />
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue
index 5bf55f2..feb4040 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue
@@ -28,6 +28,18 @@
 			<el-form-item label="作业方式">
 				<el-input v-model="details.workDetail.hotMethod" readonly type="textarea" />
 			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea" />
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
index e05a39b..5e1f2c7 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
@@ -34,6 +34,18 @@
 			<el-form-item label="动土方式">
 				<el-input v-model="details.workDetail.gbMethod" readonly type="textarea" />
 			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
index 179d224..ba57c56 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
@@ -31,6 +31,18 @@
 			<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-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue
index 0e4e53b..fb95a14 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue
@@ -31,6 +31,18 @@
 			<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-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue
index 142b69d..3cf73c9 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue
@@ -52,6 +52,18 @@
 			<el-form-item label="拆盲板时间">
 				<el-input v-model="details.workDetail.uninstallBpTime" readonly/>
 			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue
index 7c3b754..c83eb3d 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue
@@ -34,6 +34,18 @@
 			<el-form-item label="用电设备及功率">
 				<el-input v-model="details.workDetail.equipmentAndPower" readonly type="textarea" />
 			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
index 4b65d15..3cc4206 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
@@ -23,7 +23,7 @@
 				<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-input v-model="details.workLocation" readonly type="textarea"/>
 			</el-form-item>
 			<el-form-item label="受限空间所属单位">
 				<el-input v-model="details.workDetail.csDepId" readonly type="textarea" />
@@ -34,6 +34,18 @@
 			<el-form-item label="空间原有介质名称">
 				<el-input v-model="details.workDetail.csOriginalName" readonly type="textarea" />
 			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
+			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea" />
 			</el-form-item>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index eadb500..47c1a5e 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -43,12 +43,12 @@
                                         <el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
                                     </template>
                                 </el-table-column>
-                                <el-table-column fixed="right" label="操作" align="center" width="250">
+                                <el-table-column fixed="right" label="操作" align="center" width="300">
                                     <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>
-                                        <el-button link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出</el-button>
+                                        <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -352,12 +352,13 @@
             }
         };
 
-        // 分页获取工作时间组列表
+        // 分页获取
         const getListByPage = async () => {
             const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord } };
             let res = await workApplyApi().getApplyListPage(data);
             if (res.data.code === '200') {
                 state.applyData = JSON.parse(JSON.stringify(res.data.data));
+                console.log(state.applyData,'applyData')
                 state.applyData = state.applyData.map((item) => {
                     if (item.operators == null || item.operators == []) {
                         item.operators = [];
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
index 1c32a26..d33d345 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
@@ -133,13 +133,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -283,6 +283,13 @@
 				"workDetail.bcPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.involvedDepIds": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
+
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -538,6 +545,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
index 29b2fce..3d7fa88 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
@@ -115,13 +115,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -253,7 +253,11 @@
 			onMounted(() => {
 
 			});
-
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -404,6 +408,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
index 6ac168c..d265ea3 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
@@ -135,13 +135,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -313,6 +313,11 @@
 				"workDetail.gbMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.gbPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -570,6 +575,7 @@
 				Plus,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
index 207938e..ad53f53 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
@@ -129,13 +129,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -315,6 +315,13 @@
 				"workDetail.operationDepId": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.operationHeight": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
+
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -459,6 +466,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
index 57bfd66..2f28fd0 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
@@ -114,13 +114,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -213,6 +213,13 @@
 				"workDetail.hoistingToolName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.weightMass": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
+
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -357,6 +364,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue b/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
index 2f09dd7..341c585 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
@@ -210,13 +210,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -402,6 +402,13 @@
 				"workDetail.bpLocation": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.bpLocationMapPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
+
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -661,6 +668,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue b/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
index afde329..3bc9f61 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
@@ -112,13 +112,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -213,6 +213,13 @@
 				"workDetail.workingVoltage": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.equipmentAndPower": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
+
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -355,6 +362,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
index 552979f..2a6b114 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
@@ -123,13 +123,13 @@
 						<el-form label-width="150px" label-position="top">
 							<div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
 							<el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + ':'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
-								<el-input size="default" type="number" v-model="item.mustList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.mustList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
 							<div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
 							<el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + ':'">
-								<el-input size="default" type="number" v-model="item.unList[x].value" placeholder="请输入配置数量,空值默认为0">
+								<el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量,空值默认为0">
 									<template #append>{{'库存:' + item.unList[x].stock}}</template>
 								</el-input>
 							</el-form-item>
@@ -280,6 +280,13 @@
 				"workDetail.csName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				"workDetail.csOriginalName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
 			});
+
+			const toZero = (value: string | number,index: number,name: string,x:number) =>{
+				if(!value){
+					state.materialList[index][name][x].value = 0
+				}
+			}
+
 			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
 				await formEl.validate(async (valid, fields) => {
@@ -425,6 +432,7 @@
 				Search,
 				ruleFormRef,
 				applyRules,
+				toZero,
 				getMaList,
 				conFirmDevices,
 				closeMaterial,

--
Gitblit v1.9.2