From 94f2a5bed82ae0281ce5b821570597f6d73c1ce9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期六, 20 八月 2022 16:51:38 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

---
 src/views/specialWorkSystem/workTicket/workApply/components/height.vue |   32 ++++++++------------------------
 1 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
index 4478df0..d0dc61f 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
@@ -9,9 +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"
+									:key="item.uid"
+									:label="item.username"
+									:value="item.uid"
 							/>
 						</el-select>
 					</el-form-item>
@@ -85,7 +85,9 @@
 								v-model="form.workDetail.operationHeight"
 								type="number"
 								placeholder="请输入"
-						/>
+						>
+							<template #append>米(m)</template>
+						</el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -126,7 +128,6 @@
 
 	interface stateType {
 		form: Object,
-		workerList: Array<any>,
 		workTypeList: Array<any>,
 		workLevelList: Array<any>,
 		heDepList: Array<any>,
@@ -135,6 +136,7 @@
 	export default defineComponent({
 		name: 'heightForm',
 		components: {},
+		props:['workerList'],
 		setup() {
 			const userInfo = useUserInfo()
 			const { userInfos } = storeToRefs(userInfo);
@@ -154,24 +156,6 @@
 					expStartTime: '',
 					expEndTime: ''
 				},
-				workerList:[
-					{
-						label: "张三",
-						value: 53
-					},
-					{
-						label: "李四",
-						value: 54
-					},
-					{
-						label: "测试一",
-						value: 55
-					},
-					{
-						label: "测试二",
-						value: 56
-					}
-				],
 				heDepList: [
 					{
 						label: "单位一",
@@ -333,7 +317,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