bug#20101

* fix: bug#20449

* fix: bug#20488

* fix: bug#20495

* fix: bug#20101
This commit is contained in:
qiaochuLei 2023-11-23 09:57:02 +08:00 committed by GitHub
parent c3195997a0
commit 708078e03b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 54 additions and 32 deletions

View File

@ -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 queryDicItem = (data:any)=>request.post('/dictionary-item/_query',data)
/**
*
*/
export const queryDicItemNoPage = (data:any) => request.post('/dictionary-item/_query/no-paging',data)
/** /**
* *
*/ */

View File

@ -11,7 +11,7 @@
</div> </div>
</template> </template>
<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="{ <j-descriptions :column="2" :contentStyle="{
color: '#333333', color: '#333333',
}" :labelStyle="{ }" :labelStyle="{
@ -130,7 +130,7 @@ onMounted(() => {
if (!['device-transparent-codec', 'system-event'].includes(props?.data?.topicProvider)) { if (!['device-transparent-codec', 'system-event'].includes(props?.data?.topicProvider)) {
getLevel(); 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 = { const params = {
terms: [{ terms: [{
type: "or", type: "or",

View File

@ -108,7 +108,7 @@ const getType = computed(() => {
} else if (props.type === 'system-monitor') { } else if (props.type === 'system-monitor') {
return ['system-event']; return ['system-event'];
} else if(props.type === 'workflow-notification'){ } 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 { else {
return [ return [

View File

@ -77,6 +77,10 @@ const workflowNotice = [
provider: 'workflow-process-repealed', provider: 'workflow-process-repealed',
name: '关闭通知', name: '关闭通知',
}, },
{
provider: 'workflow-task-transfer-todo',
name: '转办通知'
}
], ],
}, },
] ]

View File

@ -251,7 +251,7 @@ onUnmounted(() => {
.person-content-item { .person-content-item {
padding: 10px 20px; padding: 10px 20px;
background-color: #fff; background-color: #fff;
overflow: hidden; // overflow: hidden;
} }
.person-content { .person-content {
@ -261,7 +261,7 @@ onUnmounted(() => {
} }
.person-content-item-content { .person-content-item-content {
height: calc(100vh - 251px); // height: calc(100vh - 251px);
width: 100%; width: 100%;
padding: 10px 0; padding: 10px 0;
} }

View File

@ -42,7 +42,7 @@
</template> </template>
<script lang="ts" setup> <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 Save from './Save/index.vue'
import type { ActionsType } from './typings'; import type { ActionsType } from './typings';
import { onlyMessage } from '@/utils/comm'; import { onlyMessage } from '@/utils/comm';
@ -61,11 +61,6 @@ const sort = ref(0)
const modalType = ref('add') const modalType = ref('add')
const current = ref() const current = ref()
const columns = [ const columns = [
{
title: '序号',
dataIndex: 'ordinal',
key: 'ordinal',
},
{ {
title: '检索码', title: '检索码',
dataIndex: 'searchCode', dataIndex: 'searchCode',
@ -155,7 +150,18 @@ const getActions = (
const add = () => { const add = () => {
modalType.value = 'add' modalType.value = 'add'
current.value = {} current.value = {}
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 saveVisible.value = true
})
} }
const closeModal = () => { const closeModal = () => {
@ -172,7 +178,7 @@ const queryItem = async (_params: any) => {
if (props.data?.id) { if (props.data?.id) {
const params = { const params = {
..._params, ..._params,
sorts: [{ name: 'ordinal', order: 'asc' }], sorts: [{ name: 'ordinal', order: 'desc' }],
terms: [ terms: [
..._params.terms, ..._params.terms,
{ {
@ -188,7 +194,6 @@ const queryItem = async (_params: any) => {
arr?.sort((a: any, b: any) => { arr?.sort((a: any, b: any) => {
return b.ordinal - a.ordinal return b.ordinal - a.ordinal
}) })
sort.value = arr.length ? arr[0].ordinal + 1 : 1
return { return {
code: resp.status, code: resp.status,
result: resp.result, result: resp.result,
@ -196,7 +201,6 @@ const queryItem = async (_params: any) => {
}; };
} }
} else { } else {
sort.value = 1
return { return {
code: 200, code: 200,
result: { result: {

View File

@ -126,6 +126,10 @@ const lowCodeNotice = [
provider: 'workflow-process-repealed', provider: 'workflow-process-repealed',
name: '关闭通知', name: '关闭通知',
}, },
{
provider: 'workflow-task-transfer-todo',
name: '转办通知'
}
], ],
}, },
] ]

View File

@ -72,6 +72,7 @@ import PermissionButton from '@/components/PermissionButton/index.vue';
import { import {
getRelationshipList_api, getRelationshipList_api,
delRelation_api, delRelation_api,
getObjectList_api
} from '@/api/system/relationship'; } from '@/api/system/relationship';
import EditDialog from './components/EditDialog.vue'; import EditDialog from './components/EditDialog.vue';
import { onlyMessage } from '@/utils/comm'; import { onlyMessage } from '@/utils/comm';
@ -107,17 +108,16 @@ const columns = [
fixed: 'left', fixed: 'left',
search: { search: {
type: 'select', type: 'select',
options: [ options: async () =>{
{ const res:any = await getObjectList_api()
label: '用户', return res.result?.map((i:any)=>{
value: '用户', return {
}, label:i.name,
{ value:i.id
label: '设备', }
value: '设备', })
}, }
], }
},
}, },
{ {
title: '被关联方', title: '被关联方',
@ -128,12 +128,15 @@ const columns = [
search: { search: {
rename: 'targetType', rename: 'targetType',
type: 'select', type: 'select',
options: [ options: async () =>{
{ const res:any = await getObjectList_api()
label: '用户', return res.result?.map((i:any)=>{
value: 'user', return {
}, label:i.name,
], value:i.id
}
})
}
}, },
}, },
{ {
@ -184,6 +187,7 @@ const dialog = reactive({
selectRow: {} as any, selectRow: {} as any,
visible: false, visible: false,
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>