Преглед на файлове

Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

tanxue преди 2 месеца
родител
ревизия
cba74a8ba7
променени са 3 файла, в които са добавени 71 реда и са изтрити 32 реда
  1. 7 1
      pages/admin/Jiazheng/banzhengXinxi.vue
  2. 58 31
      pages/admin/Jiazheng/jiazhengUserManager.vue
  3. 6 0
      pages/admin/Jiazheng/qiuzhiXinxi.vue

+ 7 - 1
pages/admin/Jiazheng/banzhengXinxi.vue

@@ -265,7 +265,13 @@
 				this.formData.baozhengJigouName = ''
 				this.formData.baozhengJigouId = ''
 				this.formData.baozhengJigouName = ''
+				this.formData.needKecheng = 'false'
+				this.formData.needKaoshi = 'false'
 				this.formData.needFlag = false
+				this.formData.kcDisabled = false
+				this.formData.banzhengInfoFlag = false
+	
+
 			},
 			// 报证机构选择
 			jigouChange(e) {
@@ -358,7 +364,7 @@
 			},
 			// 提交表单
 			addSaveForm() {
-				debugger
+				//debugger
 
 				console.log('statusstatusstatus', this.status);
 

+ 58 - 31
pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -83,7 +83,7 @@
 					"zhuangtai": '',
 					"jingdu": '',
 					"weidu": ''
-					
+
 				},
 				status: '',
 				id: '',
@@ -94,6 +94,7 @@
 				deleteTitle: '删除',
 				deleteIndex: '',
 				deleteId: '',
+				from: '',
 			}
 		},
 		components: {
@@ -104,17 +105,32 @@
 			commonDialog,
 			zhaopianZiliao
 		},
+		watch: {
+			// 监听外部传入的selectedIds变化,更新selectedData
+			current: {
+				handler(newVal) {
+					console.log('newValnewValnewVal', this.current);
+					if (newVal == 1 && this.status == 'add') {
+						console.log('this.$refs.qiuzhiXinxi', this.$refs.qiuzhiXinxi);
+						this.$refs.qiuzhiXinxi.zhuangtai = 1
+					}
+
+				}
+			},
+
+		},
 		onLoad(options) {
 			let pageInfo = JSON.parse(options.pageInfo)
 			this.status = pageInfo.status
+			this.from = pageInfo.from
 			this.dataHandle(pageInfo)
 		},
 		methods: {
 			goBack() {
 				this.banzhengXinxiFlag = true
 			},
-			editBanzheng(data, index) {	
-				console.log('dataasdf',data);
+			editBanzheng(data, index) {
+				console.log('dataasdf', data);
 				this.current = 3
 				this.banzhengXinxiFlag = false
 				this.$refs.banzhengXinxi.editinfo(data, index)
@@ -236,7 +252,7 @@
 			},
 			changeTab(data) {
 				console.log('data', data);
-				if (this.status == 'edit' &&data ==3) {
+				if (this.status == 'edit' && data == 3) {
 					this.banzhengXinxiFlag = true
 					return false
 				} else {
@@ -409,18 +425,22 @@
 
 			},
 			submitJiazheng(data) {
+			//	debugger
 				console.log('this.allData', this.allData);
+
+				if (data != '') {
+				//	debugger
+					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
 				}
-				if (data != '') {
-					this.allData.kaozhengList.push(data)
-				}
 				jiazhengAdd(this.allData).then(res => {
 					if (res.code == 0) {
 						uni.showToast({
@@ -443,37 +463,37 @@
 				})
 
 			},
-			editSave(data, flag,index) {
-				debugger
+			editSave(data, flag, index) {
+			//	debugger
 				console.log('this.allData', this.allData);
 				console.log('this.editInfo', this.editInfo);
 				if (flag == 'edit') {
 					jiazhengKaozhengUpdate(data).then(res => {
-						if(res.code ==0){
+						if (res.code == 0) {
 							uni.showToast({
 								title: "保存成功!",
 								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
-						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].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.banzhengXinxiFlag = true
+							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].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
 						}
-					
+
 					})
 				} else if (flag == 'editAdd') {
 					data.userId = this.userId
@@ -506,9 +526,16 @@
 				// }
 			},
 			goUpPage() {
-				uni.navigateTo({
-					url: `/pages/admin/Jiazheng/index`
-				})
+				if(this.from =='banzheng'){
+					uni.redirectTo({
+						url: "/pages/admin/banzheng/list"
+					})
+				}else{
+					uni.navigateTo({
+						url: `/pages/admin/Jiazheng/index`
+					})
+				}
+				
 			}
 
 		}

+ 6 - 0
pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -268,6 +268,12 @@
 					this.$emit('editSave', this.formData);
 				}
 			}
+		},
+		mounted() {
+			console.log('zxvasdfasdfasdfadsfadsfadsfasd');
+			// setTimeout(()=>{
+			// 			this.zhuangtai = '1'
+			// },1000)
 		}
 	};
 </script>