From c86a95618d4fcbf79bd9866391d642640bed0bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=9E=97=E8=BD=A9=E2=80=9D?= <317035359@qq.com>
Date: Tue, 2 Sep 2025 16:55:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/common/operate.ts             | 224 +++++++++----------
 src/pages/relation/components/personList.vue |  14 +-
 src/ts/base/enum.ts                          |   9 +
 src/ts/base/model.ts                         |   5 +-
 src/ts/core/target/person.ts                 |  14 +-
 src/ts/core/target/team/company.ts           |   2 +
 6 files changed, 140 insertions(+), 128 deletions(-)

diff --git a/src/pages/home/common/operate.ts b/src/pages/home/common/operate.ts
index 8d8e73d..7022f71 100644
--- a/src/pages/home/common/operate.ts
+++ b/src/pages/home/common/operate.ts
@@ -24,62 +24,62 @@ class Operate {
           placeholder: '请输入用户的账号',
           selectTargetType: TargetType.Person
         },
-        {
-          infoTitle: '创建群组',
-          infoIcon: 'tmicon-md-people',
-          weidetType: 'formlist',
-          formType: 'newGroup',
-          formOption: [
-            {
-              name: '名称',
-              type: 'input',
-              required: true,
-              field: 'name',
-              rules: [
-                {
-                  required: true,
-                  message: '名称不能为空'
-                }
-              ]
-            },
-            {
-              name: '代码',
-              type: 'input',
-              required: true,
-              field: 'code',
-              rules: [
-                {
-                  required: true,
-                  message: '代码不能为空'
-                }
-              ]
-            },
-            {
-              name: '选择制定组织',
-              type: 'select',
-              required: true,
-              field: 'typeName',
-              rules: [
-                {
-                  required: true,
-                  message: '不能为空'
-                }
-              ]
-            },
-            {
-              name: '简介',
-              type: 'input',
-              required: true,
-              field: 'remark',
-              rules: [
-                {
-                  required: true,
-                  message: '简介不能为空'
-                }
-              ]
-            }
-          ]
-        },
+        // {
+        //   infoTitle: '创建群组',
+        //   infoIcon: 'tmicon-md-people',
+        //   weidetType: 'formlist',
+        //   formType: 'newGroup',
+        //   formOption: [
+        //     {
+        //       name: '名称',
+        //       type: 'input',
+        //       required: true,
+        //       field: 'name',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '名称不能为空'
+        //         }
+        //       ]
+        //     },
+        //     {
+        //       name: '代码',
+        //       type: 'input',
+        //       required: true,
+        //       field: 'code',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '代码不能为空'
+        //         }
+        //       ]
+        //     },
+        //     {
+        //       name: '选择制定组织',
+        //       type: 'select',
+        //       required: true,
+        //       field: 'typeName',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '不能为空'
+        //         }
+        //       ]
+        //     },
+        //     {
+        //       name: '简介',
+        //       type: 'input',
+        //       required: true,
+        //       field: 'remark',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '简介不能为空'
+        //         }
+        //       ]
+        //     }
+        //   ]
+        // },
         {
           infoTitle: '加入群组',
           infoIcon: 'tmicon-ios-chatbubbles',
@@ -93,62 +93,62 @@ class Operate {
           weidetType: 'search',
           selectTargetType: TargetType.Company
         },
-        {
-          infoTitle: '设立单位',
-          infoIcon: 'tmicon-home',
-          weidetType: 'formlist',
-          formType: 'newCompany',
-          formOption: [
-            {
-              name: '名称',
-              type: 'input',
-              required: true,
-              field: 'name',
-              rules: [
-                {
-                  required: true,
-                  message: '名称不能为空'
-                }
-              ]
-            },
-            {
-              name: '企业信用代码',
-              type: 'input',
-              required: true,
-              field: 'code',
-              rules: [
-                {
-                  required: true,
-                  message: '代码不能为空'
-                }
-              ]
-            },
-            {
-              name: '类型',
-              type: 'select',
-              required: true,
-              field: 'typeName',
-              rules: [
-                {
-                  required: true,
-                  message: '不能为空'
-                }
-              ]
-            },
-            {
-              name: '简介',
-              type: 'input',
-              required: true,
-              field: 'remark',
-              rules: [
-                {
-                  required: true,
-                  message: '简介不能为空'
-                }
-              ]
-            }
-          ]
-        }
+        // {
+        //   infoTitle: '设立单位',
+        //   infoIcon: 'tmicon-home',
+        //   weidetType: 'formlist',
+        //   formType: 'newCompany',
+        //   formOption: [
+        //     {
+        //       name: '名称',
+        //       type: 'input',
+        //       required: true,
+        //       field: 'name',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '名称不能为空'
+        //         }
+        //       ]
+        //     },
+        //     {
+        //       name: '企业信用代码',
+        //       type: 'input',
+        //       required: true,
+        //       field: 'code',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '代码不能为空'
+        //         }
+        //       ]
+        //     },
+        //     {
+        //       name: '类型',
+        //       type: 'select',
+        //       required: true,
+        //       field: 'typeName',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '不能为空'
+        //         }
+        //       ]
+        //     },
+        //     {
+        //       name: '简介',
+        //       type: 'input',
+        //       required: true,
+        //       field: 'remark',
+        //       rules: [
+        //         {
+        //           required: true,
+        //           message: '简介不能为空'
+        //         }
+        //       ]
+        //     }
+        //   ]
+        // }
       ]
     }
   }
diff --git a/src/pages/relation/components/personList.vue b/src/pages/relation/components/personList.vue
index a30a62d..5a3897d 100644
--- a/src/pages/relation/components/personList.vue
+++ b/src/pages/relation/components/personList.vue
@@ -49,7 +49,7 @@
           </view>
         </view>
 
-        <view
+        <!-- <view
           class="rg-time"
           @click="goDetail(item, 'menuDetail')"
           v-show="item.isShow"
@@ -59,7 +59,7 @@
             color="#000000"
             name="tmicon-info-circle"
           ></tm-icon>
-        </view>
+        </view> -->
       </view>
     </tm-sheet>
   </view>
@@ -127,11 +127,11 @@ const goMenu = (item: any, type: any) => {
     emit('btnClick', item, type)
   }
 }
-const goDetail = (item: any, type: any) => {
-  if (item) {
-    emit('btnClick', item, type)
-  }
-}
+// const goDetail = (item: any, type: any) => {
+//   if (item) {
+//     emit('btnClick', item, type)
+//   }
+// }
 </script>
 
 <style lang="scss">
diff --git a/src/ts/base/enum.ts b/src/ts/base/enum.ts
index a19dcf0..14ceee4 100644
--- a/src/ts/base/enum.ts
+++ b/src/ts/base/enum.ts
@@ -75,3 +75,12 @@ export enum ReceptionType {
   Distribution = '分发任务',
   FillOut = '接收任务',
 }
+/** 关系类型 */
+export enum RelationType {
+  // 成员关系
+  MEMBER = 'member',
+  // 客户关系
+  CUSTOMER = 'customer',
+  // 不区分关系
+  ALL = 'all',
+}
\ No newline at end of file
diff --git a/src/ts/base/model.ts b/src/ts/base/model.ts
index 0bf8be1..a16afcf 100644
--- a/src/ts/base/model.ts
+++ b/src/ts/base/model.ts
@@ -23,8 +23,9 @@ import {
   XReportTreeNode,
   XReportTaskTreeNode
 } from './schema'
-import { NodeType as ReportTreeNodeType } from './enum';
+import { NodeType as ReportTreeNodeType,RelationType } from './enum';
 import { IIdentity } from '../core';
+
 // 请求类型定义
 export type ReqestType = {
   // 模块
@@ -443,6 +444,8 @@ export type GainModel = {
   id: string
   // 子ID
   subId: string
+  // 关系类型 //member 成员关系，//customer 客户关系, all 不区分
+  relationType: RelationType;
 }
 
 export type ApprovalModel = {
diff --git a/src/ts/core/target/person.ts b/src/ts/core/target/person.ts
index 94c5fcf..7657fcf 100644
--- a/src/ts/core/target/person.ts
+++ b/src/ts/core/target/person.ts
@@ -13,6 +13,7 @@ import { personJoins, targetOperates } from '../public'
 import { IFile } from '../thing/fileinfo'
 import { ISession } from '../chat/session'
 import { XObject } from '../public/object'
+import { RelationType } from '@/ts/base/enum'
 
 /** 人员类型接口 */
 export interface IPerson extends IBelong {
@@ -203,7 +204,6 @@ export class Person extends Belong implements IPerson {
   }
 
   async applyJoin(members: schema.XTarget[]): Promise<boolean> {
-    let result: boolean = true
     members = members.filter(
       i =>
         [
@@ -217,15 +217,13 @@ export class Person extends Belong implements IPerson {
       if (member.typeName === TargetType.Person) {
         await super.pullMembers([member])
       }
-      const res = await kernel.applyJoinTeam({
+      await kernel.applyJoinTeam({
         id: member.id,
-        subId: this.id
-      })
-      if (result && !res.success) {
-        result = false
-      }
+        subId: this.id,
+        relationType: RelationType.MEMBER,
+      });
     }
-    return result
+    return true
   }
 
   async searchTargets(
diff --git a/src/ts/core/target/team/company.ts b/src/ts/core/target/team/company.ts
index 73c92e0..4c51156 100644
--- a/src/ts/core/target/team/company.ts
+++ b/src/ts/core/target/team/company.ts
@@ -15,6 +15,7 @@ import { companyJoins } from '../../public/operates';
 import { Cohort } from '../outTeam/cohort';
 import { ISession } from '../../chat/session';
 import { IFile } from '../../thing/fileinfo';
+import { RelationType } from '@/ts/base/enum';
 
 /** 单位类型接口 */
 export interface ICompany extends IBelong {
@@ -172,6 +173,7 @@ export class Company extends Belong implements ICompany {
         await kernel.applyJoinTeam({
           id: member.id,
           subId: this.id,
+          relationType: RelationType.MEMBER,
         });
       }
     }
-- 
Gitee


From 0a1981cdb247f486811e2827486b7203f9b184c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=9E=97=E8=BD=A9=E2=80=9D?= <317035359@qq.com>
Date: Wed, 17 Sep 2025 17:01:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=8A=9E=E4=BA=8B=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=96=B0=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ts/base/api/kernelapi.ts | 16 +++++++++++++---
 src/ts/base/model.ts         | 10 ++++++++++
 src/ts/core/work/task.ts     |  8 +++++++-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/ts/base/api/kernelapi.ts b/src/ts/base/api/kernelapi.ts
index 2978cdd..c482a4a 100644
--- a/src/ts/base/api/kernelapi.ts
+++ b/src/ts/base/api/kernelapi.ts
@@ -676,15 +676,15 @@ export default class KernelApi {
   }
   /**
    * 查询下一节点信息
-   * @param {model.IdModel} params 请求参数
+   * @param {model.QueryNextApprovalNodeReq} params 请求参数
    * @returns {model.ResultType<model.PageResult<schema.XWorkTask>>} 请求结果
    */
   public async queryNextNodes(
-    params: model.IdModel
+    params: model.QueryNextApprovalNodeReq
   ): Promise<model.ResultType<model.PageResult<schema.XWorkNode>>> {
     return await this.request({
       module: 'work',
-      action: 'QueryNextNodes',
+      action: 'QueryNextApprovalNode',
       params: params
     })
   }
@@ -1228,6 +1228,16 @@ export default class KernelApi {
   ): Promise<model.ResultType<model.HttpResponseType>> {
     return await this._storeHub.invoke('HttpForward', req)
   }
+  /**
+   * 解析二维码方法
+   * @param {ReqestType} reqs 请求体
+   * @returns 异步结果
+   */
+  public async qrParse(
+    req: model.DataQrParse
+  ): Promise<model.ResultType<any>> {
+    return await this._storeHub.invoke('qrParse', req)
+  }
   /**
    * 请求一个数据核方法
    * @param {ReqestType} reqs 请求体
diff --git a/src/ts/base/model.ts b/src/ts/base/model.ts
index a16afcf..e5df484 100644
--- a/src/ts/base/model.ts
+++ b/src/ts/base/model.ts
@@ -2102,4 +2102,14 @@ export interface ReportStatus extends ReceptionContentBase<TaskContentType.Repor
     nodeType: ReportTreeNodeType;
     targetId: string;
   };
+}
+export interface QueryNextApprovalNodeReq {
+  // 当前节点Id
+  id: string;
+  // 流程定义Id
+  defineId: string;
+  // 流程定义组织Id
+  defineShareId: string;
+  // 流程实例数据
+  primary: string;
 }
\ No newline at end of file
diff --git a/src/ts/core/work/task.ts b/src/ts/core/work/task.ts
index e646253..1fdc2a6 100644
--- a/src/ts/core/work/task.ts
+++ b/src/ts/core/work/task.ts
@@ -492,7 +492,13 @@ export class WorkTask extends FileInfo<schema.XEntity> implements IWorkTask {
   async loadNextNodes(): Promise<
     model.ResultType<model.PageResult<schema.XWorkNode>>
   > {
-    return await kernel.queryNextNodes({ id: this._metadata.id })
+    await this.loadInstance();
+    return await kernel.queryNextNodes({
+      defineId: this.instance?.defineId || '',
+      defineShareId: this.instance?.defineShareId || '',
+      id: this.taskdata.nodeId,
+      primary: JSON.stringify(this.instanceData?.primary),
+    })
   }
 
   // 申请加用户审批
-- 
Gitee