From 708078e03b10fd5f09e8198987488be1661270e6 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Thu, 23 Nov 2023 09:57:02 +0800
Subject: [PATCH] bug#20101

* fix: bug#20449

* fix: bug#20488

* fix: bug#20495

* fix: bug#20101
---
 src/api/system/dictionary.ts                  |  6 +++
 .../components/ViewDialog.vue                 |  4 +-
 .../components/NotificationRecord/index.vue   |  2 +-
 src/views/account/Center/components/data.ts   |  4 ++
 src/views/account/Center/index.vue            |  4 +-
 .../Dictionary/components/Right/index.vue     | 24 +++++++-----
 src/views/system/NoticeRule/index.vue         |  4 ++
 src/views/system/Relationship/index.vue       | 38 ++++++++++---------
 8 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/src/api/system/dictionary.ts b/src/api/system/dictionary.ts
index 451d1a24..1cf9ab26 100644
--- a/src/api/system/dictionary.ts
+++ b/src/api/system/dictionary.ts
@@ -29,6 +29,12 @@ export const deleteDictionary =(id:string) => request.delete(`/dictionary/${id}`
  */
 export const queryDicItem = (data:any)=>request.post('/dictionary-item/_query',data)
 
+/**
+ * 查询字典项不分页
+ */
+export const queryDicItemNoPage = (data:any) => request.post('/dictionary-item/_query/no-paging',data)
+
+
 /**
  * 保存字典项
  */
diff --git a/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue b/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
index f327f525..a31b86a9 100644
--- a/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
+++ b/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
@@ -11,7 +11,7 @@
             </div>
         </template>
         <template
-            v-else-if="['workflow-task-cc', 'workflow-task-todo', 'workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed'].includes(data?.topicProvider)">
+            v-else-if="['workflow-task-cc', 'workflow-task-todo', 'workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed','workflow-task-transfer-todo'].includes(data?.topicProvider)">
             <j-descriptions :column="2" :contentStyle="{
                 color: '#333333',
             }" :labelStyle="{
@@ -130,7 +130,7 @@ onMounted(() => {
     if (!['device-transparent-codec', 'system-event'].includes(props?.data?.topicProvider)) {
         getLevel();
     }
-    if (['workflow-task-cc', 'workflow-task-todo', 'workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed'].includes(props?.data?.topicProvider)) {
+    if (['workflow-task-cc', 'workflow-task-todo', 'workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed','workflow-task-transfer-todo'].includes(props?.data?.topicProvider)) {
         const params = {
             terms: [{
                 type: "or",
diff --git a/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue b/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
index c39b51c6..83ad89eb 100644
--- a/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
+++ b/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
@@ -108,7 +108,7 @@ const getType = computed(() => {
     } else if (props.type === 'system-monitor') {
         return ['system-event'];
     } else if(props.type === 'workflow-notification'){
-        return ['workflow-task-cc','workflow-task-todo','workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed']
+        return ['workflow-task-cc','workflow-task-todo','workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed','workflow-task-transfer-todo']
     }
     else {
         return [
diff --git a/src/views/account/Center/components/data.ts b/src/views/account/Center/components/data.ts
index d79b38e3..b4639874 100644
--- a/src/views/account/Center/components/data.ts
+++ b/src/views/account/Center/components/data.ts
@@ -77,6 +77,10 @@ const workflowNotice = [
                 provider: 'workflow-process-repealed',
                 name: '关闭通知',
             },
+            {
+                provider: 'workflow-task-transfer-todo',
+                name: '转办通知'
+            }
         ],
     },
 ]
diff --git a/src/views/account/Center/index.vue b/src/views/account/Center/index.vue
index 2e9bf1cc..1520822d 100644
--- a/src/views/account/Center/index.vue
+++ b/src/views/account/Center/index.vue
@@ -251,7 +251,7 @@ onUnmounted(() => {
     .person-content-item {
         padding: 10px 20px;
         background-color: #fff;
-        overflow: hidden;
+        // overflow: hidden;
     }
 
     .person-content {
@@ -261,7 +261,7 @@ onUnmounted(() => {
     }
 
     .person-content-item-content {
-        height: calc(100vh - 251px);
+        // height: calc(100vh - 251px);
         width: 100%;
         padding: 10px 0;
     }
diff --git a/src/views/system/Dictionary/components/Right/index.vue b/src/views/system/Dictionary/components/Right/index.vue
index 6b3bc8e1..49723fce 100644
--- a/src/views/system/Dictionary/components/Right/index.vue
+++ b/src/views/system/Dictionary/components/Right/index.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script lang="ts" setup>
-import { queryDicItem, deleteDicItem } from '@/api/system/dictionary'
+import { queryDicItem, deleteDicItem, queryDicItemNoPage } from '@/api/system/dictionary'
 import Save from './Save/index.vue'
 import type { ActionsType } from './typings';
 import { onlyMessage } from '@/utils/comm';
@@ -61,11 +61,6 @@ const sort = ref(0)
 const modalType = ref('add')
 const current = ref()
 const columns = [
-    {
-        title: '序号',
-        dataIndex: 'ordinal',
-        key: 'ordinal',
-    },
     {
         title: '检索码',
         dataIndex: 'searchCode',
@@ -155,7 +150,18 @@ const getActions = (
 const add = () => {
     modalType.value = 'add'
     current.value = {}
-    saveVisible.value = true
+    queryDicItemNoPage({
+        paging: false, 
+        sorts: [{ name: 'ordinal', order: 'desc' }],
+        terms: [{
+            column: 'dictId',
+            termType: 'eq',
+            value: props.data?.id
+        }]
+    }).then((res:any)=>{
+        sort.value = res.result?.length ?  res.result[0].ordinal + 1 : 1 
+        saveVisible.value = true
+    })
 }
 
 const closeModal = () => {
@@ -172,7 +178,7 @@ const queryItem = async (_params: any) => {
     if (props.data?.id) {
         const params = {
             ..._params,
-            sorts: [{ name: 'ordinal', order: 'asc' }],
+            sorts: [{ name: 'ordinal', order: 'desc' }],
             terms: [
                 ..._params.terms,
                 {
@@ -188,7 +194,6 @@ const queryItem = async (_params: any) => {
             arr?.sort((a: any, b: any) => {
                 return b.ordinal - a.ordinal
             })
-            sort.value = arr.length ? arr[0].ordinal + 1 : 1
             return {
                 code: resp.status,
                 result: resp.result,
@@ -196,7 +201,6 @@ const queryItem = async (_params: any) => {
             };
         }
     } else {
-        sort.value = 1
         return {
             code: 200,
             result: {
diff --git a/src/views/system/NoticeRule/index.vue b/src/views/system/NoticeRule/index.vue
index 4c57bc94..3b58dedb 100644
--- a/src/views/system/NoticeRule/index.vue
+++ b/src/views/system/NoticeRule/index.vue
@@ -126,6 +126,10 @@ const lowCodeNotice = [
                 provider: 'workflow-process-repealed',
                 name: '关闭通知',
             },
+            {
+                provider: 'workflow-task-transfer-todo',
+                name: '转办通知'
+            }
         ],
     },
 ]
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 99b7fbce..78d5de64 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -72,6 +72,7 @@ import PermissionButton from '@/components/PermissionButton/index.vue';
 import {
     getRelationshipList_api,
     delRelation_api,
+    getObjectList_api
 } from '@/api/system/relationship';
 import EditDialog from './components/EditDialog.vue';
 import { onlyMessage } from '@/utils/comm';
@@ -107,17 +108,16 @@ const columns = [
         fixed: 'left',
         search: {
             type: 'select',
-            options: [
-                {
-                    label: '用户',
-                    value: '用户',
-                },
-                {
-                    label: '设备',
-                    value: '设备',
-                },
-            ],
-        },
+            options: async () =>{
+               const res:any = await getObjectList_api()
+               return res.result?.map((i:any)=>{
+                return {
+                    label:i.name,
+                    value:i.id
+                }
+               })
+            }
+        }
     },
     {
         title: '被关联方',
@@ -128,12 +128,15 @@ const columns = [
         search: {
             rename: 'targetType',
             type: 'select',
-            options: [
-                {
-                    label: '用户',
-                    value: 'user',
-                },
-            ],
+            options: async () =>{
+               const res:any = await getObjectList_api()
+               return res.result?.map((i:any)=>{
+                return {
+                    label:i.name,
+                    value:i.id
+                }
+               })
+            } 
         },
     },
     {
@@ -184,6 +187,7 @@ const dialog = reactive({
     selectRow: {} as any,
     visible: false,
 });
+
 </script>
 
 <style lang="less" scoped>