Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

common/styles/global/pages.scss

@@ -177,6 +177,7 @@
 .phone-list-page{
 	box-sizing: border-box;
 	.phone-scroll-view {height: calc(100vh - 182rpx);}
+	.phone-scroll-nobottom-view {height: calc(100vh - 70rpx);}
 	.admin-phone-scroll-view{height: calc(100vh - 292rpx - var(--status-bar-height));}
 	.admin-list-box{
 		.admin-list-item-box{border-bottom: 20rpx solid #f4f6fa;}
@@ -631,6 +632,7 @@
 		.uni-list--border{display: none!important;}
 		.uni-list-item__container{padding: 0 24rpx 24rpx;}
 	}
+	.uni-list .banzheng-list-item-box:nth-child(2){padding-top: 20rpx;}
 	.banzheng-list-card-box{
 		width: 100%;
 		.card-head-row{

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -158,8 +158,9 @@
 		methods: {
 			editinfo(data) {
 				this.$nextTick(() => {
-
-
+					if(!data){
+						return false
+					}
 					console.log('datssssa', data);
 					this.formData.baozhengJigouName = data.jgName;
 					this.formData.baozhengJigouId = data.jgId;
@@ -191,8 +192,8 @@
 					}
 					this.formData.canxunShijian = data.canxunShijian;
 					this.formData.shicaochengji = data.shicaochengji;
-					this.formData.needKecheng = data.needKecheng.toString();
-					this.formData.needKecheng = data.needKaoshi.toString();
+					this.formData.needKecheng = data.needKecheng ? data.needKecheng.toString() : 'false';
+					this.formData.needKaoshi = data.needKaoshi ? data.needKaoshi.toString() : 'false';
 
 					if (this.formData.banzhengInfoFlag) {
 						this.formData.needFlag = false
@@ -341,6 +342,9 @@
 			},
 			// 提交表单
 			addSaveForm() {
+				debugger
+
+				console.log('statusstatusstatus', this.status);
 
 				let req = {
 					canxunshijian: this.formData.canxunshijian,
@@ -351,27 +355,43 @@
 					zongkeshi: this.formData.zongkeshi,
 					zyId: this.formData.zhiyeId,
 					zyLevel: this.formData.zhiyeLevelId,
-					jgType:	this.formData.baozhengJigouType
+					jgType: this.formData.baozhengJigouType
 				}
 				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'
-					});		
+					});
 					return false
 				}
 				if (req.jgId && req.zyId && req.zyLevel) {
-					this.$emit('addSave', req);
-				} else if(req.jgId =='' && req.zyId =='' && req.zyLevel ==''){
-					this.$emit('addSave', '');
-				}else{
+					if (this.status == 'add') {
+						this.$emit('addSave', req);
+					} else {
+						this.$emit('editSave', req);
+					}
+
+				} else if (req.jgId == '' && req.zyId == '' && req.zyLevel == '') {
+					if (this.status == 'add') {
+						this.$emit('addSave', '');
+					} else {
+						this.$emit('editSave', '');
+						// uni.showToast({
+						// 	title: '请选择保证机构,职业名称,职业等级',
+						// 	icon: 'none'
+						// });
+
+						// return false
+					}
+				} else {
 					uni.showToast({
 						title: '请选择保证机构,职业名称,职业等级',
 						icon: 'none'
 					});
-			
+
 					return false
 				}
 				// // 表单验证

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -13,7 +13,7 @@
 		</qiuzhiXinxi>
 		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @editSave="editSaveZhaopianziliao"
 			@goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" :status='status' @addSave="addSave" v-show="current ==3">
+		<banzhengXinxi ref="banzhengXinxi" :status='status' @addSave="addSave" @editSave="editSave" v-show="current ==3">
 		</banzhengXinxi>
 		<banzhengXinxiList :list="editInfo.kaozhengList" v-show="banzhengXinxiFlag" @editBanzheng="editBanzheng"
 			ref="banzhengXinxiList"></banzhengXinxiList>
@@ -198,7 +198,7 @@
 						this.$refs.zhaopianZiliao.editinfo(this.editInfo)
 						break;
 					case 3:
-						this.$refs.banzhengXinxi.editinfo(this.editInfo)
+						this.$refs.banzhengXinxi.editinfo()
 						break;
 					default:
 						break;
@@ -338,12 +338,23 @@
 				if (data != '') {
 					this.allData.kaozhengList.push(data)
 				}
-				this.submitJiazheng()
+				if(this.status =='add'){
+					this.submitJiazheng()
+				}else{
+					
+				}
+		
+	
 			},
 			submitJiazheng() {
 				console.log('this.allData', this.allData);
 				jiazhengAdd(this.allData).then(res => {
 					if (res.code == 0) {
+						uni.showToast({
+							title: "成功",
+							icon: 'none',
+							duration: 2000
+						})
 						uni.navigateTo({
 							url: `/pages/admin/Jiazheng/index`
 						})
@@ -359,6 +370,30 @@
 				})
 
 			},
+			editSave(data){
+				if(data ==''&&this.status =='edit'){
+					jiazhengUpdate(this.allData).then(res => {
+						uni.showToast({
+							title: "保存成功！",
+							icon: 'none',
+							duration: 2000
+						})
+					})
+				}else if(data &&this.status =='edit'){
+				//	this.allData.kaozhengList.push(data)
+					//this.editInfo.kaozhengList.push(data)
+					console.log('this.editInfo.kaozhengList',this.editInfo.kaozhengList);
+					this.banzhengXinxiFlag = true
+				}
+				// if (data != '') {
+				// 	this.allData.kaozhengList.push(data)
+				// }
+				// if(this.status =='add'){
+				// 	this.submitJiazheng()
+				// }else{
+					
+				// }
+			},
 			editBanzheng(data, index) {
 				this.current = 3
 				this.banzhengXinxiFlag = false

pages/admin/banzheng/list.vue

@@ -9,7 +9,7 @@
 		<!-- 课程列表 -->
 		<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 			:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
-			class="phone-scroll-view">
+			class="phone-scroll-nobottom-view">
 			<uni-list>
 				<uni-list-item v-for="item in data.list" class="banzheng-list-item-box">
 					<template v-slot:body>
@@ -47,7 +47,7 @@
 		</scroll-view>
 
 		<!-- 页面底端 -->
-		<customTabbarClientVue></customTabbarClientVue>
+		<!-- <customTabbarClientVue></customTabbarClientVue> -->
 		<!-- 筛选 -->
 		<filter-dialog ref="filterDialogRef" @confirm-btn="confirmBtn"></filter-dialog>
 		<!-- 搜索 -->