wangguoyu vor 1 Monat
Ursprung
Commit
53f2ec9392

+ 24 - 6
pages/admin/Jiazheng/banzhengXinxi.vue

@@ -14,7 +14,8 @@
 				<view class="phone-form-label"><text class="form-label-require">*</text>报证机构</view>
 				<picker :disabled="(status =='edit'&&localStatus=='')" mode="selector" :range="jigouNames"
 					@change="jigouChange" class="select-picker-box">
-					<view class="form-radio-select" :class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
+					<view class="form-radio-select"
+						:class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
 						<view>{{ formData.baozhengJigouName || '请选择报证机构' }}</view>
 						<icon></icon>
 					</view>
@@ -82,16 +83,18 @@
 				<button type="default" v-if="piliang ==1" @click="piliangBaocun" class="phone-green-btn">保存</button>
 				<button type="default" v-if="piliang !=1" @click="addSaveForm" class="phone-green-btn">添加</button>
 			</view>
-			<view v-if="piliangArray.length>0" v-for="(item,index) in piliangArray" :key="index" class="bzsm-tip-box form-top-margin">
+			<view v-if="piliangArray.length>0" v-for="(item,index) in piliangArray" :key="index"
+				class="bzsm-tip-box form-top-margin">
 				<view class="title-btn-box">
-					<view class="phone-line-title">机构名称:{{item.jgName}}</view>
+					<view class="phone-line-title">{{item.jgName}}</view>
 					<view class="reset-btn" @click="piliangDelete(item,index)">删除</view>
 				</view>
-				<view class="tip-content-box">职业名称:{{item.zyName}}</view>
-				<view class="tip-content-box">职业等级:{{item.zyLevelName}}</view>
+				<view class="tip-content-box">{{item.zyName}} {{item.zyLevelName}}</view>
+				<!-- 				<view class="tip-content-box">职业名称:{{item.zyName}}</view>
+				<view class="tip-content-box">职业等级:{{item.zyLevelName}}</view> -->
 			</view>
 
-			
+
 		</view>
 		<view class="page-btn-box content-footer-box">
 			<button type="default" v-if="piliang ==1" @click="goBack" class="phone-white-btn">返回</button>
@@ -428,6 +431,21 @@
 					});
 					return false
 				}
+				// 检查重复数据 - 新增的重复检查逻辑
+				const isDuplicate = this.piliangArray.some(item =>
+					item.jgId === req.jgId &&
+					item.zyId === req.zyId &&
+					item.zyLevel === req.zyLevel
+				);
+
+				if (isDuplicate) {
+					uni.showToast({
+						title: '该机构、职业和等级已存在,无法重复添加',
+						icon: 'none'
+					});
+					return false;
+				}
+
 				//console.log('req', req);
 				this.piliangArray.push(req)
 				console.log('this.piliangArray', this.piliangArray);

+ 2 - 2
pages/admin/Jiazheng/banzhengXinxiList.vue

@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<view v-if="list.length>0 && status!='edit'" class="bzxx-btn-box">
-			<button type="default" v-if="status!='edit'" @click="saveBanzheng" class="phone-green-btn">保存1</button>
+			<button type="default" v-if="status!='edit'" @click="saveBanzheng" class="phone-green-btn">保存</button>
 		</view>
 		<view v-if="list.length==0" class="bzxx-add-btn-box">
 			<view @click="addBanzheng" class="bzxx-add-btn"><text>+</text>添加办证信息</view>
@@ -31,7 +31,7 @@
 
 		</view>
 		<view v-if="status =='add'" class="page-btn-box">
-			<button type="default" @click="saveBanzheng" class="phone-green-btn">保存2</button>
+			<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -641,7 +641,7 @@
 							this.editInfo.kaozhengList[index].shicaochengji = data.shicaochengji
 							this.editInfo.kaozhengList[index].statusKaoshi = data.statusKaoshi
 							this.editInfo.kaozhengList[index].zongkeshi = data.zongkeshi
-							this.editInfo.kaozhengList[index].id = data.id
+							this.editInfo.kaozhengList[index].id = data.id	
 							this.editInfo.kaozhengList[index].zyId = data.zyId
 							this.editInfo.kaozhengList[index].zyLevel = data.zyLevel
 							this.editInfo.kaozhengList[index].zyLevelName = data.zyLevelName