From 17bc12d7414dedab9d8eb60794603e61e8cce01e Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 25 十月 2022 17:20:35 +0800
Subject: [PATCH] '更新'

---
 src/views/specialWorkManage/workTicket/workApply/components/fire.vue |   83 +++++++++++++++++++++++++----------------
 1 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/views/specialWorkManage/workTicket/workApply/components/fire.vue b/src/views/specialWorkManage/workTicket/workApply/components/fire.vue
index 9901691..d770f5d 100644
--- a/src/views/specialWorkManage/workTicket/workApply/components/fire.vue
+++ b/src/views/specialWorkManage/workTicket/workApply/components/fire.vue
@@ -4,42 +4,32 @@
 		<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef">
 			<div class="homeCard">
 			<el-row>
-				<el-col :span="12">
-					<el-form-item label="作业人" prop="operatorUids">
-						<el-select v-model="form.operatorUids" multiple>
-							<el-option
-									v-for="item in workerList"
-									:key="item.id"
-									:label="item.realname + '(' + item.username.toString().replace(/^(\d{3})\d{4}(\d{4})$/,'$1****$2') + ')'"
-									:value="item.id"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
                 <el-col :span="12">
-                    <el-form-item label="危险辨识" prop="hazardIdentification">
+                    <el-form-item label="施工单位" prop="operatorCompanys">
                         <el-input
-                            v-model="form.hazardIdentification"
-                            autosize
-                            type="textarea"
-                            placeholder="请输入危险辨识"
+                            v-model="form.operatorCompanys"
+                            placeholder="请输入施工单位"
                         />
                     </el-form-item>
                 </el-col>
-			</el-row>
-			<el-row>
 				<el-col :span="12">
-					<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 label="作业人" prop="operatorUnames">
+<!--						<el-select v-model="form.operatorUids" multiple>-->
+<!--							<el-option-->
+<!--									v-for="item in workerList"-->
+<!--									:key="item.id"-->
+<!--									:label="item.realname + '(' + item.username.toString().replace(/^(\d{3})\d{4}(\d{4})$/,'$1****$2') + ')'"-->
+<!--									:value="item.id"-->
+<!--							/>-->
+<!--						</el-select>-->
+                        <el-input
+                            v-model="form.operatorUnames"
+                            placeholder="请输入作业人"
+                        />
 					</el-form-item>
 				</el-col>
+			</el-row>
+			<el-row>
 				<el-col :span="12">
 					<el-form-item label="作业时间" prop="workTimeLine">
 						<el-date-picker
@@ -52,6 +42,18 @@
 						/>
 					</el-form-item>
 				</el-col>
+                <el-col :span="12">
+                    <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-row>
 			<el-row>
 				<el-col :span="12">
@@ -75,6 +77,19 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="危险辨识" prop="hazardIdentification">
+                        <el-input
+                            v-model="form.hazardIdentification"
+                            autosize
+                            type="textarea"
+                            placeholder="请输入危险辨识"
+                        />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+                <el-divider border-style="dashed"/>
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="动火方式" prop="workDetail.hotMethod">
@@ -119,7 +134,8 @@
         data(){
             return{
                 form: {
-                    operatorUids: [],
+                    operatorCompanys: '',
+                    operatorUnames: '',
                     workType: 1,
                     workLevel: null,
                     workContent: '',
@@ -192,10 +208,11 @@
                     }
                 ],
                 applyRules:{
-                    operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'change' }],
+                    operatorUnames: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+                    operatorCompanys: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
-                    workLevel: [{ required: true, message: '该内容不能为空', trigger: 'change' }],
+                    workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -211,7 +228,6 @@
                         this.form.expEndTime = JSON.parse(JSON.stringify(this.form.workTimeLine))[1]
                         let { workTimeLine, ...data } = JSON.parse(JSON.stringify(this.form))
                         data.workDetail.otherSpecialWork = data.workDetail.otherSpecialWork.join(',')
-                        console.log(data,'data')
                         const res = await workApplyApi().postFireApply(data)
                         if (res.data.code === '200') {
                             this.$message({
@@ -220,7 +236,8 @@
                             });
                             this.$refs["ruleFormRef"].clearValidate()
                             this.form = {
-                                operatorUids: [],
+                                operatorCompanys: '',
+                                operatorUnames: '',
                                 workType: 1,
                                 workLevel: null,
                                 workContent: '',

--
Gitblit v1.9.2