diff --git a/compontent/public/model.vue b/compontent/public/model.vue index e83a01e..3f28334 100644 --- a/compontent/public/model.vue +++ b/compontent/public/model.vue @@ -10,7 +10,7 @@ --> - {{ content }} + {{ content }} diff --git a/pages.json b/pages.json index 8e05fe3..be9a03f 100644 --- a/pages.json +++ b/pages.json @@ -401,6 +401,20 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/oldmanindex/flushJobs", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/oldmanindex/all", + "style" : + { + "navigationBarTitleText" : "" + } } ], "globalStyle": { diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index eacd7e1..400ec18 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -247,19 +247,19 @@ return } else if (!form.orgAddress) { uni.showToast({ - title: '请填写详细地址', + title: '请输入详细地址', icon: 'error' }) return } else if (!form.orgLeader) { uni.showToast({ - title: '请填写机构负责人', + title: '请输入机构负责人', icon: 'error' }) return } else if (!form.orgLeaderPhone) { uni.showToast({ - title: '请填写手机号', + title: '请输入手机号', icon: 'error' }) return @@ -271,13 +271,13 @@ return } else if (!form.orgPropertyType) { uni.showToast({ - title: '请填写房屋性质', + title: '请输入房屋性质', icon: 'error' }) return } else if (!form.orgBuildingArea) { uni.showToast({ - title: '请填写建筑面积', + title: '请输入建筑面积', icon: 'error' }) return diff --git a/pages/addoldman/jianhurenall.vue b/pages/addoldman/jianhurenall.vue index 81364c8..c7fb910 100644 --- a/pages/addoldman/jianhurenall.vue +++ b/pages/addoldman/jianhurenall.vue @@ -25,12 +25,21 @@ 监护人信息 + + 待审核 + 审核通过 + 审核驳回 + 编辑 + + 驳回原因: + {{alldata.guardianModifyContent}} + 人像面 diff --git a/pages/addoldman/oldmanall.vue b/pages/addoldman/oldmanall.vue index a4ce9f3..536ed8c 100644 --- a/pages/addoldman/oldmanall.vue +++ b/pages/addoldman/oldmanall.vue @@ -18,14 +18,25 @@ 长者信息 + + 待审核 + 审核通过 + 审核驳回 + - + 编辑 + + + + 驳回原因: + {{alldata.elderModifyContent}} + diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue index f7c18da..1f7cc31 100644 --- a/pages/addstaff/information.vue +++ b/pages/addstaff/information.vue @@ -268,12 +268,12 @@ const next = () => { if (!form.maritalStatus) { uni.showToast({ - title: '请填写婚否', + title: '请输入婚否', icon: 'error' }) } else if (!form.tel) { uni.showToast({ - title: '请填写联系电话', + title: '请输入联系电话', icon: 'error' }) } else if (!isValid11DigitNumber(form.tel)) { @@ -284,32 +284,32 @@ return } else if (!form.height) { uni.showToast({ - title: '请填写身高', + title: '请输入身高', icon: 'error' }) } else if (!form.weight) { uni.showToast({ - title: '请填写体重', + title: '请输入体重', icon: 'error' }) } else if (!form.healthStatus) { uni.showToast({ - title: '请填写健康状态', + title: '请输入健康状态', icon: 'error' }) } else if (!form.politicalAppearance) { uni.showToast({ - title: '请填写政治面貌', + title: '请输入政治面貌', icon: 'error' }) } else if (!form.contactName) { uni.showToast({ - title: '请填写紧急联系人', + title: '请输入紧急联系人', icon: 'none' }) } else if (!form.contactTel) { uni.showToast({ - title: '请填写紧急联系人电话', + title: '请输入紧急联系人电话', icon: 'none' }) } else if (!isValid11DigitNumber(form.contactTel)) { @@ -320,18 +320,18 @@ return } else if (!form.contactRelationship) { uni.showToast({ - title: '请填写联系人和本人的关系', + title: '请输入联系人和本人的关系', icon: 'none' }) } else if (!form.hukouType) { uni.showToast({ - title: '请填写户口性质', + title: '请输入户口性质', icon: 'error' }) } else if (!form.currentAddress) { uni.showToast({ - title: '请填写现住址', + title: '请输入现住址', icon: 'error' }) } diff --git a/pages/addsupplier/all.vue b/pages/addsupplier/all.vue index a4ae0e8..75ad53f 100644 --- a/pages/addsupplier/all.vue +++ b/pages/addsupplier/all.vue @@ -19,16 +19,17 @@ :src="applyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[applyStatus-1]}.png`:``" /> - 申请中 - 已驳回 - 申请变更中 + 待审核 + 审核驳回 + 待审核 - + 编辑 - - 驳回原因: {{datas.auditContent}} + + 驳回原因: + {{datas.auditContent}} @@ -61,12 +62,11 @@ - + @@ -48,7 +49,8 @@ -   加盟护理单元,坐拥成熟运营体系,精简人力配置,降低运营成本。优质资源共享,多重优势协同发力,全方位拓宽利润空间,助力占领银发赛道。 +   加盟护理单元,坐拥成熟运营体系,精简人力配置,降低运营成本。优质资源共享,多重优势协同发力, + 全方位拓宽利润空间,助力占领银发赛道。 diff --git a/pages/oldmanindex/all.vue b/pages/oldmanindex/all.vue new file mode 100644 index 0000000..c5a7127 --- /dev/null +++ b/pages/oldmanindex/all.vue @@ -0,0 +1,526 @@ + + + + + \ No newline at end of file diff --git a/pages/oldmanindex/api.js b/pages/oldmanindex/api.js index 5d3f007..11cb2d0 100644 --- a/pages/oldmanindex/api.js +++ b/pages/oldmanindex/api.js @@ -114,3 +114,9 @@ export function payMoneyList(nuId,orgCode){ method: 'get', }) } +export function queryElderHisAudit(nuId,orgCode){ + return request({ + url: `/api/elderInfo/queryElderHisAudit?openId=${uni.getStorageSync('openid')}`, + method: 'get', + }) +} diff --git a/pages/oldmanindex/flushJobs.vue b/pages/oldmanindex/flushJobs.vue new file mode 100644 index 0000000..bf34afc --- /dev/null +++ b/pages/oldmanindex/flushJobs.vue @@ -0,0 +1,466 @@ + + + + + \ No newline at end of file diff --git a/pages/oldmanindex/mine.vue b/pages/oldmanindex/mine.vue index f02e297..9d2f240 100644 --- a/pages/oldmanindex/mine.vue +++ b/pages/oldmanindex/mine.vue @@ -71,7 +71,7 @@ // uni.setStorageSync('platId', res.result.platId); }) - const cardMenu = [] + const cardMenu = [`审核记录`] const change = () => { uni.navigateTo({ @@ -89,7 +89,7 @@ switch (index) { case 0: uni.navigateTo({ - url: "/pages/oldmanindex/moneylist" + url: "/pages/oldmanindex/flushJobs" }) // changeData() diff --git a/pages/supplierindex/workjoin.vue b/pages/supplierindex/workjoin.vue index d073a76..7dc6862 100644 --- a/pages/supplierindex/workjoin.vue +++ b/pages/supplierindex/workjoin.vue @@ -42,21 +42,27 @@ {{ item.orgLeaderPhone }} + + + + + {{item.createTime}} - 申请中 + 待审核 - 申请通过 + 审核通过 - 申请驳回 + 审核驳回 - 申请变更中 + 待审核 - 变更已驳回 + 审核驳回