提交 282b4e66 编写于 作者: 刘英杰's avatar 刘英杰

- 20240923 1.待办、已办、我的各列表回显流程类型select选中的文字。(完成)2.PC,移动,奖励申请比例未审批可编辑。(完成)

上级 da2ad5ba
流水线 #29454 已通过 ,包含阶段
in 53 second
[data-v-b2a9bc7a] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-b2a9bc7a] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-b2a9bc7a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-b2a9bc7a]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px} [data-v-6107c188] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-6107c188] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-6107c188]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-6107c188]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file \ No newline at end of file
.carClass[data-v-34f7439c]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-34f7439c] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-34f7439c] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-34f7439c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-34f7439c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-34f7439c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-34f7439c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-34f7439c]:hover{transform:scale(1.2)}.container[data-v-34f7439c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-34f7439c],.tableList[data-v-276da280]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-276da280]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-276da280]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-276da280]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-276da280]{width:500px;height:50px;text-align:center}.Atext[data-v-276da280]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-276da280]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-276da280]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-276da280] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-46a88aa3]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-46a88aa3] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-46a88aa3] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-46a88aa3]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-46a88aa3]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-46a88aa3]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-46a88aa3]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-46a88aa3]:hover{transform:scale(1.2)}.container[data-v-46a88aa3]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-46a88aa3],.tableList[data-v-276da280]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-276da280]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-276da280]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-276da280]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-276da280]{width:500px;height:50px;text-align:center}.Atext[data-v-276da280]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-276da280]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-276da280]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-276da280] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file \ No newline at end of file
.carClass[data-v-e3bdd618]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-e3bdd618] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-e3bdd618] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-e3bdd618]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-e3bdd618]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-e3bdd618]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-e3bdd618]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-e3bdd618]:hover{transform:scale(1.2)}.container[data-v-e3bdd618]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-e3bdd618],.tableList[data-v-1d908a60]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-1d908a60]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-1d908a60]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-1d908a60]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-1d908a60]{width:500px;height:50px;text-align:center}.Atext[data-v-1d908a60]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-1d908a60]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-1d908a60]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-1d908a60] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-e3bdd618]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-e3bdd618] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-e3bdd618] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-e3bdd618]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-e3bdd618]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-e3bdd618]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-e3bdd618]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-e3bdd618]:hover{transform:scale(1.2)}.container[data-v-e3bdd618]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-e3bdd618],.tableList[data-v-a73d7814]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-a73d7814]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-a73d7814]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-a73d7814]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-a73d7814]{width:500px;height:50px;text-align:center}.Atext[data-v-a73d7814]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-a73d7814]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-a73d7814]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-a73d7814] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file \ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.33522996.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.2db0ddb9.js></script><script src=js/app~748942c6.b4826edb.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.513eaadd.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.99aeba0d.js></script><script src=js/app~748942c6.a6cf6b95.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
:placeholder="'请选择'+item.name" :placeholder="'请选择'+item.name"
@on-change="selectChange($event,item.id)" @on-change="selectChange($event,item.id)"
> >
<template #prefix> <template #prefix>
<div> <div>
{{ item.name }} {{ item.name }}
...@@ -112,6 +114,7 @@ ...@@ -112,6 +114,7 @@
methods: { methods: {
// 搜索 // 搜索
searchBt() { searchBt() {
console.log("🚀🚀this.searchCondObjsearchBt🚀,", this.searchCondObj)
this.$emit('onSubmit', this.searchCondObj) this.$emit('onSubmit', this.searchCondObj)
}, },
// 重置 // 重置
...@@ -132,7 +135,11 @@ ...@@ -132,7 +135,11 @@
this.searchCondObj[id] = val1 this.searchCondObj[id] = val1
}, },
selectChange($event, key) { selectChange($event, key) {
console.log("🚀🚀🚀$event,", $event)
this.$forceUpdate()
console.log("🚀🚀🚀$forceUpdate,", this.searchCondObj)
//select变化 触发父组件的 批次调用 //select变化 触发父组件的 批次调用
if (key === 'is_tea') this.$emit('watchIsTea', this.searchCondObj.is_tea || 0) if (key === 'is_tea') this.$emit('watchIsTea', this.searchCondObj.is_tea || 0)
} }
}, },
......
...@@ -13,16 +13,21 @@ ...@@ -13,16 +13,21 @@
<span v-if="bonus.teamFlag" v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">{{ <span v-if="bonus.teamFlag" v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">{{
formValidate.bonus_total === 'null' || formValidate.bonus_total === null ? 0 : formValidate.bonus_total formValidate.bonus_total === 'null' || formValidate.bonus_total === null ? 0 : formValidate.bonus_total
}}</span> }}</span>
<InputNumber v-if="!bonus.teamFlag" id="bonusValue" :disabled="false" <InputNumber
v-if="!bonus.teamFlag"
id="bonusValue"
:disabled="false"
:min="Number(0)" :min="Number(0)"
placeholder="请输入奖金总金额" placeholder="请输入奖金总金额"
style="width: 130px;" style="width: 130px;"
type="number" type="number"
v-bind:value="Number(formValidate.bonus_total)" v-bind:value="Number(formValidate.bonus_total)"
@input="getTeamPeopleBonus($event,formValidate.bonus_total,'ze')"></InputNumber> @input="getTeamPeopleBonus($event,formValidate.bonus_total,'ze')">
</InputNumber>
<span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">元</span> <span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">元</span>
</h3> </h3>
<Icon v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')" <Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')"
style="cursor: pointer;font-size: 20px;" type="md-create" style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool()"></Icon> @click="teamStudentSaveBonusPool()"></Icon>
</div> </div>
...@@ -224,7 +229,8 @@ ...@@ -224,7 +229,8 @@
style="width: 130px;" style="width: 130px;"
v-bind:value="Number(row.bonus_ratio)" v-bind:value="Number(row.bonus_ratio)"
@input="getTeamPeopleBonus($event,row,'bili')"></InputNumber> @input="getTeamPeopleBonus($event,row,'bili')"></InputNumber>
<Icon v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')" <Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') ||formValidate.approval_state == 0"
style="cursor: pointer;font-size: 20px;" type="md-create" style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(row)"/> @click="teamStudentSaveBonusPool(row)"/>
</div> </div>
...@@ -271,7 +277,8 @@ ...@@ -271,7 +277,8 @@
style="width: 130px;" style="width: 130px;"
v-bind:value="Number(row.bonus_ratio)" v-bind:value="Number(row.bonus_ratio)"
@input="getTeamPeopleBonus($event,row,'bili')"></InputNumber> @input="getTeamPeopleBonus($event,row,'bili')"></InputNumber>
<Icon v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')" <Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') || formValidate.approval_state == 0"
style="cursor: pointer;font-size: 20px;" type="md-create" style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(row)"/> @click="teamStudentSaveBonusPool(row)"/>
</div> </div>
...@@ -357,7 +364,8 @@ ...@@ -357,7 +364,8 @@
style="width: 130px;" style="width: 130px;"
v-bind:value="Number(row.bonus_ratio)" v-bind:value="Number(row.bonus_ratio)"
@input="getTeamPeopleBonus($event,row,'bili')"></InputNumber> @input="getTeamPeopleBonus($event,row,'bili')"></InputNumber>
<Icon v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')" <Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') || formValidate.approval_state ==0"
style="cursor: pointer;font-size: 20px;" type="md-create" style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(row)"/> @click="teamStudentSaveBonusPool(row)"/>
</div> </div>
......
...@@ -632,7 +632,7 @@ ...@@ -632,7 +632,7 @@
// minWidth: 120, // minWidth: 120,
// }, // },
{ {
title: '申请人', title: '申请人姓名',
key: 'createby', key: 'createby',
show: true, show: true,
......
...@@ -421,8 +421,7 @@ ...@@ -421,8 +421,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.rewardType = this.init.flow_id1
}, },
// 教师工作量三项 // 教师工作量三项
...@@ -471,16 +470,16 @@ ...@@ -471,16 +470,16 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-awaitDoneList": () => { "/flow-awaitDoneList": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 102 this.init.flow_id1 = 102
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType');
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType');
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication');
this.$refs.search.searchCondObj.flow_id = this.init.flow_id1;
}, },
"/flow-awaitDoneList-eventCatalogue": () => { "/flow-awaitDoneList-eventCatalogue": () => {
//赛事申请三项 //赛事申请三项
...@@ -490,6 +489,7 @@ ...@@ -490,6 +489,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.$refs.search.searchCondObj.eventApplication = this.init.flow_id1
}, },
}, //基于路由获取流程id }, //基于路由获取流程id
strategyReset: { strategyReset: {
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.rewardType = this.init.flow_id1
}, },
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-awaitDoneList": () => { "/flow-awaitDoneList": () => {
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.flow_id = this.init.flow_id1
}, },
"/flow-awaitDoneList-eventCatalogue": () => { "/flow-awaitDoneList-eventCatalogue": () => {
//赛事申请三项 //赛事申请三项
...@@ -569,6 +569,7 @@ ...@@ -569,6 +569,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.$refs.search.searchCondObj.eventApplication = this.init.flow_id1
}, },
} //基于路由获取流程id } //基于路由获取流程id
...@@ -603,6 +604,7 @@ ...@@ -603,6 +604,7 @@
}, },
// 查询条件初始化 // 查询条件初始化
mounted() { mounted() {
this.routerCarryConditionQuery(); this.routerCarryConditionQuery();
//基于路由路径 获取flowid //基于路由路径 获取flowid
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
...@@ -846,6 +848,7 @@ ...@@ -846,6 +848,7 @@
}, },
cssearch(val) { cssearch(val) {
// 搜索 // 搜索
console.log("🚀val🚀🚀,", val)
if (val.rewardType) { if (val.rewardType) {
this.init = { this.init = {
...this.init, ...val, flow_id: val.rewardType ...this.init, ...val, flow_id: val.rewardType
...@@ -861,6 +864,11 @@ ...@@ -861,6 +864,11 @@
...this.init, ...val, flow_id: val.eventApplication ...this.init, ...val, flow_id: val.eventApplication
} }
this.init.flow_id1 = this.init.flow_id this.init.flow_id1 = this.init.flow_id
} else if (val.flow_id) {
this.init = {
...this.init, ...val, flow_id: val.flow_id
}
this.init.flow_id1 = this.init.flow_id
} else { } else {
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
this.init = { this.init = {
...@@ -914,7 +922,7 @@ ...@@ -914,7 +922,7 @@
this.init.status1 = this.init.status this.init.status1 = this.init.status
this.init.key_name1 = this.init.key_name this.init.key_name1 = this.init.key_name
this.init.action_type1 = this.init.action_type this.init.action_type1 = this.init.action_type
// this.init.flow_id1 = this.init.flow_id this.init.flow_id1 = this.init.flow_id
this.init.flow_name1 = this.init.flow_name this.init.flow_name1 = this.init.flow_name
this.GetFlowTaskList() this.GetFlowTaskList()
}, },
......
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.rewardType = this.init.flow_id1
}, },
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
}, },
// 赛事审批三项 // 赛事审批三项
...@@ -614,6 +614,7 @@ ...@@ -614,6 +614,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.flow_id = this.init.flow_id1
}, },
"/flow-processedList-eventCatalogue": () => { "/flow-processedList-eventCatalogue": () => {
...@@ -623,6 +624,7 @@ ...@@ -623,6 +624,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.$refs.search.searchCondObj.eventApplication = this.init.flow_id1
}, },
}, //基于路由获取流程id }, //基于路由获取流程id
...@@ -635,7 +637,7 @@ ...@@ -635,7 +637,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.rewardType = this.init.flow_id1
}, },
...@@ -693,7 +695,7 @@ ...@@ -693,7 +695,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
}, },
// 赛事审批三项 // 赛事审批三项
...@@ -704,7 +706,7 @@ ...@@ -704,7 +706,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.flow_id = this.init.flow_id1
}, },
"/flow-processedList-eventCatalogue": () => { "/flow-processedList-eventCatalogue": () => {
this.initSearchCondition() this.initSearchCondition()
...@@ -713,7 +715,7 @@ ...@@ -713,7 +715,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.$refs.search.searchCondObj.eventApplication = this.init.flow_id1
}, },
}, //基于路由获取流程id }, //基于路由获取流程id
...@@ -1226,6 +1228,11 @@ ...@@ -1226,6 +1228,11 @@
...this.init, ...val, flow_id: val.eventApplication ...this.init, ...val, flow_id: val.eventApplication
} }
this.init.flow_id1 = this.init.flow_id this.init.flow_id1 = this.init.flow_id
} else if (val.flow_id) {
this.init = {
...this.init, ...val, flow_id: val.flow_id
}
this.init.flow_id1 = this.init.flow_id
} else { } else {
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
this.init = { this.init = {
......
...@@ -2793,6 +2793,7 @@ ...@@ -2793,6 +2793,7 @@
return false return false
}, },
async trainBeforeUpload(file) { async trainBeforeUpload(file) {
console.log("🚀file🚀🚀,",file)
let formData = new FormData(); let formData = new FormData();
formData.append(`file`, file); formData.append(`file`, file);
await this.hooks.myEncapsulationFunction(() => { await this.hooks.myEncapsulationFunction(() => {
......
...@@ -724,7 +724,7 @@ ...@@ -724,7 +724,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.rewardType = this.init.flow_id1
}, },
// 教师工作量三项 // 教师工作量三项
...@@ -772,7 +772,7 @@ ...@@ -772,7 +772,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-myFlowList": () => { "/flow-myFlowList": () => {
...@@ -781,7 +781,7 @@ ...@@ -781,7 +781,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.flow_id = this.init.flow_id1
}, },
"/flow-myFlowList-eventCatalogue": () => { "/flow-myFlowList-eventCatalogue": () => {
//赛事申请三项 //赛事申请三项
...@@ -790,6 +790,7 @@ ...@@ -790,6 +790,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.$refs.search.searchCondObj.eventApplication = this.init.flow_id1
}, },
}, //基于路由获取流程id }, //基于路由获取流程id
strategyReset: { strategyReset: {
...@@ -802,7 +803,7 @@ ...@@ -802,7 +803,7 @@
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.rewardType = this.init.flow_id1
}, },
// 教师工作量三项 // 教师工作量三项
"/flow-myFlowList-WorkloadDeclare": () => { "/flow-myFlowList-WorkloadDeclare": () => {
...@@ -850,6 +851,7 @@ ...@@ -850,6 +851,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-myFlowList": () => { "/flow-myFlowList": () => {
...@@ -858,7 +860,7 @@ ...@@ -858,7 +860,7 @@
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication') this.deleteSearchCondition('eventApplication')
this.$refs.search.searchCondObj.flow_id = this.init.flow_id1
}, },
"/flow-myFlowList-eventCatalogue": () => { "/flow-myFlowList-eventCatalogue": () => {
//赛事申请三项 //赛事申请三项
...@@ -867,6 +869,7 @@ ...@@ -867,6 +869,7 @@
this.deleteSearchCondition('flow_id') this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType') this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType') this.deleteSearchCondition('declarationType')
this.$refs.search.searchCondObj.eventApplication = this.init.flow_id1
}, },
}, //基于路由获取流程id }, //基于路由获取流程id
...@@ -1275,6 +1278,11 @@ ...@@ -1275,6 +1278,11 @@
...this.init, ...val, flow_id: val.eventApplication ...this.init, ...val, flow_id: val.eventApplication
} }
this.init.flow_id1 = this.init.flow_id this.init.flow_id1 = this.init.flow_id
} else if (val.flow_id) {
this.init = {
...this.init, ...val, flow_id: val.flow_id
}
this.init.flow_id1 = this.init.flow_id
} else { } else {
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
this.init = { this.init = {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或