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/power.vue |   86 +++++++++++++++++++++++++-----------------
 1 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/views/specialWorkManage/workTicket/workApply/components/power.vue b/src/views/specialWorkManage/workTicket/workApply/components/power.vue
index 27093fc..8c55629 100644
--- a/src/views/specialWorkManage/workTicket/workApply/components/power.vue
+++ b/src/views/specialWorkManage/workTicket/workApply/components/power.vue
@@ -4,28 +4,30 @@
 		<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="workContent">
+                    <el-form-item label="施工单位" prop="operatorCompanys">
                         <el-input
-                            v-model="form.workContent"
-                            autosize
-                            type="textarea"
-                            placeholder="请输入作业内容"
+                            v-model="form.operatorCompanys"
+                            placeholder="请输入施工单位"
                         />
                     </el-form-item>
                 </el-col>
+				<el-col :span="12">
+					<el-form-item label="作业人" prop="operatorUnames">
+<!--						<el-select v-model="form.operatorUnames" 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">
@@ -41,6 +43,18 @@
 					</el-form-item>
 				</el-col>
                 <el-col :span="12">
+                    <el-form-item label="作业内容" prop="workContent">
+                        <el-input
+                            v-model="form.workContent"
+                            autosize
+                            type="textarea"
+                            placeholder="请输入作业内容"
+                        />
+                    </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"
@@ -50,9 +64,18 @@
                         />
                     </el-form-item>
                 </el-col>
-			</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.powerAccessPoint">
@@ -87,16 +110,6 @@
 							/>
 						</el-form-item>
 					</el-col>
-                    <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>
 			</div>
 		</el-form>
@@ -117,7 +130,8 @@
         data(){
             return{
                 form: {
-                    operatorUids: [],
+                    operatorCompanys: '',
+                    operatorUnames: '',
                     workType: 7,
                     workLevel: 0,
                     workContent: '',
@@ -147,9 +161,10 @@
                     }
                 ],
                 applyRules:{
-                    operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'change' }],
+                    operatorCompanys: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+                    operatorUnames: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
-                    workLevel: [{ required: true, message: '该内容不能为空', trigger: 'change' }],
+                    workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
                     workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -176,7 +191,8 @@
                             });
                             this.$refs["ruleFormRef"].clearValidate()
                             this.form = {
-                                operatorUids: [],
+                                operatorCompanys: '',
+                                operatorUnames: '',
                                 workType: 7,
                                 workLevel: 0,
                                 workContent: '',
@@ -194,7 +210,7 @@
                         } else {
                         this.$message({
                                 type: 'warning',
-                                message: res.data.msg
+                                message: res.data.message
                             });
                         }
                     } else {

--
Gitblit v1.9.2