Browse Source

修改搜索框,补充清除内容按钮事件

v3
chenrui 2 years ago
parent
commit
260f0d5027
  1. 7
      src/util/util.js
  2. 3
      src/views/administrative/appointment.vue
  3. 3
      src/views/administrative/deptFilter.vue
  4. 2
      src/views/administrative/userFilter.vue
  5. 23
      src/views/enforce/earlyWarning.vue
  6. 22
      src/views/enforce/enforcementPlan.vue

7
src/util/util.js

@ -91,4 +91,11 @@ const formattedTime = (dateTime) =>{
return `${year}-${month}-${day} ${hour}:${minute}:${second}`; return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
} }
const alignNames = (name) =>{
if(name.length == 2){
name = name.substring(0,1) + " " + name.substring(1,2);
}
return name;
}
export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime}; export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime};

3
src/views/administrative/appointment.vue

@ -232,6 +232,7 @@
<van-date-picker <van-date-picker
type="time" type="time"
v-model="data.currentDate" v-model="data.currentDate"
:min-date="data.minDate"
@confirm="onConfirm" @confirm="onConfirm"
@cancel="data.showTimePicker = false" @cancel="data.showTimePicker = false"
/> />
@ -312,6 +313,7 @@
ga_columns: [], ga_columns: [],
item_columns: [], item_columns: [],
currentDate: [], currentDate: [],
minDate: [],
checked: false, checked: false,
deptChecked: false, deptChecked: false,
deptContent: '', deptContent: '',
@ -391,6 +393,7 @@
const month = (now.getMonth() + 1).toString().padStart(2, '0'); const month = (now.getMonth() + 1).toString().padStart(2, '0');
const day = now.getDate().toString().padStart(2, '0'); const day = now.getDate().toString().padStart(2, '0');
data.currentDate = [year, month, day] data.currentDate = [year, month, day]
data.minDate = new Date(year, month-1, day);
} }
const onConfirm = (time) => { const onConfirm = (time) => {

3
src/views/administrative/deptFilter.vue

@ -73,7 +73,7 @@
<script> <script>
import {ref} from 'vue' import {ref} from 'vue'
import {queryDepts, nextDeptByparentId, queryUsersNoPermission} from '../../api/user' import {queryDepts, nextDeptByparentId, queryUsersNoPermission} from '@/api/user'
import {Icon, showSuccessToast} from 'vant'; import {Icon, showSuccessToast} from 'vant';
const {useCommon} = $globalStore const {useCommon} = $globalStore
@ -159,6 +159,7 @@
}, },
cancel() { cancel() {
this.searchParam.deptName = ''; this.searchParam.deptName = '';
this.searchKey = '';
this.queryList() this.queryList()
}, },
selectData() { selectData() {

2
src/views/administrative/userFilter.vue

@ -29,7 +29,7 @@
<script> <script>
import {ref} from 'vue' import {ref} from 'vue'
import {queryUsers} from '../../api/user' import {queryUsers} from '@/api/user'
const {useCommon} = $globalStore const {useCommon} = $globalStore
export default { export default {

23
src/views/enforce/earlyWarning.vue

@ -11,6 +11,7 @@
clearable="true" clearable="true"
clear-icon="clear" clear-icon="clear"
clear-trigger="always" clear-trigger="always"
@clear="clearSearch"
@search="onSearch"> @search="onSearch">
<template #action> <template #action>
<div @click="onClickButton">搜索</div> <div @click="onClickButton">搜索</div>
@ -232,15 +233,35 @@
listLoading: false, // 是否加载中 listLoading: false, // 是否加载中
listFinished: false, // 是否加载完成标识 listFinished: false, // 是否加载完成标识
}); });
const clearSearch = () =>{
// 清空列表数据
data.dataList = [];
// data.finished = false;
// 重新加载数据
// 将 loading 设置为 true,表示处于加载状态
// data.loading = true;
searchParam.pageNum = 0;
data.curPage = 1;
data.refreshing = false;
data.finished = false;
data.loading = true;
onLoad();
}
//下拉刷新 //下拉刷新
const onRefresh = () => { const onRefresh = () => {
// 清空列表数据 // 清空列表数据
data.dataList = []; data.dataList = [];
data.finished = false; // data.finished = false;
// 重新加载数据 // 重新加载数据
// 将 loading 设置为 true,表示处于加载状态 // 将 loading 设置为 true,表示处于加载状态
// data.loading = true;
searchParam.pageNum = 0;
data.curPage = 1;
data.refreshing = false;
data.finished = false;
data.loading = true; data.loading = true;
onLoad(); onLoad();
}; };

22
src/views/enforce/enforcementPlan.vue

@ -15,6 +15,7 @@
clearable="true" clearable="true"
clear-icon="clear" clear-icon="clear"
clear-trigger="always" clear-trigger="always"
@clear="clearSearch"
@search="onSearch" @search="onSearch"
> >
<template #action> <template #action>
@ -157,7 +158,7 @@
data.dateSearch = nowDate(new Date()); data.dateSearch = nowDate(new Date());
}); });
const queryList = () => { const queryList = () => {
searchParam.pageNum = (data.curPage-1)*searchParam.pageSize; searchParam.pageNum = data.curPage;
queryEnforcementInspectionProgramList(searchParam, success => { queryEnforcementInspectionProgramList(searchParam, success => {
data.curPage++; data.curPage++;
data.loading = false; // 查出结果停止加载 data.loading = false; // 查出结果停止加载
@ -232,7 +233,7 @@
// 清空列表数据 // 清空列表数据
data.dataList = []; data.dataList = [];
data.finished = false; data.finished = false;
data.curPage = 1;
// 重新加载数据 // 重新加载数据
// 将 loading 设置为 true,表示处于加载状态 // 将 loading 设置为 true,表示处于加载状态
data.loading = true; data.loading = true;
@ -247,6 +248,21 @@
queryList(); queryList();
}, 1000); }, 1000);
}; };
const clearSearch = () =>{
// 清空列表数据
data.dataList = [];
// data.finished = false;
// 重新加载数据
// 将 loading 设置为 true,表示处于加载状态
// data.loading = true;
searchParam.pageNum = 0;
data.curPage = 1;
data.refreshing = false;
data.finished = false;
data.loading = true;
onLoad();
}
//获取分类下的商品列表 //获取分类下的商品列表
@ -343,6 +359,8 @@
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
background-color: #ebf3fb; background-color: #ebf3fb;
// padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
// padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
.header_body { .header_body {
height: 1.33rem; height: 1.33rem;

Loading…
Cancel
Save