diff --git a/miniprogram/pages/addMember/addMember.ts b/miniprogram/pages/addMember/addMember.ts index 918fc81..1666c53 100644 --- a/miniprogram/pages/addMember/addMember.ts +++ b/miniprogram/pages/addMember/addMember.ts @@ -114,6 +114,8 @@ Page({ employeeNotFound: false, /** 部门展示文案 */ unitDisplay: '', + /** 员工编号查询返回的完整数据,提交时作为 base 合并 */ + employeeQueryResult: null as Record | null, }, /** tabs 切换:清空查询结果、重置表单 */ @@ -124,6 +126,7 @@ Page({ employeeQueried: false, employeeNotFound: false, unitDisplay: '', + employeeQueryResult: null, readonly: false, hasQueried: false, serverResult: null, @@ -147,6 +150,7 @@ Page({ employeeQueried: false, employeeNotFound: false, unitDisplay: '', + employeeQueryResult: null, 'form.name': '', 'form.gender': '', 'form.age': '', @@ -177,6 +181,7 @@ Page({ employeeQueried: true, employeeNotFound: true, unitDisplay: '', + employeeQueryResult: null, 'form.name': '', 'form.gender': '', 'form.age': '', @@ -191,6 +196,7 @@ Page({ this.setData({ employeeQueried: true, employeeNotFound: false, + employeeQueryResult: result, unitDisplay: [result.secondDepart, result.thirdDepart].filter(Boolean).join(' / '), 'form.name': result.realname || '', 'form.idCard': idCard, @@ -207,6 +213,7 @@ Page({ employeeQueried: true, employeeNotFound: true, unitDisplay: '', + employeeQueryResult: null, }) }) .finally(() => { @@ -462,15 +469,17 @@ Page({ const userInfo = wx.getStorageSync('userInfo') const connectDeviceInfoRaw = wx.getStorageSync('connectDeviceInfo') - const serverResult = this.data.serverResult - const baseSpread = userType === 'family' ? (this.data.selectedMember ?? {}) : {} + // 员工:以查询接口返回为 base;家庭:以选中的已有用户 + 身份证查询结果为 base + const baseSpread = userType === 'employee' + ? (this.data.employeeQueryResult ?? {}) + : { ...(this.data.selectedMember ?? {}), ...(this.data.serverResult ?? {}) } + const birthday = this.data.birthday const finalSex = userType === 'family' ? sex : this.data.form.sex const payload: Record = { ...(baseSpread), - ...(serverResult ?? {}), dataType: userType === 'family' ? 1 : 0, parentUserId: userInfo?.userId ?? '', sn: lefuService.deviceInfo?.serialNumber ?? '',