#

src/views/activityManage/makerActvity.vue

@@ -135,15 +135,8 @@
               <div class="operations">
                   <!-- <el-button type="primary" > -->
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
-<<<<<<< HEAD
                         <el-button type="primary" v-show="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
                         <el-button type="info" disabled v-show="scope.row.state==1"  @click="audi(scope.row)" 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 style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
-                        
->>>>>>> 1a40f4474359a33ad35933277aac9e657fbc7bd2
                         <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
                         <el-button type="primary" v-if="scope.row.reportFile==''||scope.row.reportFile==null" size="mini" @click="end(scope.row)" >完结</el-button>
                         <el-button type="info" v-show="scope.row.reportFile!=''&&scope.row.reportFile!=null" size="mini" disabled>完结</el-button>

src/views/projectManage/ProjectManagement.vue

@@ -267,14 +267,14 @@ import beUpload from '../../components/tool/beUpload'
           this.$router.push(`/ProjectManagementFund1`)
         },
         init(){       //对话框重置
-          this.endDialog=false
+          this.endDialog=false;
         },
         finish(val,tit){     //结项对话框显示
           // console.log(val);
-          this.iid=val
-          this.tit=tit
-          this.endDialog=true
-
+          this.iid=val;
+          this.tit=tit;
+          this.endDialog=true;
+          this.file=[];
         },
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
           // console.log(`当前页: ${val}`);

src/views/projectManage/ProjectManagement4.vue

@@ -141,6 +141,7 @@
           getFile(val) {    //上传文件
             this.file = val;
             let oldData = [];
+            // console.log()
             // console.log(this.tableData);
             if (this.tableData!=null) {
               this.tableData.forEach(item=>oldData.push(item))
@@ -185,7 +186,7 @@
               this.ajax
                     .get(this.$store.state.api+'/SelectProjectFile',param)
                     .then(res=>{
-                      // console.log(res.data[0]);
+                      console.log(res);
                       let k=[]
                       res.data[0].forEach((e,i) => {
                         // console.log(e);

src/views/projectSettlement/projectSettlement.vue

@@ -225,7 +225,7 @@
            // 分页数据
            table:{
             total:0,
-            packageSize:5,
+            packageSize:8,
             currentPage:1
           },   
           tableData:[],   //结项数据表