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

pages/Login/index.vue

@@ -1,14 +1,18 @@
 <template>
 	<!-- 客户端 -->
-	// #ifdef H5
+<<<<<<< Updated upstream
+  <!-- #ifdef H5-->
 	<ClientLoginBox></ClientLoginBox>
-	// #endif
+  <!--	#endif-->
 	    
 	<!-- 管理端 -->
-	// #ifdef APP-PLUS
+	<!-- #ifdef APP-PLUS -->
 	<AdminloginBox></AdminloginBox>
-	// #endif
+	<!-- #endif -->
 
+=======
+	<AdminloginBox></AdminloginBox>
+>>>>>>> Stashed changes
 </template>
 <script setup>
 	import ClientLoginBox  from './components/clientloginBox.vue'

pages/admin/Chengji/ksScoreShijuan.vue

@@ -290,6 +290,17 @@
 		}
 	}
 
+	function skipQuestion(dlIndex, dtIndex) {
+		progress.dlIndex = dlIndex;
+		progress.dtIndex = dtIndex;
+		handlePopupBack()
+	}
+
+	function answerCardItemClick(qa) {
+		const actQa = data.StListForSearch.find(item => item.stId == qa.stId);
+		skipQuestion(actQa.dlIndex, actQa.dtIndex)
+	}
+	
 
 	function handleBack() {
 		uni.redirectTo({

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -361,8 +361,8 @@
 				}
 				console.log('req', req);
 
-				if (this.formData.baozhengJigouType == 1 && this.formData.shicaochengji == '' && this.formData.zongkeshi ==
-					'' && this.formData.canxunshijian == '') {
+				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData.zongkeshi ==
+					'' || this.formData.canxunshijian == '')) {
 					uni.showToast({
 						title: '请填写参训时间,实操成绩,总课时',
 						icon: 'none'

pages/admin/Jiazheng/banzhengXinxiList.vue

@@ -14,7 +14,6 @@
 		</view>
 		<view class="bzxx-btn-box">
 			<button type="default" @click="addBanzheng" class="phone-white-btn">添加</button>
-			<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
 		</view>
 	</view>
 </template>
@@ -48,9 +47,6 @@
 			addBanzheng() {
 				this.$emit('addBanzheng');
 			},
-			saveBanzheng() {
-				this.$emit('saveBanzheng');
-			},
 			goEdit(item, index) {
 				this.$emit('editBanzheng', item, index);
 			},

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -17,7 +17,7 @@
 			v-show="current ==3">
 		</banzhengXinxi>
 		<banzhengXinxiList :list="editInfo.kaozhengList" v-show="banzhengXinxiFlag" @editBanzheng="editBanzheng"
-			@addBanzheng="addBanzheng" @deleteBanzheng="deleteBanzheng" @saveBanzheng="saveBanzhengList"
+			@addBanzheng="addBanzheng" @deleteBanzheng="deleteBanzheng"
 			ref="banzhengXinxiList"></banzhengXinxiList>
 	</view>
 </template>
@@ -131,21 +131,7 @@
 				})
 
 			},
-			saveBanzhengList(data, index) {
-				jiazhengUpdate(this.allData).then(res => {
-					uni.showToast({
-						title: "保存成功！",
-						icon: 'none',
-						duration: 2000
-					})
-					uni.navigateTo({
-						url: `/pages/admin/Jiazheng/index`
-					})
-				})
-
-			},
-
-
+		
 			dataHandle(pageInfo) {
 				if (this.status == 'add') {
 					this.tabs = [{
@@ -397,6 +383,14 @@
 			},
 			submitJiazheng() {
 				console.log('this.allData', this.allData);
+				if (this.allData.kaozhengList.length > 0 && this.allData.icon == '') {
+					uni.showToast({
+						title: "当录入办证信息时候，头像必填",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
 				jiazhengAdd(this.allData).then(res => {
 					if (res.code == 0) {
 						uni.showToast({
@@ -433,6 +427,14 @@
 					})
 				} else if (data && this.status == 'edit') {
 					data.userId = this.userId
+					if (this.allData.icon == '') {
+						uni.showToast({
+							title: "当录入办证信息时候，头像必填",
+							icon: 'none',
+							duration: 2000
+						})
+						return false
+					}
 					jiazhengKaozhengAdd(data).then(res => {
 						if (res.code == 0) {
 							data.id = res.data

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -140,7 +140,7 @@
 					this.idcardUrl2 = data.idcardUrl2
 					this.shenghuizhaoList = data.shenghuoUrls == '' ? '' : data.shenghuoUrls.split(",")
 					this.zigezhaoList = data.zhengshuUrls == '' ? '' : data.shenghuoUrls.split(",")
-					this.tijianUrls = data.tijianUrls == '' ? '' : data.tijianUrls.split(",")
+					this.tijianbaogaoList = data.tijianUrls == '' ? '' : data.tijianUrls.split(",")
 					this.tijianDate = data.tijianDate
 					this.jiankangDate = data.jiankangDate
 

pages/client/Chengji/ksScoreShijuan.vue

@@ -269,6 +269,16 @@
 		}
 	}
 	
+	function skipQuestion(dlIndex, dtIndex) {
+		progress.dlIndex = dlIndex;
+		progress.dtIndex = dtIndex;
+		handlePopupBack()
+	}
+	
+	function answerCardItemClick(qa) {
+		const actQa = data.StListForSearch.find(item => item.stId == qa.stId);
+		skipQuestion(actQa.dlIndex, actQa.dtIndex)
+	}
 	
 	function handleBack() {
 		

pages/client/Chengji/lxScoreShijuan.vue

@@ -290,6 +290,17 @@
 		}
 	}
 
+	function skipQuestion(dlIndex, dtIndex) {
+		progress.dlIndex = dlIndex;
+		progress.dtIndex = dtIndex;
+		handlePopupBack()
+	}
+
+	function answerCardItemClick(qa) {
+		const actQa = data.StListForSearch.find(item => item.stId == qa.stId);
+		skipQuestion(actQa.dlIndex, actQa.dtIndex)
+	}
+
 
 	function handleBack() {
 		const pages = getCurrentPages();

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,13 +1,13 @@
 {
-  "hash": "e4126def",
-  "configHash": "ee829940",
+  "hash": "7375ca5a",
+  "configHash": "fdaa8c6f",
   "lockfileHash": "e3b0c442",
-  "browserHash": "3202c580",
+  "browserHash": "520c72ef",
   "optimized": {
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "850f551d",
+      "fileHash": "763602ac",
       "needsInterop": true
     }
   },