结项修改

src/views/activityManage/makerActvityApply2.vue

@@ -76,7 +76,7 @@
         <div class="deleteContent">是否提交“{{activityName}}”项目活动？</div>
         <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submit" class="AllDialogBtn" size="small">确认提交</el-button>
-            <el-button @click="dialogVisible1=false;" class="AllDialogBtn" style="background:#cccccc" size="small">取消</el-button>
+            <el-button @click="dialogVisible1=false;" class="AllDialogBtn" size="small">取消</el-button>
         </span>
       </el-dialog>
       <!-- 提交对话框结束 -->

src/views/credit/credit.vue

@@ -112,7 +112,7 @@
           <template #default="scope">
               <div class="operations">
                       <el-button type="primary" class="bt1" size="mini" @click="queryScore(scope.row)">查看学分</el-button>
-                      <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.courseId)">修改</el-button>
+                      <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.courseId)" style="width: 85px;">修改</el-button>
               </div>
           </template>
         </el-table-column>

src/views/firm.vue

@@ -76,6 +76,7 @@
                 class="bt1"
                 size="mini"
                 @click="del(scope.row.startupId)"
+                style="width: 85px;"
                 >删除</el-button
               >
             </div>

src/views/messageNotification.vue

@@ -58,7 +58,7 @@
             <div class="operations">
                 <!-- <el-button type="primary" > -->
                     <el-button type="primary"  size="mini" @click="lookIntro(scope.row.newId)">查看信息</el-button>
-                    <el-button type="primary" size="mini"  @click="del(scope.row.newId)" >删除</el-button>
+                    <el-button type="primary" size="mini"  @click="del(scope.row.newId)" style="width: 85px;">删除</el-button>
                 <!-- </el-button> -->
             </div>
         </template>

src/views/projectManage/ProjectManagement.vue

@@ -108,16 +108,9 @@
               <span @click="fundStatus(item.courseId)">资金情况</span>
               <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span>
               <span v-show="item.isupload==1 && (item.endFile==null)"  @click="finish(item.courseId,item.title)">结项</span>
-              <span v-show="item.isupload==1 && (item.endFile!=null)"  @click="finish(item.courseId,item.title)" >修改结项</span>
+              <span v-show="item.isupload==1 && (item.endFile!=null)"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
               <span v-show="item.isupload==2" style="color: gray;cursor: no-drop;">已结项</span>
-              <!-- <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail(item.courseId)">进度详情</el-button>
-              <el-button type="primary" class="bt1" size="mini" @click="fundStatus(item.courseId)">资金情况</el-button>
-
-              <el-button type="primary" v-show="item.isupload==0"  class="bt1" @click="$message.error('请先进行项目立项审核')" size="mini">结项</el-button>
-              
-              <el-button type="primary" v-show="item.isupload==1 && (item.endFile==null)" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
-              <el-button type="primary" v-show="item.isupload==1 && (item.endFile!=null)" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button>
-              <el-button type="primary" v-show="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button> -->
+        
                           
             </div>
        
@@ -255,6 +248,7 @@ import beUpload from '../../components/tool/beUpload'
         }
       },
       methods:{
+        
         ProgressFormat(value){        //进度条
           return value ==100?'100%':`${value}%`
         },
@@ -262,35 +256,50 @@ import beUpload from '../../components/tool/beUpload'
           this.file = this.file.filter(item=>item.url!=url);
         },
         getFile(val) {//上传文件
-          // console.log(val);
           this.file.push(val);
-          this.progress.show = false;
-
           // console.log(this.file);
+          this.progress.show = false;
+        },
+        amendFinish(val,tit){
+          this.ajax.post(this.$store.state.api+"/UpdateAmendFinish",{
+            uid:this.$store.state.userInfo.userid,
+            pid:val
+          }).then(res=>{
+            // console.log(res.data[0][0].endFile);
+            let data=JSON.parse(res.data[0][0].endFile)
+            this.file=data;
+            this.tit=tit;
+            this.iid=val;
+            this.endDialog=true;
+            console.log(this.file);
+          }).catch(err=>{
+            console.log(err)
+          })
         },
         ending(){   //完结提交
-          if(this.file=="")return this.$message.error("请上传完结报告");
+          console.log(this.file.length);
+          if(this.file.length<1)return this.$message.error("请上传完结报告");
           this.ajax.post(this.$store.state.api+"/UploadProjectManageFile",{
             uid:this.$store.state.userInfo.userid,
             cid:this.iid,
             file:JSON.stringify(this.file),
             num:1
           }).then(res=>{
-            // console.log(res);
+            console.log(res);
             if(res.data==1){
               this.$message.success("结项成功");
               this.endDialog = false;
               this.progress.show = false;
-
             }else{
               this.$message.error("结项失败")
             }
             this.getData();
+          },err=>{
+            console.log(err);
           })
           this.endDialog=false;
         },
         scheduleDetail(val){      //进度详情
-          // console.log(val);
           localStorage.setItem('pid',JSON.stringify(val))
           this.$router.push(`/ProjectManagement1`)
         },
@@ -342,10 +351,8 @@ import beUpload from '../../components/tool/beUpload'
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
-                console.log(data[0]);
                 this.items=data[0];
                 a.projectFilter=data[1];
                 a.department=data[2];