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

common/styles/global/pages.scss

@@ -797,7 +797,7 @@
 		display: flex;flex-direction: column;
 		.bz-new-btn-box{
 			padding: 20rpx 24rpx 20rpx;background-color: #f4f6fa;box-sizing: border-box;display: flex;align-items: center;
-			uni-button{width:40%;font-size: 28rpx;padding:20rpx;line-height: 1;}
+			uni-button{font-size: 28rpx;width: 100%;}
 		}
 		.bzxx-wrap-box{flex: 1;overflow: auto;padding-bottom: 140rpx;}
 		.bzxx-card-box{background-color: #fff;padding:24rpx 38rpx;font-size: 28rpx;color: #666;line-height: 1;margin-top: 20rpx;}

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -57,11 +57,11 @@
 					</radio-group>
 				</view>
 				<view class="form-label-input">
-					<view class="phone-form-label"><text class="form-label-require"></text>职业名称等级</view>
+					<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-if="zyNameAndLevel">{{zyNameAndLevel}}</view>
-						<view class="text-ellipsis"  v-else>请选择职业名称</view>
+						<view class="text-ellipsis" v-else>请选择职业名称</view>
 						<icon></icon>
 					</view>
 				</view>
@@ -73,7 +73,8 @@
 				</view>
 
 			</view>
-			<selectZyLevel ref="selectRef" @confirm-btn="selectZyLevelConfirm" :id="13"></selectZyLevel>
+			<selectZyLevel ref="selectRef" @confirm-btn="selectZyLevelConfirm" :mode=modeControl
+				:id="formData.baozhengJigouId"></selectZyLevel>
 		</view>
 	</view>
 </template>
@@ -122,7 +123,7 @@
 				isZyFlag: true,
 				piliang: '',
 				piliangArray: [],
-				zyNameAndLevel:''
+				zyNameAndLevel: ''
 			};
 		},
 		props: {
@@ -147,6 +148,17 @@
 			zhiyeLevels() {
 				return this.zhiyelevelsOpt.map(item => item.name);
 			},
+			modeControl() {
+				if (this.localStatus == 'addEdit') {
+					return 'danxuan'
+				} else if (this.status == 'add') {
+					return 'duoxuan'
+				} else if (this.localStatus == 'editAdd') {
+					return 'duoxuan'
+				} else {
+					return 'danxuan'
+				}
+			}
 		},
 		created() {
 			this.getJigou()
@@ -162,8 +174,8 @@
 					});
 					return false
 				}
-				console.log('this.piliangArray',this.piliangArray);
-				
+				console.log('this.piliangArray', this.piliangArray);
+
 				let newArray = this.piliangArray.map(item => {
 					return {
 						zyId: item.id,
@@ -235,7 +247,7 @@
 				console.log('this.localStatus', this.localStatus);
 				console.log('this.mergedArray', mergedArray);
 				if (this.localStatus == 'addEdit') {
-					this.$emit('addEdit', mergedArray, 'addEdit', this.currentIndex);
+					this.$emit('addEdit', mergedArray[0], 'addEdit', this.currentIndex);
 				} else if (this.status == 'add') {
 					this.$emit('addSave', mergedArray);
 				} else if (this.localStatus == 'editAdd') {
@@ -256,10 +268,10 @@
 					if (!data) {
 						return false
 					}
-					console.log('index',index);
-					console.log('data',data);					
-					this.currentIndex = index		
-					this.zyNameAndLevel =data.zyName+data.zyLevelName
+					console.log('index', index);
+					console.log('data', data);
+					this.currentIndex = index
+					this.zyNameAndLevel = data.zyName + data.zyLevelName
 					this.formData.baozhengJigouName = data.jgName;
 					this.formData.baozhengJigouId = data.jgId;
 					this.formData.id = data.id;
@@ -328,6 +340,8 @@
 				this.formData.zongkeshi = ''
 				this.isJgFlag = true
 				this.isZyFlag = true
+				this.zyNameAndLevel = ''
+					this.piliangArray = []
 			},
 			resetFun() {
 				this.formData.zhiyeName = ''
@@ -348,6 +362,7 @@
 				this.isJgFlag = true
 				this.isZyFlag = true
 				this.piliangArray = []
+				this.zyNameAndLevel = ''
 
 			},
 			// 报证机构选择

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -17,7 +17,7 @@
 			@editSave="editSaveZhaopianziliao" @goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
 		<banzhengXinxi ref="banzhengXinxi" :isZijiazheng='isZijiazheng' :status='status' @goBack="goBack"
 			@addEdit='addEdit' @addSave="addSave" @editSave="editSave"
-			@editSavePiliang="editSavePiliang" v-show="banzhengXinxiFlag">
+		 v-show="banzhengXinxiFlag">
 		</banzhengXinxi>
 		<banzhengXinxiList :isZijiazheng='isZijiazheng' :status='status' :list="editInfo.kaozhengList"
 			v-show="current ==3&&!banzhengXinxiFlag" @saveBanzheng="saveBanzheng"
@@ -164,15 +164,15 @@
 
 			},
 			addBanzheng(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()
 				if (this.status == 'edit') {
@@ -614,7 +614,14 @@
 						}
 					})
 				} else if (flag == 'editAdd') {
-					data.userId = this.userId
+					
+					let mergedArray = data.map(item => {
+						return {
+							...item,
+							userId: this.userId
+						};
+					});
+				
 					if (this.allData.icon == '') {
 						uni.showToast({
 							title: "当录入办证信息时候，头像必填",
@@ -623,17 +630,21 @@
 						})
 						return false
 					}
-					jiazhengKaozhengAdd(data).then(res => {
+					jiazhengKaozhengAdds(mergedArray).then(res => {
 						if (res.code == 0) {
-							data.id = res.data
-							data.statusBanzheng = '未办证'
-							this.allData.kaozhengList.push(data)
-							this.editInfo.kaozhengList.push(data)
-							console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
+							//	data.id = res.data
+							const dataWithIds = mergedArray.map((item, index) => ({
+								...item,
+								statusBanzheng: '未办证',
+								id: res.data[index]
+							}));
+							this.allData.kaozhengList = [...this.allData.kaozhengList, ...dataWithIds];
+							this.editInfo.kaozhengList = [...this.editInfo.kaozhengList, ...dataWithIds];
+							// console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
 							this.banzhengXinxiFlag = false
+							console.log('this.allData.kaozhengList', this.allData.kaozhengList);
 						}
 					})
-
 				}
 				// if (data != '') {
 				// 	this.allData.kaozhengList.push(data)
@@ -644,38 +655,6 @@
 
 				// }
 			},
-			editSavePiliang(data) {
-
-				console.log('data', data);
-				const updatedData = data.map(item => ({
-					...item, // 展开原有属性
-					userId: this.userId // 添加新字段
-				}));
-				if (this.allData.icon == '') {
-					uni.showToast({
-						title: "当录入办证信息时候，头像必填",
-						icon: 'none',
-						duration: 2000
-					})
-					return false
-				}
-				jiazhengKaozhengAdds(updatedData).then(res => {
-					if (res.code == 0) {
-						//	data.id = res.data
-						const dataWithIds = updatedData.map((item, index) => ({
-							...item,
-							statusBanzheng: '未办证',
-							id: res.data[index]
-						}));
-						this.allData.kaozhengList = [...this.allData.kaozhengList, ...dataWithIds];
-						this.editInfo.kaozhengList = [...this.editInfo.kaozhengList, ...dataWithIds];
-						// console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
-						this.banzhengXinxiFlag = false
-						console.log('this.allData.kaozhengList', this.allData.kaozhengList);
-					}
-				})
-
-			},
 			goUpPage() {
 				if (this.from == 'banzheng') {
 					uni.redirectTo({