diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 727ad98..9fa5a86 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -558,7 +558,7 @@ html, body, #app, .el-container, .el-aside, .el-main { // 操作页面底部按钮 .oper-page-btn { position: fixed; - bottom: 15px; + top: 135px; right: 15px; z-index: 5; } diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue index e63a95e..bab31ba 100644 --- a/src/components/DetailComponent/Opinion.vue +++ b/src/components/DetailComponent/Opinion.vue @@ -171,20 +171,21 @@ const back = () => { } // 驳回 const handleReject = async () => { + if (!_value.value) { + ElNotification({ + title: '提示', + message: '请填写审核意见', + type: 'warning' + }) + return +} showBackNode.value = true backNode.value = {} } //回退节点 const rollbackHandler = async () => { // const values = form.value.getValues() - if (!_value.value) { - ElNotification({ - title: '提示', - message: '请填写审核意见', - type: 'warning' - }) - return - } + const params = { taskId: props.taskId, // ...values diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index d1c928d..6eb93ea 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -2,9 +2,12 @@
- 打印 +
+ 打印 +
- +
{
{ baseFormData.value?.economicEstimate ? - { toThousands(baseFormData.value?.economicEstimate )} + {toThousands(baseFormData.value?.economicEstimate)} : {'--'} }
@@ -352,7 +361,7 @@ const schema = computed(() => {
{ baseFormData.value?.specialFundAmount ? - { toThousands(baseFormData.value?.specialFundAmount )} + {toThousands(baseFormData.value?.specialFundAmount)} : {'--'} }
@@ -369,8 +378,8 @@ const schema = computed(() => { }) const localStepSuccess = ref([]) -const handlePrint=(print)=>{ - emits('openPrint',print) +const handlePrint = (print) => { + emits('openPrint', print) } // 格式化详情步骤条 const formatProcedure = (data) => { @@ -561,7 +570,7 @@ const getBaseInfo = async () => { try { const {code, data} = await getBaseInfoApi(route.query.projectId) // console.log('data.procedure', data.procedure, route.query.step) - if (route.query.step === '30'||route.query.step === '40') { + if (route.query.step === '30' || route.query.step === '40') { if (data.procedure.indexOf('30') == -1) { data.procedure.push('30') } diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index ec474c5..d88d6e8 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -1,6 +1,6 @@