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

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -319,7 +319,7 @@
 			},
 			// 提交表单
 			addSaveForm() {
-		
+
 				let req = {
 					canxunshijian: this.formData.canxunshijian,
 					jgId: this.formData.baozhengJigouId,
@@ -332,7 +332,12 @@
 				}
 				console.log('req', req);
 
-				this.$emit('addSave', req);
+				if (req.jgId && req.zyId && req.zyLevel) {
+					this.$emit('addSave', req);
+				} else {
+					this.$emit('addSave', '');
+				}
+
 				// // 表单验证
 				// if (!this.formData.institution) {
 				// 	uni.showToast({

pages/admin/Jiazheng/gerenZiliao.vue

@@ -234,10 +234,10 @@
 					this.formData.jiguanShiName = data.jiguanShiName
 					this.formData.juzhuDizhi = data.juzhuDizhi
 					this.formData.birthday = data.birthday
-					this.formData.minzu = this.dataForId(this.minzuList, data.minzu)
+					this.formData.minzu = this.dataForId(this.minzuList, data.minzu)||''
 					this.formData.gender = data.gender
-					this.formData.xueli = this.dataForId(this.xueliList, data.xueli)
-					this.formData.hunyin = this.dataForId(this.hunyinList, data.hunyin)
+					this.formData.xueli = this.dataForId(this.xueliList, data.xueli)||''
+					this.formData.hunyin = this.dataForId(this.hunyinList, data.hunyin)||''
 					this.formData.hujiDizhi = data.hujiDizhi
 					this.formData.juzhuDizhi = data.juzhuDizhi
 					this.formData.xingzuo = this.dataForId(this.xingzuoList, data.xingzuo) || ''
@@ -508,13 +508,14 @@
 				this.formData.shuxiangIndex = 0
 			},
 			selectChangeXueliList(data) {
-				this.formData.xueli = data
+				this.formData.xueli = data[0]
 			},
 			genderSelect(data) {
 				this.formData.gender = data
 			},
 			selectChangeHunyinList(data) {
-				this.formData.hunyin = data
+					console.log('data',data[0]);
+				this.formData.hunyin = data[0]
 			},
 			switchXingzuoChange(e) {
 				this.formData.xingzuoFlag = e.detail.value

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -167,6 +167,8 @@
 				if (this.status == 'edit' && data == 3 && this.editInfo.kaozhengList.length > 0) {
 					this.banzhengXinxiFlag = true
 					return false
+				} else {
+					this.banzhengXinxiFlag = false
 				}
 				this.current = data
 				if (this.status != 'edit') {
@@ -192,6 +194,8 @@
 
 			},
 			gerenZiliaoDataHandle(data) {
+				console.log('gerenZiliaoDataHandle', data);
+				console.log('gerenZiliaoDataHandle', data.hunyin.id);
 				this.allData.userName = data.userName
 				this.allData.realName = data.realName
 				this.allData.idcard = data.idcard
@@ -263,17 +267,19 @@
 				this.zhaopianziliaoDataHandle(data)
 			},
 			addSave(data) {
-				this.allData.kaozhengList.push(data)
+				if (data != '') {
+					this.allData.kaozhengList.push(data)
+				}
 				this.submitJiazheng()
 			},
 			submitJiazheng() {
 				console.log('this.allData', this.allData);
-				jiazhengAdd(this.allData).then(res=>{
-					if(res.code ==0){
+				jiazhengAdd(this.allData).then(res => {
+					if (res.code == 0) {
 						uni.navigateTo({
 							url: `/pages/admin/Jiazheng/index`
 						})
-					}else{
+					} else {
 						uni.showToast({
 							title: "失败",
 							icon: 'none',
@@ -281,9 +287,9 @@
 						})
 						return false
 					}
-				
+
 				})
-			
+
 			},
 			editBanzheng(data, index) {
 				this.current = 3