From 2ffea51205b7eb94cf3fb7221aede7ff66669fc1 Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期一, 29 七月 2024 15:59:04 +0800
Subject: [PATCH] 新需求修改

---
 qiye/record/record.vue |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/qiye/record/record.vue b/qiye/record/record.vue
index 3f9de4d..b117ca2 100644
--- a/qiye/record/record.vue
+++ b/qiye/record/record.vue
@@ -32,7 +32,7 @@
 				</view>
 				<view class="box">
 					<view class="l">
-						<p>鎵ф硶鍗曚綅锛歿{item.executeDeptName|| item.applyDeptName}}</p>
+						<p style="display: flex;justify-content: flex-start;align-items: flex-start;"><text style="display: inline-block;width: 35%;">鎵ф硶鍗曚綅锛�</text> <text style="display: inline-block;width: 65%;">{{item.executeDeptName|| item.applyDeptName}}</text></p>
 						<p>鎵ф硶鏃堕棿锛歿{item.inTime || item.planTime}}</p>
 					</view>
 					<view class="r" @click="chakan(item.orderId)">
@@ -111,16 +111,22 @@
 
 					}
 				}, {
-					name: '寰呰瘎浠�',
-					value: {
-						isEva: 0
-					}
-				}, {
 					name: '鏈墽娉�',
 					value: {
 						orderStatus: 2
 					}
 				}, {
+					name: '寰呯‘璁�',
+					value: {
+						orderStatus: 4
+					}
+				}, {
+					name: '寰呰瘎浠�',
+					value: {
+						isEva: 0,
+						orderStatus: 5
+					}
+				},{
 					name: '宸茶瘎浠�',
 					value: {
 						isEva: 1
@@ -155,15 +161,20 @@
 				})
 			},
 			getList() {
+				uni.showLoading({
+					title: '鍔犺浇涓�...',
+					mask: true
+				})
 				let data = uni.getStorageSync("qiyedata")
 				this.queryParams.companyId = data.companyId
 				companyList({
 					...this.queryParams,
 					...this.list[this.current].value
 				}).then(val => {
-					// console.log(val.data)
 					this.total = val.data.total
 					this.list1 = [...this.list1, ...val.data.rows]
+				}).catch(err => {
+					uni.hideLoading()
 				})
 			},
 			click(i) {

--
Gitblit v1.9.1