表单详情页面编写完成

src/api/oa/todo/index.js

@@ -0,0 +1,93 @@
+import { request } from "@/utils/request";
+
+// 表单权限列表
+export function getOaFormDefinition(params) {
+    return request({
+        url: '/service-oa/oaFormDefinition/myForm',
+        method: 'get',
+        params
+    })
+}
+// 表单（请假）新增
+export function addQjDocument(data) {
+    return request({
+        url: '/service-oa/oaQjDocument/addQjDocument',
+        method: 'post',
+        data
+    })
+}
+// 表单（请假）修改
+export function updateQjDocument(data) {
+    return request({
+        url: '/service-oa/oaQjDocument/updateQjDocument',
+        method: 'post',
+        data
+    })
+}
+// 表单分页
+export function myApplication(params) {
+    return request({
+        url: '/service-oa/oaDocument/myApplication',
+        method: 'get',
+        params
+    })
+}
+// 表单（加班）新增
+export function addJBDocument(data) {
+    return request({
+        url: '/service-oa/oaJbDocument/add',
+        method: 'post',
+        data
+    })
+}
+// 表单名列表
+export function getFormName(params) {
+    return request({
+        url: '/service-oa/oaFormDefinition/getFormName',
+        method: 'get',
+        params
+    })
+}
+// 表单记录详情
+export function getDocumentDetails(params) {
+    return request({
+        url: '/service-oa/oaDocument/documentDetails',
+        method: 'get',
+        params
+    })
+}
+// 表单记录删除
+export function delDoc(id) {
+    return request({
+        url: '/service-oa/oaDocument/delDoc/' + id,
+        method: 'delete'
+    })
+}
+// 表单记录提交
+export function statueSubmit(params) {
+    return request({
+        url: '/service-oa/oaDocument/submit',
+        method: 'put',
+        params
+    })
+}
+// 分页
+export function getToDoPageList(params) {
+    return request({
+        url: '/service-oa/oaApproval/pageList',
+        method: 'get',
+        params
+    })
+}
+
+
+
+
+
+
+
+
+
+
+
+

src/api/system/user.js

@@ -90,4 +90,13 @@ export function getPageAuthorization(data) {
     method: 'GET',
     data: data,
   })
-}
+}
+
+// 查询部门列表
+export function listDept(query) {
+  return request({
+      url: '/system/dept/list',
+      method: 'get',
+      params: query
+  })
+}

src/components/oa-tabbar/index.vue

@@ -45,6 +45,7 @@ const { tabbarValue, tabbarList, isSwitchTab } = toRefs(props);
 
 function tabbarChange(e) {
   if (isSwitchTab.value) {
+    console.log(tabbarList.value[e].pagePath)
     proxy.$tab.switchTab(tabbarList.value[e].pagePath);
   } else {
     proxy.$tab.redirectTo(tabbarList.value[e].pagePath);

src/pages.json

@@ -995,7 +995,44 @@
                             "titleNView": false
                         }
                     }
+                },
+                {
+                    "path": "approval/qjd",
+                    "style": {
+                        "navigationBarTitleText": "详情",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "toDo/index",
+                    "style": {
+                        "navigationBarTitleText": "我的待办",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "toDo/detail",
+                    "style": {
+                        "navigationBarTitleText": "详情",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
                 }
+                
             ]
         }
     ],

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

@@ -44,11 +44,12 @@
           <!-- 我的宫格 -->
           <view class="grid-area bg-white" v-if="state.formList.length > 0">
             <view class="grid-area_title">我的</view>
-            <u-icon class="grid-area_icon"  name="arrow-down" color="#000" size="18"  @click="splitNum('recentlyUsed',5)"></u-icon>
+            <u-icon class="grid-area_icon"  name="arrow-down" color="#000" size="18"  @click="splitNum(0,5)" v-if="state.appContent[0].direction == '0'"></u-icon>
+            <u-icon class="grid-area_icon"  name="arrow-up" color="#000" size="18"  @click="splitNum(0,5)" v-if="state.appContent[0].direction == '1'"></u-icon>
             <!-- <u-icon class="grid-area_icon"  name="arrow-up" color="#000" size="18"  @click="splitNum('recentlyUsed',5)"></u-icon> -->
             <!-- <u-icon  name="arrow-bottom" size="20" color="#000" @click="returnTo('index')"></u-icon> -->
-            <view class="grid-area_center cu-list grid col-5 no-border">
-              <view class="grid-area_center_item cu-item align-center" v-for="(item, index) in state.formList" :key="index">
+            <view class="grid-area_center cu-list grid col-5 no-border" @click="toForm(item.formId)">
+              <view class="grid-area_center_item cu-item align-center" v-for="(item, index) in state.appContent[0].array" :key="index">
                 <image class="grid-area_center_item_image" :src="item.icon"></image>
                 <text class="grid-area_center_item_title" >{{ item.formName }}</text>
               </view>
@@ -69,7 +70,7 @@
       </template>
     </oa-scroll>
   
-    <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.oaApprovalTabbar"></oa-tabbar>
+    <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.oaApprovalTabbar" :isSwitchTab="false"></oa-tabbar>
 </template>
   
   <script setup>
@@ -101,6 +102,9 @@
     cuIconList: [],
     recentlyUsed: [],
     formList:[],
+    appContent:[
+      {name:"my",array:[],direction:"0"},//我的app
+    ],
     statistics:{
       "pendingSum": 0, 
       "alreadySum": 0, 
@@ -109,7 +113,7 @@
     },//头部统计
   });
   
-  const { dialogFlag, formList, statistics } = toRefs(state);
+  const { dialogFlag, formList, statistics,appContent } = toRefs(state);
 
   function init(){
     getFormList(); //获取表单列表数据
@@ -130,8 +134,9 @@
       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`);
+        
       }
-      console.log(res.data,state.formList)
+      state.appContent[0].array = state.formList
     })
   }
   function getStatistics(){
@@ -152,15 +157,22 @@
       })
     }
   }
+  /**
+   * 跳转表单模版
+   */
+  function
+   toForm(formId){
+
+  }
   /**
    * 
-   * @param array 展示数组
+   * @param sub 数组下标
    * @param num 显示数量
    */
-  function splitNum(array,num) {
-    state[array] = state[array].slice(0, num);
+  function splitNum(sub,num) {
+    state.appContent[sub].array = state.appContent[sub].direction == "0" ? state.formList.slice(0, num) : state.formList
+    state.appContent[sub].direction = state.appContent[sub].direction == "0" ? 1 : "0"
   }
-  
   /**
    * @获取路由信息
    * @api接口请求
@@ -171,18 +183,8 @@
       storageSystem.set("homeList", state);
     });
   }
-  
-  onLoad((options) => {
-    // uni.hideTabBar(); //隐藏自带tabbar
-    // init(options);
-  });
-  
   onShow(() => {
     init()
-    // var storages = storageSystem.get("homeList");
-    // Object.keys(storages).forEach((key) => {
-    //   state[key] = storages[key];
-    // });
   });
   </script>
   

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

@@ -0,0 +1,237 @@
+<template>
+    <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <u-icon name="arrow-left" size="20" color="#fff" @click="returnTo('business/oa/approval/index')"></u-icon>
+      </template>
+      <template #center>
+        <text class="grid-area_center_item_title" style="color: #fff;">请假</text>
+      </template>
+    </u-navbar>
+        <view class="menu-list m0" style="margin-bottom:50px;">
+          <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 + '提交的' + proxy.$common.mapping("formName", "formSign", state.detail.docNo.split("-")[0], state.formList) }} </view>
+            </view>
+            <view class="content-area-row_wrap menu-item">
+              <img class="typeIcon" src="@/static/images/oa/pass.png" v-if="state.detail.docStatus === '2' "/>
+              <view class="content-area-row_wrap-view gray"> 上海永天科技股份有限公司 </view>
+              <view class="content-area-row_wrap-view gray"> 单据编号：{{ state.detail.docNo }} </view>
+              <view class="content-area-row_wrap-view" style="display: block">
+                <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', state.detail.docStatus, form_status) }" >{{ proxy.$common.mapping("label", "value", state.detail.docStatus, form_status) }} </span>
+              </view>
+              <view class="content-area-row_wrap-view gray label">所在部门</view>
+              <view class="content-area-row_wrap-view gray black">{{ state.detail.deptName }}</view>
+              <view class="content-area-row_wrap-view gray label">自定义类型</view>
+              <view class="content-area-row_wrap-view gray black">{{ state.detail.deptName }}</view>
+            </view>
+          </view>
+          <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;margin-top:10px;">
+            <view class="content-area-top menu-item">
+              流程
+            </view>
+          </view>
+          <view class="fixedBottom" v-if="state.detail.docStatus === '2' || state.detail.docStatus === '3' ">
+            <img src="@/static/images/oa/loading.png" alt="">
+            <span>再次提交</span>
+          </view>
+          <view class="fixedBottom" v-if="state.detail.docStatus === '2' || state.detail.docStatus === '3' ">
+            <img src="@/static/images/oa/loading.png" alt="">
+            <span>再次提交</span>
+          </view>
+        </view>
+  </template>
+  
+  <script setup>
+  /*----------------------------------依赖引入-----------------------------------*/
+  import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+  import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watchEffect } from "vue";
+  /*----------------------------------接口引入-----------------------------------*/
+  import { getToDoPageList } from "@/api/oa/todo/index.js";
+  import { getFormName, getDocumentDetails } from "@/api/oa/approval/index.js";
+  import { listDept } from "@/api/system/user";
+  /*----------------------------------组件引入-----------------------------------*/
+  /*----------------------------------store引入-----------------------------------*/
+  /*----------------------------------公共方法引入-----------------------------------*/
+  /*----------------------------------公共变量-----------------------------------*/
+  const { proxy } = getCurrentInstance();
+  const { form_status, workflow_form_subset } = proxy.useDict("form_status","workflow_form_subset");
+  /*----------------------------------变量声明-----------------------------------*/
+  const state = reactive({
+    loading: false,
+    queryParams:{
+      docNo: undefined,
+      pageNum:1,
+      pageSize:5,
+    },
+    detail:{},//详情数据
+  });
+  
+  const {  queryParams,  detail,formList } = toRefs(state);
+  /**
+   * @页面初始化
+   */
+  function init() {
+    getDetail();
+  }
+  
+  /**
+   * @列表查询
+   * @api接口查询
+   */
+  function getDetail(type) {
+    state.loading = true;
+    getFormName().then((res) => {
+      state.formList = res.data;
+      getDocumentDetails(state.queryParams)
+      .then((requset) => {
+          state.detail = requset.data;
+          listDept({id:state.detail.deptId}).then((res2) => {
+            state.detail.deptName = res2.data[0].deptName
+          })
+          state.loading = false;
+      })
+      .catch((err) => {
+        state.loading = false;
+      });
+    })
+  }
+  
+  
+  /**
+   * 返回上级页面
+   * @param defaultPage 默认页面
+   */
+  function returnTo(defaultPage) {
+    if(getCurrentPages().length > 1){
+      uni.navigateBack()
+    }else{
+      uni.redirectTo({
+        url: `/pages/${defaultPage}`
+      })
+    }
+  }
+  onShow((options) => {
+    
+  });
+  onLoad((options) => {
+    if(options?.docNo){
+      state.queryParams.docNo = options.docNo;
+    }
+    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>
+    .content-area {
+      &-top {
+        font-size: 16px;
+        font-weight: 600;
+        color: #000000;
+        width: 100%;
+        &-name {
+          font-size: 13px;
+          width: 65%;
+          text-align: left;
+          color: #000;
+          white-space: nowrap; /* 确保文本在一行内显示 */
+          overflow: hidden; /* 隐藏超出容器的内容 */
+          text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
+        }
+        &-time {
+          font-size: 12px;
+          text-align: right;
+          color: #999;
+          float:right;
+          width:35%;
+        }
+  
+        &-status {
+          max-width: 30%;
+          margin: auto 0 auto auto;
+          font-size: 12px;
+          color: #ffffff;
+          padding: 0 5px;
+          border-radius: 20px;
+          line-height: 20px;
+        }
+  
+        &-icon {
+          max-width: 30%;
+          margin: auto 0 auto auto;
+        }
+      }
+  
+      &-row_wrap {
+        font-size: 13px;
+        flex-flow: row wrap;
+  
+        &-view {
+          display: flex;
+          min-width: 100%;
+          > .iconfont {
+            font-size: 14px;
+            color: #909399;
+            margin-left: 5px;
+          }
+  
+          &-status {
+            margin: auto 0 auto 0;
+            font-size: 12px;
+            font-weight: 600;
+            color: #ffffff;
+            padding: 0 5px;
+            border-radius: 20px;
+            line-height: 20px;
+          }
+        }
+      }
+    }
+  
+    .gray{
+      color:#999;
+    }
+    .label{
+      margin-top:10px;
+    }
+    .black{
+      color:#000;
+      margin-top:0px;
+    }
+    .typeIcon{
+      width:55px;
+      position: absolute;
+      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;
+      }
+    }
+  
+  </style>
+  

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

@@ -0,0 +1,236 @@
+<template>
+  <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <u-icon name="arrow-left" size="20" color="#fff" @click="returnTo('business/oa/toDo/index')"></u-icon>
+    </template>
+    <template #center>
+      <text class="grid-area_center_item_title" style="color: #fff;">详情</text>
+    </template>
+  </u-navbar>
+      <view class="menu-list m0" style="margin-bottom:50px;">
+        <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 + '提交的' + proxy.$common.mapping("formName", "formSign", state.detail.docNo.split("-")[0], state.formList) }} </view>
+          </view>
+          <view class="content-area-row_wrap menu-item">
+            <img class="typeIcon" src="@/static/images/oa/pass.png" v-if="state.detail.docStatus === '2' "/>
+            <view class="content-area-row_wrap-view gray"> 上海永天科技股份有限公司 </view>
+            <view class="content-area-row_wrap-view gray"> 单据编号：{{ state.detail.docNo }} </view>
+            <view class="content-area-row_wrap-view" style="display: block">
+              <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', state.detail.docStatus, form_status) }" >{{ proxy.$common.mapping("label", "value", state.detail.docStatus, form_status) }} </span>
+            </view>
+            <view class="content-area-row_wrap-view gray label">所在部门</view>
+            <view class="content-area-row_wrap-view gray black">{{ state.detail.deptName }}</view>
+            <view class="content-area-row_wrap-view gray label">自定义类型</view>
+            <view class="content-area-row_wrap-view gray black">{{ state.detail.deptName }}</view>
+          </view>
+        </view>
+        <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;margin-top:10px;">
+          <view class="content-area-top menu-item">
+            流程
+          </view>
+        </view>
+        <view class="fixedBottom" v-if="state.detail.docStatus === '2' || state.detail.docStatus === '3' ">
+          <img src="@/static/images/oa/loading.png" alt="">
+          <span>再次提交</span>
+        </view>
+        <view class="fixedBottom" v-if="state.detail.docStatus === '2' || state.detail.docStatus === '3' ">
+          <img src="@/static/images/oa/loading.png" alt="">
+          <span>再次提交</span>
+        </view>
+      </view>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watchEffect } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { getToDoPageList } from "@/api/oa/todo/index.js";
+import { getFormName, getDocumentDetails } from "@/api/oa/approval/index.js";
+import { listDept } from "@/api/system/user";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const { form_status, workflow_form_subset } = proxy.useDict("form_status","workflow_form_subset");
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  loading: false,
+  queryParams:{
+    docNo: undefined,
+    pageNum:1,
+    pageSize:5,
+  },
+  detail:{},//详情数据
+});
+
+const {  queryParams,  detail,formList } = toRefs(state);
+/**
+ * @页面初始化
+ */
+function init() {
+  getDetail();
+}
+
+/**
+ * @列表查询
+ * @api接口查询
+ */
+function getDetail(type) {
+  state.loading = true;
+  getFormName().then((res) => {
+    state.formList = res.data;
+    getDocumentDetails(state.queryParams)
+    .then((requset) => {
+        state.detail = requset.data;
+        listDept({id:state.detail.deptId}).then((res2) => {
+          state.detail.deptName = res2.data[0].deptName
+        })
+        state.loading = false;
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+  })
+}
+
+
+/**
+ * 返回上级页面
+ * @param defaultPage 默认页面
+ */
+function returnTo(defaultPage) {
+  if(getCurrentPages().length > 1){
+    uni.navigateBack()
+  }else{
+    uni.redirectTo({
+      url: `/pages/${defaultPage}`
+    })
+  }
+}
+onShow((options) => {
+  
+});
+onLoad((options) => {
+  if(options?.docNo){
+    state.queryParams.docNo = options.docNo;
+  }
+  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>
+  .content-area {
+    &-top {
+      font-size: 16px;
+      font-weight: 600;
+      color: #000000;
+      width: 100%;
+      &-name {
+        font-size: 13px;
+        width: 65%;
+        text-align: left;
+        color: #000;
+        white-space: nowrap; /* 确保文本在一行内显示 */
+        overflow: hidden; /* 隐藏超出容器的内容 */
+        text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
+      }
+      &-time {
+        font-size: 12px;
+        text-align: right;
+        color: #999;
+        float:right;
+        width:35%;
+      }
+
+      &-status {
+        max-width: 30%;
+        margin: auto 0 auto auto;
+        font-size: 12px;
+        color: #ffffff;
+        padding: 0 5px;
+        border-radius: 20px;
+        line-height: 20px;
+      }
+
+      &-icon {
+        max-width: 30%;
+        margin: auto 0 auto auto;
+      }
+    }
+
+    &-row_wrap {
+      font-size: 13px;
+      flex-flow: row wrap;
+
+      &-view {
+        display: flex;
+        min-width: 100%;
+        > .iconfont {
+          font-size: 14px;
+          color: #909399;
+          margin-left: 5px;
+        }
+
+        &-status {
+          margin: auto 0 auto 0;
+          font-size: 12px;
+          font-weight: 600;
+          color: #ffffff;
+          padding: 0 5px;
+          border-radius: 20px;
+          line-height: 20px;
+        }
+      }
+    }
+  }
+
+  .gray{
+    color:#999;
+  }
+  .label{
+    margin-top:10px;
+  }
+  .black{
+    color:#000;
+    margin-top:0px;
+  }
+  .typeIcon{
+    width:55px;
+    position: absolute;
+    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;
+    }
+  }
+
+</style>

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

@@ -1,290 +1,293 @@
 <template>
-    <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
-      <template #left>
-        <u-icon name="arrow-left" size="20" color="#fff" @click="returnTo('index')"></u-icon>
-      </template>
-      <template #center>
-        <text class="grid-area_center_item_title" style="color: #fff;">我的申请</text>
-      </template>
-    </u-navbar>
-    <oa-scroll
-      customClass="scroll-height"
-      :customStyle="{ height: `calc(100vh - (104px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
-      :refresherLoad="false"
-      :refresherEnabled="true"
-      :refresherEnabledTitle="false"
-      :refresherDefaultStyle="'none'"
-      :refresherThreshold="44"
-      :refresherBackground="'#f5f6f7'"
-      @refresh="refresh"
-    >
-      <template #default>
-        <view class="home-container">
-            <!-- 我的宫格 -->
-          <view class="grid-area bg-white">
-            <view class="grid-area_center cu-list grid col-4 no-border">
-              <view class="grid-area_center_item cu-item justify-center align-center">
-                <text class="grid-area_center_item_num">{{ state.statistics.pendingSum }}</text>
-                <text class="grid-area_center_item_title">待处理</text>
-              </view>
-              <view class="grid-area_center_item cu-item justify-center align-center">
-                <text class="grid-area_center_item_num">{{ state.statistics.alreadySum }}</text>
-                <text class="grid-area_center_item_title">已处理</text>
-              </view>
-              <view class="grid-area_center_item cu-item justify-center align-center">
-                <text class="grid-area_center_item_num">{{ state.statistics.myInitiated }}</text>
-                <text class="grid-area_center_item_title">已发起</text>
-              </view>
-              <view class="grid-area_center_item cu-item justify-center align-center">
-                <text class="grid-area_center_item_num">{{ state.statistics.myReceived }}</text>
-                <text class="grid-area_center_item_title">我收到的</text>
-              </view>
-            </view>
+  <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <u-icon name="arrow-left" size="20" color="#fff" @click="returnTo('index')"></u-icon>
+    </template>
+    <template #center>
+      <text class="grid-area_center_item_title" style="color: #fff;">我的待办</text>
+    </template>
+  </u-navbar>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-tabs
+      :list="tabsList"
+      :current="tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
+  </u-sticky>
+  <oa-scroll
+    customClass="list-container scroll-height"
+    :pageSize="state.queryParams.pageSize"
+    :total="state.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>
+      <view class="projectSearchBox">
+        <u-input v-model.trim="state.queryParams.docNo" placeholder="搜索单据编号" clearable  size="small" style="width: 100%" @change="search"/>
+        <image class="filter" src="@/static/images/common/filter.png"></image>
+      </view>
+      <view class="menu-list m0">
+        <view class="list-cell" style="color: #666666; line-height: 25px; margin: 10px 0; width: auto; " v-for="(base, index) in state.dataList" :key="index" @click="toDetail(base.docNo)">
+          <view class="content-area-top menu-item">
+            <view class="content-area-top-name" @click="toProjectMange(base.id)">{{ base.createBy + '提交的' + proxy.$common.mapping("formName", "formSign", base.docNo.split("-")[0], state.formList) }} </view>
+            <view class="content-area-top-time" >{{ base.submitDate}} </view>
           </view>
-          <!-- 我的宫格 -->
-          <view class="grid-area bg-white" v-if="state.formList.length > 0">
-            <view class="grid-area_title">我的</view>
-            <u-icon class="grid-area_icon"  name="arrow-down" color="#000" size="18"  @click="splitNum('recentlyUsed',5)"></u-icon>
-            <!-- <u-icon class="grid-area_icon"  name="arrow-up" color="#000" size="18"  @click="splitNum('recentlyUsed',5)"></u-icon> -->
-            <!-- <u-icon  name="arrow-bottom" size="20" color="#000" @click="returnTo('index')"></u-icon> -->
-            <view class="grid-area_center cu-list grid col-5 no-border">
-              <view class="grid-area_center_item cu-item align-center" v-for="(item, index) in state.formList" :key="index">
-                <image class="grid-area_center_item_image" :src="item.icon"></image>
-                <text class="grid-area_center_item_title" >{{ item.formName }}</text>
-              </view>
+          <view class="content-area-row_wrap menu-item">
+            <view class="content-area-row_wrap-view">单据编号：{{ base.docNo }} </view>
+            <view class="content-area-row_wrap-view">类型：{{ proxy.$common.mapping("formName", "formSign", base.docNo.split("-")[0], state.formList) }}</view>
+            <view class="content-area-row_wrap-view" style="display: block">
+              <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', base.approvalStatus, form_status) }" >{{ proxy.$common.mapping("label", "value", base.approvalStatus, form_status) }} </span>
             </view>
           </view>
-  
-          <!-- 常用功能宫格 -->
-          <!-- <view class="grid-area bg-white">
-            <view class="grid-area_title">人事功能</view>
-            <view class="grid-area_center cu-list grid col-5 no-border">
-              <view class="grid-area_center_item cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in state.cuIconList" :key="index">
-                <image class="grid-area_center_item_image" :src="item.meta.icon"></image>
-                <text class="grid-area_center_item_title">{{ item.meta.aliasTitle ? item.meta.aliasTitle : item.meta.title }}</text>
-              </view>
-            </view>
-          </view> -->
         </view>
-      </template>
-    </oa-scroll>
-  
-    <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.oaApprovalTabbar"></oa-tabbar>
+      </view>
+    </template>
+  </oa-scroll>
+  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.oaApprovalTabbar" :isSwitchTab="false"></oa-tabbar>
 </template>
-  
-  <script setup>
-  /*----------------------------------依赖引入-----------------------------------*/
-  import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
-  import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs, nextTick } from "vue";
-  /*----------------------------------接口引入-----------------------------------*/
-  import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouters, qrCodeSend, getMobileBanner } from "@/api/index";
-  import { getOaFormDefinition, getFormCount } from "@/api/oa/approval/index";
-  /*----------------------------------组件引入-----------------------------------*/
-  /*----------------------------------store引入-----------------------------------*/
-  import { useStores } from "@/store/modules/index";
-  /*----------------------------------公共方法引入-----------------------------------*/
-  import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
-  import { getToken, setToken, removeToken } from "@/utils/auth";
-  import { storage, storageSystem } from "@/utils/storage"; // 公共方法引用
-  /*----------------------------------公共变量-----------------------------------*/
-  const { proxy } = getCurrentInstance();
-  const useStore = useStores();
-  /*----------------------------------变量声明-----------------------------------*/
-  const state = reactive({
-    dialogFlag: false,
-  
-    swiperBool: false,
-    swiperIndex: 0,
-    swiperTime: 5000,
-    swiperList: [],
-  
-    cuIconList: [],
-    recentlyUsed: [],
-    formList:[],
-    statistics:{
-      "pendingSum": 0, 
-      "alreadySum": 0, 
-      "myInitiated": 0, 
-      "myReceived": 0
-    },//头部统计
-  });
-  
-  const { dialogFlag, formList, statistics } = toRefs(state);
 
-  function init(){
-    getFormList(); //获取表单列表数据
-    getStatistics();//获取头部统计
-  }
-  
-  /**
-   * @scrollView刷新数据
-   */
-  function refresh() {
-    getAppRoutersData(); //调用路由信息接口
-  }
-  /**
-   * 表单权限列表
-   */
-  function getFormList(){
-    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`);
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watchEffect } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { getToDoPageList } from "@/api/oa/todo/index.js";
+import { getFormName } from "@/api/oa/approval/index.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const { form_status, workflow_form_subset } = proxy.useDict("form_status","workflow_form_subset");
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  loading: false,
+  tabsList: [
+    { name: "待处理", value: 1 },
+    { name: "已处理", value: 2 },
+    { name: "我收到的", value: 3 },
+  ],
+  queryParams:{
+    docNo: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    pageNum:1,
+    pageSize:5,
+    queryType:1,
+    formSign:""
+  },
+  total:0,
+  input: "",//搜索内容
+  formList:[],//表单列表
+});
+
+const { tabsList, total, queryParams, input, formList } = toRefs(state);
+function tabsClick(value) {
+  state.queryParams.queryType = value.value;
+  state.queryParams.pageNum = 1;
+  selectListApi();
+}
+/**
+ * @页面初始化
+ */
+function init() {
+  selectListApi();
+}
+/**
+ * 搜索
+ */
+function search(){
+  selectListApi();
+}
+/**
+ * @列表查询
+ * @api接口查询
+ */
+function selectListApi(type) {
+  state.loading = true;
+  getFormName().then((res) => {
+    state.formList = res.data;
+    getToDoPageList(state.queryParams)
+    .then((requset) => {
+      if(type){
+        if(requset.data.records.length>0){
+          state.dataList.push(...requset.data.records);
+          state.total += requset.data.total;
+        }else{
+          state.queryParams.pageNum--
+        }
+      }else{
+        state.dataList = requset.data.records;
+        state.total = requset.data.total;
       }
-      console.log(res.data,state.formList)
+      state.loading = false;
     })
-  }
-  function getStatistics(){
-    getFormCount().then((res)=>{
-      state.statistics = res.data
+    .catch((err) => {
+      state.loading = false;
+    });
+  })
+}
+
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  state.queryParams.pageNum ++;
+  selectListApi("add")
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  selectListApi()
+}
+/**
+ * 跳转到详情页
+ * @param id 
+ */
+function toDetail(id){
+  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${id}`);
+}
+/**
+ * 返回上级页面
+ * @param defaultPage 默认页面
+ */
+function returnTo(defaultPage) {
+  if(getCurrentPages().length > 1){
+    uni.navigateBack()
+  }else{
+    console.log(defaultPage)
+    uni.switchTab({
+      url: `/pages/${defaultPage}`
     })
   }
-  /**
-   * 返回上级页面
-   * @param defaultPage 默认页面
-   */
-  function returnTo(defaultPage) {
-    if(getCurrentPages().length > 1){
-      uni.navigateBack()
-    }else{
-      uni.switchTab({
-        url: `/pages/${defaultPage}`
-      })
-    }
-  }
-  /**
-   * 
-   * @param array 展示数组
-   * @param num 显示数量
-   */
-  function splitNum(array,num) {
-    state[array] = state[array].slice(0, num);
+}
+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>
+.projectSearchBox {
+  margin: 10px 4%;
+  width: 92%;
+  vertical-align: middle;
+  position: relative;
+  display: flex;
+  .filter{
+    width:17px;
+    height:16px;
+    margin:8px 0 0 4px;
   }
-  
-  /**
-   * @获取路由信息
-   * @api接口请求
-   */
-  function getAppRoutersData() {
-    getAppRouters().then((res) => {
-      state.cuIconList = res.data;
-      storageSystem.set("homeList", state);
-    });
-  }
-  
-  onLoad((options) => {
-    // uni.hideTabBar(); //隐藏自带tabbar
-    // init(options);
-  });
-  
-  onShow(() => {
-    init()
-    // var storages = storageSystem.get("homeList");
-    // Object.keys(storages).forEach((key) => {
-    //   state[key] = storages[key];
-    // });
-  });
-  </script>
-  
-  <style lang="scss" scoped>
-  .home-container {
-    font-family: "Alibaba_PuHuiTi_Regular";
-    .transition {
-      position: fixed;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      z-index: 1100;
-  
-      &-section {
-        position: absolute;
-        top: 10px;
-        right: 15px;
-        background-color: #fff;
-        border-radius: 10px;
-        box-shadow: 0px 0px 15px 0 rgba(0, 0, 0, 0.2);
-  
-        &-divider {
-          border-bottom: 0.5px rgba(0, 0, 0, 0.1) solid;
-          margin: 0 20px;
-        }
-  
-        &-content {
-          display: flex;
-          padding: 15px 20px;
-  
-          &-icon {
-            font-size: 18px;
-            color: #000;
-          }
-  
-          &-text {
-            margin: 0 20px;
-          }
-        }
-  
-        &-content:first-child {
-          padding-top: 15px;
-          border-radius: 10px 10px 0 0;
-        }
-  
-        &-content:last-child {
-          padding-bottom: 15px;
-          border-radius: 0 0 10px 10px;
-        }
-  
-        &-content:hover {
-          // transform: 3s;
-          // transition: all 600ms cubic-bezier(0.3, 1, 0.2, 1);
-          transition: all 3s cubic-bezier(0.7, -0.5, 0.2, 2);
-          background-color: rgba(0, 0, 0, 0.1);
-        }
+  .u-input {
+    display: inline-block;
+    background: #fff;
+    height: 34px;
+    line-height: 34px;
+    padding: 0 5px;
+    border-radius: 20px;
+    .uni-input-input {
+      font-size: 12px !important;
+    }
+    :deep(.u-input__content__prefix-icon) {
+      position: absolute;
+      right: 8px;
+      .uicon-search {
+        font-size: 16px;
       }
     }
-  
-    .grid-area {
-      margin-top: 10px;
-      width:calc(100% - 20px);
-      margin-left:10px;
-      border-radius: 6px;
-      position: relative;
-      &_title {
-        padding: 10px 10px 5px 10px;
-        color: #000000;
-        font-size: $uni-font-size-base;
+  }
+}
+.list-container {
+  .content-area {
+    &-top {
+      font-size: 16px;
+      color: #000000;
+      width: 100%;
+      &-name {
+        font-size: 13px;
+        font-weight: 600;
+        width: 65%;
+        text-align: left;
+        color: #000;
+        white-space: nowrap; /* 确保文本在一行内显示 */
+        overflow: hidden; /* 隐藏超出容器的内容 */
+        text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
+      }
+      &-time {
+        font-size: 12px;
+        text-align: right;
+        color: #999;
+        float:right;
+        width:35%;
       }
-      &_icon {
-        position: absolute;
-        right: 10px;
-        top:10px;
+
+      &-status {
+        max-width: 30%;
+        margin: auto 0 auto auto;
+        font-size: 12px;
+        color: #ffffff;
+        padding: 0 5px;
+        border-radius: 20px;
+        line-height: 20px;
       }
-      &_center {
-        border-radius: 6px;
-        color:#000;
-        &_item {
-          &_image {
-            width: 40px;
-            height: 40px;
-          }
-          &_title {
-            font-size: $uni-font-size-sm;
-            word-wrap: break-word;
-            max-width: 60px;
-            text-align: center;
-          }
-          &_num {
-            font-size: 16px;
-            
-          }
+    }
+
+    &-row_wrap {
+      font-size: 13px;
+      flex-flow: row wrap;
+
+      &-view {
+        display: flex;
+        min-width: 100%;
+        > .iconfont {
+          font-size: 14px;
+          color: #909399;
+          margin-left: 5px;
+        }
+
+        &-status {
+          margin: auto 0 auto 0;
+          font-size: 12px;
+          font-weight: 600;
+          color: #ffffff;
+          padding: 0 5px;
+          border-radius: 20px;
+          line-height: 20px;
         }
       }
     }
   }
-  .topReturn{
-    width:100%;
-    height:44px;
-    line-height: 44px;
-  }
-  </style>
-  
+}
+</style>

src/pages/login.vue

@@ -180,8 +180,8 @@ function init() {
   useStore.GetWxOpenId(1); //调用获取微信公众号openId
 
   if (window.location.host) {
-    // linkUrl.value = window.location.host;
-    linkUrl.value = "192.168.10.165:13200";
+    linkUrl.value = window.location.host;
+    // linkUrl.value = "192.168.10.165:13200";
     // linkUrl.value = "localhost:81";
     // linkUrl.value = "120.26.164.249:13212";
     // linkUrl.value = "manager.usky.cn";