分页

src/views/fundManage/makerfund.vue

@@ -400,8 +400,8 @@
       </el-dialog>
     </div>
     <!-- 立项撤回提交对话框结束 -->
-<!-- 完结对话框开始 -->
-<el-dialog
+    <!-- 完结对话框开始 -->
+    <el-dialog
       title="提示"
       :visible.sync="dialogVisible1"
       width="600px"
@@ -551,6 +551,8 @@
                   this.filterSelects=data[1];
                   this.departmentSelect=data[2];
                   this.leaderSelects=data[3];
+                  console.log(data[4][0]);
+                  this.table.total=data[4][0].total
                 },err=>{
                   console.log(err);
                 })

src/views/fundManage/makerfundApply.vue

@@ -205,7 +205,7 @@
                 
                 <span class="delUploadBtnSty" @click="delUploadBtn(index)">×</span>
                 <img style="position: absolute;left: -1px;top:-1px;width: 149px;height: 101%;border-radius: 5px;" :src="dialogImageUrl" alt="">
-                <div style="position: absolute;left: -20%;bottom: -30px;width: 200px;height: 30px;color: #000;line-height: 30px;display: flex;justify-content: center;">新建 DOCX 文档 (2).docx</div>
+                <div style="position: absolute;left: -20%;bottom: -30px;width: 200px;height: 30px;color: #000;line-height: 30px;display: flex;justify-content: center;">{{ item.fileName }}</div>
                 <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar"> -->
                 </el-upload>
                

src/views/fundManage/makerfundDetails.vue

@@ -205,7 +205,7 @@
               
               <span class="delUploadBtnSty" @click="delUploadBtn(index)">×</span>
               <img style="position: absolute;left: -1px;top:-1px;width: 149px;height: 101%;border-radius: 5px;" :src="dialogImageUrl" alt="">
-              <div style="position: absolute;left: -20%;bottom: -30px;width: 200px;height: 30px;color: #000;line-height: 30px;display: flex;justify-content: center;">新建 DOCX 文档 (2).docx</div>
+              <div style="position: absolute;left: -20%;bottom: -30px;width: 200px;height: 30px;color: #000;line-height: 30px;display: flex;justify-content: center;">{{ item.fileName }}</div>
               <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar"> -->
               </el-upload>
              
@@ -218,7 +218,9 @@
       <div class="blockWidth">
           <el-button type="primary">生成表单</el-button>
           <el-button type="primary" @click="uploadData">保存</el-button>
-          <el-button type="primary">审核</el-button>
+          <el-button v-show="status==0" style="width: 120px;" @click="endDialogShow()"  type="primary">审核</el-button>
+          <el-button v-show="status==1" style="width: 120px;background-color: #c8c9cc !important;border-color: #c8c9cc;cursor: no-drop;" type="primary">审核</el-button>
+          <el-button v-show="status==2" style="width: 120px;background-color: #c8c9cc !important;border-color: #c8c9cc;cursor: no-drop;" type="primary">审核</el-button>
       </div>
   </div>
 
@@ -237,6 +239,23 @@
         </span>
       </el-dialog>
     <!-- 提交对话框结束 -->
+
+      <!-- 审核对话框框开始 -->
+      <el-dialog
+        title="提示"
+        :visible.sync="auditDialog"
+        width="600px"
+        class="projectApplicationfundAddDialog"
+        :before-close="init">
+        <div class="addDialogLogo">LOGO</div>
+        <div class="deleteContent">确定完成审核？</div>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitAudit" class="btn5">确认审核</el-button>
+          <el-button @click="auditDialog=false" class="btn5" style="background:#cccccc" size="small">取消</el-button>
+        </span>
+      </el-dialog>
+    <!-- 审核对话框结束 -->
+
 </div>
 </template>
 
@@ -250,7 +269,10 @@ export default {
   data() {
       return {
           accept:"*",
+          status:'',   //审核状态
+          fid:'',
           submitHint:false,   //提交按钮
+          auditDialog:false,   //审核按钮
           dialogImageUrl:require('../../assets/img/jj.jpg'),
           disabled: false,
           file:[],
@@ -401,6 +423,29 @@ export default {
   },
 
   methods:{
+    endDialogShow(){    //审核对话框显示
+        this.auditDialog=true
+    },
+    submitAudit(){       //确定审核
+        let param={
+            uid:this.$store.state.userInfo.userid,
+            fid:this.fid,
+            status:1
+          }
+          this.ajax
+              .post(this.$store.state.api+"/UpdateMakerFundState",param)
+              .then(res=>{
+                  this.auditDialog=false;
+                  if (res.data) {
+                      this.$message.success('审核成功')
+                      this.getData()
+                    }else{
+                      this.$message.error('审核失败')
+                    }
+              },err=>{
+                console.log(err);
+              })
+    },
       delInDerData(index){                       //删除间接经费
           this.indirectFundBlock.splice(index,1)
       },
@@ -487,6 +532,8 @@ export default {
                   this.file=JSON.parse(data[0][0].fundFile);
                   this.selects.projectName=data[0][0].courseId;
                   this.selects.projectType=data[0][0].type;
+                  this.status=data[0][0].state;
+                  this.fid=data[0][0].fid;
                   this.projectFilter=data[1];
               },err=>{
                   console.log(err);
@@ -513,8 +560,7 @@ export default {
   },
   mounted(){
       this.getData()
-      console.log(this.$route.query['Id']);
-      
+    //   console.log(this.$route.query['Id']);
   }
 }
 </script>

src/views/projectApply/projectApplication.vue

@@ -441,7 +441,7 @@
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                // console.log(res.data);
+                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.tableData=data[0];
@@ -450,12 +450,7 @@
                 a.sort=data[3];
                 a.person=data[4];
                 this.table.total=data[5][0].total
-                // this.tableData=data[0];
-                // a.projectFilter=data[2];
-                // a.department=data[3];
-                // a.sort=data[4];
-                // a.person=data[5];
-                // this.table.total=data[5][0].total
+                
               },err=>{
                 console.log(err);
               })  

src/views/projectManage/ProjectManagement.vue

@@ -296,12 +296,10 @@ import beUpload from '../../components/tool/beUpload'
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                // console.log(res);
+                console.log(res.data);
                 let data=res.data;
-                // console.log(data);
                 let a=this.options;
                 this.items=data[0];
-                // console.log(this.items);
                 a.projectFilter=data[1];
                 a.department=data[2];
                 a.sort=data[3];

src/views/projectManage/ProjectManagement3.vue

@@ -133,7 +133,7 @@
             this.ajax
                   .get(this.$store.state.api+'/GetAllActivity',param)
                   .then(res=>{
-                    // console.log(res.data);
+                    console.log(res.data);
                     this.tableData=res.data[0]
                     this.table.total=res.data[4][0].total
                   },err=>{

src/views/projectManage/ProjectManagement4.vue

@@ -89,7 +89,7 @@
     </el-dialog>
     <!-- 展示文档结束 -->
         <!-- 分页 -->
-        <el-pagination
+        <!-- <el-pagination
             @current-change="handleCurrentChange"
             :current-page="table.currentPage"
             :page-size="table.packageSize"
@@ -97,7 +97,7 @@
             background
             class="paginations"
             :total="table.total">
-          </el-pagination>
+          </el-pagination> -->
         <!-- 分页结束 -->
     </div>
   </template>
@@ -111,11 +111,11 @@
         data() {
           return {
           accept:"*",
-            table:{         // 分页数据
-              total:0,
-              packageSize:8,
-              currentPage:1
-            }, 
+            // table:{         // 分页数据
+            //   total:0,
+            //   packageSize:2,
+            //   currentPage:1
+            // }, 
             showFile:false,
             showFileType: 0,
             showFileUrl: "",
@@ -141,8 +141,6 @@
           getFile(val) {    //上传文件
             this.file = val;
             let oldData = [];
-            // console.log()
-            // console.log(this.tableData);
             if (this.tableData!=null) {
               this.tableData.forEach(item=>oldData.push(item))
               oldData.push(val)
@@ -170,32 +168,28 @@
                     console.log(err);
                   })
           },
-          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
-          // console.log(`当前页: ${val}`);
-          this.table.currentPage=val
-          this.getData()
-        },
+        //   handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
+        //   // console.log(`当前页: ${val}`);
+        //   this.table.currentPage=val
+        //   this.getData()
+        // },
           getData(){       //获取基础信息
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
-                page:this.table.currentPage,
-                lim:this.table.packageSize
+                // page:this.table.currentPage,
+                // lim:this.table.packageSize
               }
               // console.log(param);
               this.ajax
                     .get(this.$store.state.api+'/SelectProjectFile',param)
                     .then(res=>{
-                      console.log(res);
+                      console.log(res.data);
                       let k=[]
                       res.data[0].forEach((e,i) => {
-                        // console.log(e);
                         let { projectFile: l } = e;
-                        // console.log(l);
                         k=JSON.parse(l)
                       });
-                      console.log(k);
-                      // console.log(k);
                       this.tableData=k
                     },err=>{
                       console.log(err);

src/views/projectManage/ProjectManagement5.vue

@@ -90,7 +90,7 @@
       </div>
     </el-dialog>
       <!-- 分页 -->
-      <el-pagination
+      <!-- <el-pagination
             @current-change="handleCurrentChange"
             :current-page="table.currentPage"
             :page-size="table.packageSize"
@@ -98,7 +98,7 @@
             background
             class="paginations"
             :total="table.total">
-          </el-pagination>
+          </el-pagination> -->
         <!-- 分页结束 -->
   
     </div>
@@ -113,11 +113,11 @@
         data() {
           return {
           accept:"*",
-            table:{         // 分页数据
-              total:0,
-              packageSize:8,
-              currentPage:1
-            }, 
+            // table:{         // 分页数据
+            //   total:0,
+            //   packageSize:8,
+            //   currentPage:1
+            // }, 
             showFile:false,
             showFileType: 0,
             showFileUrl: "",
@@ -180,27 +180,22 @@
                     console.log(err);
                   })
           },
-          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
-            // console.log(`当前页: ${val}`);
-            this.table.currentPage=val
-            this.getData()
-          },
+          // handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
+          //   // console.log(`当前页: ${val}`);
+          //   this.table.currentPage=val
+          //   this.getData()
+          // },
           getData(){       //获取基础信息
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
-                page:this.table.currentPage,
-                lim:this.table.packageSize
               }
               // console.log(param);
               this.ajax
                     .get(this.$store.state.api+'/SelectProjectManageFile',param)
                     .then(res=>{
+                      console.log(res.data);
                       let file = JSON.parse(res.data[0][0]['endFile']);
-                      // this.title = res.data[0][0]['title']
-                      // file.forEach(item=>item.projectTitle = res.data[0][0]['title'])
-                      // console.log(file)
-                     
                       this.tableData=file
                     },err=>{
                       console.log(err);

src/views/projectSettlement/projectSettlement.vue

@@ -152,7 +152,7 @@
                         <el-button type="info"  disabled v-if="scope.row.isupload==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 type="primary" size="mini" @click="edit(scope.row.id,scope.row.status)">成果查看</el-button>
+                        <el-button type="primary" size="mini" @click="resultShow(scope.row.id,scope.row.status)">成果查看</el-button>
               </div>
           </template>
         </el-table-column>
@@ -297,7 +297,7 @@
                 console.log(err);
               })  
         },
-        edit(){
+        resultShow(){
 
         },
         details(val){