diff --git a/components.d.ts b/components.d.ts index e07d992..d6fb45b 100644 --- a/components.d.ts +++ b/components.d.ts @@ -34,6 +34,7 @@ declare module 'vue' { NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] + NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] diff --git a/src/api/final/index.ts b/src/api/final/index.ts index 10d4f30..fab2e62 100644 --- a/src/api/final/index.ts +++ b/src/api/final/index.ts @@ -68,31 +68,16 @@ export async function repetitionTask() { * @returns */ export async function getRepeatList(params: FinalParam) { - const notEmptyParams = pickBy(params, notEmpty) - - Object.keys(notEmptyParams).forEach((key) => { - const val = notEmptyParams[key] - - if (key === 'izuptime') { - const start = formatToDate2(val[0]) - const end = formatToDate2(val[1]) - notEmptyParams[key] = `${start}-${end}` - } - - if (Array.isArray(notEmptyParams[key])) - notEmptyParams[key] = val.join(',') - }) - const res = await http.request({ url: `/flow/task/repetitionTaskList`, method: 'get', - params: notEmptyParams, + params, }) - const { data: { list, totalPage, totalCount } } = res + const { data: { records, totalPage, totalCount } } = res return { pageCount: totalPage, - data: list, + data: records, totalCount, } } diff --git a/src/assets/icons/summary.svg b/src/assets/icons/summary.svg new file mode 100644 index 0000000..075c554 --- /dev/null +++ b/src/assets/icons/summary.svg @@ -0,0 +1,26 @@ + + + chazhongjiansuo + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue index b2e53a5..7d3ea14 100644 --- a/src/components/Approval/NotPassed.vue +++ b/src/components/Approval/NotPassed.vue @@ -101,7 +101,7 @@ async function handleSumbit(e: MouseEvent) { audit(param).then((res) => { const { code } = res if (code === 'OK') { - message.success('审核成功') + message.success(res.message) emit('success', param) closeModal() } @@ -199,6 +199,8 @@ async function selectChange(id) { justify-content: flex-end; padding-right: 24px; padding-bottom: 10px; + border-top: 0.5px solid #d9d9d9; + padding-top: 15px; } &-info { @@ -236,6 +238,10 @@ async function selectChange(id) { margin-bottom: 0px; } +::v-deep(.n-form-item-label__text) { + color: #666666; +} + ::v-deep(.n-input__placeholder) { color: #333333!important; } diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue index 0b62d37..0d1c1ae 100644 --- a/src/views/final/comp/RepeatTaskTableModal.vue +++ b/src/views/final/comp/RepeatTaskTableModal.vue @@ -40,10 +40,6 @@ onBeforeMount(() => { dicStore.fetchizstatusListt() }) -function showModal() { - show.value = true -} - function closeModal() { show.value = false } @@ -53,10 +49,6 @@ async function handleSumbit(e: MouseEvent) { closeModal() } -defineExpose({ - showModal, -}) - const columns: DataTableColumns = [ { type: 'selection', @@ -190,7 +182,7 @@ async function query(page: number, pageSize: number) { const result = await getRepeatList({ sortorder: 'asc', pageSize: pagination.pageSize, - currPage: 1, + pageNo: 1, sortname: '', }) console.log(666666) @@ -330,7 +322,7 @@ function doAudit(param: any) { audit(param).then((res) => { const { code } = res if (code === 'OK') { - message.success('审核成功') + message.success(res.message) reload() } else { message.error(res.message) } @@ -351,12 +343,21 @@ function rejectHandler(list) { const modal = unref(notPassModalRef)! as any modal.showModal(list) } -query(pagination.page, pagination.pageSize) +// query(pagination.page, pagination.pageSize) +function showModal() { + query(pagination.page, pagination.pageSize) + + show.value = true +} function reload() { selectionIds.value = [] checkedRowKeys.value = [] } + +defineExpose({ + showModal, +})