Ver código fonte

办证功能修改

tanxue 2 meses atrás
pai
commit
a04df8a285

+ 0 - 7
common/styles/global/components.scss

@@ -120,13 +120,6 @@ view{box-sizing: border-box;}
 		.nav-bar-right-icon{font-size: 42rpx;color: #666;}
 		.nav-bar-right-icon + .nav-bar-right-icon{margin-left: 24rpx;}
 	}
-	// 带筛选按钮的
-	.filter-btn{position: absolute;right:80rpx;font-size: 28rpx;bottom:20rpx;color: #666;}
-	.filter-btn::after{
-		content: '';width: 0;height: 0;position: absolute;bottom: 5rpx;right: -12rpx;
-		border-left: 4rpx solid transparent;border-top: 4rpx solid transparent;
-		border-bottom: 4rpx solid #666;border-right: 4rpx solid #666;
-	}
 }
 // 两个元素
 .icon-title-navBar-box,.icon-title-bjcolor-navBar-box{

+ 27 - 1
common/styles/global/pages.scss

@@ -180,7 +180,7 @@
 .phone-list-page{
 	box-sizing: border-box;
 	.phone-scroll-view {height: calc(100vh - 182rpx - var(--status-bar-height));}
-	.phone-scroll-saixuan-view {height: calc(100vh - 188rpx - var(--status-bar-height));}
+	.phone-scroll-saixuan-view {height: calc(100vh - 270rpx - var(--status-bar-height));}
 	.admin-phone-scroll-view{height: calc(100vh - 312rpx - var(--status-bar-height));}
 	.admin-list-box{
 		.admin-list-item-box{border-bottom: 20rpx solid #f4f6fa;}
@@ -795,6 +795,32 @@
 			}
 		}
 	}
+	// 办证状态
+	.banzheng-search-box{
+		width: 100%;box-sizing: border-box;padding: 20rpx 20rpx;position: relative;
+		display: flex;justify-content: space-between;align-items: center;border-top: 1rpx solid #f4f6fa;
+		.select-item-box{
+			font-size: 30rpx;
+			.select-jt-default,.select-jt-click{
+				width: 16rpx;height: 16rpx;vertical-align: middle;margin-left: 10rpx;
+				background-image: url("@/static/images/common/sanjiao-shixin-icon.svg");@include ezy-no-repeat-contain();
+			}
+			.select-jt-click{transform: rotate(180deg);}
+		}
+		
+		// 带筛选按钮的
+		.filter-btn{font-size: 28rpx;color: #666;position: relative;margin-right: 20rpx;}
+		.filter-btn::after{
+			content: '';width: 0;height: 0;position: absolute;bottom: 5rpx;right: -12rpx;
+			border-left: 4rpx solid transparent;border-top: 4rpx solid transparent;
+			border-bottom: 4rpx solid #666;border-right: 4rpx solid #666;
+		}
+	}
+	.banzheng-type-box{
+		position: absolute;top: 80rpx;left: 0;right: 0;bottom: 0;
+		z-index: 2;background-color: rgba(0,0,0,0.3);
+		.data-check-radio-group{height: 500rpx;border:1rpx solid #f5f5f5;align-content: flex-start;}
+	}
 }
 /*** 筛选 ***/
 .phone-filter-page{

+ 7 - 7
pages/admin/banzheng/filter.vue

@@ -26,10 +26,10 @@
 			</view>
 			
 			<!-- 办证状态 -->
-			<view class="filter-body-name">办证状态</view>
+			<!-- <view class="filter-body-name">办证状态</view>
 			<view class="phone-radio-group filter-radio-group">
 				<view class="phone-radio-item" v-for="(item,index) in banzhengList" :class="{radioActive: showData.banzhengId===index}" @click="radioSelect('bzStatus',item,index)">{{item.name}}</view>
-			</view>
+			</view> -->
 			
 			<!-- 考试状态 -->
 			<view class="filter-body-name">考试状态</view>
@@ -56,7 +56,7 @@
 		jigouId: '',
 		zhiyeId: '',
 		levelId: '',
-		banzhengId: '',
+		// banzhengId: '',
 		kaoshiId: '',
 	})
 	// 传到父组件
@@ -64,7 +64,7 @@
 		jigouId: '',
 		zhiyeId: '',
 		levelId: '',
-		banzhengId: '',
+		// banzhengId: '',
 		kaoshiId: '',
 	})
 	const bzJigouList = ref([]);
@@ -140,10 +140,10 @@
 			    showData.levelId = index;
 				bzData.levelId = item.id;
 			    break;	
-			case 'bzStatus':
+			/* case 'bzStatus':
 			    showData.banzhengId = index;
 				bzData.banzhengId = item.id;
-			    break;
+			    break; */
 			case 'ksStatus':
 			    showData.kaoshiId = index;
 				bzData.kaoshiId = item.id;
@@ -159,7 +159,7 @@
 		bzData.jigouId = '';
 		bzData.zhiyeId = '';
 		bzData.levelId = '';
-		bzData.banzhengId =  '';
+		// bzData.banzhengId =  '';
 		bzData.kaoshiId =  '';
 		
 		showData.jigouId = '';

+ 35 - 4
pages/admin/banzheng/list.vue

@@ -2,10 +2,20 @@
 	<view class="phone-list-page phone-banzheng-page">
 		<view class="phone-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
-			<view class="filter-btn" @click="filterBtn">筛选</view>
 			<text class="nav-bar-title">办证管理</text>
 			<uni-icons class="nav-bar-right-icon" type="search" size="18" color="#666" @click="searchBtn"></uni-icons>
 		</view>
+		<view class="banzheng-search-box">
+			<view @click.stop="clickAlltype" class="select-item-box">
+				<text>{{data.bzztName}}</text>
+				<icon class="select-jt-default" />
+			</view>
+			<view class="filter-btn" @click="filterBtn">筛选</view>
+		</view>
+		<view class="banzheng-type-box" v-show="isOpen" @click="clickAlltype">
+			<dataChecked :list="allType" mode="single" :defaultCount="99" :showAdd="false"
+				@change="selectChangeSkill" />
+		</view>
 		<!-- 课程列表 -->
 		<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 			:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
@@ -69,6 +79,8 @@
 </template>
 
 <script setup>
+	import * as banzhengApi from "@/api/banzheng.js"
+	import dataChecked from '../Jiazheng/common/dataChecked.vue';
 	import customTabbarClientVue from "@/components/custom-tabbar/custom-tabbar-admin.vue";
 	import filterDialog from "./filter.vue";
 	import commonDialog from '@/components/dialog/commonDialog.vue';
@@ -97,6 +109,7 @@
 	const deleteConcent = ref('你确定要执行这个操作吗');
 
 	const data = reactive({
+		bzztName: '全部状态',
 		jgId: '', // 机构ID
 		realName: '', // 姓名
 		statusBanzheng: '', // 办证状态
@@ -117,7 +130,25 @@
 		from: ''
 	})
 
-
+	/*** 办证状态 ***/
+	let isOpen = ref(false)
+	let allType = ref([])
+	function getKaozhengBanzhengList(){
+		banzhengApi.getKaozhengBanzheng().then(res => {
+			const newItem = { id: 0, name: '全部状态' };
+			allType.value = [newItem,...res.data ];
+		})
+	}
+	const clickAlltype = (data) => {
+		isOpen.value = !isOpen.value;
+	}
+	function selectChangeSkill(item) {
+		data.statusBanzheng = item[0].id == 0 ? '' :item[0].id;
+		data.bzztName = item[0].name;
+		data.page = 0;
+		refreshData();
+	}
+	
 	function deleteFun(data) {
 		console.log('data', data);
 		deleteId.value = data.id
@@ -168,7 +199,7 @@
 			from: 'banzheng'
 		}
 		uni.redirectTo({
-			url: `/pages/admin/Jiazheng/jiazhengUserInfo?pageInfo=` + JSON.stringify(pageInfo)
+			url: "/pages/admin/Jiazheng/jiazhengUserManager?pageInfo=" + JSON.stringify(pageInfo)
 		})
 	}
 
@@ -251,7 +282,6 @@
 		data.jgId = dialogData.jigouId;
 		data.zyId = dialogData.zhiyeId;
 		data.zyLevel = dialogData.levelId;
-		data.statusBanzheng = dialogData.banzhengId;
 		data.statusKaoshi = dialogData.kaoshiId;
 		data.page = 0;
 		refreshData();
@@ -293,5 +323,6 @@
 
 	onShow(() => {
 		getMore()
+		getKaozhengBanzhengList();
 	})
 </script>