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

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -93,7 +93,7 @@
 			</radio-group>
 		</view>
 		<view class="page-btn-box">
-			<button type="default" v-if="status!='add'" @click="goBack" class="phone-white-btn">返回</button>
+			<button type="default"  @click="goBack" class="phone-white-btn">返回</button>
 			<button type="default" @click="addSaveForm" class="phone-green-btn">添加</button>
 		</view>
 		<!-- 提交按钮 -->
@@ -390,6 +390,13 @@
 				if(this.status =='add'||this.localStatus =='editadd'||this.localStatus =='addEdit'){
 					req.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
 				}
+				if(req.jgId =='' ||req.zyId =='' ||req.zyLevel ==''){
+					uni.showToast({
+						title: '请选择保证机构,职业名称,职业等级',
+						icon: 'none'
+					});
+					return false
+				}
 				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData
 						.zongkeshi ==
 						'' || this.formData.canxunshijian == '')) {

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -268,9 +268,9 @@
 				})
 			},
 			changeTab(data) {
-					this.banzhengXinxiFlag = false
+				this.banzhengXinxiFlag = false
 				if (this.status == 'add') {
-			
+
 					if (this.current >= 0) {
 						this.current--;
 						this.updateTabs();
@@ -440,13 +440,28 @@
 				// } else {
 
 				// }
-				this.submitJiazheng(data)
 
+				this.submitJiazheng(data)
 			},
 			submitJiazheng(data) {
 				//	debugger
 				console.log('this.allData', this.allData);
-
+				if (this.allData.kaozhengList.length > 0) {
+					const isDuplicate = this.allData.kaozhengList.some(item => {
+						return item.jgId == data.jgId &&
+							item.zyLevelName == data.zyLevelName &&
+							item.zyName == data.zyName;
+					});
+					if(isDuplicate){
+						 uni.showToast({
+						    title: '此用户的职业等级系统已存在，如想继续添加，请联系管理员处理!',
+						    icon: 'none',
+						    duration: 2000
+						  });
+						  
+						  return false
+					}
+				}
 				if (data != '') {
 
 					this.allData.kaozhengList.push(data)