diff --git a/components/hrm/detailPanels/leave.vue b/components/hrm/detailPanels/leave.vue index 331a9d3..b2854e9 100644 --- a/components/hrm/detailPanels/leave.vue +++ b/components/hrm/detailPanels/leave.vue @@ -40,6 +40,59 @@ 申请时间: {{ formatTime(detail.createTime) || '无' }} + + + + 项目名称 + {{ detail.projectName || '无' }} + + + + 项目编号 + {{ detail.projectNum || '无' }} + + + + 项目代号 + {{ detail.projectCode || '无' }} + + + + + + 项目名称: + {{ detail.projectName || '-' }} + + + 项目编号: + {{ detail.projectNum || '-' }} + + + 项目代号: + {{ detail.projectCode || '-' }} + + + 项目类型: + + + + 项目地址: + {{ detail.address || '-' }} + + + 项目总金额: + {{ detail.funds || '-' }}元 + + + 负责人: + {{ detail.functionary || '-' }} + + + 备注: + {{ detail.remark || '-' }} + + + @@ -84,7 +137,10 @@ if (!timeStr) return ''; const [datePart] = timeStr.split(' '); return datePart; - } + }, + openPopup() { + this.$refs.popup.open() + }, } } @@ -162,6 +218,12 @@ color: #333333; word-break: break-all; } +/* 总金额突出 - 字体加粗+主题色,视觉重点 */ +.amount-item .item-value { + color: #409eff; + font-weight: 600; + font-size: 32rpx; +} /* 请假原因 - 适配多行文,增加行高 */ .reason-item .item-value { line-height: 52rpx; @@ -183,4 +245,26 @@ margin: 8rpx 16rpx 0; flex-shrink: 0; } + +.detail-content { + border: 1px solid #ccc; /* 边框 */ + border-radius: 10px; /* 圆角 */ + padding: 15px; /* 内边距 */ + background-color: #f9f9f9; /* 背景色 */ +} + +.info-item { + display: flex; /* 使用 Flexbox 布局 */ + justify-content: space-between; /* 在一行内均匀分布 */ + margin-top: 10px; /* 上边距 */ +} + +.info-label { + color: #333; /* 标签颜色 */ + font-weight: bold; /* 标签加粗 */ +} + +.info-value { + color: #666; /* 值的颜色 */ +} \ No newline at end of file diff --git a/components/hrm/detailPanels/reimburse.vue b/components/hrm/detailPanels/reimburse.vue index f30c5c1..b93648a 100644 --- a/components/hrm/detailPanels/reimburse.vue +++ b/components/hrm/detailPanels/reimburse.vue @@ -42,6 +42,59 @@ 更新人: {{ detail.updateBy || '无' }} + + + + 项目名称 + {{ detail.projectName || '无' }} + + + + 项目编号 + {{ detail.projectNum || '无' }} + + + + 项目代号 + {{ detail.projectCode || '无' }} + + + + + + 项目名称: + {{ detail.projectName || '-' }} + + + 项目编号: + {{ detail.projectNum || '-' }} + + + 项目代号: + {{ detail.projectCode || '-' }} + + + 项目类型: + + + + 项目地址: + {{ detail.address || '-' }} + + + 项目总金额: + {{ detail.funds || '-' }}元 + + + 负责人: + {{ detail.functionary || '-' }} + + + 备注: + {{ detail.remark || '-' }} + + + @@ -99,6 +152,9 @@ const [datePart] = timeStr.split(' '); return datePart; }, + openPopup() { + this.$refs.popup.open() + }, /** * 状态文本转换 * 将接口返回的英文状态转为中文展示 @@ -219,4 +275,26 @@ margin: 8rpx 16rpx 0; flex-shrink: 0; } + +.detail-content { + border: 1px solid #ccc; /* 边框 */ + border-radius: 10px; /* 圆角 */ + padding: 15px; /* 内边距 */ + background-color: #f9f9f9; /* 背景色 */ +} + +.info-item { + display: flex; /* 使用 Flexbox 布局 */ + justify-content: space-between; /* 在一行内均匀分布 */ + margin-top: 10px; /* 上边距 */ +} + +.info-label { + color: #333; /* 标签颜色 */ + font-weight: bold; /* 标签加粗 */ +} + +.info-value { + color: #666; /* 值的颜色 */ +} \ No newline at end of file diff --git a/components/hrm/detailPanels/seal.vue b/components/hrm/detailPanels/seal.vue index 63cadcc..bbc55ea 100644 --- a/components/hrm/detailPanels/seal.vue +++ b/components/hrm/detailPanels/seal.vue @@ -36,6 +36,59 @@ 更新人 {{ detail.updateBy || '无' }} + + + + 项目名称 + {{ detail.projectName || '无' }} + + + + 项目编号 + {{ detail.projectNum || '无' }} + + + + 项目代号 + {{ detail.projectCode || '无' }} + + + + + + 项目名称: + {{ detail.projectName || '-' }} + + + 项目编号: + {{ detail.projectNum || '-' }} + + + 项目代号: + {{ detail.projectCode || '-' }} + + + 项目类型: + + + + 项目地址: + {{ detail.address || '-' }} + + + 项目总金额: + {{ detail.funds || '-' }}元 + + + 负责人: + {{ detail.functionary || '-' }} + + + 备注: + {{ detail.remark || '-' }} + + + @@ -65,6 +118,11 @@ immediate: true } }, + methods: { + openPopup() { + this.$refs.popup.open() + } + } } @@ -143,6 +201,12 @@ word-break: break-all; /* 适配超长文本,防止溢出 */ line-height: 48rpx; } +/* 总金额突出 - 字体加粗+主题色,视觉重点 */ +.amount-item .item-value { + color: #409eff; + font-weight: 600; + font-size: 32rpx; +} /* 多行文适配 - 用印原因/备注,加大行高提升阅读体验,与其他组件一致 */ .multi-line .item-value { line-height: 52rpx; @@ -164,4 +228,26 @@ margin: 8rpx 16rpx 0; flex-shrink: 0; } + +.detail-content { + border: 1px solid #ccc; /* 边框 */ + border-radius: 10px; /* 圆角 */ + padding: 15px; /* 内边距 */ + background-color: #f9f9f9; /* 背景色 */ +} + +.info-item { + display: flex; /* 使用 Flexbox 布局 */ + justify-content: space-between; /* 在一行内均匀分布 */ + margin-top: 10px; /* 上边距 */ +} + +.info-label { + color: #333; /* 标签颜色 */ + font-weight: bold; /* 标签加粗 */ +} + +.info-value { + color: #666; /* 值的颜色 */ +} \ No newline at end of file diff --git a/components/hrm/detailPanels/travel.vue b/components/hrm/detailPanels/travel.vue index 3b92fd7..476c318 100644 --- a/components/hrm/detailPanels/travel.vue +++ b/components/hrm/detailPanels/travel.vue @@ -1,76 +1,131 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 9a44fa4..da8d436 100644 --- a/pages.json +++ b/pages.json @@ -585,6 +585,13 @@ "navigationBarTitleText": "我的申请", "navigationStyle": "default" } + }, + { + "path": "pages/hrm/approve/approve", + "style": { + "navigationBarTitleText": "办公审批", + "navigationStyle": "default" + } } ], "tabBar": { @@ -600,6 +607,12 @@ "selectedIconPath": "static/images/tabbar_conversation_active.png", "text": "消息" }, + { + "pagePath": "pages/hrm/approve/approve", + "iconPath": "/static/images/tabbar_shenpi.png", + "selectedIconPath": "/static/images/tabbar_shenpi_active.png", + "text": "审批" + }, // { // "pagePath": "pages/contact/index/index", // "iconPath": "./static/images/tabbar_contacts.png", diff --git a/pages/hrm/approve/approve.vue b/pages/hrm/approve/approve.vue new file mode 100644 index 0000000..018a1ee --- /dev/null +++ b/pages/hrm/approve/approve.vue @@ -0,0 +1,626 @@ + + + + + \ No newline at end of file diff --git a/pages/workbench/hrm/apply/apply.vue b/pages/workbench/hrm/apply/apply.vue index f175399..120c987 100644 --- a/pages/workbench/hrm/apply/apply.vue +++ b/pages/workbench/hrm/apply/apply.vue @@ -9,7 +9,7 @@ - diff --git a/pages/workbench/hrm/cc/cc.vue b/pages/workbench/hrm/cc/cc.vue index 6540cd2..b098e95 100644 --- a/pages/workbench/hrm/cc/cc.vue +++ b/pages/workbench/hrm/cc/cc.vue @@ -46,9 +46,9 @@ - + + + @@ -278,6 +278,7 @@ }); return; } + readCc(task.ccId) uni.navigateTo({ url: `/pages/workbench/hrm/detail/detail?bizId=${task.bizId}&bizType=${task.bizType}` }); diff --git a/pages/workbench/index/index.vue b/pages/workbench/index/index.vue index b9007cb..1802eb6 100644 --- a/pages/workbench/index/index.vue +++ b/pages/workbench/index/index.vue @@ -17,7 +17,7 @@ diff --git a/static/images/tabbar_shenpi.png b/static/images/tabbar_shenpi.png new file mode 100644 index 0000000..772a119 Binary files /dev/null and b/static/images/tabbar_shenpi.png differ diff --git a/static/images/tabbar_shenpi_active.png b/static/images/tabbar_shenpi_active.png new file mode 100644 index 0000000..ecdc393 Binary files /dev/null and b/static/images/tabbar_shenpi_active.png differ