H5 mobile.js修改

client/src/service/project.ts

@@ -30,7 +30,7 @@ export const getProjectWithChildrenById = async (projectId: ProjectId): Promise<
 }
 
 /**
- * 发起项目验收、结项、中止
+ * 发起项目验收、结项
  * @param projectId
  */
 export const projectStatusAndProcess = async (params: {
@@ -45,6 +45,33 @@ export const projectStatusAndProcess = async (params: {
     '/business'
   )
 }
+/**
+ * 项目中止
+ * @param projectId
+ */
+export const projectTerminate = async (projectId: ProjectId): Promise<ProjectRecord> => {
+  return await request.get(
+    {
+      url: '/project/terminate',
+      params: { projectId: projectId }
+    },
+    '/business'
+  )
+}
+
+/**
+ * 项目恢复
+ * @param projectId
+ */
+export const projectRecover = async (projectId: ProjectId): Promise<ProjectRecord> => {
+  return await request.get(
+    {
+      url: '/project/recover',
+      params: { projectId: projectId }
+    },
+    '/business'
+  )
+}
 /**
  * 修改项目信息
  * @param data

client/src/views/OaSystem/projectCenter/projectDetail/projectDetail.vue

@@ -48,20 +48,20 @@
             v-if="projectDetail?.['xmzt'] === 1"
             :title="`是否中止项目【${projectDetail['xmbh']}】？`"
             width="280px"
-            @confirm="editorProjectState(3)"
+            @confirm="projectTerminateHandler"
           >
             <template #reference>
-              <li @click="projectStatusAndProcessHandler('zz')">中止</li>
+              <li>中止</li>
             </template>
           </el-popconfirm>
           <el-popconfirm
             v-if="projectDetail?.['xmzt'] === 3"
             :title="`是否恢复项目【${projectDetail['xmbh']}】？`"
             width="280px"
-            @confirm="editorProjectState(3)"
+            @confirm="projectRecoverHandler"
           >
             <template #reference>
-              <li @click="projectStatusAndProcessHandler('hf')">恢复</li>
+              <li>恢复</li>
             </template>
           </el-popconfirm>
           <li v-if="projectDetail?.['xmzt'] === 4" @click="projectStatusAndProcessHandler('jx')">
@@ -141,7 +141,12 @@ import { openFlow } from '@/utils/flow'
 import { useMutation } from '@tanstack/vue-query'
 import { ProjectId } from '@/interface/project'
 import { Contract } from '@/interface/contract'
-import { getProjectWithChildrenById, projectStatusAndProcess } from '@/service/project'
+import {
+  getProjectWithChildrenById,
+  projectStatusAndProcess,
+  projectTerminate,
+  projectRecover
+} from '@/service/project'
 import XmxxComp from './components/xmxx/index.vue'
 import XmhtComp from './components/xmht/index.vue'
 import XmcbComp from './components/xmcb/index.vue'
@@ -170,11 +175,24 @@ const queryProjectByDetail = async (projectId: string) => {
   }
 }
 queryProjectByDetail(query?.id as string)
-// 添加子项目
+/**
+ * 添加子项目
+ * **/
 const addSubProject: () => void = () => {
   dynamicRef.value?.handleAddSubProject()
 }
-
+/**
+ * 项目中止
+ */
+const projectTerminateHandler = () => {
+  projectTerminate(id)
+}
+/**
+ * 项目恢复
+ */
+const projectRecoverHandler = () => {
+  projectRecover(id)
+}
 /**
  * 发起项目验收或结项
  */

client_h5/src/App.vue

@@ -16,6 +16,7 @@ const initUserInfoHandler = async () => {
                 accessToken: userIdResult?.data.accessToken,
             }
             userStore.setUser(userInfo)
+            localStorage.setItem("ACCESS_TOKEN", userIdResult?.data.accessToken)
             localStorage.setItem("_userInfo", JSON.stringify(userInfo))
         }
     }

zjugis-workflow/src/main/resources/static/all.mobile.js

@@ -2266,11 +2266,17 @@ window.pinyin_dict_notone = {"a":"阿啊呵腌嗄吖锕","e":"额阿俄恶鹅遏
         })
      */
     z.ui.ajax=function(option){
+        var headers = {
+            'X-Requested-With':'XMLHttpRequest'
+        }
+        var aStr = localStorage.getItem('ACCESS_TOKEN');
+        if(aStr){
+            var a = JSON.parse(aStr);
+            a['v'] && (headers['Authorization'] = 'Bearer '+JSON.parse(a['v']));
+        }
         var opt=$.extend(true,
         {
-            headers:{
-                'X-Requested-With':'XMLHttpRequest'
-            },
+            headers:headers,
             type:'post',
             contentType:'application/x-www-form-urlencoded',
             dataType: 'json',