发布申请上线

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/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>
@@ -166,7 +166,6 @@
   function toForm(formSign){
     console.log(formSign)
     if(formSign == "QJD" || formSign == "JBD" || formSign == "SXSQ"){
-      console.log(1111)
       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}`);
 }
 /**
  * 返回上级页面