diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts index 81bcf4b..4fb75fb 100644 --- a/src/store/modules/asideConfig.ts +++ b/src/store/modules/asideConfig.ts @@ -34,7 +34,7 @@ export const useAsideConfigStore = defineStore({ return this.customConfig }, getAsideValue(): any { - return this.asideValue + return this.asideValue || {} }, getSearchValue(): any { return this.searchValue diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue index 7adf491..496cb3d 100644 --- a/src/views/final/comp/RepeatTaskTableModal.vue +++ b/src/views/final/comp/RepeatTaskTableModal.vue @@ -64,12 +64,12 @@ const columns: DataTableColumns = [ title: '任务ID', key: 'id', fixed: 'left', - width: 180, + width: 200, ellipsis: { tooltip: true, }, render(row: any) { - return row.fromtaskname + return row.fromtaskid }, }, { diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 33e6ed6..e660239 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -248,9 +248,7 @@ async function getColumns() { // #endregion columnsRef.value.push(actionsColumns as any) - console.log(columnsRef.value, 'columnsRef111') formatColumns() - console.log(columnsRef.value, 'columnsRef222') } async function formatColumns() { @@ -278,7 +276,7 @@ async function formatColumns() { 'text-color': '#507AFD', 'onClick': () => goDetail(row), }, - { default: () => row.fromtaskname }, + { default: () => row.fromtaskid }, ) }, } @@ -463,7 +461,7 @@ const dialog = useDialog() const message = useMessage() const finalStore = useFinal() -async function query(page: number, pageSize: number, filterId?: any) { +async function query(page: number, pageSize: number, filterId?: any,taskName?:string) { const asideParmas = unref(finalStore.getAsideValue) // 有过滤配置的时候优先使用过滤配置,不要使用左侧参数 const params = filterId ? { userSearchId: filterId } : asideParmas @@ -472,6 +470,7 @@ async function query(page: number, pageSize: number, filterId?: any) { pageSize, currPage: page, sortname: 'states', + taskName:taskName, ...params, }) const { data, pageCount, totalCount } = result @@ -570,7 +569,7 @@ function exportHandler() { '更新时间', ] const filterVal = [ - 'id', + 'pictureid', 'name', 'approvalnode', 'approvalstatus', @@ -801,8 +800,11 @@ async function refreshHandler(searchId?: any) { } function filterTableData(keyword) { + pagination.page = 1; + pagination.pageSize = 10; if (keyword) - tableData.value = tableData.value.filter(item => item.id.includes(keyword)) + // tableData.value = tableData.value.filter(item => item.id.includes(keyword)) + query(pagination.page, pagination.pageSize,'',keyword) else query(pagination.page, pagination.pageSize) } diff --git a/src/views/final/index.vue b/src/views/final/index.vue index f3b3415..f47cf36 100644 --- a/src/views/final/index.vue +++ b/src/views/final/index.vue @@ -5,9 +5,10 @@ import Content from './content/Content.vue' import ListContent from './content/ListContent.vue' const showList = ref(false); -const contentRef = ref(null); +const contentRef:any = ref(null); const inputChange = (keyword)=>{ contentRef.value.filterTableData(keyword) + } diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue index df4acad..b0434f6 100644 --- a/src/views/home/aside/comp/Search.vue +++ b/src/views/home/aside/comp/Search.vue @@ -54,6 +54,7 @@ function selectHandler(item: SearchEntity) { // 模糊搜索 const searchName = () => { configStore.setSearchValue(searchKeyword.value); + emit('inputChange',searchKeyword.value); } const close = () => { diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 6399f37..c7d31f0 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -387,7 +387,7 @@ async function commitHandler(settingParam) { modal.showModal(); createPackage(params).then((res) => { if (res.code === "OK") { - message.success(res.data); + message.success(res.message); packageIdRef.value = res.data.id; modal.closeModal(); finishModal.showModal(); diff --git a/src/views/home/content/modal/CheckingTaskModal.vue b/src/views/home/content/modal/CheckingTaskModal.vue index 88b432b..4bdcbc8 100644 --- a/src/views/home/content/modal/CheckingTaskModal.vue +++ b/src/views/home/content/modal/CheckingTaskModal.vue @@ -1,5 +1,5 @@ -