审核逻辑

src/views/activityManage/makerActvityApplyMain.vue

@@ -84,7 +84,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
                     uid:this.$store.state.userInfo.userid,
                 }).then(res=>{
-                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload==0||item.isupload==1||item.isupload==2);
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload!=3 && item.isupload!=4 );
                 }).catch(err=>{
                     this.$message.error(err.message)
                 })

src/views/activityManage/makerActvityDetails.vue

@@ -572,7 +572,7 @@ export default {
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
           console.log(res)
-          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||item.isupload==2));
+          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||(item.isupload!=3 && item.isupload!=4 )));
           this.loading = false
         }).catch(err=>{
             this.$message.error(err.message)

src/views/fundManage/makerfundApply.vue

@@ -1021,9 +1021,9 @@ export default {
             for(let k in this.newIndirectFundBlock) return this.newIndirectFundBlock[k]=''
         },
         init(){
-                //重置
-                this.submitHint=false;
-                this.createFromDialog=false;
+            //重置
+            this.submitHint=false;
+            this.createFromDialog=false;
         },
         directFundDataSelectChange(){//直接经费全部下拉框
             

src/views/projectApply/projectApplication.vue

@@ -153,7 +153,7 @@
 
                     <span v-if="scope.row.isupload==0">未审核</span>
                     <span v-if="scope.row.isupload==1">审核中</span>
-                    <span v-if="scope.row.isupload==2">已审核</span>
+                    <span v-if="scope.row.isupload==2">进行中</span>
                     <span v-if="scope.row.isupload==3">待结项</span>
                     <span v-if="scope.row.isupload==4">已结项</span>
 
@@ -365,7 +365,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
               },
               {
                 value:2,
-                label:'已审核'
+                label:'进行中'
               },
               {
                 value:3,
@@ -528,7 +528,6 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.person,  //负责人
             st:this.selectInp.state,  //审核状态
-            endState:"",
             year:"",
             textInp:'',
             page:this.table.currentPage,  //当前页

src/views/projectManage/ProjectManagement.vue

@@ -101,9 +101,9 @@
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           <!-- {{ item.isupload }} -->
-          <span v-if="item.endProject==0">进行中</span>
-          <span v-if="item.endProject==1">待结题</span>
-          <span v-if="item.endProject==2">已结题</span>
+          <span v-if="item.isupload==2">进行中</span>
+          <span v-if="item.isupload==3">待结题</span>
+          <span v-if="item.isupload==4">已结题</span>
 
         </div>
         <img :src="item.image" alt="">
@@ -121,9 +121,9 @@
               <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
               <span @click="fundStatus(item.courseId)">资金情况</span>
               <!-- <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span> -->
-              <span v-show="item.endProject==0"  @click="finish(item.courseId,item.title)">结项</span>
-              <span v-show="item.endProject==1"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-              <span v-show="item.endProject==2" style="color: gray;cursor: no-drop;">已结项</span>
+              <span v-show="item.isupload==2"  @click="finish(item.courseId,item.title)">结项</span>
+              <span v-show="item.isupload==3"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
+              <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>
         
                           
             </div>

src/views/projectSettlement/projectSettlement.vue

@@ -136,8 +136,8 @@
           min-width="8%">
           <template #default="scope">
             <div>
-              <span v-if="scope.row.endProject == 1">待审核</span>
-              <span v-if="scope.row.endProject == 2">已审核</span>
+              <span v-if="scope.row.isupload == 3">待审核</span>
+              <span v-if="scope.row.isupload == 4">已审核</span>
            </div>
           </template>
         </el-table-column>
@@ -151,8 +151,8 @@
               <div class="operations">
                         <el-button type="primary" size="mini" @click="details(scope.row)">查看详情</el-button>
                         
-                        <el-button type="primary"  v-if="scope.row.endProject==1" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
-                        <el-button type="info"  disabled v-if="scope.row.endProject==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
+                        <el-button type="primary"  v-if="scope.row.isupload==3" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
+                        <el-button type="info"  disabled v-if="scope.row.isupload==4" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
                         <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->
 
                         <el-button  type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
@@ -286,6 +286,7 @@
               .then(res=>{
                 let data=res.data;
                 let a=this.options;
+                console.log(data)
                 this.tableData=data[0];
                 a.projectFilter=data[1];
                 a.department=data[2];

src/views/resultShow/resultsShow.vue

@@ -180,6 +180,8 @@
             .get(this.$store.state.api+'/GetProjectIsConclusion',param)
               .then(res=>{
                 let data = res.data;
+
+                console.log(data)
                 if (data[0].length==0 && data[5][0]['total'] != 0&&this.Page.currentPage!=1) {
                   this.Page.currentPage=1
                   return this.getData()