oa图标显示优化

src/api/business/project.js

@@ -116,7 +116,23 @@ export function projectApi() {
                 method: 'get',
                 params: query
             })
-        }
+        },
+        usersProjectWorkTime(params) {
+            return request({
+                url: '/service-iot/pmProject/usersProjectWorkTime',
+                method: 'GET',
+                params
+            })
+        },
+        //日报统计
+        pmTimeConf(params) {
+            return request({
+                url: '/service-iot/pmTimeConf/submitCount',
+                method: 'GET',
+                params
+            })
+        },
+        
         
     }
 }

src/config.js

@@ -9,6 +9,7 @@ export default {
   //#endif
 
   //#ifdef H5
+  // baseUrl: "https://gateWay.usky.cn/prod-api",
   baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
   //#endif
 

src/pages.json

@@ -888,6 +888,30 @@
                         }
                     }
                 },
+                {
+                    "path": "projectMange/statistics/index",
+                    "style": {
+                        "navigationBarTitleText": "报告统计",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "projectMange/statistics/dailyReport",
+                    "style": {
+                        "navigationBarTitleText": "日报",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
                 {
                     "path": "projectMange/list/index",
                     "style": {

src/pages/business/common/projectMange/list/index.vue

@@ -91,7 +91,7 @@
             </view> -->
             <view class="content-area-row_wrap-view">
               类型：
-              {{ proxy.$common.mapping("label", "value", base.projectStatus, project_type) }}
+              {{ proxy.$common.mapping("label", "value", base.projectType, project_type) }}
             </view>
             <view class="content-area-row_wrap-view">
               公开状态：
@@ -276,6 +276,7 @@ function handleAction(value, event, index, ind) {
 function selectAction(e) {
   state.projectType = e.value[0].value;
   state.projectTypeName = e.value[0].label;
+  console.log(state.projectType, state.projectTypeName,e)
   state.actionShow = false;
 }
 

src/pages/business/common/projectMange/statistics/dailyReport.vue

@@ -0,0 +1,179 @@
+<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">
+        <template #left>
+          <view class="u-navbar__content__left__item">
+            <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+          </view>
+        </template>
+      </u-navbar>
+    </u-sticky>
+    <view class="container">
+      <view class="menu-list">
+        <view class="list-cell">
+          <view class="list active">
+            <text>{{ statistics.submitOnTime }}</text> 
+            <text>按时提交</text> 
+            <text></text> 
+            <text class="line"></text> 
+          </view>
+          <view class="list">
+            <text>{{ statistics.submitLate }}</text> 
+            <text>迟交</text> 
+            <text></text> 
+            <text class="line"></text> 
+          </view>
+          <view class="list">
+            <text>{{ statistics.notSubmitted }}</text> 
+            <text>未提交</text> 
+            <text class="line"></text> 
+          </view>
+        </view>
+      </view>
+    </view>
+</template>
+  
+  <script setup>
+  /*----------------------------------依赖引入-----------------------------------*/
+  import { onLoad, onShow, onReady } from "@dcloudio/uni-app";
+  import { ref, getCurrentInstance } from "vue";
+  /*----------------------------------接口引入-----------------------------------*/
+  import { projectApi } from "@/api/business/project.js";
+  // import dayjs from 'dayjs/esm/index'
+  /*----------------------------------组件引入-----------------------------------*/
+  /*----------------------------------store引入-----------------------------------*/
+  import { useStores } from "@/store/modules/index";
+  import dayjs from "dayjs";
+  /*----------------------------------公共方法引入-----------------------------------*/
+  /*----------------------------------公共变量-----------------------------------*/
+  const { proxy } = getCurrentInstance();
+  /*----------------------------------变量声明-----------------------------------*/
+  const statistics = ref({
+    submitOnTime: 0, //按时提交
+    submitLate: 0, //迟交
+    notSubmitted:0,  //未交
+  })
+  /**
+   * @页面初始化
+   */
+  function init() {
+    return
+    projectApi().pmTimeConf().then((res) => {
+      statistics.value = res.data;
+    });
+  }
+  /**
+   * @tabs点击事件
+   */
+  function tabsClick(e) {
+  
+  }
+  /**
+   * 跳转项目概览
+   * @param id 项目id
+   */
+  function toPage(id) {
+    proxy.$tab.navigateTo(`/pages/business/common/projectMange/overview/index?id=${id}`);
+  }
+  
+  onReady(() => {});
+  
+  onShow(() => {
+    init();
+    //调用系统主题颜色
+    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>
+  .container{
+    width:calc(100% - 20px);
+    height:calc(100% - 20px);
+    margin:10px;
+    .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;
+      padding:15px 10px;
+      background: #ffffff;
+      border-radius: 10px;
+      .list-cell{
+        display: flex;
+        padding:0;
+        .list{
+          flex:1;
+          text-align: center;
+          position: relative;
+          text{
+            display: block;
+            color:#999999;
+          }
+          text:nth-child(1){
+            font-weight: 700;
+            font-size: 14px;
+          }
+          text:nth-child(2){
+            font-size: 12px;
+            margin-top:10px;
+          }
+          
+        }
+        .list:nth-child(1),.list:nth-child(2){
+            text:nth-child(3){
+                width:1px;
+                height:50%;
+                position: absolute;
+                top:25%;
+                right:0;
+                background: #E7E7E7;
+            }
+        }
+        .active{
+            text{
+                color:#000;
+            }
+            .line{
+                position: absolute;
+                bottom:-36%;
+                left:25%;
+                width:50%;
+                height:4px;
+                border-radius: 2px;
+                background: #000;
+            }
+        }
+      }
+    }
+  }
+  </style>
+  

src/pages/business/common/projectMange/statistics/index.vue

@@ -0,0 +1,174 @@
+<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">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+  </u-sticky>
+  <view class="container">
+    <!-- <view class="statisticsSearchBox">
+      <u-input v-model="projectName" placeholder="请输入时间" clearable prefixIcon="search" size="small" />
+    </view> -->
+    <view style="width: calc(100% - 51px); display: flex; padding-right: 10px">
+          <view>统计时间：18:00 ~ 22:00</view>
+        </view>
+    <view class="menu-list">
+      <view class="title">{{ statistics?.submitDate == dayjs().format('YYYY-MM-DD') ? '今日' : statistics?.submitDate }}报告</view>
+      <view class="list-cell">
+        <view class="list" @click="toPage(1)">
+          <text>{{ statistics.submitOnTime }}</text> 
+          <text>按时提交</text> 
+          <text></text> 
+        </view>
+        <view class="list" @click="toPage(2)">
+          <text>{{ statistics.submitLate }}</text> 
+          <text>迟交</text> 
+          <text></text> 
+        </view>
+        <view class="list" @click="toPage(3)">
+          <text>{{ statistics.notSubmitted }}</text> 
+          <text>未提交</text> 
+        </view>
+      </view>
+    </view>
+  </view>
+ 
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady } from "@dcloudio/uni-app";
+import { ref, getCurrentInstance } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { projectApi } from "@/api/business/project.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import dayjs from "dayjs";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const statistics = ref({
+  submitOnTime: 0, //按时提交
+  submitLate: 0, //迟交
+  notSubmitted:0,  //未交
+  submitDate:null, //统计日期
+})
+/**
+ * @页面初始化
+ */
+function init() {
+  return
+  projectApi().pmTimeConf().then((res) => {
+    statistics.value = res.data;
+  });
+}
+/**
+ * 跳转项目概览
+ * @param id 项目id
+ */
+function toPage(id) {
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/statistics/dailyReport?id=${id}`);
+}
+
+onReady(() => {});
+
+onShow(() => {
+  init();
+  //调用系统主题颜色
+  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>
+.container{
+  width:calc(100% - 20px);
+  height:calc(100% - 20px);
+  margin:10px;
+  .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:10px 0 0 0px;
+    padding:15px 10px;
+    background: #ffffff;
+    border-radius: 10px;
+    .title{
+      font-size: 14px;
+      font-weight: 600;
+      color: #333333;
+    }
+    .list-cell{
+      margin-top:20px;
+      display: flex;
+      padding:0;
+      .list{
+        flex:1;
+        text-align: center;
+        position: relative;
+        text{
+          display: block;
+        }
+        text:nth-child(1){
+          font-weight: 700;
+          font-size: 14px;
+        }
+        text:nth-child(2){
+          font-size: 12px;
+          margin-top:10px;
+        }
+        text:nth-child(3){
+          width:1px;
+          height:50%;
+          position: absolute;
+          top:25%;
+          right:0;
+          background: #E7E7E7;
+        }
+      }
+      .list:nth-child(2){
+        text:nth-child(1){
+          color:#E6A23C;
+        }
+      }
+      .list:nth-child(3){
+        text:nth-child(1){
+          color:#F56C6C;
+        }
+      }
+    }
+  }
+}
+</style>

src/pages/business/oa/approval/index.vue

@@ -129,10 +129,17 @@
    * 表单权限列表
    */
   function getFormList(){
+    var prefix = ""
+    if(import.meta.url.includes("http://localhost")){
+      prefix = import.meta.url.split("/src/")[0] + "/static/"
+    }else{
+      prefix = import.meta.url.split("/src/")[0] + "/mobile/static/"
+    }
     getOaFormDefinition().then((res) => {
       state.formList = res.data;
       for(let i=0;i<state.formList.length;i++){
-        state.formList[i].icon = proxy.$common.getAssetsFile(`images/oa/${state.formList[i].formImage}.png`);
+        state.formList[i].icon = prefix + `images/oa/${state.formList[i].formImage}.png`
+        console.log(state.formList[i].icon)
       }
       state.appContent[0].array = state.formList
     })

src/pages/business/oa/toDo/detail.vue

@@ -7,7 +7,7 @@
       <text class="grid-area_center_item_title" style="color: #fff;">详情</text>
     </template>
   </u-navbar>
-  <view class="menu-list m0" style="overflow-y:scroll">
+  <view class="menu-list m0" style="overflow-y:scroll !important; height: 100%;" v-if="state.loading">
     <view class="list-cell" style="color: #666666; line-height: 25px; width: auto; ">
       <view class="content-area-top menu-item">
         <view class="content-area-top-name" >{{ state?.detail?.createBy + '提交的' + state?.detail?.formName }} </view>
@@ -29,7 +29,7 @@
         <view class="content-area-row_wrap-view gray black" v-if="state.detail.reason">{{ state.detail.reason }}</view>
       </view>
     </view>
-    <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;margin:10px 0 60px 0;">
+    <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;margin-top:10px;">
       <view class="content-area-top">
         <view style="width:100%;">流程</view>
         <view class="stepBar">
@@ -74,7 +74,8 @@
             <view class="right">
               <!-- 2021-08-01 10:30:00 -->
             </view>
-            <view class="center" v-if="item.nodeType == 2 && item.appointApprover.indexOf(',') && item.appointApprover.split(',').length > 1">
+            <view class="center" v-if="item.nodeType == 2 && item.appointApprover.indexOf(',') && item.appointApprover.split(',').length > 1" 
+              :style="{paddingBottom:state.approvalStatus == 1 || (state.approvalStatus == 2 || state.approvalStatus == 3)  && state.detail.proposer == useStore.userId  && state.detail.docNo.split('-')[0] == 'JBD' ? '0px' : '30px'}">
               <view class="content-area-header  mb10 text-center" style="display: inline-block"  v-for="(approver, index2) in item.appointApprover.split(',')" :key="index2">
                 <img v-if='proxy.$common.mapping("avatar", "userId", approver, state.userData)' class="content-area-header-avatarImg mlr5" :src='proxy.$common.mapping("avatar", "userId", approver, state.userData)' style="display: block; width: 40px; height: 40px" />
                 <u-avatar
@@ -90,20 +91,32 @@
                 <u-text :text='proxy.$common.mapping("nickName", "userId", approver, state.userData)' color="#000000" size="14" align="center"></u-text>
               </view>
             </view>
-            <view class="line gray" v-if="item.nodeType == 1">
+            <view class="line gray" v-if="item.nodeType == 1 && nodeList.length-1 != index">
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view class="fixedBottom" v-if="(state.approvalStatus == 2 || state.approvalStatus == 3)  && state.detail.proposer == useStore.userId  && state.detail.docNo.split('-')[0] == 'JBD'" @click="handle('again')">
+    <view class="list-cell list-cell-bottom againWrap" v-if="(state.approvalStatus == 2 || state.approvalStatus == 3)  && state.detail.proposer == useStore.userId  && state.detail.docNo.split('-')[0] == 'JBD'" @click="handle('again')">
+      <view class="again">
+        <img src="@/static/images/oa/loading.png" alt="">
+        <span>再次提交</span>
+      </view>
+    </view>
+    <view class="list-cell list-cell-bottom approvalWrap" v-if="state.approvalStatus == 1">
+      <view class="approval">
+        <button class="refuse" @click="handle('refuse',2)">拒绝</button>
+        <button class="pass" @click="handle('pass',2)">同意</button>
+      </view>
+    </view>
+    <!-- <view class="fixedBottom" v-if="(state.approvalStatus == 2 || state.approvalStatus == 3)  && state.detail.proposer == useStore.userId  && state.detail.docNo.split('-')[0] == 'JBD'" @click="handle('again')">
       <img src="@/static/images/oa/loading.png" alt="">
       <span>再次提交</span>
     </view>
     <view class="approval" v-if="state.approvalStatus == 1">
       <button class="refuse" @click="handle('refuse',2)">拒绝</button>
       <button class="pass" @click="handle('pass',2)">同意</button>
-    </view>
+    </view> -->
   </view>
 </template>
 <script setup>
@@ -173,11 +186,12 @@ function handle(type) {
  * @api接口查询
  */
 function getDetail(type) {
-  state.loading = true;
+  state.loading = false;
   // getFormName().then((res1) => {
   //   state.formList = res1.data;
     getDocumentDetails(state.queryParams)
     .then((requset) => {
+      if(requset.data){
         state.detail = requset.data;
         state.detail.id = state.id;
         listDept({id:state.detail.deptId}).then((res2) => {
@@ -190,10 +204,17 @@ function getDetail(type) {
               var info = res4.data[0]
               state.nodeList = JSON.parse(info.flowInfo).node
               state.detail.formName = info.formName
+              state.loading = true;
             }
           })
         })
-        state.loading = false;
+        
+      }else{
+        proxy.$modal.msgError("详情数据异常");
+        setTimeout(()=>{
+          returnTo("business/oa/toDo/index")
+        },2000)
+      }
     })
     .catch((err) => {
       state.loading = false;
@@ -324,25 +345,6 @@ onLoad((options) => {
     top:25px;
     right:10px;
   }
-  .fixedBottom{
-    width:100%;
-    height:36px;
-    line-height: 36px;
-    position: fixed;
-    bottom: 0;
-    left:0;
-    background-color: #fff;
-    text-align: center;
-    color:#000;
-    img{
-      vertical-align: middle;
-      margin-right:10px;
-      margin-top:-2px;
-    }
-    span{
-      vertical-align: middle;
-    }
-  }
   .stepBar{
     margin-top:-20px;
     font-weight: 400;
@@ -402,7 +404,7 @@ onLoad((options) => {
         background: #999;
       }
       .center{
-        width:100%;
+        width:calc(100% - 40px);
         margin:10px 0 0 40px;
         padding-right:10px;
       }
@@ -438,25 +440,51 @@ onLoad((options) => {
       }
     }
   }
-  .approval{
-    position: fixed;
-    width:100%;
-    bottom: 10px;
-    left:0;
-    button{
-      width:calc(50% - 15px);
-      height:50px;
-      margin-left:10px;
-      display: inline-block;
-      border-radius: 16px !important;
-      
-    }
-    button.pass{
-      background: #2A98FF;
-      color:#fff;
+  .list-cell-bottom{
+    padding:0;
+    margin-top:10px;
+    background-color: #fff;
+    .approval{
+      height:auto;
+      button{
+        width:calc(50% - 15px);
+        height:50px;
+        margin-left:10px;
+        display: inline-block;
+        border-radius: 16px !important;
+        
+      }
+      button.pass{
+        background: #2A98FF;
+        color:#fff;
+      }
+      button.refuse{
+        border:1px solid #CFCFCF;
+      }
     }
-    button.refuse{
-      border:1px solid #CFCFCF;
+    .again{
+      width:100%;
+      height:36px;
+      line-height: 36px;
+      text-align: center;
+      color:#000;
+      img{
+        vertical-align: middle;
+        margin-right:10px;
+        margin-top:-2px;
+      }
+      span{
+        vertical-align: middle;
+      }
     }
   }
+  .approvalWrap{
+    height:133px;
+    padding:20px 0;
+  }
+  .againWrap{
+    height:90px;
+    padding:5px 0;
+  }
+  
 </style>

src/plugins/constData.plugins.js

@@ -115,6 +115,14 @@ let projectTabbar = [
 		text: "报告填写",
 		dot: false,
 	},
+	// {
+	// 	pagePath: "/pages/business/common/projectMange/statistics/index",
+	// 	iconClass: "oaIcon-tab-reportInsert",
+	// 	iconPath: "",
+	// 	selectedIconPath: "",
+	// 	text: "报告统计",
+	// 	dot: false,
+	// },
 	{
 		pagePath: "/pages/business/common/projectMange/list/index",
 		iconClass: "oaIcon-tab-projectsList",