From ba9d970c2c52185e54217cbb736d879c2493ed9b Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期四, 18 八月 2022 20:37:44 +0800
Subject: [PATCH] Default Changelist

---
 src/views/specialWorkSystem/workApplyManage/workTicket/index.vue |  627 +++++++++++++++-----------------------------------------
 1 files changed, 169 insertions(+), 458 deletions(-)

diff --git a/src/views/specialWorkSystem/workApplyManage/workTicket/index.vue b/src/views/specialWorkSystem/workApplyManage/workTicket/index.vue
index 6310e43..7d162b9 100644
--- a/src/views/specialWorkSystem/workApplyManage/workTicket/index.vue
+++ b/src/views/specialWorkSystem/workApplyManage/workTicket/index.vue
@@ -1,47 +1,45 @@
 <template>
 	<div class="home-container">
 		<div style="height: 100%">
-		<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef2">
+		<el-form :model="form" label-width="120px" :rules="applyRules" ref="ruleFormRef">
 			<div class="homeCard">
 			<el-row>
 				<el-col :span="12">
-					<el-form-item label="作业人" prop="operatorUid">
-						<el-input
-								v-model="form.operatorUid"
-								placeholder="请输入"
-								class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
+					<el-form-item label="作业人" prop="operatorUids">
+						<el-select v-model="form.operatorUids" multiple>
+							<el-option
+									v-for="item in workerList"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+							/>
+						</el-select>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="12">
-					<el-form-item label="作业地点" prop="workLocation">
-						<el-input
-							v-model="form.workLocation"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
+					<el-form-item label="作业等级" prop="workLevel">
+						<el-select v-model="form.workLevel">
+							<el-option
+									v-for="item in workLevelList"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+							/>
+						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="作业期限" prop="workTimeLine">
+					<el-form-item label="作业时间" prop="workTimeLine">
 						<el-date-picker
-							v-model="form.workTimeLine"
-							type="daterange"
-							unlink-panels
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							:shortcuts="shortcuts"
+								v-model="form.workTimeLine"
+								format="YYYY-MM-DD HH:mm"
+								value-format="YYYY-MM-DD HH:mm:00"
+								type="datetimerange"
+								range-separator="至"
+								start-placeholder="开始时间"
+								end-placeholder="结束时间"
 						/>
 					</el-form-item>
 				</el-col>
@@ -50,280 +48,53 @@
 				<el-col :span="12">
 					<el-form-item label="作业内容" prop="workContent">
 						<el-input
-							v-model="form.workContent"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
+								v-model="form.workContent"
+								autosize
+								type="textarea"
+								placeholder="请输入作业内容"
+						/>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="作业单位" prop="workUnit">
+					<el-form-item label="作业地址" prop="workLocation">
 						<el-input
-							v-model="form.workUnit"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>选择作业单位</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="8">
-					<el-form-item label="作业负责人" prop="responsor">
-						<el-input
-							v-model="form.responsor"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="监护人" prop="monitor">
-						<el-input
-							v-model="form.monitor"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="监护人岗位" prop="monitorStation">
-						<el-input
-							v-model="form.monitorStation"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="12">
-					<el-form-item label="生产车间负责人" prop="workhouseLeader">
-						<el-input
-							v-model="form.workhouseLeader"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="申请日期" prop="applyDate">
-						<el-date-picker
-							size="large"
-							v-model="form.applyDate"
-							type="date"
-							placeholder="请选择"
-							style="width: 100%"
-						></el-date-picker>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			</div>
-			<div class="homeCard">
-			<el-row>
-				<el-col :span="24">
-					<el-form-item label="涉及的其他特殊作业" prop="otherSpecialWorks">
-						<el-checkbox-group v-model="form.otherSpecialWorks">
-							<el-checkbox label="动火作业" />
-							<el-checkbox label="受限空间" />
-							<el-checkbox label="高处作业" />
-							<el-checkbox label="吊装作业" />
-							<el-checkbox label="临时用电" />
-							<el-checkbox label="设备检修" />
-							<el-checkbox label="盲板抽堵" />
-							<el-checkbox label="断路作业" />
-							<el-checkbox label="动土作业" />
-						</el-checkbox-group>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row>
-				<el-col>
-					<el-form-item label="防护用品" prop="protections">
-						<el-cascader
-							v-model="form.protections"
-							:options="protectOption"
-							:props="{expandTrigger: 'hover'}"
-							@change="protectionsChange"
-							placeholder="请选择"
-							style="width: 100%"
+								v-model="form.workLocation"
+								autosize
+								type="textarea"
+								placeholder="请输入作业地址"
 						/>
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<el-row style="justify-content: center">
-				<el-button type="primary" size="default" @click="dialogAddFile = true">点击添加安全交底和风险告知书</el-button>
-			</el-row>
 			<el-row>
 				<el-col :span="12">
-					<el-form-item label="实施安全教育人" prop="safetyMan">
+					<el-form-item label="动火方式" prop="workDetail.hotMethod">
 						<el-input
-							v-model="form.safetyMan"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search"/>
-							</template>
-						</el-input>
+								v-model="form.workDetail.hotMethod"
+								autosize
+								type="textarea"
+								placeholder="请输入动火方式"
+						/>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="被教育人" prop="educated">
-						<el-input
-							v-model="form.educated"
-							placeholder="请输入"
-							class="input-with-select"
-						>
-							<template #append>
-								<el-button :icon="Search" />
-							</template>
-						</el-input>
+					<el-form-item label="关联作业" prop="workDetail.otherSpecialWork">
+						<el-select v-model="form.workDetail.otherSpecialWork" multiple>
+							<el-option
+									v-for="item in otherWorkList"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+							/>
+						</el-select>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			</div>
 		</el-form>
 		<div class="applyBtn">
-			<el-button type="primary" size="large" plain @click="handleApply(ruleFormRef2)">发起申请</el-button>
+			<el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">发起申请</el-button>
 		</div>
-		<el-dialog v-model="dialogAddWorker" title="添加作业人">
-			<el-form :model="addWorkerForm" label-width="120px" :rules="addWorkerRules" ref='ruleFormRef3'>
-				<el-form-item label="作业人" prop="worker">
-					<el-input
-							v-model="addWorkerForm.worker"
-							placeholder="请输入"
-							class="input-with-select"
-					>
-						<template #append>
-							<el-button :icon="Search" />
-						</template>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="作业人角色" prop="role">
-					<el-input
-							v-model="addWorkerForm.role"
-							placeholder="请输入"
-							class="input-with-select"
-					>
-						<template #append>
-							<el-button :icon="Search" />
-						</template>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="作业人角色" prop="unit">
-					<el-input
-							v-model="addWorkerForm.unit"
-							placeholder="请输入"
-							class="input-with-select"
-					>
-						<template #append>
-							<el-button :icon="Search" />
-						</template>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="证书名称" prop="certificate">
-					<el-input
-							v-model="addWorkerForm.certificate"
-							placeholder="请输入"
-							class="input-with-select"
-					>
-						<template #append>
-							<el-button :icon="Search" />
-						</template>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="证书号" prop="certificateId">
-					<el-input
-							v-model="addWorkerForm.certificateId"
-							placeholder="请输入"
-							class="input-with-select"
-					>
-						<template #append>
-							<el-button :icon="Search" />
-						</template>
-					</el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="onSubmitAddForm(ruleFormRef3)" size="default">确认</el-button>
-					<el-button size="default" @click="cancleAdd">取消</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
-		<el-dialog v-model="dialogAddFile" title="安全交底和风险告知">
-			<el-form :model="saftyFileForm" label-width="0" ref="ruleFormRef" :rules="saftyFileRules">
-				<el-form-item label="" prop="surrounding">
-					<div>1.作业许可范围及作业环境:</div>
-					<el-input
-							v-model="saftyFileForm.surrounding"
-							:rows="2"
-							type="textarea"
-							placeholder="请输入"
-					/>
-				</el-form-item>
-				<el-form-item label="" prop="risk">
-					<div>2.作业风险:</div>
-					<el-input
-							v-model="saftyFileForm.risk"
-							:rows="2"
-							type="textarea"
-							placeholder="请输入"
-					/>
-				</el-form-item>
-				<el-form-item label="" prop="protection">
-					<div>3.防范措施(工艺、设备、个体防护等):</div>
-					<el-input
-							v-model="saftyFileForm.protection"
-							:rows="2"
-							type="textarea"
-							placeholder="请输入"
-					/>
-				</el-form-item>
-				<el-form-item label="" prop="emergency">
-					<div>4.应急措施:</div>
-					<el-input
-							v-model="saftyFileForm.emergency"
-							:rows="2"
-							type="textarea"
-							placeholder="请输入"
-					/>
-				</el-form-item>
-				<el-form-item label="" prop="otherStuff">
-					<div>5.其他注意事项:</div>
-					<el-input
-							v-model="saftyFileForm.otherStuff"
-							:rows="2"
-							type="textarea"
-							placeholder="请输入"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="onSubmitAddFile(ruleFormRef)" size="default">确认</el-button>
-					<el-button size="default" @click="cancleAddFile">取消</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
 	</div>
 	</div>
 </template>
@@ -337,11 +108,15 @@
 	import { Search } from '@element-plus/icons-vue'
 	import { ElMessage } from 'element-plus'
 	import type { FormInstance, FormRules } from 'element-plus'
-	import { fireApplyApi } from '/@/api/specialWorkSystem/workApply/fire';
+	import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
 
 
 	interface stateType {
-		form: Object
+		form: Object,
+		workerList: Array<any>,
+		workTypeList: Array<any>,
+		workLevelList: Array<any>,
+		otherWorkList: Array<any>
 	}
 	export default defineComponent({
 		name: 'workTicket',
@@ -351,8 +126,8 @@
 			const { userInfos } = storeToRefs(userInfo);
 			const state  = reactive<stateType>({
 				form: {
-					operatorUid: [],
-					workType: null,
+					operatorUids: [],
+					workType: 1,
 					workLevel: null,
 					workContent: '',
 					workLocation: '',
@@ -360,170 +135,124 @@
 						hotMethod: '',
 						otherSpecialWork: []
 					},
+					workTimeLine: [],
 					expStartTime: '',
 					expEndTime: ''
 				},
-
+				workerList:[
+					{
+						label: "张三",
+						value: 53
+					},
+					{
+						label: "李四",
+						value: 54
+					},
+					{
+						label: "测试一",
+						value: 55
+					},
+					{
+						label: "测试二",
+						value: 56
+					}
+				],
+				workTypeList: [
+					{
+						label: "类型一",
+						value: 1
+					},
+					{
+						label: "类型二",
+						value: 2
+					}
+				],
+				workLevelList: [
+					{
+						label: "一级动火作业",
+						value: 1
+					},
+					{
+						label: "二级动火作业",
+						value: 2
+					},
+					{
+						label: "特级动火作业",
+						value: 3
+					}
+				],
+				otherWorkList: [
+					{
+						label: "动火作业",
+						value: 1
+					},
+					{
+						label: "受限空间作业",
+						value: 2
+					},
+					{
+						label: "吊装作业",
+						value: 3
+					},
+					{
+						label: "动土作业",
+						value: 4
+					},
+					{
+						label: "断路作业",
+						value: 5
+					},
+					{
+						label: "高处作业",
+						value: 6
+					},
+					{
+						label: "临时用电作业",
+						value: 7
+					},
+					{
+						label: "盲板抽堵作业",
+						value: 8
+					}
+				]
 			});
-			const dialogAddWorker = ref(false)
-			const dialogAddFile = ref(false)
-			const addWorkerForm = ref({
-				worker: '',
-				role: '',
-				unit: '',
-				certificate: '',
-				certificateId: ''
-			})
-			const saftyFileForm = reactive({
-				surrounding: '',
-				risk: '',
-				protection: '',
-				emergency: '',
-				otherStuff: ''
-			})
-			const shortcuts = [
-				{
-					text: 'Last week',
-					value: () => {
-						const end = new Date()
-						const start = new Date()
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-						return [start, end]
-					},
-				},
-				{
-					text: 'Last month',
-					value: () => {
-						const end = new Date()
-						const start = new Date()
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-						return [start, end]
-					},
-				},
-				{
-					text: 'Last 3 months',
-					value: () => {
-						const end = new Date()
-						const start = new Date()
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-						return [start, end]
-					},
-				},
-			]
-			const protectOption = [
-				{
-					value: 'guide',
-					label: 'Guide',
-					children: [
-						{
-							value: 'disciplines',
-							label: 'Disciplines',
-							children: [
-								{
-									value: 'consistency',
-									label: 'Consistency',
-								},
-								{
-									value: 'feedback',
-									label: 'Feedback',
-								}
-							],
-						},
-						{
-							value: 'navigation',
-							label: 'Navigation',
-							children: [
-								{
-									value: 'side nav',
-									label: 'Side Navigation',
-								}
-							],
-						},
-					],
-				}
-			]
 			const ruleFormRef = ref<FormInstance>()
-			const ruleFormRef2 = ref<FormInstance>()
-			const ruleFormRef3 = ref<FormInstance>()
-			const addWorkerRules = reactive<FormRules>({
-				worker: [{required: true,message: '此处不能为空'}],
-				role: [{required: true,message: '此处不能为空'}],
-				unit: [{required: true,message: '此处不能为空'}],
-				certificate: [{required: true,message: '此处不能为空'}],
-				certificateId: [{required: true,message: '此处不能为空'}]
-			})
-			const saftyFileRules = reactive<FormRules>({
-				surrounding: [{required: true,message: '该选项不能为空'}],
-				risk: [{required: true,message: '该选项不能为空'}],
-				protection: [{required: true,message: '该选项不能为空'} ],
-				emergency: [{required: true,message: '该选项不能为空'} ]
-			})
-			const protectionsChange = (value) => {
-				console.log(value)
-			}
-
-			const onSubmitAddForm = async (formEl: FormInstance | undefined) => {
+			const applyRules = reactive<FormRules>({
+				operatorUid: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				"workDetail.hotMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+				"workDetail.otherSpecialWork": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
+			});
+			const submitForm = async (formEl: FormInstance | undefined) => {
 				if (!formEl) return
-				await formEl.validate((valid, fields) => {
+				await formEl.validate(async (valid, fields) => {
 					if (valid) {
-						form.workerList.unshift(addWorkerForm.value)
-						addWorkerForm.value = {
-							worker: '',
-							role: '',
-							unit: '',
-							certificate: '',
-							certificateId: ''
+						state.form.expStartTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[0]
+						state.form.expEndTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[1]
+						let { workTimeLine, ...data } = JSON.parse(JSON.stringify(state.form))
+						data.workDetail.otherSpecialWork = data.workDetail.otherSpecialWork.join(',')
+						console.log(data,'data')
+						const res = await workApplyApi().postFireApply(data)
+						if (res.data.code === '200') {
+								ElMessage({
+									type: 'success',
+									message: '提交成功!'
+								});
+								formEl.resetFields()
+						} else {
+							ElMessage({
+								type: 'warning',
+								message: res.data.msg
+							});
 						}
-						dialogAddWorker.value = false
 					} else {
 						console.log('error submit!', fields)
 					}
 				})
-			}
-			const onSubmitAddFile = () =>{
-
-			}
-			const cancleAdd = ()=> {
-				addWorkerForm.value = {
-					worker: '',
-					role: '',
-					unit: '',
-					certificate: '',
-					certificateId: ''
-				}
-				dialogAddWorker.value = false
-			}
-			const cancleAddFile = ()=>{
-
-			}
-			const deleteRow = (index) =>{
-				form.workerList.splice( index,1)
-			}
-			const isValid = ref(false)
-			const additionalForm = ref(null)
-			const handleApply = async (formEl: FormInstance | undefined) =>{
-				if (!formEl) return
-				const flag = additionalForm.value.validateForm()
-				await flag.then((res)=>{
-					isValid.value = res
-				})
-				await formEl.validate((valid, fields) => {
-					console.log(valid,'and',isValid.value)
-					if (valid && isValid.value) {
-						console.log('submit',form,fields)
-						ElMessage({
-							message: '提交成功!',
-							type: 'success',
-						})
-					} else {
-						// console.log('error submit!',form,fields)
-						ElMessage({
-							message: '表单未填写完整',
-							type: 'error',
-						})
-					}
-				})
-
 			}
 			// 折线图
 			const renderMenu = async (value: string) => {
@@ -533,28 +262,10 @@
 			};
 			return {
 				renderMenu,
-				form,
 				Search,
-				shortcuts,
-				protectOption,
-				dialogAddWorker,
-				dialogAddFile,
-				addWorkerForm,
-				saftyFileForm,
 				ruleFormRef,
-				ruleFormRef2,
-				ruleFormRef3,
-				additionalForm,
-				addWorkerRules,
-				saftyFileRules,
-				isValid,
-				handleApply,
-				cancleAddFile,
-				deleteRow,
-				cancleAdd,
-				onSubmitAddForm,
-				onSubmitAddFile,
-				protectionsChange,
+				applyRules,
+				submitForm,
 				...toRefs(state),
 			};
 		},

--
Gitblit v1.9.2