更新

components/task/taskItem.vue

@@ -17,7 +17,10 @@
           <view class="left">
             <view>任务状态:</view>
             <view class="text">
-              <text v-if="datas.status==2||datas.status==1" style="color: #ff7c32;">进行中</text>
+              <text v-if="datas.status==2||datas.status==1" style="color: #ff7c32;">
+                <block v-if="(datas.type==31||datas.type==32||datas.type==33)&&datas.extend&&datas.extend.informationg">{{datas.extend.informationg.update+'/'+datas.extend.informationg.count}}</block>
+                <block v-else>进行中</block>
+              </text>
               <text v-if="datas.status==3" style="color: #46be61;">已完成</text>
               <text v-if="datas.status==5">已关闭</text>
             </view>
@@ -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('');
       }
     }

pages/oaLogin/oaLogin.vue

@@ -86,6 +86,7 @@
           uni.switchTab({
             url: '/pages/oaHome/oaHome',
             success: () => {
+              uni.$emit('initOaTask'); // 更新任务
               uni.hideLoading()
             }
           })

subpkg/archives/archives.vue

@@ -17,7 +17,7 @@
         <view class="bottom">
           <view>更新时间: {{item.create_time}}</view>
           <view class="right" v-if="showView">
-            <view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
+            <view class="update" @click="navTo(`/subpkg/updateArchives/updateArchives?id=${item.id}&task_id=${task_id}`)">
               更新
             </view>
             <view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
@@ -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);
     },

subpkg/archivesDetail/archivesDetail.vue

@@ -261,6 +261,8 @@
     }
   }
   
+  
+  
   .card {
     background-color: #fff;
     margin: 28rpx;

subpkg/finance/finance.vue

@@ -54,7 +54,7 @@
       </view>
       <!-- 日账单 -->
       <view class="bill_list" v-show="current==0">
-        <view class="card" v-for="(item, index) in billList" :key="index">
+        <!-- <view class="card" v-for="(item, index) in billList" :key="index">
           <view class="top">
             <view class="blue">账单详情</view>
             <view>账单日期：{{item.create_time}}</view>
@@ -69,7 +69,35 @@
               <view>入账金额:{{item.change_amount_desc>0?item.change_amount:'0.00'}}</view>
             </view>
           </view>
+        </view> -->
+        <view class="item" v-for="(item, index) in billList" :key="item.id">
+          <view class="top">
+            账单日期: {{current?item.month:item.create_time}}
+          </view>
+          <view class="bottom">
+            <view class="text">
+              <view class="t_item" v-if="current==0">
+                <view class="t_title">任务名称：</view>
+                <view class="tips">{{item.remark}}</view>
+              </view>
+              <view class="t_item">
+                <view class="t_title">金额归属：</view>
+                <view class="tips">{{$store.state.app.userInfo.nickname}}</view>
+              </view>
+              <view class="t_item">
+                <view class="t_title">收益来源：</view>
+                <view class="tips">
+                  <!-- {{current?item.remark:item.type_desc}} -->
+                  <text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
+                  <text v-else-if="item.change_type==203" style="color: #ff7c32;">{{item.type_desc}}</text>
+                  <text v-else="item.change_type==203">{{item.type_desc}}</text>
+                </view>
+              </view>
+            </view>
+            <view class="price">{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}</view>
+          </view>
         </view>
+        
         <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />        
       </view>
       <!-- 月账单 -->
@@ -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{

uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue

@@ -104,5 +104,6 @@
 		&--column {
 			@include flex(column);
 		}
+    
 	}
 </style>

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;
 			}
 		}
+    
+    
 	}
 </style>