diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index a373b961..2fa6b1a3 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -694,10 +694,12 @@ 应用中心 + 待办中心 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html index ee4d5d85..959814dd 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html @@ -14,7 +14,7 @@ layout("/layouts/platform.html"){ style="width: 100%" v-model="pageForm.year" value-format="yyyy" - :clearable="false" + clearable @change="doSearch" > @@ -57,7 +57,8 @@ layout("/layouts/platform.html"){ 未缴费 - + 导入缴费记录 @@ -81,10 +82,10 @@ layout("/layouts/platform.html"){ type="primary">导出年度缴费名单 - 清空{{pageForm.year}}年缴费名单 + type="danger">清空{{pageForm.year ? pageForm.year + '年' : ''}}缴费名单 diff --git a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/pending/index.html b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/pending/index.html index f1dbf793..9a36a4d8 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/pending/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/pending/index.html @@ -29,6 +29,14 @@ layout("/layouts/platform.html"){ margin-right: 8px; } + /* 在列表标题旁说明待确认人员的来源及可能情况。 */ + .pending-confirm-tip { + color: #f56c6c; + font-size: 14px; + font-weight: normal; + line-height: 1.5; + } + /* 批量变更弹窗固定在当前浏览器可视区域正中间。 */ .el-dialog.pending-batch-change-dialog { position: absolute; @@ -109,6 +117,9 @@ layout("/layouts/platform.html"){ +