审核逻辑

src/views/projectManage/ProjectManagement.vue

@@ -392,24 +392,21 @@ import { getNowDate } from '@/components/tool/Date';
             did:this.selectInp.department,  //部门
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.leader,  //负责人
-            st:2,  //审核状态
             endState:this.selectInp.state,
             year:this.selectInp.year, //年份
-            // year:'',
             textInp:this.selectText,
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize,  //限制获取几条数据
           }
           // console.log(param);
           this.ajax    
-            .get(this.$store.state.api+'/SelectAllProject',param)
+            .get(this.$store.state.api+'/SelectAllProjectManagement',param)
               .then(res=>{
                 let data=res.data;
                 if (data[0].length==0 && data[5][0]['total'] != 0&&this.table.currentPage!=1) {
                   this.table.currentPage=1
                   return this.getData()
                 }
-                console.log(data);
                 let a=this.options;
                 this.items=data[0];
                 a.projectFilter=data[1];

src/views/projectManage/ProjectManagementMain.vue

@@ -71,7 +71,6 @@
             },
         },
         mounted(){
-            this.$route.query['Id']
         }
     }
 </script>

src/views/projectManage/components/ProjectManagement1.vue

@@ -666,8 +666,9 @@
                     .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
                     .then(res=>{
                       // console.log(data.);
+                        console.log(res.data);
                         let data=res.data[0][0]
-                        console.log(data);
+    
                         // console.log(data.multiSelectProject);
                         this.content.select.projectName=data.title
                         this.content.select.leader=data.leader

src/views/projectSettlement/projectSettlement.vue

@@ -155,8 +155,8 @@
                         <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" 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 v-show="scope.row.isupload==2" type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
-                        <el-button v-show="scope.row.isupload!=2" type="info" disabled="" size="mini">成果查看</el-button>
+                        <el-button  type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
+                        <!-- <el-button v-show="scope.row.isupload!=2" type="info" disabled="" size="mini">成果查看</el-button> -->
               </div>
           </template>
         </el-table-column>
@@ -284,9 +284,8 @@
           // return console.log(param);
           // console.log(param)
           this.ajax    
-            .get(this.$store.state.api+'/SelectSettlement',param)
+            .get(this.$store.state.api+'/SelectAllProjectSettlement',param)
               .then(res=>{
-                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.tableData=data[0];

src/views/resultShow/resultsShow.vue

@@ -12,7 +12,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">项目筛选</span>
         <el-select v-model="pavalues.value" @change="getData" placeholder="我的项目">
-          <el-option label="所有项目" :value="0"/>
+          <el-option label="所有项目" value=""/>
           <el-option
             v-for="item in options"
             :key="item.courseId"
@@ -25,7 +25,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">部门</span>
         <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
-          <el-option label="所有部门" :value="0"/>
+          <el-option label="所有部门" value=""/>
           <el-option
             v-for="item in options1"
             :key="item.classid"
@@ -38,7 +38,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">分类</span>
         <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" :value="0"/>
+          <el-option label="所有分类" value=""/>
           <el-option
             v-for="item in options2"
             :key="item.typeid"
@@ -140,9 +140,9 @@
           options4:[],
           loading:false,
           pavalues:{
-            value:0,
-            value1:0,
-            value2:0,
+            value:'',
+            value1:'',
+            value2:'',
             value3:'',
             value4:new Date().getFullYear().toString(),
           },
@@ -167,11 +167,10 @@
           this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,  //当前账号id
-            pid:this.pavalues.value,  //筛选
+            pid:this.pavalues.value,  //项目筛选
             did:this.pavalues.value1,  //部门
             tid:this.pavalues.value2,    //分类
             leader:this.pavalues.value3,  //负责人
-            st:2,  //审核状态
             year:this.pavalues.value4,
             textInp:this.input,
             page:this.Page.currentPage,  //当前页