|
@@ -55,13 +55,15 @@
|
|
</div>
|
|
</div>
|
|
<template #footer>
|
|
<template #footer>
|
|
<div class="hc-task-dialog-footer">
|
|
<div class="hc-task-dialog-footer">
|
|
- <el-button :loading="rejectionLoading" @click="rejectionClick">驳回审批</el-button>
|
|
|
|
|
|
+ <el-button @click="rejectionClick">驳回审批</el-button>
|
|
<el-button type="primary" :loading="confirmLoading" @click="confirmClick">同意审批</el-button>
|
|
<el-button type="primary" :loading="confirmLoading" @click="confirmClick">同意审批</el-button>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</hc-new-dialog>
|
|
</hc-new-dialog>
|
|
<!-- 批注 -->
|
|
<!-- 批注 -->
|
|
<HcTaskNotes v-model="isNotesShow" :table="tableNoteInfo" :info="rowInfo" @finish="taskNotesFinish" />
|
|
<HcTaskNotes v-model="isNotesShow" :table="tableNoteInfo" :info="rowInfo" @finish="taskNotesFinish" />
|
|
|
|
+ <!-- 驳回 -->
|
|
|
|
+ <HcRepealForm v-model="isRepealShow" :info="rowInfo" @finish="taskRepealFinish" />
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
@@ -70,6 +72,7 @@ import { getArrValue, getObjValue, getRandom } from 'js-fast-way'
|
|
import { useAppStore } from '~src/store'
|
|
import { useAppStore } from '~src/store'
|
|
import HcTaskForm from './task-form.vue'
|
|
import HcTaskForm from './task-form.vue'
|
|
import HcTaskNotes from './task-notes.vue'
|
|
import HcTaskNotes from './task-notes.vue'
|
|
|
|
+import HcRepealForm from './repeal-form.vue'
|
|
import mainApi from '~api/tasks/hc-data'
|
|
import mainApi from '~api/tasks/hc-data'
|
|
|
|
|
|
const props = defineProps({
|
|
const props = defineProps({
|
|
@@ -154,7 +157,6 @@ const setTaskInfo = () => {
|
|
const isLoading = ref(false)
|
|
const isLoading = ref(false)
|
|
const getTableDetail = async () => {
|
|
const getTableDetail = async () => {
|
|
isLoading.value = true
|
|
isLoading.value = true
|
|
- rejectionLoading.value = true
|
|
|
|
confirmLoading.value = true
|
|
confirmLoading.value = true
|
|
//获取数据
|
|
//获取数据
|
|
const { data } = await mainApi.getDetail(rowInfo.value.id)
|
|
const { data } = await mainApi.getDetail(rowInfo.value.id)
|
|
@@ -172,7 +174,6 @@ const getTableDetail = async () => {
|
|
})
|
|
})
|
|
//关闭加载状态
|
|
//关闭加载状态
|
|
isLoading.value = false
|
|
isLoading.value = false
|
|
- rejectionLoading.value = false
|
|
|
|
confirmLoading.value = false
|
|
confirmLoading.value = false
|
|
}
|
|
}
|
|
|
|
|
|
@@ -261,16 +262,20 @@ const confirmClick = async () => {
|
|
}
|
|
}
|
|
|
|
|
|
//驳回审批
|
|
//驳回审批
|
|
-const rejectionLoading = ref(false)
|
|
|
|
|
|
+const isRepealShow = ref(false)
|
|
const rejectionClick = async () => {
|
|
const rejectionClick = async () => {
|
|
|
|
+ isRepealShow.value = true
|
|
|
|
+}
|
|
|
|
|
|
|
|
+//驳回完成
|
|
|
|
+const taskRepealFinish = () => {
|
|
|
|
+ getTableDetail()
|
|
}
|
|
}
|
|
|
|
|
|
//取消审批
|
|
//取消审批
|
|
const cancelClick = () => {
|
|
const cancelClick = () => {
|
|
isShow.value = false
|
|
isShow.value = false
|
|
isLoading.value = false
|
|
isLoading.value = false
|
|
- rejectionLoading.value = false
|
|
|
|
confirmLoading.value = false
|
|
confirmLoading.value = false
|
|
tableColumn.value = []
|
|
tableColumn.value = []
|
|
tableData.value = []
|
|
tableData.value = []
|