wangguoyu há 1 mês atrás
pai
commit
84d1ac94ea

+ 9 - 8
pages/admin/Jiazheng/banzhengXinxi.vue

@@ -61,7 +61,7 @@
 					<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>
@@ -122,7 +122,7 @@
 				isZyFlag: true,
 				piliang: '',
 				piliangArray: [],
-				zyNameAndLevel:''
+				zyNameAndLevel: ''
 			};
 		},
 		props: {
@@ -162,8 +162,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,
@@ -256,10 +256,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;
@@ -348,6 +348,7 @@
 				this.isJgFlag = true
 				this.isZyFlag = true
 				this.piliangArray = []
+				this.zyNameAndLevel = ''
 
 			},
 			// 报证机构选择

+ 20 - 41
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"
@@ -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({