Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into fanghuisheng

src/api/oa/todo/index.js

@@ -71,7 +71,7 @@ export function statueSubmit(params) {
         params
     })
 }
-// 分页
+// 表单分页(待处理、已处理、我收到的)
 export function getToDoPageList(params) {
     return request({
         url: '/service-oa/oaApproval/pageList',

src/manifest.json

@@ -2,8 +2,8 @@
     "name": "综合智慧云",
     "appid": "__UNI__36DE3A0",
     "description": "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
-    "versionName": "2.2.3",
-    "versionCode": 23,
+    "versionName": "2.2.4",
+    "versionCode": 24,
     "transformPx": false,
     "app-plus": {
         "compatible": {

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

@@ -0,0 +1,506 @@
+<template>
+  <oa-scroll
+    customClass="unitInfoCollection-container scroll-height"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherEnabledTitle="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+    style="height:calc(100vh - 110px)"
+  >
+    <template #default>
+      <view class="centerOne">
+        <u--form ref="uForm" :model="form" :rules="rules" labelWidth="180">
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="申请名称："
+                prop="applicationName"
+                required
+                label-position="top"
+              >
+                <u-input
+                  v-model="form.applicationName"
+                  placeholder="请输入申请名称"
+                  border="none"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="发布时间："
+                prop="publishTime"
+                required
+                label-position="top"
+                @click="handleDateTime('发布时间', 0, form.publishTime)"
+              >
+                <u-input
+                  v-model="form.publishTime"
+                  placeholder="请选择发布时间"
+                  border="none"
+                  suffixIcon="arrow-right"
+                  suffixIconStyle="color: #909399;"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="发布项目："
+                prop="publishProject"
+                required
+                label-position="top"
+              >
+                <u-input
+                  v-model="form.publishProject"
+                  placeholder="请输入发布项目"
+                  border="none"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="项目类型："
+                prop="projectType"
+                required
+                :borderBottom="false"
+                label-position="top"
+                @click="handleAction('项目类型')"
+                style="margin-top:10px"
+              >
+                <u-input
+                  v-model="form.projectTypeName"
+                  placeholder="请选择项目类型"
+                  suffixIcon="arrow-right"
+                  suffixIconStyle="color: #909399"
+                  border="none"
+                  disabledColor="transparent"
+                  disabled
+                />
+              </u-form-item>
+            </view>
+          </view>
+          
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="上线功能："
+                prop="onlineFunction"
+                required
+                label-position="top"
+              >
+                <u-input
+                  v-model="form.onlineFunction"
+                  placeholder="请输入上线功能"
+                  border="none"
+                  type="textarea"
+                  row="6"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          
+          
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="上线前准备："
+                prop="preparation"
+                label-position="top"
+              >
+                <u-input
+                  v-model="form.preparation"
+                  placeholder="请输入上线前准备"
+                  border="none"
+                  type="textarea"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item label="图片：" prop="image" label-position="top">
+                <div style="margin-top: 10px">
+                  <oa-upload :uploadCount="1" :uploadImage="form.image" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+                </div>
+                <!-- <view style="color: #666666">图片支持png、jpg</view> -->
+              </u-form-item>
+            </view>
+          </view>
+        </u--form>
+      </view>
+      <u-picker
+        :show="actionShow"
+        :columns="actionsList"
+        :title="actionTitle"
+        keyName="label"
+        visibleItemCount="6"
+        :defaultIndex="[actionDefaultIndex]"
+        :closeOnClickOverlay="true"
+        @close="actionShow = false"
+        @cancel="actionShow = false"
+        @confirm="selectAction"
+      ></u-picker>
+      <u-datetime-picker
+        :show="showTime"
+        v-model="timeValue"
+        mode="datetime"
+        @close="showTime = false"
+        @cancel="showTime = false"
+        @confirm="timeSubmit"
+        :closeOnClickOverlay="true"
+        :minDate="Number(new Date())"
+        :maxDate="Number(new Date('2027'))"
+      ></u-datetime-picker>
+      <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.nodeType == "1" ? "审批" : item.nodeType == "2" ? "抄送" : "" }}
+                  </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;border-radius: 6px;" />
+                  <u-avatar
+                  v-else
+                    class="content-area-header-avatar mlr5"
+                    :text='item2.nickName.length > 2 ? item2.nickName.slice(1, 3) : item2.nickName'
+                    shape="square"
+                    size="40"
+                    fontSize="12"
+                    color="#ffffff"
+                    :bgColor="proxy.$settingStore.themeColor.color"
+                  ></u-avatar>
+                  <u-text :text='item2.nickName' color="#000000" size="14" align="center" class="userName"></u-text>
+                </view>
+              </view>
+              <view class="line gray" v-if="index < nodeList.length -1">
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+  <view class="app-button">
+    <u-button  type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+  </view>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
+import {
+  ref,
+  onMounted,
+  inject,
+  shallowRef,
+  reactive,
+  toRefs,
+  getCurrentInstance,
+} from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import {
+  companyByNameSelect,
+  addBaseCompany,
+  delBaseBuild,
+  delBaseBuildExtinguish,
+} from "@/api/business/mhxf/unitInfoCollection";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+import {
+  getOaFormDefinition,
+  addOaDocument,
+} from "@/api/oa/approval/index.js";
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const { OA_FB_projectType } = proxy.useDict("OA_FB_projectType");
+/*----------------------------------变量声明-----------------------------------*/
+const props = defineProps({
+  data: {
+    type: Object,
+    default: Object,
+  },
+})
+const actionTitle = ref(null);
+const actionsList = ref([]);
+const actionDefaultIndex = ref(0);
+const actionShow = ref(false);
+const uForm = ref(null);
+const showTime = ref(false) //时间选择显示隐藏
+const timeValue = ref(Number(new Date())) //时间选择值
+const timeTitle = ref("") //时间选择标题
+const state = reactive({
+  form: {
+    applicationName:"",
+    publishTime: "",
+    publishProject: undefined,
+    onlineFunction: undefined,
+    projectType: "",
+    formSign: undefined,
+    formId: undefined,
+    projectTypeName: "",
+  },
+  rules: {
+    applicationName: [{ required: true, message: "申请名称不能为空", trigger: "blur" }],
+    publishTime:[{ required: true, message: "发布时间不能为空", trigger: "change" }],
+    publishProject:[{ required: true, message: "发布项目名称不能为空", trigger: "blur" }],
+    onlineFunction:[{ required: true, message: "上线功能不能为空", trigger: "blur" }],
+    projectType:[{ required: true, message: "项目类型不能为空", trigger: "change" }],
+  },
+  userData:[],
+  ccTo:[]
+});
+
+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
+
+
+form.value.formSign = props.data.form.formSign
+form.value.formId = props.data.form.id
+
+//编辑状态
+if(JSON.stringify(props.data.docNoDetail)!= "{}"){
+  form.value.accountingMethod = props.data.docNoDetail.accountingMethod.toString()
+  form.value.accountingMethodName = "申请调休"
+}
+/**
+ * @图片上传成功回调
+ */
+ function uploadSuccessChange(e) {
+  form.value.image = e.url;
+}
+
+/**
+ * @图片删除回调
+ */
+function uploadDeleteChange(e) {
+  form.value.image = e;
+}
+
+/**
+ * @api提交
+ */
+function handleSubmit(value) {
+  uForm.value
+    .validate()
+      .then((res) => {
+        if(form.value.docNo){
+          updateDocument({
+            applicationName: form.value.applicationName,
+            publishTime: form.value.publishTime,
+            publishProject:form.value.publishProject,
+            projectType:form.value.projectType,
+            onlineFunction:form.value.onlineFunction,
+            preparation:form.value.preparation,
+            image: form.value.image,
+            docStatus: 1,
+
+            docNo: form.value.docNo,
+            id: form.value.id,
+            formId: form.value.formId,
+            formSign: form.value.formSign,
+          }).then((res) => {
+            proxy.$modal.msgSuccess("表单修改成功");
+            if(getCurrentPages().length > 1){
+              uni.navigateBack()
+            }else{
+              uni.switchTab({
+                url: `/pages/business/oa/approval/index`
+              })
+            }
+          });
+        }else{
+          addOaDocument({
+            applicationName: form.value.applicationName,
+            publishTime: form.value.publishTime,
+            publishProject:form.value.publishProject,
+            projectType:form.value.projectType,
+            onlineFunction:form.value.onlineFunction,
+            preparation:form.value.preparation,
+            image: form.value.image,
+            docStatus: 1,
+
+            formId: form.value.formId,
+            formSign: form.value.formSign,
+          }).then((res) => {
+            proxy.$modal.msgSuccess("表单提交成功");
+            if(getCurrentPages().length > 1){
+              uni.navigateBack()
+            }else{
+              uni.redirectTo({
+                url: `/pages/business/oa/approval/index`
+              })
+            }
+          });
+        }
+      })
+      .catch((errors) => {
+        proxy.$modal.msg("校验失败");
+      });
+}
+
+/**
+ * @action弹出框点击事件
+ */
+function handleAction(value, index, ind) {
+  if (value == "项目类型") {
+    actionsList.value = [[]]
+
+    actionTitle.value = value;
+    for(let i =0;i<OA_FB_projectType.value.length;i++){
+      actionsList.value[0].push({label:OA_FB_projectType.value[i].label,value:OA_FB_projectType.value[i].value})
+    }
+    actionDefaultIndex.value = 0;
+  }
+  actionShow.value = true;
+}
+
+/**
+ * @action弹出框选择事件
+ */
+function selectAction(e) {
+  console.log(e,123)
+  if(actionTitle.value == "项目类型"){
+    form.value.projectType = e.value[0].value;
+    form.value.projectTypeName = e.value[0].label;
+  }
+  actionShow.value = false;
+}
+/**
+ * @时间弹出框点击事件
+ */
+function handleDateTime(value, index, time) {
+  showTime.value = true;
+  timeTitle.value = value;
+}
+
+/**
+ * @时间选择器
+ * @确定按钮事件
+ */
+function timeSubmit(data) {
+  let time = proxy.$time.getFormatterDate(data.value);
+  let timeData = time.split(" ")[0] + " " + time.split(" ")[1]
+  form.value.publishTime = timeData;
+  // if (timeTitle.value == "发布时间") {
+  //   form.value.startTime1 = timeData;
+  //   form.value.startTime = timeData;
+  // } 
+  showTime.value = false;
+}
+
+onLoad((options) => {
+
+});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+</script>
+
+<style lang="scss">
+.unitInfoCollection-container {
+  .centerOne,
+  .centerTwo {
+    .title {
+      color: #333333;
+      text-align: center;
+      margin-top: 10px;
+    }
+  }
+  :deep(.u-picker__view__column__item) {
+    font-size: 13px;
+  }
+}
+.app-button{
+  position: fixed;
+  bottom:10px;
+  left:10px;
+  width:calc(100% - 20px);
+  background: #fff;
+  button{
+    border-radius: 10px !important;
+  }
+}
+.stepBar{
+    margin-top:-20px;
+    font-weight: 400;
+    width:100%;
+    .item{
+    position: relative;
+      .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:84%;
+        width:1px;
+        position: absolute;
+        top:24px;
+        left:5px;
+        background: #999;
+      }
+      .right{
+        width:calc(100% - 100px);
+        margin-left:100px;
+        text-align: right;
+      }
+    }
+    .item:nth-child(1){
+      margin-top:10%;
+    }
+  }
+.userName{
+  white-space: nowrap;      /* 确保文本在一行内显示 */
+  overflow: hidden;         /* 超出容器部分隐藏 */
+  text-overflow: ellipsis;  /* 超出部分显示省略号 */
+  width: 50px !important;             /* 定义容器宽度 */
+  text-align: center;
+}
+</style>

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

@@ -22,6 +22,7 @@
     </u-navbar>
     <qjd v-if="datail?.fieldInfo == 'QJD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType,docNoDetail:docNoDetail}" />
     <jbd v-if="datail?.fieldInfo == 'JBD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType,docNoDetail:docNoDetail}" />
+    <fbsq v-if="datail?.fieldInfo == 'FBD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType,docNoDetail:docNoDetail}" />
   </view>
     <!-- :data="{form:form,nodeList:nodeList,ccTo:ccTo}" -->
 </template>
@@ -48,6 +49,7 @@
   /*----------------------------------组件引入-----------------------------------*/
   import qjd from "./components/qjd.vue";//请假单
   import jbd from "./components/jbd.vue";//加班单
+  import fbsq from "./components/fbsq.vue";//发布申请
   /*----------------------------------store引入-----------------------------------*/
   import { useStores, commonStores } from "@/store/modules/index";
   /*----------------------------------公共方法引入-----------------------------------*/

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

@@ -31,7 +31,7 @@
                 <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" style="cursor: not-allowed;">
+              <view class="grid-area_center_item cu-item justify-center align-center" @click="navItemClick(4)">
                 <text class="grid-area_center_item_num">{{ state.statistics.myInitiated }}</text>
                 <text class="grid-area_center_item_title">已发起</text>
               </view>
@@ -164,7 +164,8 @@
    * 跳转表单模版
    */
   function toForm(formSign){
-    if(formSign == "QJD" || formSign == "JBD"){
+    console.log(formSign)
+    if(formSign == "QJD" || formSign == "JBD" || formSign == "SXSQ"){
       uni.navigateTo({
         url: `/pages/business/oa/approval/formType?formSign=${formSign}`
       })

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

@@ -27,6 +27,18 @@
         <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 class="content-area-row_wrap-view gray label" v-if="state.detail.applicationName">申请名称</view>
+        <view class="content-area-row_wrap-view gray black" v-if="state.detail.applicationName">{{ state.detail.applicationName }}</view>
+        <view class="content-area-row_wrap-view gray label" v-if="state.detail.publishTime">发布时间</view>
+        <view class="content-area-row_wrap-view gray black" v-if="state.detail.publishTime">{{ state.detail.publishTime }}</view>
+        <view class="content-area-row_wrap-view gray label" v-if="state.detail.publishProject">发布项目</view>
+        <view class="content-area-row_wrap-view gray black" v-if="state.detail.publishProject">{{ state.detail.publishProject }}</view>
+        <view class="content-area-row_wrap-view gray label" v-if="state.detail.onlineFunction">上线功能</view>
+        <view class="content-area-row_wrap-view gray black" v-if="state.detail.onlineFunction">{{ state.detail.onlineFunction }}</view>
+        <view class="content-area-row_wrap-view gray label" v-if="state.detail.preparation">上线准备</view>
+        <view class="content-area-row_wrap-view gray black" v-if="state.detail.preparation">{{ state.detail.preparation }}</view>
       </view>
     </view>
     <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;margin-top:10px;">
@@ -147,7 +159,6 @@ const state = reactive({
   userData:[],//用户列表
   nodeList:[],//节点列表
   approvalStatus:"",
-  id:undefined,
 });
 
 const {  queryParams,  detail,formList, userData, nodeList, approvalStatus, id } = toRefs(state);
@@ -193,7 +204,6 @@ function getDetail(type) {
     .then((requset) => {
       if(requset.data){
         state.detail = requset.data;
-        state.detail.id = state.id;
         listDept({id:state.detail.deptId}).then((res2) => {
           state.detail.deptName = res2.data[0].deptName
         })
@@ -246,9 +256,6 @@ onLoad((options) => {
   if(options?.approvalStatus){
     state.approvalStatus = options.approvalStatus;
   }
-  if(options?.id){
-    state.id = options.id;
-  }
   init();
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);

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

@@ -50,13 +50,13 @@
         <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>
+            <view class="content-area-top-time">{{ state.queryParams.queryType!=4 ? base.submitDate : base.createTime.replace(/T/g," ") }} </view>
           </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 class="content-area-row_wrap-view" style="display: block" >
+              <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', state.queryParams.queryType!=4 ? base.approvalStatus : base.docStatus, form_status) }" >{{ proxy.$common.mapping("label", "value", state.queryParams.queryType!=4 ? base.approvalStatus : base.docStatus, form_status) }} </span>
             </view>
           </view>
         </view>
@@ -72,7 +72,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, on
 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";
+import { getFormName, myApplication } from "@/api/oa/approval/index.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
@@ -87,6 +87,7 @@ const state = reactive({
     { name: "待处理", value: 1 },
     { name: "已处理", value: 2 },
     { name: "我收到的", value: 3 },
+    { name: "我发起的", value: 4 },
   ],
   queryParams:{
     docNo: undefined,
@@ -129,24 +130,45 @@ 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;
+    if(state.queryParams.queryType !=4){
+      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.queryParams.pageNum--
+          state.dataList = requset.data.records;
+          state.total = requset.data.total;
         }
-      }else{
-        state.dataList = requset.data.records;
-        state.total = requset.data.total;
-      }
-      state.loading = false;
-    })
-    .catch((err) => {
-      state.loading = false;
-    });
+        state.loading = false;
+      })
+      .catch((err) => {
+        state.loading = false;
+      });
+    }else{
+      myApplication({pageNum:state.queryParams.pageNum,pageSize:state.queryParams.pageSize}).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;
+        }
+        state.loading = false;
+      })
+      .catch((err) => {
+        state.loading = false;
+      });
+    }
+    
   })
 }
 
@@ -169,7 +191,7 @@ function refresh() {
  * @param row 
  */
 function toDetail(row){
-  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${row.docNo}&approvalStatus=${row.approvalStatus}&id=${row.id}`);
+  proxy.$tab.navigateTo(`/pages/business/oa/toDo/detail?docNo=${row.docNo}&approvalStatus=${state.queryParams.queryType !=4 ?row.approvalStatus : row.docStatus}&id=${row.id}`);
 }
 /**
  * 返回上级页面