diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index b237412..d653c98 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -232,11 +232,6 @@ const getDetailInfo = async () => { const init = async () => { processDiagramViewer.value = false getAllocationProcess().then(res => { - ElNotification({ - title: '提示', - message: res.msg, - type: res.code === 1000 ? 'success' : 'error' - }) if (res.code === 1000) { let data = res.data processInstanceData.value = data @@ -249,6 +244,12 @@ const init = async () => { nextTick(() => { processDiagramViewer.value = true }) + }else { + ElNotification({ + title: '提示', + message: res.msg, + type: 'error' + }) } }) } diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue index 211f087..37f6bc9 100644 --- a/src/views/expense-management/share/index.vue +++ b/src/views/expense-management/share/index.vue @@ -77,7 +77,13 @@ const tableConfig = reactive({ label: '状态', align: 'center', showOverflowTooltip: false, - // currentRender: ({row, index}) => () + currentRender: ({row, index}) => { + if (row.state == undefined||row.state == 0) { + return '--' + } else { + return () + } + } }, { prop: 'oper', diff --git a/src/views/project-demand/requirement/detail.vue b/src/views/project-demand/requirement/detail.vue index 2007e7e..12e73ab 100644 --- a/src/views/project-demand/requirement/detail.vue +++ b/src/views/project-demand/requirement/detail.vue @@ -238,13 +238,20 @@ const init = async () => { await getCompanyOption() await getFundOptions() getInfo(route.query.id).then(res => { + if (res.code !== 1000) { + ElNotification({ + title: '提示', + message: res.msg, + type: 'error' + }) + } loading.value = false let data = res.data formData.value = data.formData; data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds) - if(data.formData.specialFund){ + if (data.formData.specialFund) { specialFundOption.value.forEach(item => { - if(data.formData.specialFund==item.value){ + if (data.formData.specialFund == item.value) { data.formData.specialFund = item.label } }) @@ -272,9 +279,11 @@ onMounted(async () => { :deep(.el-empty__description) { margin-top: 0; } -:deep(.el-table--fit ){ - height: 300px!important; + +:deep(.el-table--fit ) { + height: 300px !important; } + .detail-block { overflow: hidden; padding-right: 10px; diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index 422761c..25f8e7c 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -119,11 +119,6 @@ const handleSubmit = (instance) => { const init = async () => { const {msg, code,data} = await getProjectCheckProcess(route.query.projectId) - ElNotification({ - title: '提示', - message: msg, - type: code === 1000 ? 'success' : 'error' - }) processDiagramViewer.value = false if (code === 1000) { deploymentId.value = data.deploymentId @@ -137,6 +132,12 @@ const init = async () => { nextTick(() => { processDiagramViewer.value = true }) + }else { + ElNotification({ + title: '提示', + message: msg, + type:'error' + }) } } onMounted(async () => { diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue index 74a8fb2..858dc14 100644 --- a/src/views/special-fund/add.vue +++ b/src/views/special-fund/add.vue @@ -189,11 +189,6 @@ const handleResubmit = () => { const init = async () => { processDiagramViewer.value = false getFundProcess().then(res => { - ElNotification({ - title: '提示', - message: res.msg, - type: res.code === 1000 ? 'success' : 'error' - }) if (res.code === 1000) { let data = res.data processInstanceData.value = data @@ -206,6 +201,12 @@ const init = async () => { nextTick(() => { processDiagramViewer.value = true }) + }else { + ElNotification({ + title: '提示', + message: msg, + type:'error' + }) } }) }