oa对接审批流程

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

@@ -145,6 +145,85 @@
       <view class="app-button">
         <u-button  type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
       </view>
+      <view class="menu-list m0" style="margin-bottom:50px;">
+        <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;margin-top:10px;flex:none">
+          <view class="content-area-top">
+            <view style="width:100%;font-weight:bold;color:#333333;font-size:16px;">流程</view>
+            <!-- <view class="stepBar">
+              <view class="item">
+                <view class="left">
+                  <image class="icon" src="@/static/images/oa/user.png"></image>
+                  <image class="status" src="@/static/images/oa/pass2.png"></image>
+                  <div>
+                    <view class="title">
+                      发起申请
+                    </view>
+                    <view class="name">
+                      {{ state.detail.createBy }}
+                    </view>
+                  </div>
+                </view>
+                <view class="right">
+                  {{ state.detail.createTime?.split("T")[0] + " " + state.detail.createTime?.split("T")[1]}}
+                </view>
+                <view class="line sucess">
+                </view>
+              </view>
+              <view class="item" v-for="(item, index) in nodeList" :key="index">
+                <view class="left">
+                  <image class="icon" src="@/static/images/oa/user.png" v-if="item.nodeType == 1"></image>
+                  <image class="icon" src="@/static/images/oa/Ccto.png" v-if="item.nodeType == 2"></image>
+                  <div>
+                    <view class="title">
+                      {{ item.nodeType == 1 ? '审批人' : item.nodeType == 2 ? `抄送${item.appointApprover.indexOf(",") && item.appointApprover.split(",").length>1 ? `(${item.appointApprover.split(",").length}人)` : "人"}` : "" }}
+                    </view>
+                    <view class="name" v-if="item.nodeType == 1">
+                      {{  proxy.$common.mapping("nickName", "userId", item.appointApprover, state.userData) }}
+                    </view>
+                    <view class="name" v-if="item.nodeType == 2 && item.appointApprover.indexOf(',') && item.appointApprover.split(',').length == 1">
+                      {{  proxy.$common.mapping("nickName", "userId", item.appointApprover, state.userData) }}
+                    </view>
+                    <view class="name" v-if="item.nodeType == 2 && item.appointApprover.indexOf(',') && item.appointApprover.split(',').length > 1">
+                      抄送人
+                    </view>
+                  </div>
+                </view>
+                <view class="right">
+                </view>
+                <view class="center" v-if="item.nodeType == 2 && item.appointApprover.indexOf(',') && item.appointApprover.split(',').length > 1">
+                  <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
+                      class="content-area-header-avatar mlr5"
+                      :text='proxy.$common.mapping("nickName", "userId", approver, state.userData).length > 2 ? proxy.$common.mapping("nickName", "userId", approver, state.userData).slice(1, 3) : proxy.$common.mapping("nickName", "userId", approver, state.userData)'
+                      shape="square"
+                      size="40"
+                      fontSize="12"
+                      color="#ffffff"
+                      :bgColor="proxy.$settingStore.themeColor.color"
+                    ></u-avatar>
+                    <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>
+              </view>
+            </view> -->
+          </view>
+        </view>
+        <!-- <view class="fixedBottom" v-if="state.queryType == 2">
+          <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 class="approval" v-if="state.queryType == 1">
+          <button class="refuse" @click="handle('refuse',2)">拒绝</button>
+          <button class="pass" @click="handle('pass',2)">同意</button>
+        </view> -->
+      </view>
     </template>
   </oa-scroll>
 </template>
@@ -208,7 +287,7 @@ const state = reactive({
     endTime: "",
     endTime1: "",
     formSign: undefined,
-    id: undefined,
+    formId: undefined,
   },
   rules: {
     type: [{ required: true, message: "请选择请假类型", trigger: "change" }],
@@ -228,7 +307,7 @@ const state = reactive({
 const { form, rules } = toRefs(state);
 
 form.value.formSign = props.data.form.formSign
-form.value.id = props.data.form.id
+form.value.formId = props.data.form.id
 /**
  * @图片上传成功回调
  */
@@ -253,7 +332,7 @@ function handleSubmit(value) {
       .then((res) => {
         // proxy.$modal.msg("校验通过");
         addQjDocument({
-          id: form.value.id,
+          formId: form.value.formId,
           formSign: form.value.formSign,
           type: form.value.type,
           startTime: form.value.startTime,

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

@@ -23,19 +23,19 @@
             <!-- 我的宫格 -->
           <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">
+              <view class="grid-area_center_item cu-item justify-center align-center" @click="navItemClick(1)">
                 <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">
+              <view class="grid-area_center_item cu-item justify-center align-center" @click="navItemClick(2)">
                 <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">
+              <view class="grid-area_center_item cu-item justify-center align-center" style="cursor: not-allowed;">
                 <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">
+              <view class="grid-area_center_item cu-item justify-center align-center" @click="navItemClick(3)">
                 <text class="grid-area_center_item_num">{{ state.statistics.myReceived }}</text>
                 <text class="grid-area_center_item_title">我收到的</text>
               </view>
@@ -165,6 +165,11 @@
       })
     }
   }
+  function navItemClick(index){
+    uni.navigateTo({
+        url: `/pages/business/oa/toDo/index?queryType=${index}`
+      })
+  }
   /**
    * 
    * @param sub 数组下标

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

@@ -43,7 +43,7 @@
                   </div>
                 </view>
                 <view class="right">
-                  {{ state.detail.createTime?.split("T")[0] + " " + state.detail.createTime?.split("T")[1]}}
+                  {{ state.detail.createTime }}
                 </view>
                 <view class="line sucess">
                 </view>
@@ -71,7 +71,7 @@
                   <!-- 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="content-area-header mt20 mb10 text-center" style="display: inline-block"  v-for="(approver, index2) in item.appointApprover.split(',')" :key="index2">
+                  <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
                       class="content-area-header-avatar mlr5"
@@ -91,15 +91,11 @@
             </view>
           </view>
         </view>
-        <!-- <view class="fixedBottom" v-if="state.detail.docStatus === '2' || state.detail.docStatus === '3' ">
+        <view class="fixedBottom" v-if="state.queryType == 2">
           <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 class="approval">
+        <view class="approval" v-if="state.queryType == 1">
           <button class="refuse" @click="handle('refuse',2)">拒绝</button>
           <button class="pass" @click="handle('pass',2)">同意</button>
         </view>
@@ -130,9 +126,11 @@ const state = reactive({
   detail:{},//详情数据
   userData:[],//用户列表
   nodeList:[],//节点列表
+  queryType:"",
+  id:undefined,
 });
 
-const {  queryParams,  detail,formList, userData, nodeList } = toRefs(state);
+const {  queryParams,  detail,formList, userData, nodeList, queryType, id } = toRefs(state);
 /**
  * @页面初始化
  */
@@ -166,6 +164,7 @@ function getDetail(type) {
     getDocumentDetails(state.queryParams)
     .then((requset) => {
         state.detail = requset.data;
+        state.detail.id = state.id;
         listDept({id:state.detail.deptId}).then((res2) => {
           state.detail.deptName = res2.data[0].deptName
         })
@@ -175,7 +174,6 @@ function getDetail(type) {
             if(res4.data.length){
               var info = res4.data[0]
               state.nodeList = JSON.parse(info.flowInfo).node
-              console.log(state.nodeList)
               state.detail.formName = info.formName
             }
           })
@@ -210,6 +208,12 @@ onLoad((options) => {
   if(options?.docNo){
     state.queryParams.docNo = options.docNo;
   }
+  if(options?.queryType){
+    state.queryType = options.queryType;
+  }
+  if(options?.id){
+    state.id = options.id;
+  }
   init();
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
@@ -384,9 +388,9 @@ onLoad((options) => {
         background: #999;
       }
       .center{
-        width:40%;
-        margin-left:35px;
-        background: red;
+        width:100%;
+        margin:10px 0 0 40px;
+        padding-right:10px;
       }
     }
   }
@@ -421,7 +425,10 @@ onLoad((options) => {
     }
   }
   .approval{
-    margin-top:10px;
+    position: fixed;
+    width:100%;
+    bottom: 10px;
+    left:0;
     button{
       width:calc(50% - 15px);
       height:50px;

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

@@ -1,7 +1,7 @@
 <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>
+      <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>
@@ -47,7 +47,7 @@
         <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="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)">
           <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>
@@ -82,6 +82,7 @@ const { form_status, workflow_form_subset } = proxy.useDict("form_status","workf
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
   loading: false,
+  tabsCurrent:0,
   tabsList: [
     { name: "待处理", value: 1 },
     { name: "已处理", value: 2 },
@@ -101,8 +102,9 @@ const state = reactive({
   formList:[],//表单列表
 });
 
-const { tabsList, total, queryParams, input, formList } = toRefs(state);
+const { tabsList, total, queryParams, input, formList, tabsCurrent } = toRefs(state);
 function tabsClick(value) {
+  state.tabsCurrent = value.value - 1
   state.queryParams.queryType = value.value;
   state.queryParams.pageNum = 1;
   selectListApi();
@@ -164,17 +166,19 @@ function refresh() {
 }
 /**
  * 跳转到详情页
- * @param id 
+ * @param row 
  */
-function toDetail(id){
-  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${id}`);
+function toDetail(row){
+  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${row.docNo}&queryType=${state.queryParams.queryType}&id=${row.id}`);
 }
 /**
  * 返回上级页面
  * @param defaultPage 默认页面
  */
 function returnTo(defaultPage) {
+  console.log(getCurrentPages().length)
   if(getCurrentPages().length > 1){
+    console.log(1)
     uni.navigateBack()
   }else{
     console.log(defaultPage)
@@ -188,6 +192,15 @@ onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
 });
+onLoad((options) => {
+  if(options?.queryType){
+    tabsClick({value:options.queryType});
+  }else{
+    // init();
+  }
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 <style lang="scss" scoped>
 :deep(.u-modal__content) {