|
@@ -124,7 +124,7 @@
|
|
|
>同意</el-button
|
|
>同意</el-button
|
|
|
>
|
|
>
|
|
|
<el-button
|
|
<el-button
|
|
|
- v-if="currentTaskType === 'pendingApproval'"
|
|
|
|
|
|
|
+ v-if="currentTaskType === 'pendingApproval' && allowReject"
|
|
|
:icon="Close"
|
|
:icon="Close"
|
|
|
type="danger"
|
|
type="danger"
|
|
|
@click="openComment('consentOrRefuseVisible', 'reject')"
|
|
@click="openComment('consentOrRefuseVisible', 'reject')"
|
|
@@ -210,7 +210,7 @@
|
|
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
|
import useTaskProcessStore from '@/store/modules/taskProcess'
|
|
import useTaskProcessStore from '@/store/modules/taskProcess'
|
|
|
-import { computed, ref, onMounted, nextTick, watch } from 'vue'
|
|
|
|
|
|
|
+import { computed, ref, nextTick, watch } from 'vue'
|
|
|
import FlowStatusStamp from '@/components/Flow/FlowStatusStamp.vue'
|
|
import FlowStatusStamp from '@/components/Flow/FlowStatusStamp.vue'
|
|
|
import FlowStatusTag from '@/components/Flow/FlowStatusTag.vue'
|
|
import FlowStatusTag from '@/components/Flow/FlowStatusTag.vue'
|
|
|
import FlowNodeAvatar from '@/components/Flow/FlowNodeAvatar.vue'
|
|
import FlowNodeAvatar from '@/components/Flow/FlowNodeAvatar.vue'
|
|
@@ -227,6 +227,7 @@ import RollbackDialog from './rollbackDialog'
|
|
|
import { storeToRefs } from 'pinia'
|
|
import { storeToRefs } from 'pinia'
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
import { erFormPreview } from '@ER/formEditor'
|
|
import { erFormPreview } from '@ER/formEditor'
|
|
|
|
|
+
|
|
|
const { VITE_APP_BASE_API } = import.meta.env
|
|
const { VITE_APP_BASE_API } = import.meta.env
|
|
|
const uploadFileApi = ref(`${VITE_APP_BASE_API}/v1/oss/upload`)
|
|
const uploadFileApi = ref(`${VITE_APP_BASE_API}/v1/oss/upload`)
|
|
|
import { package_modelContentConfig } from './config.ts'
|
|
import { package_modelContentConfig } from './config.ts'
|
|
@@ -272,6 +273,7 @@ const consentOrRefuseVisible = ref(false)
|
|
|
const deliverToReviewVisible = ref(false)
|
|
const deliverToReviewVisible = ref(false)
|
|
|
const loseSignVisible = ref(false)
|
|
const loseSignVisible = ref(false)
|
|
|
const rollbackVisible = ref(false)
|
|
const rollbackVisible = ref(false)
|
|
|
|
|
+const allowReject = ref(false)
|
|
|
const allowRevocation = ref(false)
|
|
const allowRevocation = ref(false)
|
|
|
// 各种操作弹窗显示隐藏 end
|
|
// 各种操作弹窗显示隐藏 end
|
|
|
const activeData = ref([])
|
|
const activeData = ref([])
|
|
@@ -397,6 +399,9 @@ const getTaskDetail = () => {
|
|
|
allowAppendNode.value = data?.allowAppendNode
|
|
allowAppendNode.value = data?.allowAppendNode
|
|
|
allowRollback.value = data?.allowRollback
|
|
allowRollback.value = data?.allowRollback
|
|
|
}
|
|
}
|
|
|
|
|
+ if (data?.taskType !== 0) {
|
|
|
|
|
+ allowReject.value = true
|
|
|
|
|
+ }
|
|
|
if (props.currentTaskType === 'myApplication') {
|
|
if (props.currentTaskType === 'myApplication') {
|
|
|
allowRevocation.value = data.processSetting.allowRevocation
|
|
allowRevocation.value = data.processSetting.allowRevocation
|
|
|
}
|
|
}
|
hubin