结项评语修改

src/views/projectManage/ProjectManagement.vue

@@ -109,11 +109,13 @@
               <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-if="item.isupload==0"  class="bt1" @click="$message.error('请确定立项审核')" size="mini">结项</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-if="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
+              <el-button type="primary" v-show="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
 
-              <el-button type="primary" v-if="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button>
+              <!-- <el-button type="primary" v-if="item.isupload==1" 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>
               
               <!-- <el-button type="primary" class="bt1" size="mini" v-if="item.endProject==0" @click="finish(item.courseId,item.title)">结项</el-button> -->
               <!-- <el-button type="info" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="item.endProject==1"  size="mini">已结项</el-button> -->

src/views/projectManage/ProjectManagement5.vue

@@ -151,15 +151,6 @@
             }else{
                 oldData.push(val)
             }
-            // this.tableData.forEach(item=>oldData.push(item))
-            // oldData.push(val)
-            // console.log(oldData)
-            // oldData.push(val)
-            // Object.assign(oldData,this.tableData)
-            // oldData.push(val)
-            // console.log(oldData)
-            // this.tableData.push(val)
-            // console.log(this.tableData);
             let param={
                 uid:this.$store.state.userInfo.userid,
                 cid:JSON.parse(localStorage.getItem('pid')),
@@ -217,12 +208,12 @@
             this.$router.push('/ProjectManagement5')
           },
           
-          backBtn2(){
-            this.$router.push('/ProjectManagement1')
-          },
-          detail(){
+          // backBtn2(){
+          //   this.$router.push('/ProjectManagement1')
+          // },
+          // detail(){
 
-          },
+          // },
           back(){
             this.$router.push('/ProjectManagement')
           },

src/views/projectSettlement/projectSettlement5.vue

@@ -221,7 +221,9 @@
                       let data=res.data[0];
                       console.log(data);
                       this.file=JSON.parse(data[0].endFile)
-                      this.AllRemark=JSON.parse(data[0].endProjectRemark)
+                      if(JSON.parse(data[0].endProjectRemark)!=null){
+                        this.AllRemark=JSON.parse(data[0].endProjectRemark)
+                      }
                     },err=>{
                       console.log(err);
                     })