999999999999

pages/addoldman/IDcard.vue

@@ -54,7 +54,10 @@
 	import {
 		base_url
 	} from '@/request/index.js';
-	import { savePayer,changePayer } from './api/api.js'
+	import {
+		savePayer,
+		changePayer
+	} from './api/api.js'
 	import {
 		getMessage
 	} from '@/api/loginApi.js'
@@ -67,7 +70,7 @@
 		idCard: "",
 		homeAddress: "",
 		workUnit: "",
-		izJs:1,
+		izJs: 1,
 		openId: uni.getStorageSync('openid'),
 
 	})
@@ -75,6 +78,7 @@
 	function isValid11DigitNumber(val) {
 		return /^(\d{11})$/.test(val);
 	}
+
 	function isValid18DigitNumber(val) {
 		return /^(\d{18})$/.test(val);
 	}
@@ -90,22 +94,18 @@
 				title: '请填写电话',
 				icon: 'error'
 			})
-		}else if (!isValid11DigitNumber(form.tel)) {
+		} else if (!isValid11DigitNumber(form.tel)) {
 			uni.showToast({
 				title: '电话格式错误',
 				icon: 'none'
 			})
 			return
-		} 
+		} else if (!form.idCard) {
-		
-		else if (!form.idCard) {
 			uni.showToast({
 				title: '请填写身份证号',
 				icon: 'error'
 			})
-		}
+		} else if (!isValid18DigitNumber(form.idCard)) {
-		
-		else if (!isValid18DigitNumber(form.idCard)) {
 			uni.showToast({
 				title: '身份证号格式错误',
 				icon: 'none'
@@ -122,25 +122,55 @@
 				icon: 'error'
 			})
 		} else {
-			if(uni.getStorageSync('allinfo').name){
+			if (uni.getStorageSync('allinfo').name) {
-				form.id = uni.getStorageSync('allinfo').id
+				let data = uni.getStorageSync('allinfo');
-				changePayer(form).then((res)=>{
+				data.id = uni.getStorageSync('allinfo').id
-					// console.log("res",res)
+				data.name = form.name
-					if(res.success){
+				data.tel = form.tel
-						getMessage(uni.getStorageSync('openid')).then(res=>{
+				data.idCard = form.idCard
+				data.homeAddress = form.homeAddress
+				data.workUnit = form.workUnit
+				data.modifyType = "jhr"
+				// changePayer(form).then((res)=>{
+				// 	// console.log("res",res)
+				// 	if(res.success){
+				// 		getMessage(uni.getStorageSync('openid')).then(res=>{
+				// 			uni.setStorageSync('allinfo', res.result);
+				// 			uni.reLaunch({
+				// 				url: "/pages/oldmanindex/index"
+				// 			});
+				// 		})
+				// 	}
+				// })
+				const urlpost = `${payurl.value}/api/elderInfo/updateElderInfo`;
+				uni.request({
+					url: urlpost,
+					method: 'POST',
+					header: {
+						'Content-Type': 'application/json',
+						'X-Access-Token': uni.getStorageSync('token') || '',
+					},
+					data: data,
+					success: (res) => {
+						if (res.success) {
+							getMessage(uni.getStorageSync('openid')).then(res => {
 								uni.setStorageSync('allinfo', res.result);
 								uni.reLaunch({
 									url: "/pages/oldmanindex/index"
 								});
 							})
 						}
-				})
+					},
-			}else{
+					fail: (e) => {
-				savePayer(form).then((res)=>{
+						console.log("????", e)
-					if(res.code==401){
+					}
-						savePayer(form).then((res)=>{
+				});
-							if(res.success){
+			} else {
-								getMessage(uni.getStorageSync('openid')).then(res=>{
+				savePayer(form).then((res) => {
+					if (res.code == 401) {
+						savePayer(form).then((res) => {
+							if (res.success) {
+								getMessage(uni.getStorageSync('openid')).then(res => {
 									uni.setStorageSync('allinfo', res.result);
 									uni.reLaunch({
 										url: "/pages/login/callback",
@@ -149,8 +179,8 @@
 							}
 						})
 					}
-					if(res.success){
+					if (res.success) {
-						getMessage(uni.getStorageSync('openid')).then(res=>{
+						getMessage(uni.getStorageSync('openid')).then(res => {
 							uni.setStorageSync('allinfo', res.result);
 							uni.reLaunch({
 								url: "/pages/login/callback",

pages/addoldman/jianhurenall.vue

@@ -123,10 +123,15 @@
 		textArray[4] = data.guardianWorkUnit;
 	})
 	const changeMessage = () => {
+		if(alldata.value.guardianModifyStatus=='1'){
+			openLook("该监护人信息正在审核中，请等待")
+		}else{
 			uni.navigateTo({
 				url: `/pages/addoldman/IDcard`
 			});
 		}
+		
+	}
 </script>
 
 <style lang="scss" scoped>

pages/addoldman/oldIDcard.vue

@@ -509,8 +509,9 @@
 			data.guardianWorkUnit = res.workUnit
 			data.guardianOpenId = uni.getStorageSync('openid')
 			data.guardianId = uni.getStorageSync('allinfo').id
+			data.modifyType = "zz"
 
-			console.log("?????", data)
+			// console.log("?????", data)
 			if (id.value) {
 				data.id = id.value
 				const urlpost = `${payurl.value}/api/elderInfo/updateElderInfo`;

pages/addoldman/oldmanall.vue

@@ -187,12 +187,9 @@
 		endphoto.value = data.idCardPositive
 	})
 	const changeMessage = () => {
-		// uni.setStorageSync("baddata", alldata.value)
+		if(alldata.value.elderModifyStatus=='1'){
-		// uni.setStorageSync('specicalid', alldata.value.id);
+			openLook("该长者信息正在审核中，请等待")
-		// uni.setStorageSync("backhuancun", {})
+		}else{
-		// uni.navigateTo({
-		// 	url: `/pages/addstaff/information`
-		// });
 			let item = alldata.value
 			uni.setStorageSync("baddata", item)
 			uni.setStorageSync('specicalid', item.id);
@@ -206,6 +203,8 @@
 				url: "/pages/addoldman/oldIDcard"
 			})
 		}
+		
+	}
 </script>
 
 <style lang="scss" scoped>

pages/oldmanindex/index.vue

@@ -78,11 +78,9 @@
 												{{ item.elderInfo && item.elderInfo.name }}
 											</view>
 											<view style="color: #7C788D;margin-left: 5rpx;font-size: 22rpx;">
-
 												<view>
 													{{ item.nuName  }}
 												</view>
-												<!-- 啊啊啊啊啊啊啊啊啊 -->
 											</view>
 										</view>
 
@@ -354,37 +352,46 @@
 	onUnload(() => {
 		if (timer) clearInterval(timer)
 	})
-	const openLook = (res) => {
+	// const openLook = (res) => {
-		content.value = res;
+	// 	content.value = res;
-		show.value = true
+	// 	show.value = true
-	}
+	// }
 	const clickButton = (item, index) => {
 
 		switch (index) {
 			case 5:
-				if (item.elderModifyStatus == '1') {
+				// if (item.elderModifyStatus == '1') {
-					openLook("长者信息正在审核中，请等待")
+				// 	openLook("长者信息正在审核中，请等待")
-				} else {
+				// } else {
+				// 	queryElders(item.elderId, item.orgCode).then(res => {
+				// 		uni.navigateTo({
+				// 			url: `/pages/addoldman/oldmanall?element=${JSON.stringify(res.result[0])}`
+				// 		});
+				// 	})
+				// }
 				queryElders(item.elderId, item.orgCode).then(res => {
 					uni.navigateTo({
 						url: `/pages/addoldman/oldmanall?element=${JSON.stringify(res.result[0])}`
 					});
 				})
-				}
-
 				break
 			case 6:
-				if (item.guardianModifyStatus == '1') {
+				// if (item.guardianModifyStatus == '1') {
-					openLook("监护人信息正在审核中，请等待")
+				// 	openLook("监护人信息正在审核中，请等待")
-				} else {
+				// } else {
+				// 	queryElders(item.elderId, item.orgCode).then(res => {
+				// 		uni.navigateTo({
+				// 			url: `/pages/addoldman/jianhurenall?element=${JSON.stringify(res.result[0])}`
+				// 		});
+
+				// 	})
+				// }
 				queryElders(item.elderId, item.orgCode).then(res => {
 					uni.navigateTo({
 						url: `/pages/addoldman/jianhurenall?element=${JSON.stringify(res.result[0])}`
 					});
 
 				})
-				}
-
 				break
 		}
 	}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/addoldman/api/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sources":["pages/addoldman/api/api.js"],"sourcesContent":["import { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//新增监护人信息\r\nexport function savePayer(data){\r\n    return request({\r\n        url: `/api/elderInfo/addGuardian`,\r\n\t\tmethod: 'post',\r\n        data,\r\n\t\tno401:true\r\n    })\r\n}\r\n//绑定监护人信息\r\nexport function connectionPayer(data){\r\n    return request({\r\n        url: `/api/nuInfo/bindNu`,\r\n\t\tmethod: 'post',\r\n        data,\r\n\t\t\r\n    })\r\n}\r\n\r\n//修改监护人信息\r\nexport function changePayer(data){\r\n    return request({\r\n        url: `/api/elderInfo/editNuBizAdvisoryInfo`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n\r\n//获取base\r\nexport function getAccount(orgCode){\r\n    return request({\r\n        url: `/api/baseInfo/getOrgApiAddress?orgCode=${orgCode}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//根据手机号获取员工信息\r\n// export function getMessageList(id){\r\n//     return request({\r\n//         url: `/api/employessAdvisiory/queryApiEmployessInfo?openId=${id}&status=1,2,3`,\r\n// \t\tmethod: 'get',\r\n//     })\r\n// }"],"names":["request"],"mappings":";;;AAIO,SAAS,UAAU,MAAK;AAC3B,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,IACN,OAAM;AAAA,EACR,CAAK;AACL;AAYO,SAAS,YAAY,MAAK;AAC7B,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;;;"}
+{"version":3,"file":"api.js","sources":["pages/addoldman/api/api.js"],"sourcesContent":["import { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//新增监护人信息\r\nexport function savePayer(data){\r\n    return request({\r\n        url: `/api/elderInfo/addGuardian`,\r\n\t\tmethod: 'post',\r\n        data,\r\n\t\tno401:true\r\n    })\r\n}\r\n//绑定监护人信息\r\nexport function connectionPayer(data){\r\n    return request({\r\n        url: `/api/nuInfo/bindNu`,\r\n\t\tmethod: 'post',\r\n        data,\r\n\t\t\r\n    })\r\n}\r\n\r\n//修改监护人信息\r\nexport function changePayer(data){\r\n    return request({\r\n        url: `/api/elderInfo/editNuBizAdvisoryInfo`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n\r\n//获取base\r\nexport function getAccount(orgCode){\r\n    return request({\r\n        url: `/api/baseInfo/getOrgApiAddress?orgCode=${orgCode}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//根据手机号获取员工信息\r\n// export function getMessageList(id){\r\n//     return request({\r\n//         url: `/api/employessAdvisiory/queryApiEmployessInfo?openId=${id}&status=1,2,3`,\r\n// \t\tmethod: 'get',\r\n//     })\r\n// }"],"names":["request"],"mappings":";;;AAIO,SAAS,UAAU,MAAK;AAC3B,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,IACN,OAAM;AAAA,EACR,CAAK;AACL;;"}

unpackage/dist/dev/mp-weixin/pages/addoldman/IDcard.js

@@ -62,8 +62,24 @@ const _sfc_main = {
         });
       } else {
         if (common_vendor.index.getStorageSync("allinfo").name) {
-          form.id = common_vendor.index.getStorageSync("allinfo").id;
+          let data = common_vendor.index.getStorageSync("allinfo");
-          pages_addoldman_api_api.changePayer(form).then((res) => {
+          data.id = common_vendor.index.getStorageSync("allinfo").id;
+          data.name = form.name;
+          data.tel = form.tel;
+          data.idCard = form.idCard;
+          data.homeAddress = form.homeAddress;
+          data.workUnit = form.workUnit;
+          data.modifyType = "jhr";
+          const urlpost = `${payurl.value}/api/elderInfo/updateElderInfo`;
+          common_vendor.index.request({
+            url: urlpost,
+            method: "POST",
+            header: {
+              "Content-Type": "application/json",
+              "X-Access-Token": common_vendor.index.getStorageSync("token") || ""
+            },
+            data,
+            success: (res) => {
               if (res.success) {
                 api_loginApi.getMessage(common_vendor.index.getStorageSync("openid")).then((res2) => {
                   common_vendor.index.setStorageSync("allinfo", res2.result);
@@ -72,6 +88,10 @@ const _sfc_main = {
                   });
                 });
               }
+            },
+            fail: (e) => {
+              common_vendor.index.__f__("log", "at pages/addoldman/IDcard.vue:165", "????", e);
+            }
           });
         } else {
           pages_addoldman_api_api.savePayer(form).then((res) => {

unpackage/dist/dev/mp-weixin/pages/addoldman/api/api.js

@@ -9,13 +9,5 @@ function savePayer(data) {
     no401: true
   });
 }
-function changePayer(data) {
-  return request_index.request({
-    url: `/api/elderInfo/editNuBizAdvisoryInfo`,
-    method: "post",
-    data
-  });
-}
-exports.changePayer = changePayer;
 exports.savePayer = savePayer;
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pages/addoldman/api/api.js.map

unpackage/dist/dev/mp-weixin/pages/addoldman/jianhurenall.js

@@ -44,9 +44,13 @@ const _sfc_main = {
       textArray[4] = data.guardianWorkUnit;
     });
     const changeMessage = () => {
+      if (alldata.value.guardianModifyStatus == "1") {
+        openLook("该监护人信息正在审核中，请等待");
+      } else {
         common_vendor.index.navigateTo({
           url: `/pages/addoldman/IDcard`
         });
+      }
     };
     return (_ctx, _cache) => {
       return common_vendor.e({

unpackage/dist/dev/mp-weixin/pages/addoldman/oldIDcard.js

@@ -318,7 +318,7 @@ const _sfc_main = {
         data.guardianWorkUnit = res.workUnit;
         data.guardianOpenId = common_vendor.index.getStorageSync("openid");
         data.guardianId = common_vendor.index.getStorageSync("allinfo").id;
-        common_vendor.index.__f__("log", "at pages/addoldman/oldIDcard.vue:513", "?????", data);
+        data.modifyType = "zz";
         if (id.value) {
           data.id = id.value;
           const urlpost = `${payurl.value}/api/elderInfo/updateElderInfo`;
@@ -336,7 +336,7 @@ const _sfc_main = {
               });
             },
             fail: (e) => {
-              common_vendor.index.__f__("log", "at pages/addoldman/oldIDcard.vue:532", "????", e);
+              common_vendor.index.__f__("log", "at pages/addoldman/oldIDcard.vue:533", "????", e);
             }
           });
         } else {
@@ -350,7 +350,7 @@ const _sfc_main = {
             },
             data,
             success: (r) => {
-              common_vendor.index.__f__("log", "at pages/addoldman/oldIDcard.vue:547", "r", r);
+              common_vendor.index.__f__("log", "at pages/addoldman/oldIDcard.vue:548", "r", r);
               if (r.data.code != 200) {
                 common_vendor.index.showToast({
                   title: r.data.message,

unpackage/dist/dev/mp-weixin/pages/addoldman/oldmanall.js

@@ -86,6 +86,9 @@ const _sfc_main = {
       endphoto.value = data.idCardPositive;
     });
     const changeMessage = () => {
+      if (alldata.value.elderModifyStatus == "1") {
+        openLook("该长者信息正在审核中，请等待");
+      } else {
         let item = alldata.value;
         common_vendor.index.setStorageSync("baddata", item);
         common_vendor.index.setStorageSync("specicalid", item.id);
@@ -98,6 +101,7 @@ const _sfc_main = {
         common_vendor.index.navigateTo({
           url: "/pages/addoldman/oldIDcard"
         });
+      }
     };
     return (_ctx, _cache) => {
       return common_vendor.e({

unpackage/dist/dev/mp-weixin/pages/oldmanindex/index.js

@@ -51,33 +51,21 @@ const _sfc_main = {
       if (timer)
         clearInterval(timer);
     });
-    const openLook = (res) => {
-      content.value = res;
-      show.value = true;
-    };
     const clickButton = (item, index) => {
       switch (index) {
         case 5:
-          if (item.elderModifyStatus == "1") {
-            openLook("长者信息正在审核中，请等待");
-          } else {
           pages_oldmanindex_api.queryElders(item.elderId, item.orgCode).then((res) => {
             common_vendor.index.navigateTo({
               url: `/pages/addoldman/oldmanall?element=${JSON.stringify(res.result[0])}`
             });
           });
-          }
           break;
         case 6:
-          if (item.guardianModifyStatus == "1") {
-            openLook("监护人信息正在审核中，请等待");
-          } else {
           pages_oldmanindex_api.queryElders(item.elderId, item.orgCode).then((res) => {
             common_vendor.index.navigateTo({
               url: `/pages/addoldman/jianhurenall?element=${JSON.stringify(res.result[0])}`
             });
           });
-          }
           break;
       }
     };