考核考评

common/utils.js

@@ -336,10 +336,23 @@ function handleReduceAMonth(nowTime,newTime){
 
 	let howDay = this.getThisMonthDay(`${y}-${m}`)
 	let newHowDay = this.getThisMonthDay(`${newY}-${newM}`)
-
+	console.log('d',d)
-		if (d === howDay){
+	console.log('newHowDay',newHowDay)
+	const nowDate = new Date()
+	let nowM =nowDate.getMonth() + 1
+	let nowD = nowDate.getDate()
+	console.log('nowD',nowD)
+		if (d === newHowDay){
+			if (d<nowD){
 				console.log('111',`${y}-${newM}-${newHowDay}`)
 				return `${newY}-${newM}-${newHowDay}`
+			}else{
+				if (newM===nowM){
+					return `${newY}-${newM}-${nowD}`
+				}else{
+					return `${newY}-${newM}-${newHowDay}`
+				}
+			}
 		}else{
 			if (newM===2){
 				if (d>newHowDay){
@@ -350,8 +363,26 @@ function handleReduceAMonth(nowTime,newTime){
 					return `${newY}-${newM}-${d}`
 				}
 			}else{
+				console.log('nowD',nowD)
+				console.log('d',d)
+				if (nowD<d){
+					if (nowM===newM){
+						console.log('3333',`${y}-${newM}-${nowD}`)
+						return `${newY}-${newM}-${nowD}`
+					}else{
+						if (d<newHowDay){
 							console.log('333',`${y}-${newM}-${d}`)
 							return `${newY}-${newM}-${d}`
+						}else{
+							console.log('333',`${y}-${newM}-${newHowDay}`)
+							return `${newY}-${newM}-${newHowDay}`
+						}
+
+					}
+				}else {
+					console.log('333',`${y}-${newM}-${d}`)
+					return `${newY}-${newM}-${d}`
+				}
 			}
 		}
 }

pages/examine/index.vue

@@ -136,6 +136,11 @@
                           <span class="text">{{item.list[0].SERVERPARTList[0].MEETING_PLACE}}</span>
                         </view>
                       </view>
+                      <view class="noDataItem" v-if="!item.list[0].SERVERPARTList[0].MEETING_PERSONS && !item.list[0].SERVERPARTList[0].MEETING_CONTENT">
+                        <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
+                        <p class="text">暂无会议内容</p>
+                      </view>
+                      <view v-else>
                         <view class="detail">
                           <view class="message" style="margin-bottom: 6px">
                             <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/time.svg"></image>
@@ -155,13 +160,14 @@
                           </view>
                         </view>
                       </view>
+
+                    </view>
                   </view>
                   <view class="noData" v-else>
                     <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
                     <p class="text">暂无数据</p>
                   </view>
                 </view>
-
             </view>
 
             <uniPopup type="bottom" :round="true" :show="showPop" @hidePopup="hidePopup">
@@ -294,7 +300,7 @@ export default {
           this.current='item'+month
           // 日期选择器
           this.selectDate = `${year}-${month}-${day}`
-          this.currentDate = 'item'+`${year}-${month}-${day}`
+          this.currentDate = 'item'+`${year}-${month}-${day - 4>0?day - 4:1}`
         },
         // 是否显示弹出框
         handleShowPopup(value,obj){
@@ -346,27 +352,27 @@ export default {
             let howDay = this.$util.getThisMonthDay(`${y}-${this.selectMonth}`)
             this.searchTime = `${y}-${this.selectMonth}-${howDay}`
           }
+
+          // 月份改变之后 重新渲染选择日期的数组
+          this.dateList = this.$util.getThisMonthDateList(`${y}-${this.selectMonth}`)
+          // 当月份改变了之后 日期栏也会根据当前选中的时间  选择新月份默认的时间
+          this.selectDate = this.$util.handleReduceAMonth(`${this.selectDate}`,`${y}-${this.selectMonth}`)
+          // 日期的自动滚动设置
+          const selectTime = new Date(this.selectDate)
+          let selectY = selectTime.getFullYear()
+          let selectM = selectTime.getMonth() + 1
+          let selectD = selectTime.getDate() - 4>0?selectTime.getDate() - 4:1
+          this.currentDate = 'item' + `${selectY}-${selectM}-${selectD}`
+
           if (this.selectTab===1){
             // 选中的是考核管理 调用拿到考核管理的列表
             this.getManagerList()
           }else if (this.selectTab===2){
             // 选中日常巡检 就调用拿到日常巡检的方法
-            // 月份改变之后 重新渲染选择日期的数组
-            this.dateList = this.$util.getThisMonthDateList(`${y}-${this.selectMonth}`)
-            // 当月份改变了之后 日期栏也会根据当前选中的时间  选择新月份默认的时间
-            this.selectDate = this.$util.handleReduceAMonth(`${this.selectDate}`,`${y}-${this.selectMonth}`)
-            // 日期的自动滚动设置
-            this.currentDate = 'item'+this.selectDate
             // 调用日常巡检的方法
             this.getDailyInspectionList()
           }else if(this.selectTab===3){
             // 选中日常巡检 就调用拿到日常巡检的方法
-            // 月份改变之后 重新渲染选择日期的数组
-            this.dateList = this.$util.getThisMonthDateList(`${y}-${this.selectMonth}`)
-            // 当月份改变了之后 日期栏也会根据当前选中的时间  选择新月份默认的时间
-            this.selectDate = this.$util.handleReduceAMonth(`${this.selectDate}`,`${y}-${this.selectMonth}`)
-            // 日期的自动滚动设置
-            this.currentDate = 'item'+this.selectDate
             // 晨会管理列表
             this.getMeetingDetail()
           }
@@ -397,16 +403,20 @@ export default {
         },
         // 选择日期的方法
         handleChangeDate(value){
-          const date = new Date(this.lastDay)
+          let time = `${value.split('-')[0]}-${value.split('-')[1]<10?'0'+value.split('-')[1]:value.split('-')[1]}-${value.split('-')[2]}`
+          const date = new Date()
+          let m = date.getMonth() +1
           let d = date.getDate()
-          const selectDay = new Date(value)
+          const selectDay = new Date(time)
+          let selectM = selectDay.getMonth() +1
           let selectd = selectDay.getDate()
-          if (d<selectd){
+          if (d<selectd && m<=selectM){
-            uni.showToast({
+            uni.showModal({
-              title: '时间还未到,不可选择',
+              title: `日常巡检仅支持查看${m}月${d}号及之前的数据`,
-              icon: 'none'
+              icon:'none',
+              showCancel: false,
+              duration:3000
             })
-
           }else{
             this.selectDate = value
             // 切换日期日常巡检列表 选项卡为2的时候调用
@@ -519,6 +529,7 @@ export default {
 .main{
     width: 100%;
     height: calc(100vh + 105px);
+    background: #fff;
     .heard{
         width: 100%;
         height: 185px;
@@ -988,6 +999,25 @@ export default {
                         }
                     }
                 }
+              .noDataItem{
+                width: 100%;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                margin-top: 6px;
+                .img{
+                  width: 80px;
+                  height: 80px;
+                }
+                .text{
+                  text-align: center;
+                  font-size: 14px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #A69E9F;
+                }
+              }
                 .detail{
                     margin-top: 12px;
                     .message{
@@ -1177,6 +1207,8 @@ export default {
         }
         .meetList{
             margin-top: 16px;
+            height: calc(60vh - 80px);
+            overflow-y: scroll;
             .message{
                 display: flex;
                 align-items: flex-start;