Compare commits
No commits in common. "3169ff030e055f1c56f0be67e30090e1987f7fa9" and "15d0c850c46e3c0300851827c9e6c6fc8285a3fb" have entirely different histories.
3169ff030e
...
15d0c850c4
|
@ -337,12 +337,3 @@ export function getDeviceDetail(deviceId) {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 催办
|
|
||||||
export function treminders(data) {
|
|
||||||
return request({
|
|
||||||
url: '/reminders/treminders',
|
|
||||||
method: 'post',
|
|
||||||
data,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<detailsPageconetentTree />
|
<detailsPageconetentTree />
|
||||||
</div>
|
</div>
|
||||||
<div class="details-pageconetent-left" v-else>
|
<div class="details-pageconetent-left" v-else>
|
||||||
<detailsPageInfrastructureTree v-if="flag == '1'" />
|
<detailsPageInfrastructureTree v-if="flag != '6'" />
|
||||||
</div>
|
</div>
|
||||||
<div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
|
<div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
|
||||||
<div class="resultListSearchInput-father">
|
<div class="resultListSearchInput-father">
|
||||||
|
@ -1325,6 +1325,7 @@
|
||||||
}
|
}
|
||||||
select = router.currentRoute.value.query.select
|
select = router.currentRoute.value.query.select
|
||||||
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
(select == '应用资源' &&
|
(select == '应用资源' &&
|
||||||
(paramsGetResources.orderField == '' ||
|
(paramsGetResources.orderField == '' ||
|
||||||
|
|
|
@ -175,17 +175,7 @@
|
||||||
</a-button>
|
</a-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-if="item.approveStatus === '通过'" style=" margin-top: 15px;font-size: 16px; color: #ee4457;font-weight: bold;">说明:已申请成功,使用方式及联系人请点击"查看详情"按钮查看。</div>
|
||||||
v-if="item.approveStatus === '通过'"
|
|
||||||
style="
|
|
||||||
margin-top: 15px;
|
|
||||||
font-size: 16px;
|
|
||||||
color: #ee4457;
|
|
||||||
font-weight: bold;
|
|
||||||
"
|
|
||||||
>
|
|
||||||
说明:已申请成功,使用方式及联系人请点击"查看详情"按钮查看。
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -290,7 +280,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 单个预览弹窗 -->
|
<!-- 单个预览弹窗 -->
|
||||||
|
|
|
@ -30,36 +30,7 @@
|
||||||
<div v-if="showType !== '云资源'">
|
<div v-if="showType !== '云资源'">
|
||||||
<div class="title">审批详情</div>
|
<div class="title">审批详情</div>
|
||||||
<template v-for="item in dataSource.data" :key="item">
|
<template v-for="item in dataSource.data" :key="item">
|
||||||
<div class="oddNumbers">
|
<div class="oddNumbers">子单号:{{ item[0] }}</div>
|
||||||
<div>子单号:{{ item[0] }}</div>
|
|
||||||
<template
|
|
||||||
v-if="
|
|
||||||
item[1][0].assignee !== store.getters['user/userId'] &&
|
|
||||||
typeStrObj.indexOf(showType) !== -1
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<a-popconfirm
|
|
||||||
v-if="refObj.allowReminders || item[1][0].allowReminders"
|
|
||||||
title="是否催办此流程?"
|
|
||||||
ok-text="是"
|
|
||||||
cancel-text="否"
|
|
||||||
@confirm="urgeThis(item)"
|
|
||||||
@cancel="cancel"
|
|
||||||
>
|
|
||||||
<a-button type="primary" danger>催办</a-button>
|
|
||||||
</a-popconfirm>
|
|
||||||
<a-tooltip
|
|
||||||
v-else-if="refObj.doneReminders || item[1][0].doneReminders"
|
|
||||||
>
|
|
||||||
<template #title>
|
|
||||||
{{
|
|
||||||
refObj.nextRemindersDays || item[1][0].nextRemindersDays
|
|
||||||
}}天后可再次催办
|
|
||||||
</template>
|
|
||||||
<a-button type="primary" danger>已催办</a-button>
|
|
||||||
</a-tooltip>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<a-table
|
<a-table
|
||||||
:dataSource="item[1]"
|
:dataSource="item[1]"
|
||||||
:columns="dataSourceColumns"
|
:columns="dataSourceColumns"
|
||||||
|
@ -83,11 +54,9 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import { message } from 'ant-design-vue'
|
|
||||||
import AbilityApplication from './AbilityApplication.vue'
|
import AbilityApplication from './AbilityApplication.vue'
|
||||||
import PutOnTheShelf from './PutOnTheShelf .vue'
|
import PutOnTheShelf from './PutOnTheShelf .vue'
|
||||||
import OffTheShelf from './OffTheShelf.vue'
|
import OffTheShelf from './OffTheShelf.vue'
|
||||||
import mybus from '@/myplugins/mybus'
|
|
||||||
import Demand from './Demand.vue'
|
import Demand from './Demand.vue'
|
||||||
import Comment from './Comment.vue'
|
import Comment from './Comment.vue'
|
||||||
import dataResourceApplication from './dataResourceApplication.vue'
|
import dataResourceApplication from './dataResourceApplication.vue'
|
||||||
|
@ -95,7 +64,6 @@
|
||||||
import DeviceApplyDetail from './DeviceApplyDetail.vue'
|
import DeviceApplyDetail from './DeviceApplyDetail.vue'
|
||||||
import OtherApplications from '@/views/personalCenter/components/OtherApplications '
|
import OtherApplications from '@/views/personalCenter/components/OtherApplications '
|
||||||
import { onMounted, reactive, defineProps, ref } from 'vue'
|
import { onMounted, reactive, defineProps, ref } from 'vue'
|
||||||
import { useStore } from 'vuex'
|
|
||||||
import Cookies from 'js-cookie'
|
import Cookies from 'js-cookie'
|
||||||
// import { baseURL } from '@/config'
|
// import { baseURL } from '@/config'
|
||||||
import qs from 'qs'
|
import qs from 'qs'
|
||||||
|
@ -104,7 +72,7 @@
|
||||||
getTaskHandleDetailInfo,
|
getTaskHandleDetailInfo,
|
||||||
getDemandForm,
|
getDemandForm,
|
||||||
nengliziyuanshangjiaapply,
|
nengliziyuanshangjiaapply,
|
||||||
treminders,
|
getTaskVariables,
|
||||||
} from '@/api/personalCenter'
|
} from '@/api/personalCenter'
|
||||||
import { selectOneDel } from '@/api/home'
|
import { selectOneDel } from '@/api/home'
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -115,7 +83,6 @@
|
||||||
refObj: { type: Object, default: null },
|
refObj: { type: Object, default: null },
|
||||||
showType: { type: String, default: null },
|
showType: { type: String, default: null },
|
||||||
})
|
})
|
||||||
const store = useStore()
|
|
||||||
const refObj = ref({})
|
const refObj = ref({})
|
||||||
const showType = ref('')
|
const showType = ref('')
|
||||||
// eslint-disable-next-line vue/no-setup-props-destructure
|
// eslint-disable-next-line vue/no-setup-props-destructure
|
||||||
|
@ -125,13 +92,7 @@
|
||||||
//流转详情
|
//流转详情
|
||||||
const dataSource = reactive({ data: [] })
|
const dataSource = reactive({ data: [] })
|
||||||
console.log('refObj------------>', refObj)
|
console.log('refObj------------>', refObj)
|
||||||
const typeStrObj = [
|
|
||||||
'能力申请',
|
|
||||||
'能力上架',
|
|
||||||
'能力下架',
|
|
||||||
'能力需求',
|
|
||||||
'需求评论',
|
|
||||||
]
|
|
||||||
// console.log(props.refObj, '---------------------------------------')
|
// console.log(props.refObj, '---------------------------------------')
|
||||||
|
|
||||||
const downloadFile = (path, name) => {
|
const downloadFile = (path, name) => {
|
||||||
|
@ -324,27 +285,6 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 催办
|
|
||||||
const urgeThis = (item) => {
|
|
||||||
console.log('催办==========>', item)
|
|
||||||
treminders({
|
|
||||||
instanceId: item[0],
|
|
||||||
processTaskId: item[1][0].id,
|
|
||||||
processTaskStats: 1,
|
|
||||||
applyNumber: refObj.value.applyNumber,
|
|
||||||
}).then((res) => {
|
|
||||||
if (res.data.msg !== 'success') {
|
|
||||||
message.warning('催办失败')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
message.success('催办成功!')
|
|
||||||
mybus.emit('closeModal', {
|
|
||||||
type: showType.value,
|
|
||||||
index: typeStrObj.indexOf(showType.value),
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
// getInfo()
|
// getInfo()
|
||||||
if (props.refObj.resourceApplication) {
|
if (props.refObj.resourceApplication) {
|
||||||
|
@ -408,20 +348,4 @@
|
||||||
.oddNumbers {
|
.oddNumbers {
|
||||||
margin-bottom: 0.05rem;
|
margin-bottom: 0.05rem;
|
||||||
}
|
}
|
||||||
.oddNumbers {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
.button {
|
|
||||||
width: 96px;
|
|
||||||
height: 30px;
|
|
||||||
background: #ff4d4f;
|
|
||||||
font-size: 14px;
|
|
||||||
color: #fff;
|
|
||||||
border-radius: 4px;
|
|
||||||
text-align: center;
|
|
||||||
line-height: 30px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue