From 4eb676bf084925599cb725ee6c50344719891180 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Sat, 1 Mar 2025 11:43:33 +0800
Subject: [PATCH] 1.1.9
---
.env.development | 4 +-
.env.production | 1 -
manifest.json | 4 +-
.../views/renliziyuan/qingjiaxinxi/index.vue | 41 +++++++++++++++++--
.../trq-depart-select/trq-depart-select.vue | 2 +-
5 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/.env.development b/.env.development
index ad77649..00d46af 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
# 开发环境
# 请求接口地址
-VITE_REQUEST_BASE_URL = https://36.112.48.190
-#VITE_REQUEST_BASE_URL = http://10.75.15.249:8080
+# VITE_REQUEST_BASE_URL = https://36.112.48.190
+VITE_REQUEST_BASE_URL = http://10.75.15.249:8080
diff --git a/.env.production b/.env.production
index 391c2dd..5ca2ca3 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,3 @@
# 生产环境
# 请求接口地址
VITE_REQUEST_BASE_URL = https://36.112.48.190
-#VITE_REQUEST_BASE_URL = http://10.75.15.247:8080
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ac1880c..5de65f6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "数智产销",
"appid" : "__UNI__9F097F0",
"description" : "",
- "versionName" : "1.1.7",
- "versionCode" : 20250228,
+ "versionName" : "1.1.9",
+ "versionCode" : 20250302,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/views/renliziyuan/qingjiaxinxi/index.vue b/pages/views/renliziyuan/qingjiaxinxi/index.vue
index 8b9a4ce..2938848 100644
--- a/pages/views/renliziyuan/qingjiaxinxi/index.vue
+++ b/pages/views/renliziyuan/qingjiaxinxi/index.vue
@@ -13,13 +13,24 @@
@change="departChange">
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -73,6 +84,9 @@
const range = ref('') //日期查询
const type = ref('') //图表点击事件
const username = ref('') //用户名
+ const realname = ref('') //姓名查询
+ const contractNumber = ref('') //劳动合同号查询
+ const timeout = ref(null)
const store = useStore();
const list = ref([])
let pageNo = 1
@@ -95,21 +109,39 @@
range.value = []
type.value = ''
username.value = ''
+ realname.value = ''
+ contractNumber.value = ''
queryLeave()
}
function handleInput(e) {
- range.value = e;
queryLeave()
}
+ function Search() {
+ if (timeout.value) {
+ clearTimeout(timeout.value);
+ }
+ timeout.value = setTimeout(() => {
+ queryLeave()
+ }, 300); // 300ms 防抖时间
+ }
+
+ function clearSearch() {
+ console.log('-----',realname.value)
+ console.log('-----',contractNumber.value)
+
+ }
+
const queryLeave = (e) => {
let param = {
sysOrgCode: orgCode.value,
begin: range.value[0],
end: range.value[1],
type: type.value,
- username: username.value
+ username: username.value,
+ realname: realname.value,
+ contractNumbers: contractNumber.value
}
if (e == 1) { // 下拉刷新时，pageNo++
pageNo++;
@@ -135,6 +167,7 @@
if (res.success) {
list.value = [...list.value, ...res.result.records]
}
+
loading = false
}).catch((err) => {})
}
diff --git a/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue b/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue
index 0252e97..61b6f8e 100644
--- a/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue
+++ b/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue
@@ -1,7 +1,7 @@