update

pages/settlementApproval/detail.vue

@@ -98,7 +98,10 @@
                 <view class="name">{{item.STAFF_NAME === '待审核'?item.APPLYAPPROVE_NAME:`【${item.APPLYAPPROVE_NAME}】`}}</view>
                 <view class="time">{{`${item.APPLYAPPROVE_DATE}`}}</view>
               </view>
-              <view class="desc" v-if="item.STAFF_NAME!=='待审核'">
+              <view class="desc" v-if="item.STAFF_NAME!=='待审核'" @click="handleShowAllNotice(item.APPLYAPPROVE_DATE,true)" >
+                {{item.STAFF_NAME}}:{{`${item.APPLYAPPROVE_INFO}`}}
+              </view>
+              <view class="noticeBox" v-if="item.showNotice" @click.stop="handleShowAllNotice(item.APPLYAPPROVE_DATE,false)">
                 {{item.STAFF_NAME}}:{{`${item.APPLYAPPROVE_INFO}`}}
               </view>
             </view>
@@ -848,6 +851,18 @@ export default {
 
   methods:{
     numeral,
+    // 点击流程的备注 显示悬浮内容 备注展示全
+    handleShowAllNotice(time,state){
+      console.log('state',state)
+      let list = JSON.parse(JSON.stringify(this.progressList))
+      list.forEach((item)=>{
+        if(item.APPLYAPPROVE_DATE === time){
+          item.showNotice = state
+        }
+      })
+      this.progressList = list
+      console.log('progressList',this.progressList)
+    },
     // 经营商户应交费用明细表
     async handleGetProjectExpenseList(){
       console.log('this.detailObj.SETTLEMENT_DATE',this.detailObj.SETTLEMENT_DATE)
@@ -920,6 +935,8 @@ export default {
         uni.redirectTo({
           url: '/pages/settlementApproval/index'
         });
+        // 推送进来的数据
+        uni.setStorageSync('pushDetail', this.detailObj)
       }else{
         uni.navigateBack({ delta: 1})
       }
@@ -1054,22 +1071,47 @@ export default {
         title: '请求结算数据...'
       })
       const data = await request.$webGet('EShangApiMain/Finance/GetReconciliation',req)
+
+      // 当前流程实际出现的
+      const nowData = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodAccount',req)
+      let nowList = wrapTreeNode(nowData.Result_Data.ProjectPeriodList)
+      console.log('nowList',nowList)
+
       let res = data.Result_Data.List[0]
-      console.log('res',res)
       // 页面显示的结算数据
       let resList = wrapTreeNode(res.ProjectPeriodList.children)
+      console.log('resList222',resList)
+
+      let result = []
       if(resList && resList.length>0){
+        if(nowList && nowList.length>0){
           resList.forEach(item=>{
-          item.level = 1
+            nowList.forEach(subItem=>{
-          if(item.children && item.children.length>0){
+              if(item.PeriodIndex === subItem.PeriodIndex){
-            item.showChildren = false
+                result.push(item)
-            item.children.forEach(subItem=>{
-              subItem.level = 2
-            })
               }
             })
+          })
         }
-      this.yearDataList = resList
+      }
+
+
+
+      // if(resList && resList.length>0){
+      //   resList.forEach(item=>{
+      //     item.level = 1
+      //     if(item.children && item.children.length>0){
+      //       item.showChildren = false
+      //       item.children.forEach(subItem=>{
+      //         subItem.level = 2
+      //       })
+      //     }
+      //   })
+      // }
+
+
+
+      this.yearDataList = result
       console.log('this',this.yearDataList)
       // 判断是否已经完成全部月度结算
       let other = res.ProjectPeriodList.node
@@ -2826,6 +2868,7 @@ export default {
           .itemRight{
             width: calc(100% - 72rpx);
             margin-left: 12rpx;
+            position: relative;
             .nameBox{
               display: flex;
               align-items: center;
@@ -2863,6 +2906,17 @@ export default {
               white-space: nowrap;
               overflow: hidden;
             }
+            .noticeBox{
+              position: absolute;
+              top: 0;left: 0;
+              width: 250px;
+              padding: 16px;
+              background: #fff;
+              box-shadow: 5px 5px 2px 0px rgba(0, 0, 0, 0.75);
+              z-index: 8;
+              border: 1px solid #ccc;
+              border-radius: 20px;
+            }
           }
         }
         .lineBox{

pages/settlementApproval/index.vue

@@ -5,7 +5,7 @@
       <view class="arrowBox" :style="{paddingTop: menu.top + 'px',height: menu.height + 'px'}">
         <image @click="handleBack" class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
 
-        <picker :value="selectServiceId" :range="selectServiceList" @change="handleChangeService" range-key="label">
+        <picker :value="selectIndex" :range="selectServiceList" @change="handleChangeService" range-key="label">
           <view class="selectServiceBox">
             <image class="serviceIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/serviceIcon.png"/>
             <view class="nameBox">
@@ -69,7 +69,7 @@
             <div class="content-index">{{index+1}}</div>
             <view class="itemRow" >
               <view class="projectName">{{ item.BUSINESSPROJECT_NAME }}</view>
-              <view class="stateName" :style="{color: item.SETTLEMENT_STATE===2?'#FF814FFF':''}">{{ item.SETTLEMENT_STATE===0?'待结算':item.SETTLEMENT_STATE===1?'已结算':item.SETTLEMENT_STATE===2?'审批中':'' }}</view>
+              <view class="stateName" :style="{color: (item.SETTLEMENT_STATE===2) || (item.SETTLEMENT_STATE ===2 && item.PEND_STATE ===0)?'#FF814FFF':''}">{{ item.SETTLEMENT_STATE ===2 && item.PEND_STATE ===0?'待我处理': item.SETTLEMENT_STATE===0?'待结算':item.SETTLEMENT_STATE===1?'已结算':item.SETTLEMENT_STATE===2?'审批中':'' }}</view>
             </view>
             <view class="itemCenterRow" style="margin: 60rpx 0 20rpx">
               <view class="value">{{ item.SETTLEMENT_TYPE===1?$util.getMoney(item.REVENUE_AMOUNT):item.SETTLEMENT_TYPE===2?$util.getMoney(item.CURREVENUE_AMOUNT):'' }}</view>
@@ -188,7 +188,6 @@ import moment from "moment";
       console.log('this.useInfo',this.useInfo)
       console.log('Store.state.userData',Store.state.userData)
 
-      await this.getSeverpart()
 
 
       // this.startDate = this.$moment().startOf('year').format('YYYY-MM')
@@ -212,9 +211,25 @@ import moment from "moment";
       //   this.selectServiceList = list
       // }
       // this.selectServiceId = this.selectServiceList[0].value
-      this.handleGetPageData()
+      await this.getSeverpart()
+      await this.handleGetPageData()
     },
     onShow(){
+      // 判断是不是推送进去小程序之后 直接返回到的列表页
+      let uploadDetail = uni.getStorageSync('pushDetail')
+      if (uploadDetail) {
+        console.log('uploadDetail', uploadDetail)
+        this.selectServiceId = uploadDetail.SERVERPART_ID
+        console.log('this.selectServiceList',this.selectServiceList)
+        if (this.selectServiceList && this.selectServiceList.length > 0) {
+          this.selectServiceList.forEach((item, index) => {
+            if (Number(item.value) === Number(uploadDetail.SERVERPART_ID)) {
+              this.selectIndex = index
+            }
+          })
+        }
+      }
+
       let reload = uni.getStorageSync('reolad')
       if(reload==='true'){
         this.dataList = []
@@ -257,7 +272,8 @@ import moment from "moment";
       // 返回按钮
       handleBack(){
         console.log('1111')
-        uni.navigateBack({ delta: 1})
+        uni.switchTab({ url:'/pages/index/index'})
+
       },
       // 拿到服务区列表
       async getSeverpart(){
@@ -283,7 +299,18 @@ import moment from "moment";
           })
           this.selectServiceList = list
         }
+        let uploadDetail = uni.getStorageSync('pushDetail')
+        if(this.selectServiceId){
+          if (this.selectServiceList && this.selectServiceList.length > 0) {
+            this.selectServiceList.forEach((item, index) => {
+              if (Number(item.value) === Number(uploadDetail.SERVERPART_ID)) {
+                this.selectIndex = index
+              }
+            })
+          }
+        }else{
           this.selectServiceId = this.selectServiceList[0].value
+        }
       },
       // 自动跳转到指定月份的方法
       async handleGetNewMonth(obj,time){
@@ -395,7 +422,8 @@ import moment from "moment";
           EndDate: this.endDate?this.$moment(this.endDate).format('YYYYMM'):'',
           PageIndex: this.PageIndex,
           PageSize: 10,
-          UserId: this.useInfo.userData.UserId
+          UserId: this.useInfo.userData.UserId,
+          ToDoFirst: true
         }
         uni.showLoading({
           title: '正在加载...'