-
-
-
- 搜索
-
-
-
-
-
- 全部
- 本月
- 本季
- 本年
- 筛选
-
-
-
-
- {{ dateSearchDisplay }}
-
-
-
-
-
-
+
@@ -82,30 +51,27 @@
import { queryEnforcementRegistrationPageList } from '@/api/enterprise';
import { showToast } from 'vant';
import 'vant/es/toast/style';
+import SearchFilterBar from '@/components/common/SearchFilterBar.vue';
const { useCommon } = $globalStore;
const router = useRouter();
+const searchFilterBarRef = ref(null);
+
// ========== 列表状态 ==========
const list = ref([]);
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
-const searchText = ref('');
// ========== 分页参数 ==========
const pageNum = ref(1);
const pageSize = ref(10);
-// ========== 日期筛选 ==========
+// ========== 筛选条件 ==========
+const searchText = ref('');
const dateType = ref(null);
const dateSearch = ref(null);
-const dateSearchDisplay = ref('');
-const dateShow = ref(false);
-const showDatePicker = ref(false);
-const currentDate = ref(['2026', '01']);
-const minDate = new Date(2020, 0, 1);
-const maxDate = new Date(2030, 11, 31);
// ========== 格式化日期 ==========
const formatDate = (dateStr) => {
@@ -135,15 +101,12 @@ const fetchList = () => {
pageSize: pageSize.value,
// enterpriseNumber: useCommon.enterpriseNumber,
};
- // 关键字搜索
if (searchText.value) {
params.searchValue = searchText.value;
}
- // 日期类型
if (dateType.value != null && dateType.value !== 9) {
params.dateType = dateType.value;
}
- // 指定月份
if (dateSearch.value) {
params.dateSearch = dateSearch.value;
}
@@ -210,8 +173,11 @@ const onRefresh = () => {
fetchList();
};
-// ========== 搜索 ==========
-const onSearch = () => {
+// ========== 筛选搜索 ==========
+const onSearchFilter = ({ searchText: st, dateType: dt, dateSearch: ds }) => {
+ searchText.value = st;
+ dateType.value = dt;
+ dateSearch.value = ds;
pageNum.value = 1;
list.value = [];
finished.value = false;
@@ -219,38 +185,6 @@ const onSearch = () => {
fetchList();
};
-// ========== 清空搜索 ==========
-const onClear = () => {
- searchText.value = '';
- onSearch();
-};
-
-// ========== 日期类型切换 ==========
-const searchDateType = (val) => {
- dateType.value = val;
- dateSearch.value = null;
- dateShow.value = false;
- onSearch();
-};
-
-// ========== 打开月份选择器 ==========
-const openDatePicker = () => {
- dateType.value = 9;
- showDatePicker.value = true;
-};
-
-// ========== 月份选择确认 ==========
-const onDateConfirm = (value) => {
- const year = value.selectedValues[0];
- const month = value.selectedValues[1];
- dateSearchDisplay.value = year + '/' + month;
- dateSearch.value = year + '-' + month;
- dateType.value = 9;
- dateShow.value = true;
- showDatePicker.value = false;
- onSearch();
-};
-
// ========== 跳转详情(只读查看,始终不显示提交按钮)==========
const toDetailView = (item) => {
router.push({
@@ -286,39 +220,6 @@ const toEvaluate = (id, checkItem) => {
}
}
-/* ===== 搜索按钮行 ===== */
-.search-button-list {
- display: flex;
- flex-direction: row;
- padding: 0.2rem 0.27rem 0;
- gap: 0.15rem;
- margin-bottom: 8px;
- .search-btn {
- flex: 1;
- height: 0.7rem;
- background: #ebebeb;
- border-color: #ebebeb;
- color: #999;
- font-size: 0.3rem;
- }
-
- .search-btn.active {
- background-color: #d9e6fd;
- border-color: #75a5fb;
- color: #1367fe;
- }
-}
-
-/* ===== 日期显示 ===== */
-.search-date-display {
- padding: 0.15rem 0.27rem 0;
-
- .date-label {
- color: #c1bfbf;
- font-size: 0.4rem;
- }
-}
-
/* ===== 卡片样式 ===== */
.card-item {
background: #fff;
@@ -416,22 +317,4 @@ const toEvaluate = (id, checkItem) => {
}
}
-/* ===== Vant 搜索框样式覆盖 ===== */
-:deep(.van-search__content) {
- height: 0.9rem;
- border: 1px solid #ececec;
- border-radius: 0.15rem 0 0 0.15rem;
-}
-
-:deep(.van-search__action) {
- margin: 0 3% 0 0;
- width: 10%;
- height: 0.9rem;
- background: #1367fe;
- border: 0.01rem solid #1367fe;
- border-radius: 0 0.15rem 0.15rem 0;
- color: #fff;
- text-align: center;
- line-height: 0.9rem;
-}
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawServiceList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawServiceList.vue
index de835fad..229e7075 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawServiceList.vue
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawServiceList.vue
@@ -1,13 +1,6 @@
-
-
-
+
@@ -60,6 +53,7 @@
import { getEducationServicesList } from '@/api/enterprise';
import { showToast } from 'vant';
import 'vant/es/toast/style';
+import SearchFilterBar from '@/components/common/SearchFilterBar.vue';
const router = useRouter();
@@ -71,6 +65,11 @@ const refreshing = ref(false);
const pageNum = ref(1);
const pageSize = ref(10);
+// ========== 搜索条件 ==========
+const searchText = ref('');
+const dateType = ref(null);
+const dateSearch = ref(null);
+
// ========== 格式化时间 ==========
const formatTime = (val) => {
if (!val) return '';
@@ -100,6 +99,15 @@ const fetchList = () => {
pageNum: pageNum.value,
pageSize: pageSize.value,
};
+ if (searchText.value) {
+ params.searchValue = searchText.value;
+ }
+ if (dateType.value != null && dateType.value !== 9) {
+ params.dateType = dateType.value;
+ }
+ if (dateSearch.value) {
+ params.dateSearch = dateSearch.value;
+ }
getEducationServicesList(params, (res) => {
if (res.code === 200) {
const rows = res.rows || res.data?.rows || [];
@@ -151,14 +159,16 @@ const onClickLeft = () => {
router.back();
};
-// ========== 筛选点击 ==========
-const onFilterClick = () => {
- showToast('筛选功能开发中');
-};
-
-// ========== 搜索点击 ==========
-const onSearchClick = () => {
- showToast('搜索功能开发中');
+// ========== 筛选搜索 ==========
+const onSearchFilter = ({ searchText: st, dateType: dt, dateSearch: ds }) => {
+ searchText.value = st;
+ dateType.value = dt;
+ dateSearch.value = ds;
+ pageNum.value = 1;
+ list.value = [];
+ finished.value = false;
+ loading.value = true;
+ fetchList();
};
// ========== 跳转详情 ==========
@@ -183,6 +193,7 @@ const toDetail = (item) => {
flex: 1;
overflow-y: auto;
padding: 0.27rem;
+ padding-top: 0px;
}
}
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/message/nosTaskList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/message/nosTaskList.vue
index 461ef1e9..b79bd488 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/message/nosTaskList.vue
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/message/nosTaskList.vue
@@ -1,11 +1,13 @@
-
+ /> -->
+
+
@@ -70,13 +72,14 @@