oa第一次上线

src/api/oa/approval/index.js

@@ -8,22 +8,6 @@ export function getOaFormDefinition(params) {
         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({
@@ -32,14 +16,6 @@ export function myApplication(params) {
         params
     })
 }
-// 表单（加班）新增
-export function addJBDocument(data) {
-    return request({
-        url: '/service-oa/oaJbDocument/add',
-        method: 'post',
-        data
-    })
-}
 // 表单名列表
 export function getFormName(params) {
     return request({
@@ -78,6 +54,22 @@ export function getFormCount() {
         method: 'get'
     })
 }
+// 表单记录新增
+export function addOaDocument(data) {
+    return request({
+        url: '/service-oa/oaDocument/add',
+        method: 'post',
+        data
+    })
+}
+// 表单记录修改
+export function updateDocument(data) {
+    return request({
+        url: '/service-oa/oaDocument/update',
+        method: 'post',
+        data
+    })
+}
 
 
 

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

@@ -8,6 +8,7 @@
     :refresherThreshold="44"
     :refresherBackground="'#f5f6f7'"
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+    style="height:calc(100vh - 110px)"
   >
     <template #default>
       <view class="centerOne">
@@ -142,87 +143,45 @@
         :minDate="Number(new Date())"
         :maxDate="Number(new Date('2027'))"
       ></u-datetime-picker>
-      <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 class="list-cell" style="color: #666666; line-height: 25px; width: auto;">
+        <view class="content-area-top">
+          <view style="width:100%;font-weight:bold;color:#333333;font-size:16px;margin-bottom:20px">流程</view>
+          <view class="stepBar">
+            <view class="item" v-for="(item, index) in nodeList" :key="index">
+              <view class="left">
+                <view class="yuan"></view>
+                <div>
+                  <view class="title">
+                    {{ item.nodeName }}
                   </view>
+                  <view class="name">
+                    {{  item.appointApprover.split(',').length }}人{{ item.nodeName }}
+                  </view>
+                </div>
+              </view>
+              <view class="right">
+                <view class="content-area-header  mb10 text-center" style="display: inline-block"  v-for="(item2, index2) in ccTo[index]" :key="index2">
+                  <img v-if='item2.avatar' class="content-area-header-avatarImg mlr5" :src='item2.avatar' style="display: block; width: 40px; height: 40px" />
+                  <u-avatar
+                    class="content-area-header-avatar mlr5"
+                    :text='item2.userName.length > 2 ? item2.userName.slice(1, 3) : item2.userName'
+                    shape="square"
+                    size="40"
+                    fontSize="12"
+                    color="#ffffff"
+                    :bgColor="proxy.$settingStore.themeColor.color"
+                  ></u-avatar>
+                  <u-text :text='item2.userName' color="#000000" size="14" align="center" class="userName"></u-text>
                 </view>
-                <view class="line gray" v-if="item.nodeType == 1">
-                </view>
               </view>
-            </view> -->
+              <view class="line gray" v-if="index < nodeList.length -1">
+              </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>
+      <view class="app-button">
+        <u-button  type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
       </view>
     </template>
   </oa-scroll>
@@ -249,12 +208,10 @@ import {
 } from "@/api/business/mhxf/unitInfoCollection";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
-import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 import {
   getOaFormDefinition,
-  addQjDocument,
-  updateQjDocument,
+  addOaDocument,
 } from "@/api/oa/approval/index.js";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
@@ -266,6 +223,7 @@ const props = defineProps({
     default: Object,
   },
 })
+console.log(props.data)
 const actionTitle = ref(null);
 const actionsList = ref([]);
 const actionDefaultIndex = ref(0);
@@ -302,12 +260,22 @@ const state = reactive({
     ],
     reason: [{ required: true, message: "请假事由不能为空", trigger: "blur" }],
   },
+  userData:[],
+  ccTo:[]
 });
 
-const { form, rules } = toRefs(state);
+const { form, rules, userData, ccTo} = toRefs(state);
+const nodeList = ref([]);
+state.userData = props.data.userData
+
+nodeList.value = props.data.nodeList
+state.ccTo = props.data.ccTo
+console.log(state.ccTo,1)
 
 form.value.formSign = props.data.form.formSign
 form.value.formId = props.data.form.id
+
+console.log(props.data.form)
 /**
  * @图片上传成功回调
  */
@@ -326,27 +294,54 @@ function uploadDeleteChange(e) {
  * @api提交
  */
 function handleSubmit(value) {
-  console.log(form.value)
   uForm.value
     .validate()
       .then((res) => {
-        // proxy.$modal.msg("校验通过");
-        addQjDocument({
-          formId: form.value.formId,
-          formSign: form.value.formSign,
-          type: form.value.type,
-          startTime: form.value.startTime,
-          endTime: form.value.endTime,
-          duration: Number(form.value.duration),
-          reason: form.value.reason,
-          docStatus: 1,
-          image: form.value.image
-        }).then((res) => {
-          proxy.$modal.msgSuccess("表单提交成功");
-          uni.switchTab({
-            url: `/pages/business/oa/toDo/index`
-          })
-        });
+        if(form.value.docNo){
+          updateDocument({
+            docNo: form.value.docNo,
+            id: form.value.id,
+            formId: form.value.formId,
+            formSign: form.value.formSign,
+            type: form.value.type,
+            startTime: form.value.startTime,
+            endTime: form.value.endTime,
+            duration: Number(form.value.duration),
+            reason: form.value.reason,
+            docStatus: 1,
+            image: form.value.image
+          }).then((res) => {
+            proxy.$modal.msgSuccess("表单修改成功");
+            if(getCurrentPages().length > 1){
+              uni.navigateBack()
+            }else{
+              uni.switchTab({
+                url: `/pages/business/oa/approval/index`
+              })
+            }
+          });
+        }else{
+          addOaDocument({
+            formId: form.value.formId,
+            formSign: form.value.formSign,
+            type: form.value.type,
+            startTime: form.value.startTime,
+            endTime: form.value.endTime,
+            duration: Number(form.value.duration),
+            reason: form.value.reason,
+            docStatus: 1,
+            image: form.value.image
+          }).then((res) => {
+            proxy.$modal.msgSuccess("表单提交成功");
+            if(getCurrentPages().length > 1){
+              uni.navigateBack()
+            }else{
+              uni.switchTab({
+                url: `/pages/business/oa/approval/index`
+              })
+            }
+          });
+        }
       })
       .catch((errors) => {
         proxy.$modal.msg("校验失败");
@@ -400,7 +395,9 @@ function timeSubmit(data) {
   showTime.value = false;
 }
 
-onLoad((options) => {});
+onLoad((options) => {
+
+});
 
 onShow(() => {
   //调用系统主题颜色
@@ -431,4 +428,59 @@ onShow(() => {
     border-radius: 10px !important;
   }
 }
+.stepBar{
+    margin-top:-20px;
+    font-weight: 400;
+    width:100%;
+    position: relative;
+    .item{
+      margin-top:10%;
+      .left{
+        width:100%;
+        position: relative;
+        .yuan{
+          width:10px;
+          height:10px;
+          margin-top:10px;
+          vertical-align: middle;
+          float: left;
+          border-radius: 50%;
+          background: #999;
+        }
+        >div{
+          width:80%;
+          margin-left:20px;
+          vertical-align: top;
+          line-height: 20px;
+          .title{
+            font-size: 14px;
+          }
+          .name{
+            font-size: 12px;
+            color: #999;
+          }
+        }
+      }
+      .line{
+        height:39.5%;
+        width:1px;
+        position: absolute;
+        top:24px;
+        left:5px;
+        background: #999;
+      }
+      .right{
+        width:calc(100% - 100px);
+        margin-left:100px;
+        text-align: right;
+      }
+    }
+  }
+  .userName{
+    white-space: nowrap;      /* 确保文本在一行内显示 */
+    overflow: hidden;         /* 超出容器部分隐藏 */
+    text-overflow: ellipsis;  /* 超出部分显示省略号 */
+    width: 50px !important;             /* 定义容器宽度 */
+    text-align: center;
+  }
 </style>

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

@@ -19,7 +19,7 @@
         >
       </template>
     </u-navbar>
-    <qjd v-if="datail?.fieldInfo == 'QJD' && JSON.stringify(datail) != '{}' " :data="{form:datail}" />
+    <qjd v-if="datail?.fieldInfo == 'QJD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType}" />
     <!-- :data="{form:form,nodeList:nodeList,ccTo:ccTo}" -->
 </template>
   
@@ -48,61 +48,105 @@
   import { useStores, commonStores } from "@/store/modules/index";
   /*----------------------------------公共方法引入-----------------------------------*/
   import {
-    getOaFormDefinition, addQjDocument, updateQjDocument, myApplication, getDocumentDetails
+    getOaFormDefinition, getDocumentDetails
   } from "@/api/oa/approval/index.js";
+  import {
+    UserList
+  } from "@/api/system/user.js";
   /*----------------------------------公共变量-----------------------------------*/
   const { proxy } = getCurrentInstance();
   /*----------------------------------变量声明-----------------------------------*/
   const formType = ref(""); //表单类型
   const datail = ref({}); //表单详情
-  const formSign = ref(""); //表单标识
+  const userData = ref([]); //用户列表
+  const ccTo = ref([]); //抄送人列表
+  const nodeList = ref([]); //节点列表
+  const pageStatus = ref(false); //页面状态
   /**
    *
-   * @param {*事件类型} eventType
+   * @param {*事件类型} type
    * @param {*} row
    */
-   function handle(type,row) {
+   function handle(type,formSign,docNo) {
     if(type == "getMore"){
-      if(formType.value == 1){
-        getOaFormDefinition( {formSign:row}).then((res)=>{
+      getOaFormDefinition( {formSign:formSign ? formSign : docNo.split("-")[0]}).then((res)=>{
+        if(formType.value == 1){
           if(res.data.length){
             datail.value = res.data[0]
+            var data = res.data[0]
             /** 查询用户列表 */
-            // listUser({ pageNum: "1", pageSize: "10000" }).then((res2) => {
-            //   userData.value = res2.data.rows;
-            //   var data = res.data[0]
-            //   var flowInfo = JSON.parse(data.flowInfo)
-            //   if(flowInfo.node){
-            //     nodeList.value = flowInfo.node
-            //     for(let i = 0; i < nodeList.value.length; i++){
-            //         ccTo.value.push([])
-            //         var nodeUsers = []
-            //         if(nodeList.value[i].appointApprover){
-            //             if(nodeList.value[i].appointApprover.indexOf(",")>-1){
-            //                 nodeUsers = nodeList.value[i].appointApprover.split(",")
-            //                 // console.log("长度长",nodeUsers)
-            //             }else{
-            //                 nodeUsers.push(nodeList.value[i].appointApprover)  
-            //                 // console.log("长度0",nodeUsers)
-            //             }
-            //         }
-            //         for (let j = 0; j < nodeUsers.length; j++) {
-            //             for (let k = 0; k < userData.value.length; k++) {
-            //                 if (nodeUsers[j] == userData.value[k].userId) {
-            //                     ccTo.value[i].push(userData.value[k]);
-            //                 }
-            //             }
-            //         }
-            //     }
-            //   }
-            //   pageStatus.value = true;
-            // })
+            UserList({ pageNum: "1", pageSize: "10000" }).then((res2) => {
+              userData.value = res2.data.rows;
+              var flowInfo = JSON.parse(data.flowInfo)
+              if(flowInfo.node){
+                nodeList.value = flowInfo.node
+                for(let i = 0; i < nodeList.value.length; i++){
+                  ccTo.value.push([])
+                  var nodeUsers = []
+                  if(nodeList.value[i].appointApprover){
+                    if(nodeList.value[i].appointApprover.indexOf(",")>-1){
+                        nodeUsers = nodeList.value[i].appointApprover.split(",")
+                    }else{
+                        nodeUsers.push(nodeList.value[i].appointApprover)  
+                    }
+                  }
+                  for (let j = 0; j < nodeUsers.length; j++) {
+                    for (let k = 0; k < userData.value.length; k++) {
+                        if (nodeUsers[j] == userData.value[k].userId) {
+                            ccTo.value[i].push(userData.value[k]);
+                        }
+                    }
+                  }
+                }
+              }
+              pageStatus.value = true;
+            })
           }else{
             proxy.$modal.msgError("表单模版不存在")
-              returnTo('index')
+            returnTo('index')
           }
-        })
-      }
+        }else if(formType.value == 2){
+          getDocumentDetails( {docNo:docNo}).then((res2)=>{
+            if(res2.data){
+              activeName.value  = docNo.split("-")[0]
+              form.value = res2.data
+              /** 查询用户列表 */
+              listUser({ pageNum: "1", pageSize: "10000" }).then((res3) => {
+                userData.value = res3.data.rows;
+                var data = res.data[0]
+                var flowInfo = JSON.parse(data.flowInfo)
+                if(flowInfo.node){
+                  nodeList.value = flowInfo.node
+                  for(let i = 0; i < nodeList.value.length; i++){
+                      ccTo.value.push([])
+                      var nodeUsers = []
+                      if(nodeList.value[i].appointApprover){
+                          if(nodeList.value[i].appointApprover.indexOf(",")>-1){
+                              nodeUsers = nodeList.value[i].appointApprover.split(",")
+                          }else{
+                              nodeUsers.push(nodeList.value[i].appointApprover)  
+                          }
+                      }
+                      for (let j = 0; j < nodeUsers.length; j++) {
+                          for (let k = 0; k < userData.value.length; k++) {
+                              if (nodeUsers[j] == userData.value[k].userId) {
+                                  ccTo.value[i].push(userData.value[k]);
+                              }
+                          }
+                      }
+                  }
+                }
+                pageStatus.value = true;
+              })
+            }else{
+              proxy.$modal.msgError("表单模版不存在")
+              setTimeout(() => {
+                handle("return")
+              })
+            }
+          })
+        }
+      })
     }
   }
   /**
@@ -118,26 +162,17 @@
       })
     }
   }
-  function init(){
-    //新增
-    if(formSign.value){
+  onLoad((options) => {
+     //新增
+    if(options.formSign){
       formType.value = 1
-      handle("getMore",formSign.value) 
+      handle("getMore",options.formSign) 
     }
     //编辑
-    // if(route.query.docNo){
-    //   formType.value = 2 
-    //   if(route.query.status == 3){
-    //     docStatus.value = route.query.status
-    //   }
-    //   handle("getMore",route.query.docNo) 
-    // }
-  }
-  onLoad((options) => {
-    if(options?.formSign){
-      formSign.value = options.formSign;
+    if(options.docNo){
+      formType.value = 2 
+      handle("getMore",null,options.docNo) 
     }
-    init()
   });
   
   onShow(() => {

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

@@ -48,7 +48,8 @@
             <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>
             <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.appContent[0].array" :key="index" @click="toForm(item.formSign)">
-                <image class="grid-area_center_item_image" :src="item.icon"></image>
+                <!-- <image class="grid-area_center_item_image" :src="item.icon"></image> -->
+                <img :src="item.icon" alt="" style="width: 40px;height: 40px;">
                 <text class="grid-area_center_item_title" >{{ item.formName }}</text>
               </view>
             </view>
@@ -132,9 +133,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`);
-        
       }
       state.appContent[0].array = state.formList
+      console.log(state.appContent[0].array)
     })
   }
   function getStatistics(){

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

@@ -7,99 +7,103 @@
       <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 + '提交的' + state?.detail?.formName }} </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 class="menu-list m0" style="overflow-y:scroll">
+    <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>
+      </view>
+      <view class="content-area-row_wrap menu-item">
+        <img class="typeIcon" src="@/static/images/oa/approval.png" v-if="state.approvalStatus === '1' "/>
+        <img class="typeIcon" src="@/static/images/oa/pass.png" v-if="state.approvalStatus === '2' "/>
+        <img class="typeIcon" src="@/static/images/oa/refuse.png" v-if="state.approvalStatus === '3' "/>
+        <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.approvalStatus, form_status) }" >{{ proxy.$common.mapping("label", "value", state.approvalStatus, form_status) }} </span>
         </view>
-        <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%;">流程</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 }}
+        <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" v-if="state.detail.duration">{{ state.detail.docNo.split("-")[0] ==  "JBD" ? "加班" : state.detail.docNo.split("-")[0] == "QJD" ? "请假" : ""  }}时长</view>
+        <view class="content-area-row_wrap-view gray black" v-if="state.detail.duration">{{ state.detail.duration }}</view>
+        <view class="content-area-row_wrap-view gray label" v-if="state.detail.reason">{{ state.detail.docNo.split("-")[0] ==  "JBD" ? "加班" : state.detail.docNo.split("-")[0] == "QJD" ? "请假" : ""    }}原因</view>
+        <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="content-area-top">
+        <view style="width:100%;">流程</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="line sucess">
+                <view class="name">
+                  {{ state.detail.createBy }}
                 </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>
+              </div>
+            </view>
+            <view class="right">
+              {{ state.detail.createTime }}
+            </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="right">
-                  <!-- 2021-08-01 10:30:00 -->
+                <view class="name" v-if="item.nodeType == 1">
+                  {{  proxy.$common.mapping("nickName", "userId", item.appointApprover, state.userData) }}
                 </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 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="line gray" v-if="item.nodeType == 1">
+                <view class="name" v-if="item.nodeType == 2 && item.appointApprover.indexOf(',') && item.appointApprover.split(',').length > 1">
+                  抄送人
                 </view>
+              </div>
+            </view>
+            <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="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 class="fixedBottom" v-if="state.queryType == 2">
-          <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>
+    </view>
+    <view class="fixedBottom" v-if="state.approvalStatus == 2 || state.approvalStatus == 3">
+      <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>
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
@@ -126,11 +130,11 @@ const state = reactive({
   detail:{},//详情数据
   userData:[],//用户列表
   nodeList:[],//节点列表
-  queryType:"",
+  approvalStatus:"",
   id:undefined,
 });
 
-const {  queryParams,  detail,formList, userData, nodeList, queryType, id } = toRefs(state);
+const {  queryParams,  detail,formList, userData, nodeList, approvalStatus, id } = toRefs(state);
 /**
  * @页面初始化
  */
@@ -170,6 +174,7 @@ function getDetail(type) {
         })
         UserList({ pageNum: "1", pageSize: "10000" }).then((res3) => {
           state.userData = res3.data.rows;
+          console.log(state.userData.length)
           getOaFormDefinition( {formSign:state.queryParams?.docNo?.split("-")[0]}).then((res4)=>{
             if(res4.data.length){
               var info = res4.data[0]
@@ -178,7 +183,6 @@ function getDetail(type) {
             }
           })
         })
-        
         state.loading = false;
     })
     .catch((err) => {
@@ -208,8 +212,8 @@ onLoad((options) => {
   if(options?.docNo){
     state.queryParams.docNo = options.docNo;
   }
-  if(options?.queryType){
-    state.queryType = options.queryType;
+  if(options?.approvalStatus){
+    state.approvalStatus = options.approvalStatus;
   }
   if(options?.id){
     state.id = options.id;

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

@@ -169,20 +169,17 @@ function refresh() {
  * @param row 
  */
 function toDetail(row){
-  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${row.docNo}&queryType=${state.queryParams.queryType}&id=${row.id}`);
+  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${row.docNo}&approvalStatus=${row.approvalStatus}&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)
-    uni.switchTab({
+    uni.redirectTo({
       url: `/pages/${defaultPage}`
     })
   }