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

pages/admin/Chengji/ksScoreShijuan.vue

@@ -184,7 +184,7 @@
 		}
 		if (qa.stTypeId == 3) {
 			// 判断题
-			if (qa.reply == '') {
+			if (qa.reply === '') {
 				reply = '未答'
 			} else  if (qa.reply == 0) {
 				reply = '错误'

pages/admin/Jiazheng/common/jiazhengUpload.vue

@@ -3,6 +3,10 @@
 		<text v-if="!imageUrl">+</text>
 		<image v-else style="width: 100rpx;height: 100rpx;"   :src="imageUrl" mode=""></image>
 	</view>
+	
+	<view v-else-if="changjingType =='more'" class="admin-upload-btn-box" @click="showActionSheet">
+		<text>+</text>
+	</view>
 	<view v-else class="admin-upload-btn-box" @click="showActionSheet">
 	<text v-if="!imageUrl">+</text>
 	<image v-else style="width: 100rpx;height: 100rpx;"   :src="imageUrl" mode=""></image>

pages/admin/Jiazheng/gerenZiliao.vue

@@ -102,6 +102,7 @@
 					style="transform:scale(0.7)" />
 			</view>
 		</view>
+		
 		<view class="agree-section-box form-top-margin">
 			<checkbox-group @change="handleAgree">
 				<label class="checkbox">

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -7,7 +7,7 @@
 		<v-tabs v-model="current" :tabs="tabs" :scroll="false" @change="changeTab" field="name" class="admin-tab-box"></v-tabs>	
 		<gerenZiliao ref="gerenZiliao" @goNext="gerenziliaoNext" v-show="current ==0"></gerenZiliao>
 		<qiuzhiXinxi ref="qiuzhiXinxi" @goUp="goUpQiuzhixinxi" @goNext="goNextQiuzhixinxi" v-show="current ==1"></qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
+		<zhaopianZiliao ref="zhaopianZiliao" @goUp="goUpZhaopianZiliao" @goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
 		<banzhengXinxi ref="banzhengXinxi" v-show="current ==3"></banzhengXinxi>
 	</view>
 </template>
@@ -23,7 +23,7 @@
 	export default {
 		data() {
 			return {
-				current:1,
+				current:3,
 			//	tabs: ['个人资料', '求职信息', '照片资料', '办证信息']
 				tabs: [
 				  { id: 1, name: '个人资料', disabled: false },
@@ -62,6 +62,13 @@
 			goNextQiuzhixinxi(data,num){
 				this.current = num + 1
 				this.tabs[this.current].disabled = false
+			},	
+			goUpZhaopianZiliao(data,num){
+				this.current = num - 1
+			},
+			goNextZhaopianZiliao(data,num){
+				this.current = num + 1
+				this.tabs[this.current].disabled = false
 			},
 		}
 	}

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="form-label-switch">
 			<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>
-			<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" />
+		<!-- 	<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="ziliao-upload-box">
 			<view class="upload-item-box">
@@ -17,35 +17,35 @@
 		</view>
 		<view class="form-label-switch form-top-margin">
 			<view class="phone-form-label"><text class="form-label-require"></text>工作生活照</view>
-			<switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" />
+			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
 				<view v-if="shenghuizhaoList.length>0">
 					<view v-for="(item, index) in shenghuizhaoList" :key="index">
-						<img :src="item" alt="">
+						<img style="width: 100rpx;height: 100rpx;" :src="item" alt="">
 						<view @click="deleteShenghuoZhao(item,index)">删除</view>
 					</view>
 				</view>
 				<view>
-					<jiazhengUpload @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
+					<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
 				</view>
 			</view>
 		</view>
 		<view class="form-label-switch form-top-margin">
 			<view class="phone-form-label"><text class="form-label-require"></text>资格类照片</view>
-			<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)" />
+		<!-- 	<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
 				<view v-if="zigezhaoList.length>0">
 					<view v-for="(item, index) in zigezhaoList" :key="index">
-						<img :src="item" alt="">
+						<img style="width: 100rpx;height: 100rpx;" :src="item" alt="">
 						<view @click="deleteZigeZhao(item,index)">删除</view>
 					</view>
 				</view>
 				<view>
-					<jiazhengUpload @getFileUrl="getZgzhao"></jiazhengUpload>
+					<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
 				</view>
 			</view>
 		</view>
@@ -86,8 +86,8 @@
 		</view>
 
 		<view class="page-btn-box">
-			<button type="default" class="phone-white-btn">上一步</button>
-			<button type="default" class="phone-green-btn">下一步</button>
+			<button type="default" @click="goUp" class="phone-white-btn">上一步</button>
+			<button type="default" @click="goNext" class="phone-green-btn">下一步</button>
 		</view>
 	</view>
 </template>
@@ -102,8 +102,6 @@
 		data() {
 
 			return {
-				single: '',
-				tijianRiqi: false,
 				shenghuizhaoList: [],
 				zigezhaoList: [],
 				icon: '',
@@ -113,6 +111,7 @@
 				tijianDate: '',
 				tijianUrl: '',
 				jiankangDate: '',
+				zhengshuUrls: '',
 			}
 		},
 		components: {
@@ -164,6 +163,41 @@
 			switchZgChange(data) {
 				console.log('data', data);
 			},
+			
+			goNext() {
+				this.formData = {
+					icon:this.icon,
+					idcardUrl1:this.idcardUrl1,
+					idcardUrl2:this.idcardUrl2,
+					shenghuoUrls:this.shenghuizhaoList.join(','),
+					zhengshuUrls:this.zigezhaoList.join(','),
+					tijianDate:this.tijianDate,
+					jiankangDate:this.jiankangDate,
+					tijianUrl:this.tijianUrl,
+					
+				}
+				console.log('this.formData',this.formData);
+				// if(!this.formData.agree){
+				// 	uni.showToast({
+				// 		title: "请勾选本人同意！",
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	})
+				// 	return false
+				// }
+				this.$emit('goNext',{},2);
+			},
+			goUp() {
+				// if(!this.formData.agree){
+				// 	uni.showToast({
+				// 		title: "请勾选本人同意！",
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	})
+				// 	return false
+				// }
+				this.$emit('goUp',{},2);
+			},
 
 		},
 		created() {

pages/admin/Kaoshi/exam.vue

@@ -419,7 +419,7 @@
 		}
 		if (qa.stTypeId == 3) {
 			// 判断题
-			if (qa.reply == '') {
+			if (qa.reply === '') {
 				reply = '未答'
 			} else  if (qa.reply == 0) {
 				reply = '错误'

pages/admin/Lianxi/lianxi.vue

@@ -420,7 +420,7 @@
 		}
 		if (qa.stTypeId == 3) {
 			// 判断题
-			if (qa.reply == '') {
+			if (qa.reply === '') {
 				reply = '未答'
 			} else  if (qa.reply == 0) {
 				reply = '错误'

pages/client/Chengji/ksScoreShijuan.vue

@@ -189,7 +189,7 @@
 		}
 		if (qa.stTypeId == 3) {
 			// 判断题
-			if (qa.reply == '') {
+			if (qa.reply === '') {
 				reply = '未答'
 			} else  if (qa.reply == 0) {
 				reply = '错误'

pages/client/Chengji/lxScoreShijuan.vue

@@ -203,9 +203,9 @@
 		}
 		if (qa.stTypeId == 3) {
 			// 判断题
-			if (qa.reply == '') {
+			if (qa.reply === '') {
 				reply = '未答'
-			} else  if (qa.reply == 0) {
+			} else  if (qa.reply == 0 ) {
 				reply = '错误'
 			} else if (qa.reply == 1) {
 				reply = '正确'

pages/client/Kaoshi/exam.vue

@@ -182,7 +182,8 @@
 		zhuapai: 0,
 		duanluo: [],
 		StListForSearch: [],
-		from: ''
+		from: '',
+		hisId: '',
 	})
 	
 	const markDB = ref([]);
@@ -239,7 +240,7 @@
 	// 考试得分相关 start
 	function handleScoreConfirm() {
 		uni.redirectTo({
-			url: '/pages/client/Chengji/list'
+			url: `/pages/client/Chengji/ksScoreShijuan?hisId=${data.hisId}&from=kaoshi`
 		})
 	}
 	
@@ -368,6 +369,7 @@
 		ksApi.getClientKsSubmit(result).then(res => {
 			if (res.code == 0) {
 				subScoreRef.value.showDialog(res.data);
+				data.hisId = res.data.hisId;
 				// 清空缓存
 				removeCacheKs(data.operId);
 			}