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

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -359,7 +359,7 @@
 				this.formData.needKaoshi = e.detail.value.toString();
 			},
 			currentMove(data) {
-				console.log('');
+				console.log('data',data);
 				// currentMove 编辑状态下的新增
 				this.localStatus = data
 				console.log('localStatus', this.localStatus);
@@ -387,7 +387,7 @@
 					createTime:dayjs().format("YYYY-MM-DD HH:mm:ss")
 				}
 				console.log('req', req);
-				if(this.status =='add'||this.localStatus =='editadd'){
+				if(this.status =='add'||this.localStatus =='editadd'||this.localStatus =='addEdit'){
 					req.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
 				}
 				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData
@@ -400,7 +400,10 @@
 					return false
 				}
 				if (req.jgId && req.zyId && req.zyLevel) {
-					if (this.status == 'add') {
+					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');

pages/admin/Jiazheng/banzhengXinxiList.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view v-if="list.length>0" class="bzxx-btn-box">
 			<button type="default" @click="addBanzheng" class="phone-white-btn">添加</button>
-			<button type="default" @click="saveBanzheng" class="phone-white-btn">保存</button>
+			<button type="default" v-if="status!='edit'"  @click="saveBanzheng" class="phone-white-btn">保存</button>
 		</view>
 		<view v-else class="bzxx-add-btn-box">
 			<view  @click="addBanzheng" class="bzxx-add-btn"><text>+</text>添加办证信息</view>
@@ -40,6 +40,9 @@
 				type: Array,
 				default: () => []
 			},
+			status: {
+				type: String,
+			}
 		},
 		computed: {
 

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -13,10 +13,10 @@
 		</qiuzhiXinxi>
 		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @editSave="editSaveZhaopianziliao"
 			@goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" :status='status' @goBack="goBack" @addSave="addSave" @editSave="editSave"
-			v-show="banzhengXinxiFlag">
+		<banzhengXinxi ref="banzhengXinxi" :status='status' @goBack="goBack" @addEdit='addEdit' @addSave="addSave"
+			@editSave="editSave" v-show="banzhengXinxiFlag">
 		</banzhengXinxi>
-		<banzhengXinxiList :list="editInfo.kaozhengList" v-show="current ==3&&!banzhengXinxiFlag"
+		<banzhengXinxiList :status='status' :list="editInfo.kaozhengList" v-show="current ==3&&!banzhengXinxiFlag"
 			@saveBanzheng="saveBanzheng" @editBanzheng="editBanzheng" @addBanzheng="addBanzheng"
 			@deleteBanzheng="deleteBanzheng" ref="banzhengXinxiList"></banzhengXinxiList>
 		<common-dialog ref="commonDialogRef" :title="deleteTitle" :content="deleteConcent"
@@ -128,54 +128,67 @@
 		},
 		methods: {
 			goBack() {
-				//this.banzhengXinxiFlag = true
+				this.banzhengXinxiFlag = false
 			},
 			editBanzheng(data, index) {
 				console.log('dataasdf', data);
 				this.current = 3
-				this.banzhengXinxiFlag = false
-				this.$refs.banzhengXinxi.editinfo(data, index)
-				this.$refs.banzhengXinxi.currentMove('edit')
+				this.banzhengXinxiFlag = true
+				if (this.status == 'edit') {
+					this.$refs.banzhengXinxi.editinfo(data, index)
+					this.$refs.banzhengXinxi.currentMove('edit')
+				} else {
+					this.$refs.banzhengXinxi.editinfo(data, index)
+					this.$refs.banzhengXinxi.currentMove('addEdit')
+				}
+
 			},
 			addBanzheng(data, index) {
 				this.banzhengXinxiFlag = true
 				this.$refs.banzhengXinxi.resetFun()
 				//this.current = 3
 				//	this.$refs.banzhengXinxi.resetFun()
-				//	this.$refs.banzhengXinxi.currentMove('editAdd')
+				if (this.status == 'edit') {
+					this.$refs.banzhengXinxi.currentMove('editAdd')
+				}
+
 			},
 			deleteBanzheng(data, index) {
-				console.log('data', data);
-				console.log('index', index);
-				console.log('data.statusBanzheng', data.statusBanzheng);
 				this.deleteId = data.id
 				this.deleteIndex = index
 				if (data.statusBanzheng == '办证完成') {
 					uni.showToast({
-						title: "办证状态为办证完成禁止删除",
+						title: "办证状态为办证完成禁止删除	",
 						icon: 'none',
 						duration: 2000
 					})
 					return false
 				}
 				this.$refs.commonDialogRef.handleShow()
+
 			},
 			deleteQuerenBtn() {
-				jiazhengKaozhengDelete({
-					ids: [this.deleteId]
-				}).then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: "成功",
-							icon: 'none',
-							duration: 2000
-						})
-						this.editInfo.kaozhengList.splice(this.deleteIndex, 1);
-						if (this.editInfo.kaozhengList.length == 0) {
-							this.banzhengXinxiFlag = true
+				if (this.status == 'add') {
+					this.allData.kaozhengList.splice(this.deleteIndex, 1)
+					this.editInfo.kaozhengList.splice(this.deleteIndex, 1)
+				} else {
+					jiazhengKaozhengDelete({
+						ids: [this.deleteId]
+					}).then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: "成功",
+								icon: 'none',
+								duration: 2000
+							})
+							this.editInfo.kaozhengList.splice(this.deleteIndex, 1);
+							if (this.editInfo.kaozhengList.length == 0) {
+								this.banzhengXinxiFlag = true
+							}
 						}
-					}
-				})
+					})
+				}
+
 			},
 			idCardBlur(data) {
 				if (this.status == 'edit') {
@@ -255,13 +268,6 @@
 				})
 			},
 			changeTab(data) {
-				console.log('data', data);
-				if (this.status == 'edit' && data == 3) {
-					this.banzhengXinxiFlag = true
-					return false
-				} else {
-					this.banzhengXinxiFlag = false
-				}
 				if (this.status == 'add') {
 					if (this.current >= 0) {
 						this.current--;
@@ -283,6 +289,11 @@
 						this.$refs.zhaopianZiliao.editinfo(this.editInfo)
 						break;
 					case 3:
+						if (this.editInfo.kaozhengList.length > 0) {
+							this.banzhengXinxiFlag = false
+						} else {
+							this.banzhengXinxiFlag = true
+						}
 						this.$refs.banzhengXinxi.editinfo()
 						break;
 					default:
@@ -422,10 +433,12 @@
 				this.zhaopianziliaoDataHandle(data, 'edit')
 			},
 			addSave(data) {
-				if (this.status == 'add') {
-					this.submitJiazheng(data)
-				} else {}
+				// if (this.status == 'add') {
+				// 	this.submitJiazheng(data)
+				// } else {
 
+				// }
+				this.submitJiazheng(data)
 
 			},
 			submitJiazheng(data) {
@@ -476,7 +489,30 @@
 
 				}
 			},
-
+			addEdit(data, flag, index) {
+				uni.showToast({
+					title: "修改成功！",
+					icon: 'none',
+					duration: 2000
+				})
+				this.editInfo.kaozhengList[index].canxunshijian = data.canxunshijian
+				this.editInfo.kaozhengList[index].jgId = data.jgId
+				this.editInfo.kaozhengList[index].jgName = data.jgName
+				this.editInfo.kaozhengList[index].jzId = data.jzId
+				this.editInfo.kaozhengList[index].needKaoshi = data.needKaoshi
+				this.editInfo.kaozhengList[index].needKecheng = data.needKecheng
+				this.editInfo.kaozhengList[index].shicaochengji = data.shicaochengji
+				this.editInfo.kaozhengList[index].statusBanzheng = data.statusBanzheng
+				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].zyId = data.zyId
+				this.editInfo.kaozhengList[index].zyLevel = data.zyLevel
+				this.editInfo.kaozhengList[index].zyLevelName = data.zyLevelName
+				this.editInfo.kaozhengList[index].zyName = data.zyName
+				this.allData.kaozhengList = JSON.parse(JSON.stringify(this.editInfo.kaozhengList));
+				this.banzhengXinxiFlag = false
+			},
 
 			editSave(data, flag, index) {
 				//	debugger
@@ -490,7 +526,6 @@
 								icon: 'none',
 								duration: 2000
 							})
-							//this.banzhengXinxiFlag = true
 							this.editInfo.kaozhengList[index].canxunshijian = data.canxunshijian
 							this.editInfo.kaozhengList[index].jgId = data.jgId
 							this.editInfo.kaozhengList[index].jgName = data.jgName
@@ -507,6 +542,7 @@
 							this.editInfo.kaozhengList[index].zyLevel = data.zyLevel
 							this.editInfo.kaozhengList[index].zyLevelName = data.zyLevelName
 							this.editInfo.kaozhengList[index].zyName = data.zyName
+							this.banzhengXinxiFlag = false
 						}
 
 					})
@@ -526,7 +562,7 @@
 							this.allData.kaozhengList.push(data)
 							this.editInfo.kaozhengList.push(data)
 							console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
-							//	this.banzhengXinxiFlag = true
+							this.banzhengXinxiFlag = false
 						}
 					})