提交 8d81d686 编写于 作者: 刘英杰's avatar 刘英杰

V20240829

上级 272c5f42
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<link rel="icon" type="image/svg+xml" href="./vite.svg"/> <link rel="icon" type="image/svg+xml" href="./vite.svg"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<title>竞赛管理</title> <title>竞赛管理</title>
<script type="module" crossorigin src="./assets/index-T1wLdwsq.js"></script> <script type="module" crossorigin src="./assets/index-B4DRmj7l.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-RofWzhxq.css"> <link rel="stylesheet" crossorigin href="./assets/index-RofWzhxq.css">
</head> </head>
<body> <body>
......
...@@ -66,7 +66,7 @@ function getData() { ...@@ -66,7 +66,7 @@ function getData() {
hooks.myEncapsulationFunction(() => { hooks.myEncapsulationFunction(() => {
return api.getApiFlowViewApiFlowViewGetFlowInfo({runid: props.runid}).then(res => { return api.getApiFlowViewApiFlowViewGetFlowInfo({runid: props.runid}).then(res => {
//获取流程信息 //获取流程信息
let info = res.response.competition_report let info = res.response.competition_report ? res.response.competition_report : res.response.report_temp_update
competitionFormInfo.setFormData(res.response) competitionFormInfo.setFormData(res.response)
init.array = [ init.array = [
......
...@@ -295,7 +295,7 @@ function recordAction(key, item) { ...@@ -295,7 +295,7 @@ function recordAction(key, item) {
} }
function details(item) { function details(item) {
//详情 //审批
router.push({ router.push({
path: '/eventCatalogDetails', path: '/eventCatalogDetails',
query: { query: {
......
...@@ -89,7 +89,8 @@ const refreshing = ref(false); ...@@ -89,7 +89,8 @@ const refreshing = ref(false);
const onLoad = () => { const onLoad = () => {
//初始化数据 //初始化数据
api.postApiFlowViewApiFlowViewGetFlowTaskList(init.params).then(res => {
api.postApiFlowViewApiFlowViewGetAlreadyFlowTaskList(init.params).then(res => {
if (refreshing.value) { if (refreshing.value) {
list.value = [] list.value = []
refreshing.value = false; refreshing.value = false;
...@@ -298,9 +299,12 @@ function recordAction(key, item) { ...@@ -298,9 +299,12 @@ function recordAction(key, item) {
function details(item) { function details(item) {
//详情 //详情
router.push({ router.push({
path: '/flowDetails', path: '/eventCatalogDetails',
query: { query: {
id: item.runid, runid: item.runid, //基础信息
flowid: item.flow_id,
flowType: 'haveDone', //鉴别是否审批 await 才审批
form_id: item.form_id, //日志轨迹
} }
}) })
} }
...@@ -629,14 +633,14 @@ onMounted(() => { ...@@ -629,14 +633,14 @@ onMounted(() => {
</template> </template>
<template v-slot:default> <template v-slot:default>
<div class="w-full h-full flex items-center justify-end"> <div class="w-full h-full flex items-center justify-end">
<div class="w-[30%] mx-2"> <div class="w-full mx-2">
<van-button <van-button
class="w-full " class="w-full "
plain plain
size="small" size="small"
type="primary" type="primary"
@click="details(item)"> @click="details(item)">
审批 详情
</van-button> </van-button>
</div> </div>
......
...@@ -89,7 +89,7 @@ const refreshing = ref(false); ...@@ -89,7 +89,7 @@ const refreshing = ref(false);
const onLoad = () => { const onLoad = () => {
//初始化数据 //初始化数据
api.postApiFlowViewApiFlowViewGetFlowTaskList(init.params).then(res => { api.postApiFlowViewApiFlowViewGetMyFlowTaskList(init.params).then(res => {
if (refreshing.value) { if (refreshing.value) {
list.value = [] list.value = []
refreshing.value = false; refreshing.value = false;
...@@ -298,9 +298,12 @@ function recordAction(key, item) { ...@@ -298,9 +298,12 @@ function recordAction(key, item) {
function details(item) { function details(item) {
//详情 //详情
router.push({ router.push({
path: '/flowDetails', path: '/eventCatalogDetails',
query: { query: {
id: item.runid, runid: item.runid, //基础信息
flowid: item.flow_id,
flowType: 'myFlow', //鉴别是否审批
form_id: item.form_id, //日志轨迹
} }
}) })
} }
...@@ -629,6 +632,26 @@ onMounted(() => { ...@@ -629,6 +632,26 @@ onMounted(() => {
</template> </template>
<template v-slot:default> <template v-slot:default>
<div class="w-full h-full flex items-center justify-end"> <div class="w-full h-full flex items-center justify-end">
<div class="w-[30%] mx-2">
<van-button
class="w-full "
plain
size="small"
type="warning"
@click="details(item)">
重新发起
</van-button>
</div>
<div class="w-[30%] mx-2">
<van-button
class="w-full "
plain
size="small"
type="primary"
@click="details(item)">
取消
</van-button>
</div>
<div class="w-[30%] mx-2"> <div class="w-[30%] mx-2">
<van-button <van-button
class="w-full " class="w-full "
...@@ -636,7 +659,7 @@ onMounted(() => { ...@@ -636,7 +659,7 @@ onMounted(() => {
size="small" size="small"
type="primary" type="primary"
@click="details(item)"> @click="details(item)">
审批 详情
</van-button> </van-button>
</div> </div>
......
...@@ -280,17 +280,17 @@ onMounted(() => { ...@@ -280,17 +280,17 @@ onMounted(() => {
<div class="mb-3 w-full flex flex-nowrap justify-between"> <div class="mb-3 w-full flex flex-nowrap justify-between">
<van-cell-group class="mb-3 w-full " inset style="padding: 0 !important;"> <van-cell-group class="mb-3 w-full " inset style="padding: 0 !important;">
<van-cell <van-cell
@click="gotoPath('myFlow-awardApplication')" @click="gotoPath('myFlow-eventCatalog')"
:value="init.flow.count.report_me_count" :value="init.flow.count.report_me_count"
class="van-haptics-feedback" is-link title="赛事申请" class="van-haptics-feedback" is-link title="赛事申请"
/> />
<van-cell <van-cell
@click="gotoPath('myFlow-awardApplication')" @click="gotoPath('myFlow-eventRegistration')"
:value="init.flow.count.sign_me_count" :value="init.flow.count.sign_me_count"
class="van-haptics-feedback" is-link title="赛事审批" class="van-haptics-feedback" is-link title="赛事审批"
/> />
<van-cell <van-cell
@click="gotoPath('myFlow-awardApplication')" @click="gotoPath('myFlow-achievementDeclaration')"
:value="init.flow.count.certificate_me_count" :value="init.flow.count.certificate_me_count"
class="van-haptics-feedback" is-link title="成绩申报" class="van-haptics-feedback" is-link title="成绩申报"
/> />
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或