|
|
@@ -1,10 +1,8 @@
|
|
|
<template>
|
|
|
<u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
|
|
|
- <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="日报" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
|
|
|
+ <u-navbar :titleStyle="{ color: '#000' }" :autoBack="false" title="日报" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
|
|
|
<template #left>
|
|
|
- <view class="u-navbar__content__left__item">
|
|
|
- <u-icon name="arrow-left" size="20" color="#000"></u-icon>
|
|
|
- </view>
|
|
|
+ <u-icon name="arrow-left" size="20" color="#000" @click="returnTo('business/common/projectMange/statistics/index')"></u-icon>
|
|
|
</template>
|
|
|
</u-navbar>
|
|
|
</u-sticky>
|
|
|
@@ -24,103 +22,62 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <oa-scroll
|
|
|
- customClass="record-container scroll-height"
|
|
|
- :pageSize="query.pageSize"
|
|
|
- :total="total"
|
|
|
- :isSticky="true"
|
|
|
- :customStyle="{
|
|
|
- //#ifdef APP-PLUS || MP-WEIXIN
|
|
|
- height: `calc(100vh - (138px + ${proxy.$settingStore.StatusBarHeight}))`,
|
|
|
- //#endif
|
|
|
- //#ifdef H5
|
|
|
- height: `calc(100vh - (138px))`,
|
|
|
- //#endif
|
|
|
- }"
|
|
|
- :refresherLoad="true"
|
|
|
- :refresherEnabled="true"
|
|
|
- :refresherDefaultStyle="'none'"
|
|
|
- :refresherThreshold="44"
|
|
|
- :lowerThreshold="44"
|
|
|
- :refresherBackground="'#f5f6f7'"
|
|
|
- @load="load"
|
|
|
- @refresh="refresh"
|
|
|
- :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
|
|
|
- >
|
|
|
- <template #default>
|
|
|
- <!-- <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page> -->
|
|
|
- <!-- start -->
|
|
|
- <view class="content-area" v-for="(el, index) in reportList" :key="index">
|
|
|
- <!-- <view class="flex mb10" @click="goContentDetails(el)">
|
|
|
- <img :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
|
|
|
+ <view class="report-list">
|
|
|
+ <view class="report-cell" v-for="(el,index) in reportList" :key="index">
|
|
|
+ <view class="flex report" @click="toPage(el.id,el.lockStatus)">
|
|
|
+ <image :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
|
|
|
<u-avatar
|
|
|
- v-if="!el.avatar"
|
|
|
+ v-if="!el.avatar && query.queryType != 2 && el.createBy"
|
|
|
class="content-area-center-avatar mr10"
|
|
|
:text="el.createBy.length > 2 ? el.createBy.slice(1, 3) : el.createBy"
|
|
|
shape="square"
|
|
|
- size="35"
|
|
|
- fontSize="10"
|
|
|
+ fontSize="12"
|
|
|
color="#ffffff"
|
|
|
:bgColor="proxy.$settingStore.themeColor.color"
|
|
|
></u-avatar>
|
|
|
- <view>
|
|
|
- <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
|
|
|
- <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
|
|
|
- </view>
|
|
|
- </view> -->
|
|
|
- <!-- <view class="content-area-center bg-white" v-else style="margin: 0 10px 10px; border-radius: 10px">
|
|
|
- <view class="content-area-top menu-item" style="float: right; padding: 10px 0px">
|
|
|
- <view class="content-area-top-time"> </view>
|
|
|
- <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
|
|
|
- </view>
|
|
|
- <view class="flex mb10" @click="goContentDetails(el)">
|
|
|
- <img :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
|
|
|
<u-avatar
|
|
|
- v-if="!el.avatar"
|
|
|
+ v-if="!el.avatar && query.queryType == 2 && el.userName"
|
|
|
class="content-area-center-avatar mr10"
|
|
|
- :text="el.createBy.length > 2 ? el.createBy.slice(1, 3) : el.createBy"
|
|
|
+ :text="el.nickName.length > 2 ? el.nickName.slice(1, 3) : el.nickName"
|
|
|
shape="square"
|
|
|
- size="35"
|
|
|
- fontSize="10"
|
|
|
+ fontSize="12"
|
|
|
color="#ffffff"
|
|
|
:bgColor="proxy.$settingStore.themeColor.color"
|
|
|
></u-avatar>
|
|
|
- <view>
|
|
|
- <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
|
|
|
- <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
|
|
|
+ <view class="left">
|
|
|
+ <view class="content-area-center-title font14 mb5">{{ query.queryType == 2 ? el.nickName : el.createBy }}</view>
|
|
|
+ <view class="content-area-center-time font12">{{ el.deptName }}</view>
|
|
|
+ </view>
|
|
|
+ <view class="right" v-if="query.queryType != 2">
|
|
|
+ <view class="content-area-center-time font12">{{ el.submitDateOutput }}</view>
|
|
|
+ <image src="@/static/images/projectMange/lock.png" alt="" style="width: 10px;height: 12.5px;margin-top:10px;" v-if="el.lockStatus" />
|
|
|
+ <view class="content-area-center-time font12" v-if="!el.lockStatus" :style="{color: el.readStatus ? '#999' : '#2A98FF',marginTop: '10px'}">{{ el.readStatus ? '已读' : '未读' }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="mb5" @click="goContentDetails(el)">
|
|
|
- <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
|
|
|
- </view>
|
|
|
- <view class="flex" v-if="el.createBy != useStore.nickName" @click="goContentDetails(el)">
|
|
|
- <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>
|
|
|
- <u-tag class="mr10" type="error" text="未读" size="mini" plain v-if="el.readFlag === 0" style="margin: 0 auto"></u-tag>
|
|
|
- <u-text text="全文" :color="proxy.$settingStore.themeColor.color" size="14"></u-text>
|
|
|
- </view>
|
|
|
- </view> -->
|
|
|
+ </view>
|
|
|
+ <view class="noData" v-if="!total">
|
|
|
+ <image src="@/static/images/data.png" alt="" />
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <!-- end -->
|
|
|
- </template>
|
|
|
- </oa-scroll>
|
|
|
+ </view>
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
/*----------------------------------依赖引入-----------------------------------*/
|
|
|
import { onLoad, onShow, onReady } from "@dcloudio/uni-app";
|
|
|
import { ref, getCurrentInstance, reactive } from "vue";
|
|
|
- import { useRouter, useRoute } from "vue-router";
|
|
|
/*----------------------------------接口引入-----------------------------------*/
|
|
|
import { projectApi } from "@/api/business/project.js";
|
|
|
+ import { listDept } from "@/api/system/user";
|
|
|
// import dayjs from 'dayjs/esm/index'
|
|
|
/*----------------------------------组件引入-----------------------------------*/
|
|
|
/*----------------------------------store引入-----------------------------------*/
|
|
|
+ import { useStores } from "@/store/modules/index";
|
|
|
import dayjs from "dayjs";
|
|
|
- const route = useRoute();
|
|
|
/*----------------------------------公共方法引入-----------------------------------*/
|
|
|
/*----------------------------------公共变量-----------------------------------*/
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
+ const useStore = useStores();
|
|
|
const day = ref("")
|
|
|
const statusNext = ref(false)//下一天按钮状态
|
|
|
const currentDate = ref("")//当前日期
|
|
|
@@ -136,10 +93,10 @@
|
|
|
])
|
|
|
const query = ref({
|
|
|
queryType:0,
|
|
|
- submitDate:dayjs().format("YYYY-MM-DD"),
|
|
|
+ submitDate:null,
|
|
|
reportId:null,
|
|
|
pageNum:1,
|
|
|
- pageSize:10,
|
|
|
+ pageSize:1000,
|
|
|
})
|
|
|
/*----------------------------------变量声明-----------------------------------*/
|
|
|
const statistics = ref({
|
|
|
@@ -148,26 +105,44 @@
|
|
|
notSubmitted:0, //未交
|
|
|
})
|
|
|
const loading = ref(false)
|
|
|
- const reportList =reactive([])
|
|
|
+ const reportList = ref([])
|
|
|
const pageSize = ref(20)
|
|
|
const current = ref(1)
|
|
|
const total = ref(0)
|
|
|
+ var pages = getCurrentPages(); //获取当前页面栈的实例；
|
|
|
/**
|
|
|
* @页面初始化
|
|
|
*/
|
|
|
- function init(id) {
|
|
|
+ function init(id,statisticalDate) {
|
|
|
if(id){
|
|
|
query.value.queryType = id
|
|
|
}
|
|
|
- var time = dayjs().format("YYYY-MM-DD").split("-")
|
|
|
- currentDate.value = `${time[0]}${time[1]}${time[2]}`
|
|
|
- day.value = `${time[0]}年${time[1]}月${time[2]}日`
|
|
|
+ var time;
|
|
|
+ if(statisticalDate){
|
|
|
+ time = statisticalDate.split("-")
|
|
|
+ day.value = `${time[0]}年${time[1]>=10 ? time[1] : time[1].slice(1)}月${time[2]>=10 ? time[2] : time[2].slice(1)}日`
|
|
|
+ query.value.submitDate = statisticalDate
|
|
|
+ }else{
|
|
|
+ time = dayjs().format("YYYY-MM-DD").split("-")
|
|
|
+ day.value = `${time[0]}年${time[1]}月${time[2]}日`
|
|
|
+ query.value.submitDate = dayjs().format("YYYY-MM-DD")
|
|
|
+ }
|
|
|
+ currentDate.value = dayjs().format("YYYYMMDD")
|
|
|
date.value = {
|
|
|
year:time[0],
|
|
|
month:time[1],
|
|
|
day:time[2]
|
|
|
}
|
|
|
- getStatistics()
|
|
|
+ if(`${time[0]}${time[1]}${time[2]}` < currentDate.value){
|
|
|
+ statusNext.value = true
|
|
|
+ }else{
|
|
|
+ statusNext.value = false
|
|
|
+ }
|
|
|
+ if(statisticalDate){
|
|
|
+ getStatistics(statisticalDate)
|
|
|
+ }else{
|
|
|
+ getStatistics()
|
|
|
+ }
|
|
|
getPageList()
|
|
|
}
|
|
|
//获取统计数据
|
|
|
@@ -178,17 +153,36 @@
|
|
|
}
|
|
|
//获取分页数据
|
|
|
function getPageList() {
|
|
|
+ reportList.value = []
|
|
|
projectApi().pmTimeConfPage(query.value).then((res) => {
|
|
|
- reportList.value = res.data.records[0];
|
|
|
- console.log(reportList.value)
|
|
|
+ if(res.data.records){
|
|
|
+ reportList.value = res.data.records[0];
|
|
|
+ total.value = res.data.total;
|
|
|
+ var deptItem = []
|
|
|
+ listDept().then((res)=>{//部门名称
|
|
|
+ deptItem = res.data
|
|
|
+ for(let i=0;i<reportList.value.length;i++){
|
|
|
+ reportList.value[i].deptName = deptItem.find(item => item.deptId == reportList.value[i].deptId).deptName
|
|
|
+ if(query.value.queryType != 2){ //按时提交/迟交
|
|
|
+ var monthDayWrap = reportList.value[i].submitDate.split(" ")[0]
|
|
|
+ var time = reportList.value[i].submitDate.split(" ")[1].slice(0,5)
|
|
|
+ var month = monthDayWrap.split("-")[1] >= 10 ? monthDayWrap.split("-")[1] : monthDayWrap.split("-")[1].slice(1)
|
|
|
+ var day = monthDayWrap.split("-")[2] >= 10 ? monthDayWrap.split("-")[2] : monthDayWrap.split("-")[2].slice(1)
|
|
|
+ reportList.value[i].submitDateOutput = `${month}月${day}日 ${time}` //提交时间
|
|
|
+ reportList.value[i].lockStatus = reportList.value[i].ccTo.indexOf(useStore.userId) > -1 ? false : true //锁定状态
|
|
|
+ reportList.value[i].readStatus = reportList.value[i].pmReportReaders.readAlready.map((item) => item).length > 0 ? true : false //阅读状态
|
|
|
+ if(reportList.value[i].createBy == useStore.userName){//本人
|
|
|
+ reportList.value[i].lockStatus = false
|
|
|
+ reportList.value[i].readStatus = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
/** 日期选择*/
|
|
|
function daySwitch(id){
|
|
|
- //获取前一天/后一天日期
|
|
|
- if(id == 1 && statusNext.value == false){
|
|
|
- return
|
|
|
- }
|
|
|
const targetDate = dayjs(`${date.value.year}-${date.value.month}-${date.value.day}`);
|
|
|
var previousDay;
|
|
|
if(id == 0){
|
|
|
@@ -197,63 +191,70 @@
|
|
|
if(id == 1){
|
|
|
previousDay = targetDate.subtract(-1, 'day');
|
|
|
}
|
|
|
- var time = previousDay.format("YYYY-MM-DD").split("-")
|
|
|
- day.value = `${time[0]}年${time[1]}月${time[2]}日`
|
|
|
- date.value = {
|
|
|
- year:time[0],
|
|
|
- month:time[1],
|
|
|
- day:time[2]
|
|
|
+ var time = previousDay.format("YYYY-MM-DD")
|
|
|
+ var time2 = previousDay.format("YYYYMMDD")
|
|
|
+ if(id == 0){
|
|
|
+ uni.redirectTo({
|
|
|
+ url:`/pages/business/common/projectMange/statistics/dailyReport?id=${query.value.queryType}&statisticalDate=${time}`
|
|
|
+ })
|
|
|
}
|
|
|
- query.value.submitDate = `${time[0]}-${time[1]}-${time[2]}`
|
|
|
- //获取下一天按钮状态
|
|
|
- var changeDate = `${date.value.year}${date.value.month}${date.value.day}`
|
|
|
- if(changeDate >= currentDate.value){
|
|
|
- statusNext.value = false
|
|
|
- }else{
|
|
|
- statusNext.value = true
|
|
|
+ if(id == 1 && time2 <= currentDate.value){
|
|
|
+ uni.redirectTo({
|
|
|
+ url:`/pages/business/common/projectMange/statistics/dailyReport?id=${query.value.queryType}&statisticalDate=${time}`
|
|
|
+ })
|
|
|
}
|
|
|
+ }
|
|
|
+ /**类型选择 */
|
|
|
+ function tabsClick(id){
|
|
|
+ query.value.queryType = id
|
|
|
getStatistics(query.value.submitDate)
|
|
|
getPageList()
|
|
|
}
|
|
|
- /**
|
|
|
- * @scrollView加载数据
|
|
|
- */
|
|
|
- function load() {
|
|
|
- query.value.current ++;
|
|
|
- init();
|
|
|
+ /** 跳转到详情页 */
|
|
|
+ function toPage(id,permission){
|
|
|
+ if(query.value.queryType != 2){
|
|
|
+ if(!permission){
|
|
|
+ proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${id}`);
|
|
|
+ }else{
|
|
|
+ uni.showToast({
|
|
|
+ title: '你不是接收人不能查看内容',
|
|
|
+ icon: "none",
|
|
|
+ duration: 2000,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
/**
|
|
|
- * @scrollView刷新数据
|
|
|
- */
|
|
|
- function refresh() {
|
|
|
- query.value.current = 1;
|
|
|
- init();
|
|
|
+ * 返回上级页面
|
|
|
+ * @param defaultPage 默认页面
|
|
|
+ */
|
|
|
+ function returnTo(defaultPage) {
|
|
|
+ if(getCurrentPages().length > 1){
|
|
|
+ uni.navigateBack()
|
|
|
+ }else{
|
|
|
+ uni.switchTab({
|
|
|
+ url: `/pages/${defaultPage}`
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- onLoad(() => {
|
|
|
- });
|
|
|
-
|
|
|
- onShow(() => {
|
|
|
- if(route?.query?.id){
|
|
|
- init(route.query.id)
|
|
|
+ onLoad((options) => {
|
|
|
+ if(options?.id && options?.statisticalDate){
|
|
|
+ init(options.id,options.statisticalDate)
|
|
|
+ }else if(options?.id){
|
|
|
+ init(options.id)
|
|
|
+ }else if(options?.statisticalDate){
|
|
|
+ init(null,options.statisticalDate)
|
|
|
}else{
|
|
|
init()
|
|
|
}
|
|
|
+ });
|
|
|
+
|
|
|
+ onShow(() => {
|
|
|
//调用系统主题颜色
|
|
|
proxy.$settingStore.systemThemeColor([1]);
|
|
|
});
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
- :deep(.u-modal__content) {
|
|
|
- font-size: 14px;
|
|
|
- justify-content: left;
|
|
|
- }
|
|
|
- :deep(.list-container .content-area-top-name) {
|
|
|
- font-size: 16px !important;
|
|
|
- }
|
|
|
- </style>
|
|
|
- <style lang="scss" scoped>
|
|
|
.timeSelect{
|
|
|
width:100%;
|
|
|
height:35px;
|
|
|
@@ -290,29 +291,6 @@
|
|
|
width:100%;
|
|
|
height:calc(100% - 20px);
|
|
|
margin:10px 0;
|
|
|
- .statisticsSearchBox {
|
|
|
- width: 100%;
|
|
|
- vertical-align: middle;
|
|
|
- position: relative;
|
|
|
- display: flex;
|
|
|
- .uni-input-input {
|
|
|
- font-size: 12px !important;
|
|
|
- }
|
|
|
- :deep(.u-input__content__prefix-icon) {
|
|
|
- position: absolute;
|
|
|
- right: 8px;
|
|
|
- .uicon-search {
|
|
|
- font-size: 16px;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- .u-input {
|
|
|
- display: inline-block;
|
|
|
- background: #fff;
|
|
|
- height: 34px;
|
|
|
- line-height: 34px;
|
|
|
- border-radius: 10px
|
|
|
- }
|
|
|
.menu-list{
|
|
|
width:100%;
|
|
|
margin:0px 0 0 0px;
|
|
|
@@ -367,5 +345,67 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ .report-list{
|
|
|
+ height:calc(100vh - 160px);
|
|
|
+ padding-bottom:50px;
|
|
|
+ overflow: scroll;
|
|
|
+ .report{
|
|
|
+ padding:15px 10px;
|
|
|
+ background: #ffffff;
|
|
|
+ margin-top:4px;
|
|
|
+ .left,.right{
|
|
|
+ width:calc(50% - 25px);
|
|
|
+ }
|
|
|
+ .right{
|
|
|
+ text-align: right;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .noData{
|
|
|
+ image{
|
|
|
+ width:50%;
|
|
|
+ margin:20px 25%;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .content-area {
|
|
|
+ &-time {
|
|
|
+ padding: 10px;
|
|
|
+ text-align: left;
|
|
|
+ color: #000000;
|
|
|
+ font-weight: 600;
|
|
|
+ }
|
|
|
+
|
|
|
+ &-center {
|
|
|
+ margin: 0;
|
|
|
+ padding: 15px;
|
|
|
+ overflow: hidden;
|
|
|
+ border-bottom: 1px solid #eaeef1;
|
|
|
+ &:last-child {
|
|
|
+ border-bottom: 0px solid #eaeef1;
|
|
|
+ }
|
|
|
+ &-avatar {
|
|
|
+ margin: auto 0;
|
|
|
+ width:40px !important;
|
|
|
+ height:40px !important;
|
|
|
+ }
|
|
|
+ &-avatarImg {
|
|
|
+ width:40px !important;
|
|
|
+ height:40px !important;
|
|
|
+ border-radius: 4px;
|
|
|
+ >img{
|
|
|
+ width:100% !important;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &-title {
|
|
|
+ margin: 0 0 15px 0;
|
|
|
+ font-weight: 600;
|
|
|
+ color: #000000;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+.list-cell::after{
|
|
|
+ border:none;
|
|
|
+}
|
|
|
</style>
|
|
|
|
wangtao
