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

更新审批退回发起人

上级 67a1b237
流水线 #22875 已通过 ,包含阶段
in 49 second
<!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.064c214c.css rel=stylesheet><link href=css/app.1af866c1.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.dd103f50.js></script><script src=js/app.d23d1cd3.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.064c214c.css rel=stylesheet><link href=css/app.1af866c1.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.b8ea6964.js></script><script src=js/app.72cf4645.js></script></body></html>
\ No newline at end of file \ No newline at end of file
...@@ -603,7 +603,7 @@ export function FlowApproval(data) { ...@@ -603,7 +603,7 @@ export function FlowApproval(data) {
export function FlowRevocation(data) { export function FlowRevocation(data) {
//流程撤回 //流程撤回
return request({ return request({
url: `/api/Flow/api/Flow/FlowRevocation?taskid=${data.taskid}&remark=${data.remark}`, url: `/api/Flow/api/Flow/FlowRevocation?taskid=${data.taskid}&remark=${data.remark}&action=${data.action}`,
method: 'get', method: 'get',
data data
}); });
......
...@@ -11,5 +11,14 @@ export const publicState = { ...@@ -11,5 +11,14 @@ export const publicState = {
label: '退回到发起人', label: '退回到发起人',
value: 2, value: 2,
} }
] ],
// ['未审批', '审批中', '审批通过', '审批不通过', '驳回']
flowApprovalState: {
color: ['default', 'primary', 'success', 'warning', 'error'],
"0": '未审批',
"1": '审批中',
"2": '审批通过',
"3": '审批不通过',
"4": '驳回',
}
} }
...@@ -57,7 +57,6 @@ Vue.prototype.getUserRole = () => { ...@@ -57,7 +57,6 @@ Vue.prototype.getUserRole = () => {
} }
Vue.prototype.publicState = publicState Vue.prototype.publicState = publicState
Vue.use(plugins); Vue.use(plugins);
Vue.use(ViewUI, { Vue.use(ViewUI, {
i18n: (key, value) => i18n.t(key, value) i18n: (key, value) => i18n.t(key, value)
}); });
......
...@@ -481,7 +481,7 @@ export default { ...@@ -481,7 +481,7 @@ export default {
} }
</script> </script>
<style> <style lang="less" scoped>
.tableList { .tableList {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -626,7 +626,7 @@ export default { ...@@ -626,7 +626,7 @@ export default {
} }
</script> </script>
<style> <style lang="less" scoped>
.tableList { .tableList {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -60,7 +60,9 @@ ...@@ -60,7 +60,9 @@
</template> </template>
> >
<template #approval_state="{row}"> <template #approval_state="{row}">
{{ ['未审批', '审批中', '审批通过', '审批不通过'][row.approval_state] }} <Tag :color="publicState.flowApprovalState.color[row.approval_state] ">
{{ publicState.flowApprovalState[row.approval_state] }}
</Tag>
</template> </template>
<template v-slot:action="{row}"> <template v-slot:action="{row}">
......
<template> <template>
<Card> <Card>
<h1>333测试中...</h1> <h1>测试中...</h1>
</Card> </Card>
</template> </template>
......
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
</div> </div>
</Card> </Card>
<div <div
style="box-sizing: border-box; border-top: #1e93ff 0.3vw solid; width: 15%;height: 127vh;margin-top:20px; style="overflow-y: auto; box-sizing: border-box; border-top: #1e93ff 0.3vw solid; width: 15%;height: 127vh;margin-top:20px;
padding:3vw 1vw 3vw 1vw;background-color: white;display: flex;justify-content: center"> padding:3vw 1vw 3vw 1vw;background-color: white;display: flex;justify-content: center">
<Timeline> <Timeline>
<TimelineItem :color="['blue','green'][Number(!item.action_name)]" <TimelineItem :color="['blue','green'][Number(!item.action_name)]"
...@@ -345,16 +345,26 @@ ...@@ -345,16 +345,26 @@
<Modal <Modal
v-model="publicModal" v-model="publicModal"
title="审批意见" title="审批意见"
@on-ok="ok" >
@on-cancel="cancel"> <Form v-if="publicIdentificatio === 'revocation'" ref="formValidate" :model="formValidate" :rules="ruleValidate"
<Select v-model="publicAction"> :label-width="80">
<Option v-for="(item,index) in publicState.revocationApporval" :value="item.value" :key="index">{{ <FormItem label="退回节点" prop="publicAction">
item.label <Select v-model="formValidate.publicAction">
}} <Option v-for="(item,index) in publicState.revocationApporval" :value="item.value" :key="index">{{
</Option> item.label
</Select> }}
</Option>
</Select>
</FormItem>
</Form>
<Input v-model="publicTextarea" type="textarea" :autosize="{minRows: 5,maxRows: 10}" <Input v-model="publicTextarea" type="textarea" :autosize="{minRows: 5,maxRows: 10}"
placeholder="请输入审批意见..."></Input> placeholder="请输入审批意见..."></Input>
<template #footer>
<div style="display: flex;justify-content: flex-end">
<Button type="text" @click="cancel"> 取消</Button>
<Button :loading="btLoad" type="primary" @click="ok" style="margin-left: 10px"> 确定</Button>
</div>
</template>
</Modal> </Modal>
<Drawer title="团队详细" :closable="false" v-model="teamDrawer" width="40%"> <Drawer title="团队详细" :closable="false" v-model="teamDrawer" width="40%">
...@@ -436,6 +446,7 @@ export default { ...@@ -436,6 +446,7 @@ export default {
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
btLoad: false,
viewFileUpdataKeys: 1, viewFileUpdataKeys: 1,
split: 0.7, split: 0.7,
drawerPreview: false, drawerPreview: false,
...@@ -511,7 +522,15 @@ export default { ...@@ -511,7 +522,15 @@ export default {
flowInfo: '', flowInfo: '',
publicIdentificatio: '', publicIdentificatio: '',
publicTextarea: '', publicTextarea: '',
publicAction: "", formValidate: {
publicAction: "",
},
ruleValidate: {
publicAction: [
{required: true, type: 'number', message: '该项不能为空', trigger: 'change'}
],
},
publicModal: false, publicModal: false,
data: { data: {
keyValueArray: [], keyValueArray: [],
...@@ -631,7 +650,7 @@ export default { ...@@ -631,7 +650,7 @@ export default {
this.teamDrawer = true this.teamDrawer = true
}, },
async ok() { async ok() {
this.$Spin.show() this.btLoad = true
const data = { const data = {
taskid: this.data.Object.taskid, taskid: this.data.Object.taskid,
remark: this.publicTextarea remark: this.publicTextarea
...@@ -639,7 +658,9 @@ export default { ...@@ -639,7 +658,9 @@ export default {
switch (this.publicIdentificatio) { switch (this.publicIdentificatio) {
case 'pass': case 'pass':
const pass = await api.FlowApproval(data) const pass = await api.FlowApproval(data)
this.btLoad = false
hook.publicMessage(pass) hook.publicMessage(pass)
this.publicModal = false
if (pass.code === 1) { if (pass.code === 1) {
setTimeout(() => { setTimeout(() => {
localStorage.setItem('updataEvent', 'getDataEvent'); localStorage.setItem('updataEvent', 'getDataEvent');
...@@ -648,17 +669,25 @@ export default { ...@@ -648,17 +669,25 @@ export default {
} }
break; break;
case 'revocation': case 'revocation':
const Revocation = await api.FlowRevocation(data) this.$refs.formValidate.validate(async (value) => {
if (Revocation.code === 1) { if (value) {
hook.publicMessage(Revocation) data.action = this.formValidate.publicAction
setTimeout(() => { const Revocation = await api.FlowRevocation(data)
localStorage.setItem('updataEvent', 'getDataEvent'); if (Revocation.code === 1) {
this.$router.back() hook.publicMessage(Revocation)
}, 1500) this.publicModal = false
} else { setTimeout(() => {
this.$Spin.hide() localStorage.setItem('updataEvent', 'getDataEvent');
this.$Message.error(Revocation.msg_detail) this.$router.back()
} }, 1500)
} else {
this.btLoad = false
this.$Message.error(Revocation.msg_detail)
}
this.btLoad = false
}
})
break; break;
} }
}, },
...@@ -681,6 +710,7 @@ export default { ...@@ -681,6 +710,7 @@ export default {
revocationFlow() { revocationFlow() {
this.publicTextarea = '' this.publicTextarea = ''
this.publicIdentificatio = 'revocation' this.publicIdentificatio = 'revocation'
if (this.formValidate.publicAction) this.$refs['formValidate'].resetFields()
this.publicModal = true this.publicModal = true
}, },
passFlow() { passFlow() {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或