From 40957ee00d12f432e3871b44e1a87213b49a33ac Mon Sep 17 00:00:00 2001 From: zhouxiaoan <13598091228@139.com> Date: Sat, 20 Apr 2024 13:15:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/aside.ts | 2 +- src/config/workorder.ts | 4 ++-- src/store/modules/dictonary.ts | 2 +- src/views/home/aside/comp/items/Iztaskstatus.vue | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config/aside.ts b/src/config/aside.ts index 7b6b5b7..132d0f8 100644 --- a/src/config/aside.ts +++ b/src/config/aside.ts @@ -107,7 +107,7 @@ export const asideMap: Recordable = { component: IztaskrromVue, }, iztaskstatus: { - label: '任务状态', + label: '任务审批状态', defaultValue: null, isDefaultFilter: false, key: 'iztaskstatus', diff --git a/src/config/workorder.ts b/src/config/workorder.ts index 1583c0f..c0cb0d7 100644 --- a/src/config/workorder.ts +++ b/src/config/workorder.ts @@ -37,7 +37,7 @@ export const workPackageMap: Recordable = { key: 'upuser', }, status: { - label: '任务状态', + label: '任务审批状态', isDefault: false, key: 'upuser', }, @@ -168,6 +168,6 @@ export const fieldMap = { field13: '病历号', field14: '是否重复', field15: '任务类型', - field16: '任务状态', + field16: '任务审批状态', field17: '项目类别', } diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts index e912b35..9a1aeb0 100644 --- a/src/store/modules/dictonary.ts +++ b/src/store/modules/dictonary.ts @@ -116,7 +116,7 @@ export const useDictionaryStore = defineStore({ // this.fetchIzShowList(); //废弃 this.fetchIzProjectList(); this.fetchIztaskrromList(); - this.fetchIztaskstatusList(); + this.fetchIztaskstatusList(); this.fetchIzvisitproList(); this.fetchIzfirmList(); this.fetchIzproductnameList(); diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue index 99859df..0244794 100644 --- a/src/views/home/aside/comp/items/Iztaskstatus.vue +++ b/src/views/home/aside/comp/items/Iztaskstatus.vue @@ -57,7 +57,7 @@ const labStyle = { } onBeforeMount(async () => { - const list = await configStore.fetchIztaskstatusList() + const list = await configStore.fetchizstatusListt() options.value = list }) const isLoadValue = ref(false) @@ -71,7 +71,7 @@ function onChange(value: Array) { From 024d7892dc834bd1ef6f6352c27a3742f33190ac Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Sat, 20 Apr 2024 13:28:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E8=AF=A6=E6=83=85=E9=A1=B5=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/content/Content.vue | 14 ++++++++++++-- src/views/final/content/ListContent.vue | 11 +++++++---- src/views/final/index.vue | 11 ++++++++++- src/views/task/content/Content.vue | 6 ++++++ 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index e19ff70..79b789e 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -415,9 +415,19 @@ async function formatColumns() { key: columnsRef.value[index].key, fixed: columnsRef.value[index].fixed || undefined, width: 200, + sorter: 'default', + renderSorterIcon: ({ order }) => { + if (order === false) + return h(SvgIcon, { name: 'sort-2' }) + if (order === 'ascend') + return h(SvgIcon, { name: 'sort-1' }) + if (order === 'descend') + return h(SvgIcon, { name: 'sort-3' }) + }, render(row: any) { return row.fromusername }, + } } @@ -545,7 +555,7 @@ async function handleSorterChange(value) { else if (name === 'similarityscore') name = 'similarity_score' else if (name === 'fromusername') - name = 'fromuserid' + name = 'field1' sortname.value = name sortorder.value = value.order === 'ascend' ? 'asc' : 'desc' @@ -729,7 +739,7 @@ function validate(items: any[]) { function goDetail(row) { router.push({ name: 'final-detail', - query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex }, + query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex,type:'table' }, }) } diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue index bdd3d2c..90457e0 100644 --- a/src/views/final/content/ListContent.vue +++ b/src/views/final/content/ListContent.vue @@ -189,7 +189,7 @@ async function query( ...params, }) const { data, pageCount, totalCount } = result - // console.log(data, pageCount, totalCount); + console.log(data, pageCount, totalCount); const newlist = [] const oldlist = tableData.value if (oldlist.length > 0) { @@ -239,7 +239,7 @@ function isValidTimestamp(value) { function goDetail(row) { router.push({ name: 'final-detail', - query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex }, + query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndexm,type:'card' }, }) } // 小结批量不通过 @@ -423,6 +423,7 @@ function checkBottom() { if (!container) return + // const { scrollTop, clientHeight, scrollHeight } = container; const scrollTop = window.pageYOffset || document.documentElement.scrollTop @@ -434,11 +435,13 @@ function checkBottom() { const scrollHeight = document.documentElement.scrollHeight clearTimeout(debounceTimer) + // console.log(pagination) debounceTimer = setTimeout(() => { - if (scrollTop + clientHeight >= scrollHeight - 10) { + if (scrollTop + clientHeight >= scrollHeight -500&&!(pagination.pageCount -import { ref } from 'vue' +import { ref , onMounted} from 'vue' import Aside from './aside/Aside.vue' import Content from './content/Content.vue' import ListContent from './content/ListContent.vue' @@ -26,6 +26,15 @@ if(asideref.value?.showSearch){ } } +onMounted(()=>{ + const searchParams = new URLSearchParams(window.location.search); + const type = searchParams.get('type'); + if(type=='table'){ + showList.value=false + }else{ + showList.value=true + } +})