|
|
@@ -166,26 +166,27 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="operation"
|
|
|
- width="350"
|
|
|
+ width="550"
|
|
|
align="center"
|
|
|
label="操作"
|
|
|
>
|
|
|
<template #default="scope">
|
|
|
<div class="operations">
|
|
|
- <!-- <el-button type="primary" > -->
|
|
|
- <!-- <el-link class="btt" type="primary" :underline="false"> -->
|
|
|
<el-button type="primary" size="mini" @click="lookDetail(scope.row.courseId,scope.row.typeid)">查看详情</el-button>
|
|
|
- <!-- <el-button type="primary" size="mini" @click="audit(scope.row)">{{(scope.row.data==1?"审核": scope.row.data==1?"正在审核":"审核")}}</el-button> -->
|
|
|
- <el-button v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核</el-button>
|
|
|
- <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==1" size="mini">审核中</el-button>
|
|
|
- <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==2" size="mini">已审核</el-button>
|
|
|
+
|
|
|
+ <el-button type="primary" v-show="scope.row.apIsupload==0" @click="audit(scope.row,0)" size="mini" >审核0</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==0" class="disa" size="mini" >待审核0</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==1" class="disa" size="mini">审核中0</el-button>
|
|
|
+ <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==2" class="disa" size="mini">已审核0</el-button>
|
|
|
+
|
|
|
+ <el-button v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row,1)">审核1</el-button>
|
|
|
+ <!-- <el-button v-show="scope.row.isupload==0 && scope.row.apIsupload==1" type="primary" class="disa" size="mini" @click="audit(scope.row)">审核1</el-button> -->
|
|
|
+ <el-button v-show="scope.row.isupload==1" type="primary" style="width: 73.3px;" class="disa" size="mini">审核中1</el-button>
|
|
|
+ <el-button v-show="scope.row.isupload==2" type="primary" style="width: 73.3px;" class="disa" size="mini">已审核1</el-button>
|
|
|
|
|
|
<el-button type="primary" size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button>
|
|
|
- <!-- <el-button type="primary" size="mini"><a href="/file/附件 5 ：学校创客专项资金使用申请表.xlsx" download="创客活动.doc">申请表</a> </el-button> -->
|
|
|
|
|
|
<el-button type="primary" size="mini" @click="del(scope.row)">删除</el-button>
|
|
|
- <!-- </el-link> -->
|
|
|
- <!-- </el-button> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -205,7 +206,7 @@
|
|
|
<!-- 分页结束 -->
|
|
|
|
|
|
<!-- 立项撤回对话框开始 -->
|
|
|
- <el-dialog
|
|
|
+ <!-- <el-dialog
|
|
|
title="立项撤回提交"
|
|
|
:visible.sync="dialogVisible1"
|
|
|
width="700px"
|
|
|
@@ -255,14 +256,15 @@
|
|
|
<el-button type="primary" @click="commit2" class="AllDialogBtn" >确认提交</el-button>
|
|
|
<el-button @click="init" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog> -->
|
|
|
<!-- 立项撤回对话框开始 -->
|
|
|
|
|
|
<!-- 立项审核对话框开始 -->
|
|
|
<el-dialog
|
|
|
title="立项审核"
|
|
|
:visible.sync="dialogVisible"
|
|
|
- class="dialogWidth"
|
|
|
+ class="pageSubmitData"
|
|
|
+ width="600px"
|
|
|
:before-close="init">
|
|
|
|
|
|
<div class="diaTit">
|
|
|
@@ -275,26 +277,40 @@
|
|
|
|
|
|
<div class="diaTit1">
|
|
|
<div class="spans1">所在部门</div>
|
|
|
- <div>
|
|
|
+ <div class="inp">
|
|
|
<el-input disabled v-model="auditDialog.department" placeholder="所在部门"></el-input>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<div class="diaTit1">
|
|
|
<div class="spans1">预算总经费</div>
|
|
|
- <div>
|
|
|
+ <div class="inp">
|
|
|
<el-input disabled v-model="auditDialog.fund" placeholder="预算总经费"></el-input>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<div class="diaTit1">
|
|
|
<div class="spans1">联系电话</div>
|
|
|
- <div>
|
|
|
+ <div class="inp">
|
|
|
<el-input disabled v-model="auditDialog.tel" placeholder="联系电话"></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" v-show="isManager==0" @click="ApplyPersonCommit" class="AllDialogBtn" >审核</el-button>
|
|
|
+ <el-button type="primary" v-show="isManager==1" @click="ManagerCommit" class="AllDialogBtn" >通过</el-button>
|
|
|
+ <el-button type="primary" v-show="isManager==1" @click="rejectApply" class="AllDialogBtn" >驳回</el-button>
|
|
|
<el-button @click="init" class="AllDialogBtn">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -347,6 +363,9 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
WordPreview:false,//文档预览
|
|
|
PreviewTid:"",//预览分类ID
|
|
|
PreviewData:"",//预览数据
|
|
|
+ rejectApplyText:'', //驳回-修改建议
|
|
|
+
|
|
|
+ isManager:0, //0申请人审核科----- 1管理员审核框
|
|
|
// 分页数据
|
|
|
table:{
|
|
|
total:0,
|
|
|
@@ -391,7 +410,8 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
person:'',
|
|
|
department:'',
|
|
|
fund:'',
|
|
|
- tel:''
|
|
|
+ tel:'',
|
|
|
+ // cid:''
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -406,18 +426,8 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
this.dialogVisible1=false;
|
|
|
this.dialogVisible2=false;
|
|
|
},
|
|
|
- audit(val){ //审核按钮
|
|
|
- // if(this.status==-1){
|
|
|
- // this.dialogVisible=true;
|
|
|
- // return
|
|
|
- // }else if(this.status){
|
|
|
- // this.dialogVisible1=true;
|
|
|
- // return
|
|
|
- // }else{
|
|
|
- // this.dialogVisible=true;
|
|
|
- // }
|
|
|
- // console.log(val);
|
|
|
- // this.dialogVisible2=true
|
|
|
+ audit(val,num){ //审核按钮
|
|
|
+ this.isManager=num;
|
|
|
this.iid=val //将要删除的id进行存储供删除对话框使用
|
|
|
if (val.isupload==0) {
|
|
|
this.dialogVisible=true;
|
|
|
@@ -427,6 +437,7 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
this.auditDialog.department=val.name;
|
|
|
this.auditDialog.fund=val.fund;
|
|
|
this.auditDialog.tel=val.phone || '-';
|
|
|
+ // this.auditDialog.cid=courseId
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -461,7 +472,7 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
|
|
|
|
|
|
},
|
|
|
- commit(){ //立项审核对话框里面的确定提交按钮
|
|
|
+ ManagerCommit(){ //立项审核对话框里面的管理员通过按钮
|
|
|
// console.log(this.iid);
|
|
|
let param={
|
|
|
uid:this.$store.state.userInfo.userid,
|
|
|
@@ -478,6 +489,35 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
console.log(err);
|
|
|
})
|
|
|
},
|
|
|
+ ApplyPersonCommit(){ //立项审核对话框里面的申请人审核按钮
|
|
|
+ let param={
|
|
|
+ uid:this.$store.state.userInfo.userid,
|
|
|
+ pid:this.iid.courseId,
|
|
|
+ num:1
|
|
|
+ }
|
|
|
+ this.ajax
|
|
|
+ .post(this.$store.state.api+"/updateRejectProjectApply",param)
|
|
|
+ .then(res=>{
|
|
|
+ this.dialogVisible=false
|
|
|
+ this.$message.success('已提交')
|
|
|
+ this.getData()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ rejectApply(){ //立项审核对话框里面的驳回申请
|
|
|
+ let param={
|
|
|
+ uid:this.$store.state.userInfo.userid,
|
|
|
+ pid:this.iid.courseId,
|
|
|
+ num:0
|
|
|
+ }
|
|
|
+ this.ajax
|
|
|
+ .post(this.$store.state.api+"/updateRejectProjectApply",param)
|
|
|
+ .then(res=>{
|
|
|
+ this.dialogVisible=false
|
|
|
+ this.$message.success('已驳回项目申请')
|
|
|
+ this.getData()
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
|
|
|
commit2(val){ //立项撤回对话框里面的确定撤回按钮
|
|
|
this.dialogVisible1=false;
|
|
|
@@ -518,6 +558,7 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
.get(this.$store.state.api+'/SelectAllProject',param)
|
|
|
.then(res=>{
|
|
|
let data=res.data;
|
|
|
+ console.log(data);
|
|
|
if (data[0].length==0 && data[5][0]['total'] != 0) {
|
|
|
this.table.currentPage=1
|
|
|
return this.getData()
|
|
|
@@ -677,98 +718,102 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- .dialogWidth{ //立项审核对话框
|
|
|
- .el-input__inner{
|
|
|
- width: 300px;
|
|
|
- }
|
|
|
- .el-textarea__inner{
|
|
|
- width: 430px;
|
|
|
- }
|
|
|
- .el-dialog{
|
|
|
- width: 600px;
|
|
|
- border-radius: 5px;
|
|
|
- overflow: hidden;
|
|
|
- }
|
|
|
- .el-dialog__body{
|
|
|
- padding:30px 0px 30px 70px ;
|
|
|
- }
|
|
|
+ // .dialogWidth{ //立项审核对话框
|
|
|
+ // .el-input__inner{
|
|
|
+ // width: 300px;
|
|
|
+ // }
|
|
|
+ // .el-textarea__inner{
|
|
|
+ // width: 430px;
|
|
|
+ // }
|
|
|
+ // .el-dialog{
|
|
|
+ // width: 600px;
|
|
|
+ // border-radius: 5px;
|
|
|
+ // overflow: hidden;
|
|
|
+ // }
|
|
|
+ // .el-dialog__body{
|
|
|
+ // // padding:30px 0px 30px 70px ;
|
|
|
+ // display: flex;
|
|
|
+ // align-items: center;
|
|
|
+ // justify-content: center;
|
|
|
+ // flex-wrap: wrap;
|
|
|
+ // }
|
|
|
|
|
|
- .el-dialog__header{
|
|
|
- background: #32455b;
|
|
|
- }
|
|
|
- .el-dialog__title{
|
|
|
- color: #fff;
|
|
|
- position: relative;
|
|
|
- top: -2px;
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
- font-size: 18px;
|
|
|
- }
|
|
|
- .addDialogLogo{
|
|
|
- width: 60px;
|
|
|
- height: 30px;
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
- line-height: 30px;
|
|
|
- border-radius: 5px;
|
|
|
- background: #f2f2f2;
|
|
|
- position: absolute;
|
|
|
- left: 20px; top: 15px;
|
|
|
- }
|
|
|
- .diaTit{ //项目名称、负责人
|
|
|
- width: 100%;
|
|
|
- display: flex;
|
|
|
- .spans{
|
|
|
- width: auto;
|
|
|
- font-size: 16px;
|
|
|
- // margin-right: 10px;
|
|
|
- display: inline-block;
|
|
|
- text-align: justify;
|
|
|
- color: #000;
|
|
|
- font-size: 16px;
|
|
|
- text-justify:distribute-all-lines;
|
|
|
- text-align-last: justify;
|
|
|
- transform: translate(0,22%);
|
|
|
- margin-bottom: 10px;
|
|
|
- }
|
|
|
+ // .el-dialog__header{
|
|
|
+ // background: #32455b;
|
|
|
+ // }
|
|
|
+ // .el-dialog__title{
|
|
|
+ // color: #fff;
|
|
|
+ // position: relative;
|
|
|
+ // top: -2px;
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: center;
|
|
|
+ // font-size: 18px;
|
|
|
+ // }
|
|
|
+ // .addDialogLogo{
|
|
|
+ // width: 60px;
|
|
|
+ // height: 30px;
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: center;
|
|
|
+ // line-height: 30px;
|
|
|
+ // border-radius: 5px;
|
|
|
+ // background: #f2f2f2;
|
|
|
+ // position: absolute;
|
|
|
+ // left: 20px; top: 15px;
|
|
|
+ // }
|
|
|
+ // .diaTit{ //项目名称、负责人
|
|
|
+ // width: 100%;
|
|
|
+ // display: flex;
|
|
|
+ // .spans{
|
|
|
+ // width: auto;
|
|
|
+ // font-size: 16px;
|
|
|
+ // // margin-right: 10px;
|
|
|
+ // display: inline-block;
|
|
|
+ // text-align: justify;
|
|
|
+ // color: #000;
|
|
|
+ // font-size: 16px;
|
|
|
+ // text-justify:distribute-all-lines;
|
|
|
+ // text-align-last: justify;
|
|
|
+ // transform: translate(0,22%);
|
|
|
+ // margin-bottom: 10px;
|
|
|
+ // }
|
|
|
|
|
|
- }
|
|
|
- .spanCon{
|
|
|
- font-size: 16px;
|
|
|
- margin-top: 5px;
|
|
|
- color: #a0a0a0;
|
|
|
- width: 150px;
|
|
|
- overflow: hidden;
|
|
|
- white-space: nowrap;
|
|
|
- text-overflow: ellipsis;
|
|
|
- }
|
|
|
- .spans1{ //label
|
|
|
- min-width: 84px;
|
|
|
- font-size: 16px;
|
|
|
- color: #000;
|
|
|
- margin-right: 10px;
|
|
|
- display: inline-block;
|
|
|
- text-align: justify;
|
|
|
- text-justify:distribute-all-lines;
|
|
|
- text-align-last: justify;
|
|
|
- transform: translate(0,22%);
|
|
|
- }
|
|
|
+ // }
|
|
|
+ // .spanCon{
|
|
|
+ // font-size: 16px;
|
|
|
+ // margin-top: 5px;
|
|
|
+ // color: #a0a0a0;
|
|
|
+ // width: 150px;
|
|
|
+ // overflow: hidden;
|
|
|
+ // white-space: nowrap;
|
|
|
+ // text-overflow: ellipsis;
|
|
|
+ // }
|
|
|
+ // .spans1{ //label
|
|
|
+ // min-width: 84px;
|
|
|
+ // font-size: 16px;
|
|
|
+ // color: #000;
|
|
|
+ // margin-right: 10px;
|
|
|
+ // display: inline-block;
|
|
|
+ // text-align: justify;
|
|
|
+ // text-justify:distribute-all-lines;
|
|
|
+ // text-align-last: justify;
|
|
|
+ // transform: translate(0,22%);
|
|
|
+ // }
|
|
|
|
|
|
- .diaTit1{ //label和input框
|
|
|
- display: flex;
|
|
|
- width: 80%;
|
|
|
- margin-top: 20px;
|
|
|
+ // .diaTit1{ //label和input框
|
|
|
+ // display: flex;
|
|
|
+ // width: 80%;
|
|
|
+ // margin-top: 20px;
|
|
|
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
- .dialog-footer{
|
|
|
- width: 100%;
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
- margin-bottom: 10px;
|
|
|
+ // .dialog-footer{
|
|
|
+ // width: 100%;
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: center;
|
|
|
+ // margin-bottom: 10px;
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
}
|
|
|
|
Q-ABAB