From 56176b86dbe59645a26ae0a77cb352e98f8a3061 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 30 八月 2022 14:37:45 +0800
Subject: [PATCH] Default Changelist

---
 src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue |   61 +++++++++++-------------------
 1 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
index f9617a3..96038ec 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
@@ -9,23 +9,9 @@
 						<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="workLevel">
-						<el-select v-model="form.workLevel">
-							<el-option
-									v-for="item in workLevelList"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"
+									:key="item.uid"
+									:label="item.username"
+									:value="item.uid"
 							/>
 						</el-select>
 					</el-form-item>
@@ -46,6 +32,18 @@
 			</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>
+				</el-col>
+				<el-col :span="12">
 					<el-form-item label="作业内容" prop="workContent">
 						<el-input
 								v-model="form.workContent"
@@ -55,6 +53,8 @@
 						/>
 					</el-form-item>
 				</el-col>
+			</el-row>
+			<el-row>
 				<el-col :span="12">
 					<el-form-item label="作业地址" prop="workLocation">
 						<el-input
@@ -66,6 +66,7 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
+				<el-divider border-style="dashed"/>
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="吊装工具名称" prop="workDetail.hoistingToolName">
@@ -83,7 +84,9 @@
 								v-model="form.workDetail.weightMass"
 								type="number"
 								placeholder="请输入"
-						/>
+						>
+							<template #append>吨(t)</template>
+						</el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -110,12 +113,12 @@
 
 	interface stateType {
 		form: Object,
-		workerList: Array<any>,
 		workLevelList: Array<any>
 	}
 	export default defineComponent({
 		name: 'hoistForm',
 		components: {},
+		props:['workerList'],
 		setup() {
 			const userInfo = useUserInfo()
 			const { userInfos } = storeToRefs(userInfo);
@@ -134,24 +137,6 @@
 					expStartTime: '',
 					expEndTime: ''
 				},
-				workerList:[
-					{
-						label: "张三",
-						value: 53
-					},
-					{
-						label: "李四",
-						value: 54
-					},
-					{
-						label: "测试一",
-						value: 55
-					},
-					{
-						label: "测试二",
-						value: 56
-					}
-				],
 				workLevelList: [
 					{
 						label: "一级吊装作业",
@@ -238,7 +223,7 @@
 		.applyBtn{
 			width: 100%;
 			background: #fff;
-			height: 80px;
+			padding-top: 15px;
 			z-index: 5;
 			box-shadow: 0 -3px 8px rgba(150,150,150,.1);
 			display: flex;

--
Gitblit v1.9.2