moluofu 2 éve
szülő
commit
6867855802

+ 3 - 2
pages/addHandle/index.vue

@@ -28,7 +28,7 @@
 				<u-popup v-if="type != 2" @close="nameShow=false" :closeOnClickOverlay="true" @cancel="nameShow=false" :overlay="false"
 					:show="nameShow">
 					<view style="height: 500rpx; position: relative; display: flex; justify-content: center;">
-						<view style="position: absolute; top: 20rpx; z-index: 999999;">
+						<view style="position: absolute; top: 80rpx; z-index: 999999; background: #fff;">
 							<input class="inp" confirm-type="search" v-model="key" @input="serName"
 								placeholder="学生姓名" />
 							<u-icon class="inp-img" name="search" color="#8C8C8C" size="49rpx"></u-icon>
@@ -295,9 +295,10 @@
 					console.log(res)
 					this.getClass(res.data.classId)
 					this.classCheck.label = res.data.className
+					this.classCheck.value = res.data.classId
 					this.nameCheck.label = res.data.name
+					this.nameCheck.value = id
 					this.formData.sex = res.data.sex
-
 					for (let item of this.formData.disposeRecords) {
 						item.studentId = res.data.studentId
 					}

+ 4 - 2
pages/details/index.vue

@@ -22,16 +22,18 @@
 		
 		<view class="text-block">
 			<text class="text-title">症状体征照片</text>
-			<text class="text-img" v-for="item in detailsData.symptomImgs">
+			<text v-if="detailsData.symptomImgs.length != 0" class="text-img" v-for="item in detailsData.symptomImgs">
 				<image :src="item"></image>
 			</text>
+			<text v-else style="float: right; width: 447rpx;  word-wrap: break-word;">无</text>
 		</view>
 		
 		<view class="text-block">
 			<text class="text-title">处置后照片</text>
-			<text class="text-img" v-for="item in detailsData.emergencyImgs">
+			<text v-if="detailsData.emergencyImgs.length != 0" class="text-img" v-for="item in detailsData.emergencyImgs">
 				<image :src="item"></image>
 			</text>
+			<text v-else style="float: right; width: 447rpx;  word-wrap: break-word;">无</text>
 		</view>
 		
 		<view class="text-block">

+ 3 - 3
pages/face/index.vue

@@ -471,7 +471,7 @@
 	}
 
 	.submit {
-		margin-top: 580rpx;
+		margin-top: 450rpx;
 	}
 
 	.skip {
@@ -537,8 +537,8 @@
 
 	.btn {
 		--hue: 190;
-		--btn-bg-color: hsl(var(--hue), 100%, 50%);
-		--btn-bg-color-darker: hsl(var(--hue), 100%, 45%);
+		// --btn-bg-color: hsl(var(--hue), 100%, 50%);
+		// --btn-bg-color-darker: hsl(var(--hue), 100%, 45%);
 		position: relative;
 		padding: 0.75rem 1.5rem;
 		margin: 1rem;

+ 1 - 0
pages/index/index.vue

@@ -318,6 +318,7 @@
 				if (this.status == 'loading') {
 					return
 				}
+				this.key = ''
 				this.page = 1
 				this.tobu = data
 				this.listData = []

+ 0 - 15
pages/leave/index.vue

@@ -173,7 +173,6 @@
 			<image src="../../static/icon.svg"></image>
 		</view>
 		
-		<u-loading-page :loading="loading" loading-text="加载中" bg-color="rgba(0,0,0,0.60)" style="z-index: 999999;"></u-loading-page>
 	</view>
 </template>
 
@@ -247,7 +246,6 @@
 		methods: {
 			// 获取数据
 			getData(){
-				this.loading = true
 				this.$request({
 					url: this.$api.leave.orgStudentWork,
 					header: {
@@ -266,14 +264,8 @@
 					}else{
 						this.leaveData = res.data[0]
 					}
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				}).catch(err=>{
 					console.log('err' , err)
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				})
 			},
 			
@@ -383,7 +375,6 @@
 			
 			// 记录获取列表数据
 			getListTwo(){
-				this.loading = true
 				let tenantId = localStorage.getItem('tenant_id')
 				this.$request({
 					url: this.$api.leave.page,
@@ -401,14 +392,8 @@
 				}).then(res=>{
 					// console.log('res', res)
 					this.listDataTwo = res.data.records
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				}).catch(err=>{
 					console.log('err' , err)
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				})
 			},