|
|
@@ -108,8 +108,9 @@
|
|
|
min-width="7%">
|
|
|
<template #default="scope">
|
|
|
<span v-if="scope.row.state==0">未审核</span>
|
|
|
- <span v-if="scope.row.state==1">未报销</span>
|
|
|
- <span v-if="scope.row.state==2">已报销</span>
|
|
|
+ <span v-if="scope.row.state==1">待审核</span>
|
|
|
+ <span v-if="scope.row.state==2">已审核</span>
|
|
|
+ <span v-if="scope.row.state==3">已报销</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -123,7 +124,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="operation"
|
|
|
- width="350"
|
|
|
+ width="460"
|
|
|
align="center"
|
|
|
label="操作"
|
|
|
>
|
|
|
@@ -131,12 +132,20 @@
|
|
|
<div class="operations">
|
|
|
<el-button type="primary" @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
|
|
|
|
|
|
- <el-button type="primary" v-if="scope.row.state==0" @click="audi(scope.row)" size="mini">审核</el-button>
|
|
|
- <el-button type="info" disabled v-show="scope.row.state==1 || scope.row.state==2" size="mini">审核</el-button>
|
|
|
+ <el-button type="primary" v-if="scope.row.state==0" @click="audi(scope.row,0)" size="mini">审核</el-button>
|
|
|
+ <el-button type="primary" disabled v-show="scope.row.state>=1" class="disa" size="mini">审核</el-button>
|
|
|
+
|
|
|
+ <!-- <el-button type="primary" @click="audi(scope.row,1)" size="mini">管理审核</el-button> -->
|
|
|
+ <el-button type="primary" v-show="scope.row.state==1" @click="audi(scope.row,1)" size="mini">管审核</el-button>
|
|
|
+ <el-button type="primary" disabled v-show="scope.row.state==2" class="disa" size="mini">管审核</el-button>
|
|
|
+ <el-button type="primary" disabled v-show="scope.row.state!=2 && scope.row.state!=1" class="disa" size="mini">管审核</el-button>
|
|
|
+
|
|
|
|
|
|
<el-button type="primary" size="mini" @click="edit(scope.row.acId)">申请表</el-button>
|
|
|
- <el-button type="primary" v-show="scope.row.state==1" size="mini" @click="end(scope.row)" >完结</el-button>
|
|
|
- <el-button type="info" v-show="scope.row.state==2||scope.row.state==0" size="mini" disabled>完结</el-button>
|
|
|
+
|
|
|
+ <el-button type="primary" v-show="scope.row.state!=2 && scope.row.state!=3" class="disa" size="mini" @click="end(scope.row)" >完结</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.state==2" size="mini" @click="end(scope.row)" >完结</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.state==3" size="mini" class="disa">已完结</el-button>
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -178,15 +187,29 @@
|
|
|
<el-input disabled v-model="processTable.phone"></el-input>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="diaTit1" v-show="isManager==1">
|
|
|
+ <div class="spans1" style="position: relative;top:-24px">驳回意见</div>
|
|
|
+ <div class="inp">
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ :rows="5"
|
|
|
+ resize="none"
|
|
|
+ placeholder="请输入修改建议等..."
|
|
|
+ v-model="rejectApplyText">
|
|
|
+ </el-input>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="commit" class="AllDialogBtn">确认提交</el-button>
|
|
|
+ <el-button type="primary" @click="Commit(1)" v-show="isManager==0" class="AllDialogBtn">确认提交</el-button>
|
|
|
+ <el-button type="primary" @click="Commit(2)" v-show="isManager==1" class="AllDialogBtn">通过</el-button>
|
|
|
+ <el-button type="primary" @click="rejectApply" v-show="isManager==1" class="AllDialogBtn">驳回</el-button>
|
|
|
<el-button @click="init" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 活动审核对话框结束 -->
|
|
|
|
|
|
<!-- 驳回提交对话框开始 -->
|
|
|
- <el-dialog
|
|
|
+ <!-- <el-dialog
|
|
|
title="驳回提交"
|
|
|
:visible.sync="rejectDialog"
|
|
|
class="dialogWidth"
|
|
|
@@ -241,7 +264,7 @@
|
|
|
<el-button type="primary" @click="commit2" class="AllDialogBtn">确认提交</el-button>
|
|
|
<el-button @click="init" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog> -->
|
|
|
<!-- 驳回提交对话框结束 -->
|
|
|
|
|
|
<!-- 完结对话框开始 -->
|
|
|
@@ -250,7 +273,7 @@
|
|
|
:visible.sync="endDialog"
|
|
|
width="600px"
|
|
|
class="endDialog"
|
|
|
- :before-close="cancelEndTableFile">
|
|
|
+ :before-close="init">
|
|
|
<div class="addDialogLogo">LOGO</div>
|
|
|
<div class="deleteContent">"{{ endTable.title }}"项目活动，是否确定完结？</div>
|
|
|
<div class="deleteContent1">活动完结报告</div>
|
|
|
@@ -270,7 +293,7 @@
|
|
|
</div> -->
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="ending" class="AllDialogBtn">确认提交</el-button>
|
|
|
- <el-button @click="cancelEndTableFile" class="AllDialogBtn">取消</el-button>
|
|
|
+ <el-button @click="endDialog=false" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 完结对话框结束 -->
|
|
|
@@ -318,10 +341,13 @@ import { ActivityWord } from '@/components/tool/getWord';
|
|
|
status:1,
|
|
|
textarea:'',
|
|
|
input:'',
|
|
|
+ btnState:0,
|
|
|
+ isManager:'', //审核框与驳回框的区别 0申请人 1管理员
|
|
|
endDialog:false, //完结对话框
|
|
|
auditDialog:false, //审核对话框
|
|
|
rejectDialog:false, //驳回对话框
|
|
|
activityWord:false,
|
|
|
+ rejectApplyText:'',//驳回数据
|
|
|
options:[],
|
|
|
options1:[],
|
|
|
options2:[],
|
|
|
@@ -367,44 +393,26 @@ import { ActivityWord } from '@/components/tool/getWord';
|
|
|
delEndTableFile(url){
|
|
|
this.endTable.file = this.endTable.file.filter(item=>item.url!=url);
|
|
|
},
|
|
|
- cancelEndTableFile(){
|
|
|
- if(this.endTable.file.length>=1){
|
|
|
- this.$confirm('文件还未上传,确定取消吗?', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- this.endDialog = false;
|
|
|
- })
|
|
|
- }else{
|
|
|
- this.endDialog = false;
|
|
|
- }
|
|
|
- },
|
|
|
+ // cancelEndTableFile(){
|
|
|
+ // if(this.endTable.file.length>=1){
|
|
|
+ // this.$confirm('文件还未上传,确定取消吗?', '提示', {
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // cancelButtonText: '取消',
|
|
|
+ // type: 'warning'
|
|
|
+ // }).then(() => {
|
|
|
+ // this.endDialog = false;
|
|
|
+ // })
|
|
|
+ // }else{
|
|
|
+ // this.endDialog = false;
|
|
|
+ // }
|
|
|
+ // },
|
|
|
init(){//重置
|
|
|
this.auditDialog=false;
|
|
|
this.endDialog=false;
|
|
|
this.rejectDialog=false;
|
|
|
},
|
|
|
|
|
|
- commit(){ // 活动审核对话框确定
|
|
|
- this.ajax.post(this.$store.state.api+"/UpdateActivityState",{
|
|
|
- uid:this.$store.state.userInfo.userid,
|
|
|
- aid:this.processTable.Id,
|
|
|
- st:1,
|
|
|
- }).then(res=>{
|
|
|
- if(res.data==1){
|
|
|
- this.$message.success("审核成功");
|
|
|
- this.auditDialog = false;
|
|
|
- for(let i in this.processTable)this.processTable[i] = '';
|
|
|
- this.getData()
|
|
|
- }else{
|
|
|
- this.$message.error("审核失败")
|
|
|
- }
|
|
|
- this.getData();
|
|
|
- }).catch(err=>{
|
|
|
- this.$message.error(err.message)
|
|
|
- })
|
|
|
- },
|
|
|
+
|
|
|
|
|
|
// 驳回对话框确定
|
|
|
commit2(){
|
|
|
@@ -412,6 +420,11 @@ import { ActivityWord } from '@/components/tool/getWord';
|
|
|
this.status++
|
|
|
},
|
|
|
|
|
|
+ controlActiveState(){ //控制活动状态
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
end(val){//完结按钮
|
|
|
this.endTable.title = val.title;
|
|
|
this.endTable.Id = val.acId;
|
|
|
@@ -429,7 +442,7 @@ import { ActivityWord } from '@/components/tool/getWord';
|
|
|
this.ajax.post(this.$store.state.api+"/UpdateActivityState",{
|
|
|
uid:this.$store.state.userInfo.userid,
|
|
|
aid:this.endTable.Id,
|
|
|
- st:2,
|
|
|
+ st:3,
|
|
|
}).then(res2=>{
|
|
|
if(res2.data==1){
|
|
|
this.$message.success("结项成功");
|
|
|
@@ -467,7 +480,8 @@ import { ActivityWord } from '@/components/tool/getWord';
|
|
|
ActivityWord(this.wordData)
|
|
|
},
|
|
|
|
|
|
- audi(row){ // 审核按钮
|
|
|
+ audi(row,num){ // 管理员、申请人，审核按钮
|
|
|
+ this.isManager=num
|
|
|
this.processTable.Id = row.acId;
|
|
|
this.processTable.name = row.title;
|
|
|
this.processTable.leader = row.pro_leader;
|
|
|
@@ -476,7 +490,46 @@ import { ActivityWord } from '@/components/tool/getWord';
|
|
|
this.processTable.className = row.name;
|
|
|
this.auditDialog = true;
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
+ Commit(val){
|
|
|
+ this.ajax.post(this.$store.state.api+"/UpdateActivityState",{
|
|
|
+ uid:this.$store.state.userInfo.userid,
|
|
|
+ aid:this.processTable.Id,
|
|
|
+ st:val,
|
|
|
+ }).then(res=>{
|
|
|
+ if(res.data==1){
|
|
|
+ this.$message.success("审核成功");
|
|
|
+ this.auditDialog = false;
|
|
|
+ for(let i in this.processTable)this.processTable[i] = '';
|
|
|
+ this.getData()
|
|
|
+ }else{
|
|
|
+ this.$message.error("审核失败")
|
|
|
+ }
|
|
|
+ this.getData();
|
|
|
+ }).catch(err=>{
|
|
|
+ this.$message.error(err.message)
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ rejectApply(){
|
|
|
+ this.ajax.post(this.$store.state.api+"/UpdateActivityState",{
|
|
|
+ uid:this.$store.state.userInfo.userid,
|
|
|
+ aid:this.processTable.Id,
|
|
|
+ st:0,
|
|
|
+ }).then(res=>{
|
|
|
+ if(res.data==1){
|
|
|
+ this.$message.success("已驳回");
|
|
|
+ this.auditDialog = false;
|
|
|
+ for(let i in this.processTable)this.processTable[i] = '';
|
|
|
+ this.getData()
|
|
|
+ }else{
|
|
|
+ this.$message.error("驳回失败")
|
|
|
+ }
|
|
|
+ this.getData();
|
|
|
+ }).catch(err=>{
|
|
|
+ this.$message.error(err.message)
|
|
|
+ })
|
|
|
+ },
|
|
|
makerActvityApply(){ // 创客活动申请按钮
|
|
|
this.$router.push('/makerActvityApplyMain')
|
|
|
},
|
Q-ABAB