ldeyun/cxc-szcx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yzqUniapp' into 'master'

Browse Source 
1.1.9

See merge request cxcxt/cxc-szcx-uniapp!15
This commit is contained in:
杨哲琦 2025-03-01 11:43:40 +08:00
commit 386bbe312c
5 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -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

1
.env.production
View File

@ -1,4 +1,3 @@
# 生产环境
# 请求接口地址
VITE_REQUEST_BASE_URL = https://36.112.48.190
#VITE_REQUEST_BASE_URL = http://10.75.15.247:8080

4
manifest.json
View File

@ -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" : {

41
pages/views/renliziyuan/qingjiaxinxi/index.vue
View File

@ -13,13 +13,24 @@
@change="departChange"></trq-depart-select>
</uni-col>
</uni-row>
<uni-row v-show="!username">
<uni-col :span="12"><uni-title title="姓名" align="left" type="h5"></uni-title></uni-col>
<uni-col :span="12"><uni-title title="劳动合同号" align="left" type="h5"></uni-title></uni-col>
</uni-row>
<uni-row v-show="!username">
<uni-col :span="12">
<uni-easyinput v-model="realname" placeholder="姓名模糊查询" @change="Search" @clear="Search"/>
</uni-col>
<uni-col :span="12">
<uni-easyinput v-model="contractNumber" placeholder="劳动合同号查询" @change="Search" @clear="Search"/>
</uni-col>
</uni-row>
<uni-row>
<uni-col :span="24"><uni-title title="请假时间" align="left" type="h5"></uni-title></uni-col>
</uni-row>
<uni-row>
<uni-col :span="24">
<uni-datetime-picker v-model="range" type="daterange" rangeSeparator="至"
@input="handleInput" />
<uni-datetime-picker v-model="range" type="daterange" rangeSeparator="至" @input="handleInput" />
</uni-col>
</uni-row>
<!-- ECharts图表 -->
@ -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) => {})
}

2
uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue
View File

@ -1,7 +1,7 @@
<template>
<view v-if="returnCodeOrID === 'orgCode'">
<uni-data-picker v-model="selectDepartID" ref="depart" :openSearch="true" :ellipsis="true"
placeholder="请选择单位code" popup-title="请选择单位" :localdata="departList" @nodeclick="onnodeclick"
placeholder="请选择单位" popup-title="请选择单位" :localdata="departList" @nodeclick="onnodeclick"
@popupclosed="onpopupclosed" :map="{'text':'title','value':'orgCode'}"
class="no-wrap-picker"></uni-data-picker>
</view>