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

common/styles/global/components.scss

@@ -361,12 +361,15 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	.uni-input-placeholder{overflow: unset;}
 	.uni-easyinput__placeholder-class{font-size: 30rpx!important;}
 	.content-clear-icon{color: rgb(192, 196, 204)!important;}
-	icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
+	icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;flex-shrink: 0;
 		background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
 		transform: rotate(270deg);margin-left: 4rpx;}
 		
 		// 文字行
 		.input-text-row{height:60rpx;display: flex;align-items: center;flex: 1;justify-content: flex-end;}
+		// 文字 超出省略
+		.text-ellipsis-row{overflow: hidden;}
+		.text-ellipsis{@include single-line-ellipsis();margin-left: 24rpx;}
 }
 
 // label-radio

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -23,7 +23,7 @@
 					</picker>
 				</view>
 				<!-- 职业名称（picker 实现下拉选择） -->
-				<view class="form-label-select">
+				<!-- 	<view class="form-label-select">
 					<view class="phone-form-label"><text class="form-label-require">*</text>职业名称</view>
 					<picker mode="selector" :disabled="isJgFlag" :style="isJgFlag?'color:#999':''" :range="zhiyeNames"
 						range-key="name" @change="zhiyeChange" class="select-picker-box">
@@ -32,9 +32,9 @@
 							<icon></icon>
 						</view>
 					</picker>
-				</view>
+				</view> -->
 				<!-- 职业等级（picker 实现下拉选择） -->
-				<view class="form-label-select">
+				<!-- 	<view class="form-label-select">
 					<view class="phone-form-label"><text class="form-label-require">*</text>职业等级</view>
 					<picker mode="selector" :disabled="isZyFlag" :style="isZyFlag?'color:#999':''" :range="zhiyeLevels"
 						@change="levelChange" class="select-picker-box">
@@ -43,7 +43,7 @@
 							<icon></icon>
 						</view>
 					</picker>
-				</view>
+				</view> -->
 
 				<view v-if="formData.banzhengInfoFlag" class="form-label-select">
 					<view class="phone-form-label"><text class="form-label-require">*</text>参训时间</view>
@@ -79,33 +79,30 @@
 						</label>
 					</radio-group>
 				</view>
-				<view v-if="isZijiazheng !='true'" class="page-btn-box">
-					<button type="default" v-if="piliang !=1&&isZijiazheng !='true'" @click="goBack"
-						class="phone-white-btn">返回</button>
-					<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="piliangBaocun"
-						class="phone-green-btn">确认</button>
-					<button type="default" v-if="piliang !=1&&isZijiazheng !='true'" @click="addSaveForm"
-						class="phone-green-btn">添加</button>
+				<view class="form-label-input">
+					<view class="phone-form-label"><text class="form-label-require"></text>职业名称等级</view>
+					<view @click="selectZy" class="input-text-row text-ellipsis-row">
+						<!-- wgy看这  v-for去掉换成一个数组或字符串 -->
+						<view class="text-ellipsis" v-for="(item,index) in piliangArray" :key="index">{{item.name}} {{item.zyLevelName}}</view>
+						<icon></icon>
+					</view>
 				</view>
+				
+				<!-- 
 				<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="reset-btn" @click="piliangDelete(item,index)">删除</view>
-					</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 class="tip-content-box">{{item.name}} {{item.zyLevelName}}</view>
 
+				</view> -->
+				<view v-if="isZijiazheng !='true'" class="page-btn-box">
+					<button type="default" v-if="isZijiazheng !='true'" @click="goBack"
+						class="phone-white-btn">返回</button>
+					<button type="default" v-if="isZijiazheng !='true'" @click="addSaveFormPiliang"
+						class="phone-green-btn">添加</button>
+				</view>
 
 			</view>
-			<view v-if="isZijiazheng !='true' &&piliang ==1" class="page-btn-box content-footer-box">
-				<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="goBack"
-					class="phone-white-btn">返回</button>
-				<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="addSaveFormPiliang"
-					class="phone-green-btn">添加</button>
-			</view>
+			<selectZyLevel ref="selectRef" @confirm-btn="selectZyLevelConfirm" :id="13"></selectZyLevel>
 		</view>
 	</view>
 </template>
@@ -118,6 +115,7 @@
 		getJiazhengBanzhengCheckKc
 	} from "@/api/jiazheng.js"
 	import dayjs from "dayjs";
+	import selectZyLevel from "@/components/selectZyLevel/index.vue"
 	export default {
 		data() {
 			return {
@@ -164,6 +162,9 @@
 			}
 
 		},
+		components: {
+			selectZyLevel
+		},
 		computed: {
 			jigouNames() {
 				return this.baozhengJigouOpt.map(item => item.name);
@@ -181,13 +182,89 @@
 
 		},
 		methods: {
-			piliangDelete(item, index) {
-				this.piliangArray.splice(index, 1);
+			selectZy() {
+				if (this.formData.baozhengJigouId == '') {
+					uni.showToast({
+						title: '请选择报证机构',
+						icon: 'none'
+					});
+					return false
+				}
+				this.$refs.selectRef.handleShow()
+			},
+			selectZyLevelConfirm(data) {
+				console.log('data', data);
+				this.piliangArray = [...data]
+				console.log('this.piliangArray', this.piliangArray);
+				// const dataWithIds = updatedData.map((item, index) => ({
+				// 	...item,
+				// 	statusBanzheng: '未办证',
+				// 	id: res.data[index]
+				// }));
+				// this.allData.kaozhengList = [...this.allData.kaozhengList, ...dataWithIds];
 			},
-			isPiliang(data) {
-				this.piliang = data
-				if (data == 0) {
-					this.piliangArray = []
+			// 提交表单
+			addSaveFormPiliang() {
+				let req = {
+					canxunshijian: this.formData.canxunshijian,
+					jgId: this.formData.baozhengJigouId,
+					needKaoshi: this.formData.needKaoshi,
+					needKecheng: this.formData.needKecheng,
+					shicaochengji: this.formData.shicaochengji,
+					zongkeshi: this.formData.zongkeshi,
+					jgType: this.formData.baozhengJigouType,
+					jgName: this.formData.baozhengJigouName,
+					id: this.formData.id,
+					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
+				}
+				let mergedArray = this.piliangArray.map(item => {
+					return {
+						...req, // 展开req的所有属性
+						zyId: item.id,
+						zyName: item.name,
+						zyLevel: item.zyLevel,
+						zyLevelName: item.zyLevelName
+					};
+				});
+				console.log('this.mergedArray', mergedArray);
+
+				if (req.jgId == '') {
+					uni.showToast({
+						title: '请选择报证机构',
+						icon: 'none'
+					});
+					return false
+				}
+				if (this.piliangArray.length == 0) {
+					uni.showToast({
+						title: '请选择职业名称和职业等级',
+						icon: 'none'
+					});
+					return false
+				}
+				// 验证机构类型为1时的必填字段
+				if (this.formData.baozhengJigouType == 1 &&
+					(this.formData.shicaochengji == '' ||
+						this.formData.zongkeshi == '' ||
+						this.formData.canxunshijian == '')) {
+					uni.showToast({
+						title: '请填写参训时间,实操成绩,总课时',
+						icon: 'none'
+					});
+					return false
+				}
+
+				console.log('this.status', this.status);
+				console.log('this.localStatus', this.localStatus);
+				console.log('this.mergedArray', mergedArray);
+				if (this.localStatus == 'addEdit') {
+					this.$emit('addEdit', mergedArray, 'addEdit', this.currentIndex);
+				} else if (this.status == 'add') {
+					this.$emit('addSave', mergedArray);
+				} else if (this.localStatus == 'editAdd') {
+					this.$emit('editSave', mergedArray, 'editAdd');
+				} else {
+					this.$emit('editSave', mergedArray, 'edit', this.currentIndex);
 				}
 			},
 			goBack() {
@@ -198,12 +275,10 @@
 			},
 			editinfo(data, index) {
 				this.piliangArray = []
-				console.log('123123', data);
 				this.$nextTick(() => {
 					if (!data) {
 						return false
 					}
-					console.log('datssssa', data);
 					this.currentIndex = index
 					this.formData.baozhengJigouName = data.jgName;
 					this.formData.baozhengJigouId = data.jgId;
@@ -310,7 +385,7 @@
 				this.formData.banzhengInfoFlag = false
 				this.isJgFlag = true
 				this.isZyFlag = true
-					this.piliangArray = []
+				this.piliangArray = []
 
 			},
 			// 报证机构选择
@@ -408,199 +483,6 @@
 				// currentMove 编辑状态下的新增
 				this.localStatus = data
 				console.log('localStatus', this.localStatus);
-			},
-			piliangBaocun() {
-				let req = {
-					canxunshijian: this.formData.canxunshijian,
-					jgId: this.formData.baozhengJigouId,
-					needKaoshi: this.formData.needKaoshi,
-					needKecheng: this.formData.needKecheng,
-					shicaochengji: this.formData.shicaochengji,
-					zongkeshi: this.formData.zongkeshi,
-					zyId: this.formData.zhiyeId,
-					zyLevel: this.formData.zhiyeLevelId,
-					jgType: this.formData.baozhengJigouType,
-					jgName: this.formData.baozhengJigouName,
-					zyName: this.formData.zhiyeName,
-					zyLevelName: this.formData.zhiyeLevelName,
-					id: this.formData.id,
-					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
-				}
-				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 == '')) {
-					uni.showToast({
-						title: '请填写参训时间,实操成绩,总课时',
-						icon: 'none'
-					});
-					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);
-			},
-			// 提交表单
-			addSaveFormPiliang() {
-				let req = {
-					canxunshijian: this.formData.canxunshijian,
-					jgId: this.formData.baozhengJigouId,
-					needKaoshi: this.formData.needKaoshi,
-					needKecheng: this.formData.needKecheng,
-					shicaochengji: this.formData.shicaochengji,
-					zongkeshi: this.formData.zongkeshi,
-					zyId: this.formData.zhiyeId,
-					zyLevel: this.formData.zhiyeLevelId,
-					jgType: this.formData.baozhengJigouType,
-					jgName: this.formData.baozhengJigouName,
-					zyName: this.formData.zhiyeName,
-					zyLevelName: this.formData.zhiyeLevelName,
-					id: this.formData.id,
-					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
-				}
-				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 == '')) {
-					uni.showToast({
-						title: '请填写参训时间,实操成绩,总课时',
-						icon: 'none'
-					});
-					return false
-				}
-
-
-				console.log('this.status', this.status);
-				console.log('this.localStatus', this.localStatus);
-
-				if (this.localStatus == 'editAdd') {
-					if (this.piliangArray.length == 0) {
-						this.$emit('editSavePiliang', req);
-					} else {
-						console.log('this.piliangArray', this.piliangArray);
-						this.$emit('editSavePiliang', this.piliangArray)
-					}
-
-				} else if (this.status == 'add') {
-					if (this.piliangArray.length == 0) {
-						this.$emit('addSavePiliang', req);
-					} else {
-						console.log('this.piliangArray', this.piliangArray);
-						this.$emit('addSavePiliang', this.piliangArray)
-					}
-				}
-			
-
-			},
-			// 提交表单
-			addSaveForm() {
-				//debugger
-
-				console.log('statusstatusstatus', this.status);
-
-				let req = {
-					canxunshijian: this.formData.canxunshijian,
-					jgId: this.formData.baozhengJigouId,
-					needKaoshi: this.formData.needKaoshi,
-					needKecheng: this.formData.needKecheng,
-					shicaochengji: this.formData.shicaochengji,
-					zongkeshi: this.formData.zongkeshi,
-					zyId: this.formData.zhiyeId,
-					zyLevel: this.formData.zhiyeLevelId,
-					jgType: this.formData.baozhengJigouType,
-					jgName: this.formData.baozhengJigouName,
-					zyName: this.formData.zhiyeName,
-					zyLevelName: this.formData.zhiyeLevelName,
-					id: this.formData.id,
-					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
-				}
-				console.log('req', req);
-				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 == '')) {
-					uni.showToast({
-						title: '请填写参训时间,实操成绩,总课时',
-						icon: 'none'
-					});
-					return false
-				}
-				console.log('req123123123', req);
-				if (req.jgId && req.zyId && req.zyLevel) {
-					if (this.localStatus == 'addEdit') {
-						this.$emit('addEdit', req, 'addEdit', this.currentIndex);
-					} else if (this.status == 'add') {
-						this.$emit('addSave', req);
-					} else if (this.localStatus == 'editAdd') {
-						this.$emit('editSave', req, 'editAdd');
-					} else {
-						this.$emit('editSave', req, 'edit', this.currentIndex);
-					}
-
-				} else if (req.jgId == '' && req.zyId == '' && req.zyLevel == '') {
-					if (this.status == 'add') {
-						this.$emit('addSave', '');
-					} else if (this.localStatus == 'editAdd') {
-						//this.$emit('editSave', '');
-						// uni.showToast({
-						// 	title: '请选择保证机构,职业名称,职业等级',
-						// 	icon: 'none'
-						// });
-
-						// return false
-					} else {
-
-					}
-				} else {
-					uni.showToast({
-						title: '请选择保证机构,职业名称,职业等级',
-						icon: 'none'
-					});
-
-					return false
-				}
 			}
 		}
 	};

pages/admin/Jiazheng/banzhengXinxiList.vue

@@ -2,8 +2,7 @@
 	<view class="bzxx-list-page">
 		<view :class="isZijiazheng=='true'?'mask-view':''">
 			<view  class="bz-new-btn-box" v-if="list.length>0">
-				<button type="default" class="phone-white-btn" @click="addBanzheng">添加</button>
-				<button type="default" class="phone-green-btn" @click="addBanzhengPiliang">批量添加</button>
+				<button type="default" class="phone-green-btn" @click="addBanzheng">添加</button>
 			</view>
 			<view class="bzxx-wrap-box" v-if="list.length>0">
 				<view v-for="(item,index) in list" :key="index" class="bzxx-card-box">
@@ -23,13 +22,8 @@
 					</view>
 				</view>
 			</view>
-		<!-- 	<view v-if="list.length>0 && status!='edit'" class="bzxx-btn-box">
-				<button type="default" v-if="status!='edit'&&isZijiazheng !='true'" @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>
-				<view @click="addBanzhengPiliang" class="bzxx-add-btn"><text>+</text>批量添加办证信息</view>
-
 			</view>
 			<view v-if="status =='add'&&isZijiazheng !='true'" class="bzxx-btn-box">
 				<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
@@ -73,9 +67,6 @@
 			addBanzheng() {
 				this.$emit('addBanzheng');
 			},
-			addBanzhengPiliang() {
-				this.$emit('addBanzhengPiliang');
-			},
 			saveBanzheng() {
 				this.$emit('saveBanzheng');
 			},

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -16,12 +16,12 @@
 		<zhaopianZiliao ref="zhaopianZiliao" :isZijiazheng='isZijiazheng' :status='status' :statusFlag="statusFlag"
 			@editSave="editSaveZhaopianziliao" @goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
 		<banzhengXinxi ref="banzhengXinxi" :isZijiazheng='isZijiazheng' :status='status' @goBack="goBack"
-			@addEdit='addEdit' @addSave="addSave" @addSavePiliang="addSavePiliang" @editSave="editSave"
+			@addEdit='addEdit' @addSave="addSave" @editSave="editSave"
 			@editSavePiliang="editSavePiliang" v-show="banzhengXinxiFlag">
 		</banzhengXinxi>
 		<banzhengXinxiList :isZijiazheng='isZijiazheng' :status='status' :list="editInfo.kaozhengList"
-			v-show="current ==3&&!banzhengXinxiFlag&&!banzhengXinxiFlagPiliang" @saveBanzheng="saveBanzheng"
-			@editBanzheng="editBanzheng" @addBanzheng="addBanzheng" @addBanzhengPiliang="addBanzhengPiliang"
+			v-show="current ==3&&!banzhengXinxiFlag" @saveBanzheng="saveBanzheng"
+			@editBanzheng="editBanzheng" @addBanzheng="addBanzheng" 
 			@deleteBanzheng="deleteBanzheng" ref="banzhengXinxiList">
 		</banzhengXinxiList>
 		<common-dialog ref="commonDialogRef" :title="deleteTitle" :content="deleteConcent"
@@ -51,7 +51,7 @@
 	export default {
 		data() {
 			return {
-				current: 0,
+				current: 3,
 				//	tabs: ['个人资料', '求职信息', '照片资料', '办证信息']
 				tabs: [],
 				allData: {
@@ -93,7 +93,6 @@
 
 				},
 				status: '',
-				isPiliang: '',
 				id: '',
 				userId: '',
 				banzhengXinxiFlag: false,
@@ -155,7 +154,6 @@
 				console.log('dataasdf', data);
 				this.current = 3
 				this.banzhengXinxiFlag = true
-				this.$refs.banzhengXinxi.isPiliang(0)
 				if (this.status == 'edit') {
 					this.$refs.banzhengXinxi.editinfo(data, index)
 					this.$refs.banzhengXinxi.currentMove('edit')
@@ -166,46 +164,22 @@
 
 			},
 			addBanzheng(data, index) {
-				if (this.allData.icon == '') {
-					uni.showToast({
-						title: "当录入办证信息时候，头像必填",
-						icon: 'none',
-						duration: 2000
-					});
-					this.allData.kaozhengList = []
-					return false;
-				}
-				this.banzhengXinxiFlag = true
-				this.$refs.banzhengXinxi.resetFun()
-				this.$refs.banzhengXinxi.isPiliang(0)
-				//this.current = 3
-				//	this.$refs.banzhengXinxi.resetFun()
-				if (this.status == 'edit') {
-					this.$refs.banzhengXinxi.currentMove('editAdd')
-				}
-
-			},
-			addBanzhengPiliang(data, index) {
-				if (this.allData.icon == '') {
-					uni.showToast({
-						title: "当录入办证信息时候，头像必填",
-						icon: 'none',
-						duration: 2000
-					});
-					this.allData.kaozhengList = []
-					return false;
-				}
+				// if (this.allData.icon == '') {
+				// 	uni.showToast({
+				// 		title: "当录入办证信息时候，头像必填",
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// 	this.allData.kaozhengList = []
+				// 	return false;
+				// }
 				this.banzhengXinxiFlag = true
 				this.$refs.banzhengXinxi.resetFun()
-				this.$refs.banzhengXinxi.isPiliang(1)
-				//this.current = 3
-				//	this.$refs.banzhengXinxi.resetFun()
 				if (this.status == 'edit') {
 					this.$refs.banzhengXinxi.currentMove('editAdd')
 				}
 
 			},
-
 			deleteBanzheng(data, index) {
 				this.deleteId = data.id
 				this.deleteIndex = index
@@ -239,7 +213,6 @@
 								this.banzhengXinxiFlag = true
 								this.$refs.banzhengXinxi.resetFun()
 								this.allData.kaozhengList = []
-								this.$refs.banzhengXinxi.isPiliang(0)
 							}
 						}
 					})
@@ -455,14 +428,6 @@
 					this.current++;
 					this.updateTabs();
 				}
-
-
-
-				// this.current = num + 1
-				// this.tabs = this.tabs.map((item, i) => {
-				// 	if (i == this.current) item.disabled = false
-				// 	return item
-				// })
 			},
 			updateTabs() {
 				console.log('this.tabsthis.tabs', this.tabs);
@@ -480,11 +445,6 @@
 
 			goNextZhaopianZiliao(data, num) {
 				this.zhaopianziliaoDataHandle(data)
-				// this.current = num + 1
-				// this.tabs = this.tabs.map((item, i) => {
-				// 	if (i == this.current) item.disabled = false
-				// 	return item
-				// })
 				if (this.current < this.tabs.length - 1) {
 					this.current++;
 					this.updateTabs();
@@ -513,18 +473,8 @@
 			editSaveZhaopianziliao(data) {
 				this.zhaopianziliaoDataHandle(data, 'edit')
 			},
-			addSavePiliang(data) {
-				console.log('data', data);
-				//  有可能是一个数组
-				this.submitJiazheng(data)
-			},
-			addSave(data) {
-				// if (this.status == 'add') {
-				// 	this.submitJiazheng(data)
-				// } else {
-
-				// }
 
+			addSave(data) {
 				this.submitJiazheng(data)
 			},
 			submitJiazheng(data) {
@@ -552,61 +502,11 @@
 						}
 					}
 				}
-
-				// 检查头像是否为空（如果有数据要添加）
-				if (dataToProcess.length > 0 && this.allData.icon == '') {
-					uni.showToast({
-						title: "当录入办证信息时候，头像必填",
-						icon: 'none',
-						duration: 2000
-					});
-					this.allData.kaozhengList = []
-					return false;
-				}
-
 				// 添加所有数据项
 				this.allData.kaozhengList.push(...dataToProcess);
 				this.editInfo.kaozhengList = [...this.allData.kaozhengList];
 				this.banzhengXinxiFlag = false;
 			},
-
-			// 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)
-			// 	}
-			// 	if (this.allData.kaozhengList.length > 0 && this.allData.icon == '') {
-			// 		uni.showToast({
-			// 			title: "当录入办证信息时候，头像必填",
-			// 			icon: 'none',
-			// 			duration: 2000
-			// 		})
-			// 		this.allData.kaozhengList = []
-			// 		return false
-			// 	}
-			// 	this.editInfo.kaozhengList = this.allData.kaozhengList
-			// 	this.banzhengXinxiFlag = false
-
-
-			// },
 			saveBanzheng() {
 				if (this.status == 'add') {
 					jiazhengAdd(this.allData).then(res => {