Merge pull request 'fix:终审仪表盘动态调整' (#283) from fix/change_task into test

Reviewed-on: #283
pull/284/head
赵辉 1 year ago
commit 24f6e82074

@ -132,7 +132,9 @@ watch(
} }
}, },
) )
defineExpose({
getData,
});
</script> </script>
<template> <template>

@ -61,6 +61,7 @@ const emit = defineEmits(['changeShow'])
function changeContent() { function changeContent() {
emit('changeShow') emit('changeShow')
} }
const headerref=ref(null)
const checkedRowKeys = ref([]) const checkedRowKeys = ref([])
const dicStore = useDictionary() const dicStore = useDictionary()
const izstatusList = ref([]) const izstatusList = ref([])
@ -719,6 +720,7 @@ function rejectHandler(list) {
// //
function doAudit(param: any) { function doAudit(param: any) {
const modal = unref(headerref)! as any
dialog.info({ dialog.info({
title: '确认提示', title: '确认提示',
content: '确认给该任务审批为【通过】吗?', content: '确认给该任务审批为【通过】吗?',
@ -731,7 +733,8 @@ function doAudit(param: any) {
message.success(res.message) message.success(res.message)
reload() reload()
haeaderstore.setDataConfig(true) modal.getData()
// haeaderstore.setDataConfig(true)
} }
else { else {
message.error(res.message) message.error(res.message)
@ -748,6 +751,7 @@ function switchBatch() {
} }
function reload() { function reload() {
const modal = unref(headerref)! as any
selectionIds.value = [] selectionIds.value = []
checkedRowKeys.value = [] checkedRowKeys.value = []
@ -755,8 +759,8 @@ function reload() {
tableRef.value?.pagination, tableRef.value?.pagination,
) as PaginationProps ) as PaginationProps
query(page!, pageSize!, {}, props.taskvalue) query(page!, pageSize!, {}, props.taskvalue)
modal.getData()
haeaderstore.setDataConfig(true) //haeaderstore.setDataConfig(true)
} }
watch( watch(
@ -946,7 +950,7 @@ defineExpose({
</div> </div>
</div> </div>
<div class="header_data"> <div class="header_data">
<DataHeader :has-color="true" /> <DataHeader ref="headerref" :has-color="true" />
</div> </div>
<div class="wrapper-settings"> <div class="wrapper-settings">

@ -25,6 +25,7 @@ const props = defineProps({
const emit = defineEmits(['changeShow']) const emit = defineEmits(['changeShow'])
const aa=ref(true) const aa=ref(true)
const haeaderstore=useDataHeaderStore() const haeaderstore=useDataHeaderStore()
const headerref=ref(null)
const dialog = useDialog() const dialog = useDialog()
const message = useMessage() const message = useMessage()
const router = useRouter() const router = useRouter()
@ -303,6 +304,7 @@ function actionHandler(action: any, row: any) {
} }
// //
function doAudit(param: any, row: any) { function doAudit(param: any, row: any) {
const modal = unref(headerref)! as any
dialog.info({ dialog.info({
title: '确认提示', title: '确认提示',
@ -312,18 +314,16 @@ function doAudit(param: any, row: any) {
onPositiveClick: () => { onPositiveClick: () => {
audit(param).then((res) => { audit(param).then((res) => {
aa.value=false
const { code } = res const { code } = res
if (code === 'OK') { if (code === 'OK') {
message.success(res.message) message.success(res.message)
// changecardstatus(3, row); // changecardstatus(3, row);
initData(1, 20, {}, props.taskvalue) initData(1, 20, {}, props.taskvalue)
num = 1 num = 1
reload() reload()
aa.value=true
selectionIds.value = [] selectionIds.value = []
modal.getData()
} }
else { else {
message.error(res.message) message.error(res.message)
@ -486,13 +486,14 @@ function changesort(sortnamex) {
num = 1 num = 1
} }
function notpass() { function notpass() {
aa.value=false const modal = unref(headerref)! as any
initData(1, 20, {}, props.taskvalue) initData(1, 20, {}, props.taskvalue)
selectionIds.value = [] selectionIds.value = []
modal.getData()
// haeaderstore.setDataConfig(true) // haeaderstore.setDataConfig(true)
aa.value=true
} }
watch( watch(
() => finalStore.asideValue, () => finalStore.asideValue,
@ -595,7 +596,7 @@ defineExpose({
</div> </div>
<div class="header_data"> <div class="header_data">
<DataHeader :has-color="true" v-if="aa"/> <DataHeader ref="headerref" :has-color="true" v-if="aa"/>
</div> </div>
<div class="wrapper-settings"> <div class="wrapper-settings">
<div> <div>

Loading…
Cancel
Save