From 40a0da2f8164c6d2271757c1929629e0b877e5be Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 16 Aug 2023 15:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/task/taskItem.vue | 9 +- pages/oaLogin/oaLogin.vue | 1 + subpkg/archives/archives.vue | 9 +- subpkg/archivesDetail/archivesDetail.vue | 4 +- subpkg/finance/finance.vue | 93 ++++++++++++++++++- .../u-radio-group/u-radio-group.vue | 1 + .../uview-ui/components/u-radio/u-radio.vue | 10 +- 7 files changed, 117 insertions(+), 10 deletions(-) diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index 6acb2d2..3a9aff7 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -17,7 +17,10 @@ 任务状态: - 进行中 + + {{datas.extend.informationg.update+'/'+datas.extend.informationg.count}} + 进行中 + 已完成 已关闭 @@ -64,12 +67,12 @@ import { Toast } from '../../libs/uniApi'; }, clickTask(){ // console.log('点击', this.$props.datas); - if(this.$props.datas.status!==2&&this.$props.datas.status!==1){ + if((this.$props.datas.type!=31)&&this.$props.datas.status!==2&&this.$props.datas.status!==1){ return this.$props.datas.status==3?Toast('任务已完成!'):Toast('任务已结束!'); } if(this.$props.datas.type==31){ // this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr)) - this.navTo(`/subpkg/updateArchives/updateArchives?id=${this.$props.datas?.extend?.informationg?.arr}&task_id=${this.$props.datas?.id}`) + this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`) }else this.navTo(''); } } diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue index 11e2241..422894a 100644 --- a/pages/oaLogin/oaLogin.vue +++ b/pages/oaLogin/oaLogin.vue @@ -86,6 +86,7 @@ uni.switchTab({ url: '/pages/oaHome/oaHome', success: () => { + uni.$emit('initOaTask'); // 更新任务 uni.hideLoading() } }) diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue index 844e82e..7a074f9 100644 --- a/subpkg/archives/archives.vue +++ b/subpkg/archives/archives.vue @@ -17,7 +17,7 @@ 更新时间: {{item.create_time}} - + 更新 @@ -46,6 +46,7 @@ data() { return { user_id: -1, + task_id: -1, list: [], loadConfig: { page: 1, @@ -62,6 +63,12 @@ else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id this.user_id = this.$store.state.app.userInfo.id; } + if(options.task_id) { + this.task_id = options.task_id; + uni.setNavigationBarTitle({ + title: '任务:信息更新' + }) + } this.loadInformationList(); uni.$on('loadArchives', this.initLoad); }, diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 928c6f6..b01f877 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -260,7 +260,9 @@ color: $theme-oa-color; } } - + + + .card { background-color: #fff; margin: 28rpx; diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index 65131df..88f73a6 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -54,7 +54,7 @@ - + + + + 账单日期: {{current?item.month:item.create_time}} + + + + + 任务名称： + {{item.remark}} + + + 金额归属： + {{$store.state.app.userInfo.nickname}} + + + 收益来源： + + + {{item.type_desc}} + {{item.type_desc}} + {{item.type_desc}} + + + + {{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}} + + @@ -335,6 +363,7 @@ page{ .bill_list{ // background-color: #f5f5f5; padding-bottom: 100rpx; + padding-top: 28rpx; .card{ padding: 28rpx; background-color: #fff; @@ -389,6 +418,68 @@ page{ } } } + .item { + margin: 0 auto; + margin-bottom: 28rpx; + width: 694rpx; + // height: 238rpx; + background: #FFFFFF; + border-radius: 14rpx 14rpx 14rpx 14rpx; + opacity: 1; + padding: 28rpx; + + .top { + margin-bottom: 28rpx; + font-size: 25rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #333333; + + &:before { + display: inline-block; + content: '账单详情'; + width: 137rpx; + height: 49rpx; + line-height: 49rpx; + text-align: center; + background: #3274F9; + border-radius: 26rpx 26rpx 26rpx 26rpx; + color: #fff; + margin-right: 28rpx; + } + } + + .bottom { + display: flex; + justify-content: space-between; + + .text { + font-size: 25rpx; + font-weight: 400; + color: #999999; + line-height: 39rpx; + .t_item{ + display: flex; + .t_title{ + margin-bottom: 16rpx; + flex-shrink: 0 !important; + } + .tips{ + font-size: 28rpx; + font-weight: 400; + color: #333333; + } + } + } + .price{ + display: flex; + align-items: center; + font-size: 32rpx; + font-weight: 500; + color: #F02828; + } + } + } } .btn{ diff --git a/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue b/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue index 0d3c9b5..8987fa2 100644 --- a/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue +++ b/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue @@ -104,5 +104,6 @@ &--column { @include flex(column); } + } diff --git a/uni_modules/uview-ui/components/u-radio/u-radio.vue b/uni_modules/uview-ui/components/u-radio/u-radio.vue index c0caab6..7b71df6 100644 --- a/uni_modules/uview-ui/components/u-radio/u-radio.vue +++ b/uni_modules/uview-ui/components/u-radio/u-radio.vue @@ -25,7 +25,7 @@ class="u-radio__text" @tap.stop="labelClickHandler" :style="{ - color: elDisabled ? elInactiveColor : elLabelColor, + color: elLabelColor, fontSize: elLabelSize, lineHeight: elLabelSize }" @@ -129,7 +129,7 @@ // 图标的颜色 if (this.elDisabled) { // disabled状态下，已勾选的radio图标改为elInactiveColor - return this.checked ? this.elInactiveColor : 'transparent' + return this.checked ? this.elLabelColor : 'transparent' } else { return this.checked ? iconColor : 'transparent' } @@ -154,7 +154,7 @@ // radio的整体样式 const style = {} style.backgroundColor = this.checked && !this.elDisabled ? this.elActiveColor : '#ffffff' - style.borderColor = this.checked && !this.elDisabled ? this.elActiveColor : this.elInactiveColor + style.borderColor = this.checked && !this.elDisabled ? this.elActiveColor : this.elLabelColor style.width = uni.$u.addUnit(this.elSize) style.height = uni.$u.addUnit(this.elSize) // 如果是图标在右边的话，移除它的右边距 @@ -247,7 +247,7 @@ $u-radio-checked-color:#fff !default; $u-radio-checked-background-color:red !default; $u-radio-checked-border-color: #2979ff !default; - $u-radio-disabled-background-color:#ebedf0 !default; + $u-radio-disabled-background-color:#fff !default; $u-radio-disabled--checked-color:#c8c9cc !default; $u-radio-label-margin-left: 5px !default; $u-radio-label-margin-right:12px !default; @@ -335,5 +335,7 @@ color: $u-radio-label-disabled-color; } } + + }