Merge branch '2025北京诚祥App' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥App

api/zijiazhenggongsi.js

@@ -22,4 +22,16 @@ export function getZiJiazhengGongsiInfo(data = {}) {
         data,
         timeout: 20000
     })
+}
+
+export function getKzchaxunInfo(data = {}) {
+    return request({
+        url: '/app/user/kzchaxun/info',
+        headers: {
+            isToken: true
+        },
+        method: 'post',
+        data,
+        timeout: 20000
+    })
 }

pages.json

@@ -375,6 +375,13 @@
 			{
 					"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/admin/Kaoshi/checkList",
+			"style" : 
+			{
+					"navigationStyle": "custom"
+			}
 		}
 		
 	],

pages/admin/Hetong/addSanfangHetong.vue

@@ -150,10 +150,11 @@
 		const id = data.mobanList[data.mobanIndex] && data.mobanList[data.mobanIndex].id;
 		
 		if (id) {
+			uni.showLoading({ mask: true})
 			httpApi.getHetongSanfangMoban({id: id}).then(res => {
 				 pdfRef.value.showPDF(res.data.base64List)
 			}).finally(() => {
-				
+				uni.hideLoading()
 			})
 		}
 	}

pages/admin/Hetong/components/fuzhuXiaohai.vue

@@ -7,8 +7,8 @@
 			</view>
 		</view>
 		<view class="fwnr-label-input">
-			<view class="fwnr-form-label"><text class="form-label-require"></text>孩子人数</view>
-			<uni-easyinput v-model="data.hetong.fzHaizi" placeholder="请输入照顾几个孩子" />
+			<view class="fwnr-form-label"><text class="form-label-require"></text>孩子人数(人)</view>
+			<uni-easyinput v-model="data.hetong.fzHaizi" placeholder="例子：1" />
 		</view>
 		<haiziNianlingVue2 @change="onChange"></haiziNianlingVue2>
 	</view>

pages/admin/Hetong/components/haiziNianling.vue

@@ -1,7 +1,7 @@
 <template>
 	<view v-for="(item,index) in myData.children" :key="item.timer" class="fwnr-label-input">
-		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">孩子年龄</template></view>
-		<uni-easyinput v-model="item.age" placeholder="请输入孩子年龄(月数)" @change="onChange" />
+		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">孩子年龄(月)</template></view>
+		<uni-easyinput v-model="item.age" placeholder="例子：5" @change="onChange" />
 		<view @click="handleAdd" v-if="myData.children.length == 1" class="fwnr-add-btn"><icon></icon></view>
 		<view @click="handleAdd" class="fwnr-add-btn"
 			v-else-if="myData.children.length-1 == index && myData.children.length != 1 && myData.children.length<3">

pages/admin/Hetong/components/haiziNianling2.vue

@@ -1,7 +1,7 @@
 <template>
 	<view v-for="(item,index) in myData.children" :key="item.timer" class="fwnr-label-input">
-		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">孩子年龄</template></view>
-		<uni-easyinput v-model="item.age" placeholder="请输入孩子年龄" @change="onChange" />
+		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">孩子年龄(岁)</template></view>
+		<uni-easyinput v-model="item.age" placeholder="例子：8" @change="onChange" />
 		<view @click="handleAdd" v-if="myData.children.length == 1" class="fwnr-add-btn"><icon></icon></view>
 		<view @click="handleAdd" class="fwnr-add-btn"
 			v-else-if="myData.children.length-1 == index && myData.children.length != 1 && myData.children.length">

pages/admin/Hetong/components/jiawuItem.vue

@@ -7,12 +7,12 @@
 			 </view>
 		</view>
 		<view class="fwnr-label-input">
-			<view class="fwnr-form-label"><text class="form-label-require"></text>住房面积</view>
-			<uni-easyinput v-model="data.hetong.mianji" placeholder="请输入住房面积" />
+			<view class="fwnr-form-label"><text class="form-label-require"></text>住房面积(平方米)</view>
+			<uni-easyinput v-model="data.hetong.mianji" placeholder="例子：100" />
 		</view>
 		<view class="fwnr-label-input">
-			<view class="fwnr-form-label"><text class="form-label-require"></text>常驻人口</view>
-			<uni-easyinput v-model="data.hetong.renkou" placeholder="请输入常驻人口" />
+			<view class="fwnr-form-label"><text class="form-label-require"></text>常驻人口(人)</view>
+			<uni-easyinput v-model="data.hetong.renkou" placeholder="例子：1" />
 		</view>
 	</view>
 </template>

pages/admin/Hetong/components/laorenNianling.vue

@@ -1,7 +1,7 @@
 <template>
 	<view v-for="(item,index) in myData.children" :key="item.timer" class="fwnr-label-input">
-		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">老人年龄</template></view>
-		<uni-easyinput v-model="item.age" placeholder="请输入老人年龄" @change="onChange" />
+		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">老人年龄(岁)</template></view>
+		<uni-easyinput v-model="item.age" placeholder="例子：80" @change="onChange" />
 		<view @click="handleAdd" v-if="myData.children.length == 1" class="fwnr-add-btn"><icon></icon></view>
 		<view @click="handleAdd" class="fwnr-add-btn"
 			v-else-if="myData.children.length-1 == index && myData.children.length != 1 && myData.children.length<3">

pages/admin/Hetong/components/quanzhiXiaohai.vue

@@ -7,8 +7,8 @@
 			</view>
 		</view>
 		<view class="fwnr-label-input">
-			<view class="fwnr-form-label"><text class="form-label-require"></text>孩子人数</view>
-			<uni-easyinput v-model="data.hetong.qzHaizi" placeholder="请输入照顾几个孩子" />
+			<view class="fwnr-form-label"><text class="form-label-require"></text>孩子人数(人)</view>
+			<uni-easyinput v-model="data.hetong.qzHaizi" placeholder="例子：1" />
 		</view>
 		<haiziNianlingVue @change="onChange"></haiziNianlingVue>
 	</view>

pages/admin/Hetong/components/zhaoguLaoren.vue

@@ -14,8 +14,8 @@
 			</view>
 		</view>
 		<view class="fwnr-label-input">
-			<view class="fwnr-form-label"><text class="form-label-require"></text>老人人数</view>
-			<uni-easyinput v-model="data.hetong.laoren" placeholder="请输入照顾几位老人" />
+			<view class="fwnr-form-label"><text class="form-label-require"></text>老人人数(人)</view>
+			<uni-easyinput v-model="data.hetong.laoren" placeholder="例子： 1" />
 		</view>
 		<laorenNianling @change="onChange"></laorenNianling>
 	</view>

pages/admin/Kaoshi/checkList.vue

@@ -0,0 +1,135 @@
+<template>
+	<view class="phone-zjzgs-page">
+		<view class="icon-title-navBar-box">
+			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<text class="nav-bar-title">考试查询</text>
+		</view>
+		<view class="jiazheng-search-box">
+			<uni-datetime-picker v-model="data.range" type="daterange" @change="onDateSelect" style="flex: 1"
+				class="yishou-date-box" />
+		</view>
+		<view v-show="data.showA||data.showB||data.showC||data.showD">
+			<view :class="{active: data.showA}" @click="handleShow(1)">需要考试</view>
+			<view :class="{active: data.showB}" @click="handleShow(2)">考试通过</view>
+			<view :class="{active: data.showC}" @click="handleShow(3)">考试未通过</view>
+			<view :class="{active: data.showD}" @click="handleShow(4)">未考试</view>
+		</view>
+
+<hr>
+		<view v-show="data.showA">
+			<view>总数：{{data.listA.length}}</view>
+			<view v-for="item in data.listA" :key="item.userName">
+				<view>用户名：{{item.realName}}</view>
+				<view>手机号：{{item.userName}}</view>
+				<view>职业名称：{{item.zyName}}</view>
+				<view>职业等级：{{item.zyLevel}}</view>
+			</view>
+		</view>
+		<view v-show="data.showB">
+			<view>总数：{{data.listB.length}}</view>
+			<view v-for="item in data.listB" :key="item.userName">
+				<view>用户名：{{item.realName}}</view>
+				<view>手机号：{{item.userName}}</view>
+				<view>职业名称：{{item.zyName}}</view>
+				<view>职业等级：{{item.zyLevel}}</view>
+			</view>
+		</view>
+		<view v-show="data.showC">
+			<view>总数：{{data.listC.length}}</view>
+			<view v-for="item in data.listC" :key="item.userName">
+				<view>用户名：{{item.realName}}</view>
+				<view>手机号：{{item.userName}}</view>
+				<view>职业名称：{{item.zyName}}</view>
+				<view>职业等级：{{item.zyLevel}}</view>
+			</view>
+		</view>
+		<view v-show="data.showD">
+			<view>总数：{{data.listD.length}}</view>
+			<view v-for="item in data.listD" :key="item.userName">
+				<view>用户名：{{item.realName}}</view>
+				<view>手机号：{{item.userName}}</view>
+				<view>职业名称：{{item.zyName}}</view>
+				<view>职业等级：{{item.zyLevel}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import * as httpApi from "@/api/zijiazhenggongsi"
+	import {
+		reactive,
+		ref
+	} from "vue";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+
+	const data = reactive({
+		list: [], // 办证列表
+		range: [],
+		showA: false,
+		showB: false,
+		showC: false,
+		showD: false,
+		listA: [],
+		listB: [],
+		listC: [],
+		listD: [],
+	})
+
+	function onDateSelect(data1) {
+		data.range = data1;
+		httpApi.getKzchaxunInfo({
+			endDate: data.range[1],
+			startDate: data.range[0]
+		}).then(res => {
+			data.listA = res.data.list;
+			data.listB = res.data.ytgList;
+			data.listC = res.data.wtgList;
+			data.listD = res.data.wksList;
+
+			data.showA = true;
+			data.showB = false;
+			data.showC = false;
+			data.showD = false;
+		})
+	}
+
+	function handleShow(code) {
+		if (code == 1) {
+			data.showA = true;
+			data.showB = false;
+			data.showC = false;
+			data.showD = false;
+		}
+		if (code == 2) {
+			data.showA = false;
+			data.showB = true;
+			data.showC = false;
+			data.showD = false;
+		}
+		if (code == 3) {
+			data.showA = false;
+			data.showB = false;
+			data.showC = true;
+			data.showD = false;
+		}
+		if (code == 4) {
+			data.showA = false;
+			data.showB = false;
+			data.showC = false;
+			data.showD = true;
+		}
+	}
+
+	function goUpPage() {
+		uni.redirectTo({
+			url: `/pages/admin/ShouYe/shouye`
+		})
+	}
+</script>
+
+<style>
+
+</style>

pages/admin/ShouYe/shouye.vue

@@ -79,6 +79,10 @@
 				<icon class="index-icon kc-icon"></icon>
 				<text>课程管理</text>
 			</view>
+			<view @click="goToPage('kscx')" class="card-item-box">
+				<icon class="index-icon kz-icon"></icon>
+				<text>考试查询</text>
+			</view>
 		</view>
 		<view class="card-list-box">
 			<view class="card-list-title">合同管理</view>
@@ -261,6 +265,12 @@
 	// 获取用户头像
 	function goToPage(data) {
 		switch (data) {
+			case  'kscx':
+				uni.redirectTo({
+					url: '/pages/admin/Kaoshi/checkList'
+				})
+			break;
+			
 			case 'jz':
 				uni.redirectTo({
 					url: '/pages/admin/Jiazheng/index'

pages/admin/kehu/kehuInfo.vue

@@ -12,7 +12,7 @@
 
 			<view class="form-label-input">
 				<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
-				<uni-easyinput type="number" v-model="formData.userName" placeholder="请输入手机号" maxlength="11" />
+				<uni-easyinput type="number" :disabled="formData.userId" v-model="formData.userName" placeholder="请输入手机号" maxlength="11" />
 			</view>
 			<view class="form-label-input">
 				<view class="phone-form-label">
@@ -32,7 +32,6 @@
 		<button type="default" class="phone-green-btn info-btn" @click="saveBtn">保存</button>
 
 		<commonDialogVue ref="comRefAdd" :content="contentAdd" @confirm-btn="htAdd2"></commonDialogVue>
-		<commonDialogVue ref="comRefEditor" :content="contentEditor" @confirm-btn="htAdd2"></commonDialogVue>
 	</view>
 </template>
 
@@ -45,6 +44,9 @@
 		onLoad
 	} from "@dcloudio/uni-app";
 	import * as khApi from "@/api/kehu.js"
+	import commonDialogVue from "@/components/dialog/commonDialog.vue"
+	
+	
 	const formData = reactive({
 		realName: '',
 		userName: '',
@@ -58,10 +60,8 @@
 	})
 
 	const contentAdd = ref('');
-	const contentEditor = ref('');
 
 	const comRefAdd = ref(null);
-	const comRefEditor = ref(null)
 
 	// 返回
 	function goUpPage() {
@@ -213,50 +213,6 @@
 			idtype: formData.idtype,
 			idcard: formData.idcard,
 			jutidizhi: formData.jutidizhi,
-			checked: 0
-		}
-		khApi.getKehuUpdate(opt).then(res => {
-			if (res.data.result) {
-				uni.showToast({
-					title: '编辑成功'
-				})
-				goUpPage();
-			} else {
-				contentEditor.value = res.data.message;
-				comRefEditor.value.handleShow();
-			}
-		}).finally(() => {
-			uni.hideLoading()
-		})
-	}
-
-	function htEditor2() {
-		let arr = [];
-		if (!formData.realName) {
-			arr.push('姓名');
-		}
-		if (!formData.userName) {
-			arr.push('电话');
-		}
-		if (!formData.realName || !formData.userName) {
-			uni.showToast({
-				icon: 'none',
-				title: `请完善${arr.join('、')}信息！`
-			})
-			return;
-		}
-		uni.showLoading({
-			title: '更新中...',
-			mask: true
-		});
-		const opt = {
-			userId: formData.userId,
-			realName: formData.realName,
-			userName: formData.userName,
-			idtype: formData.idtype,
-			idcard: formData.idcard,
-			jutidizhi: formData.jutidizhi,
-			checked: 1
 		}
 		khApi.getKehuUpdate(opt).then(res => {
 			if (res.data) {