分页

src/views/projectSettlement/projectSettlement.vue

@@ -152,7 +152,11 @@
                         <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>
 
+<<<<<<< HEAD
                         <el-button type="primary" size="mini" @click="resultShow(scope.row.id,scope.row.status)">成果查看</el-button>
+=======
+                        <el-button type="primary" size="mini" @click="edit(scope.row.courseId)">成果查看</el-button>
+>>>>>>> 89c9d3483bb7f349ff6d15d0d6f55ae91fe4990e
               </div>
           </template>
         </el-table-column>
@@ -297,8 +301,9 @@
                 console.log(err);
               })  
         },
-        resultShow(){
-
+        edit(rowId){
+          console.log(rowId)
+          this.$router.push(`/resultShowDetail?Id=${rowId}`)
         },
         details(val){
           localStorage.setItem('pid',JSON.stringify(val))

src/views/resultShow/resultShowDetail.vue

@@ -194,7 +194,7 @@
                                 <span>基础信息</span>
                             </div>
                             <div class="ActivityBaseMessage">
-                                <el-descriptions class="margin-top" :column="3" :size="size" border>
+                                <el-descriptions class="margin-top" :column="3" border>
                                   <el-descriptions-item>
                                     <template slot="label">
                                       <i class="el-icon-s-custom"></i>
@@ -240,7 +240,7 @@
                                 </el-descriptions>
                             </div>
 
-                            <div class="brief_title">
+                            <div class="brief_title MarginTop30px">
                                 <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-user-solid"></i>
                                 <span>指导老师</span>
@@ -267,7 +267,7 @@
                                   </el-table-column>
                                 </el-table>
                             </div>
-                            <div class="brief_title">
+                            <div class="brief_title MarginTop30px">
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
@@ -275,7 +275,7 @@
                                 {{ item.brief }}
                             </div>
 
-                            <div class="brief_title">
+                            <div class="brief_title MarginTop30px">
                                 <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
@@ -284,7 +284,7 @@
                                 <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor>
                             </div>
 
-                            <div class="brief_title">
+                            <div class="brief_title MarginTop30px">
                                 <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
@@ -293,7 +293,7 @@
                                 <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor>
                             </div>
 
-                            <div class="brief_title">
+                            <div class="brief_title MarginTop30px">
                                 <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
@@ -302,7 +302,7 @@
                                 <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor>
                             </div>
 
-                            <div class="brief_title">
+                            <div class="brief_title MarginTop30px">
                                 <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
@@ -324,8 +324,8 @@
                 <div class="BaseTitle" type="3">
                     <span>项目附件</span>
                 </div>
-                <div class="brief">
-                    <div class="material" v-if="ProjectLookFile.url!=''">
+                <div class="brief" v-if="ProjectLookFile.url!=''">
+                    <div class="material">
                         <div class="material_title">
                             <img src="@/assets/anliDetail/fileList.png" alt="">
                             <span>项目材料</span>
@@ -366,7 +366,7 @@
                     </div>
                     <div class="TextView" >
                         <div class="TextView">
-                            {{ DetailMessage[0] }}
+                            {{ endProjectRemark['kRem'] }}
                         </div>
                         <!-- <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor> -->
                     </div>
@@ -378,7 +378,7 @@
                     </div>
                     <div class="TextView" >
                         <div class="TextView">
-                            {{ DetailMessage[0] }}
+                            {{ endProjectRemark["bRem"] }}
                         </div>
                         <!-- <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor> -->
                     </div>
@@ -390,7 +390,7 @@
                     </div>
                     <div class="TextView" >
                         <div class="TextView">
-                            {{ DetailMessage[0] }}
+                            {{ endProjectRemark["xRem"] }}
                         </div>
                         <!-- <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor> -->
                     </div>
@@ -447,13 +447,14 @@
         data() {
           return {
             pageState:0,
-            TitleMessage:{},
+            TitleMessage:{ClassName:"",EndTime:"",TypeName:"",beginTime:"",brief:"",course_student:[],image:"",pro_leader:"",title:""},
             DetailMessage:[],
             ProjectFile:[],
-            ProjectLookFile:{url:""},
+            ProjectLookFile:{url:"",type:""},
             ProjectEndFile:[],
-            ProjectEndLookFile:{url:""},
+            ProjectEndLookFile:{url:"",type:""},
             AllActivity:[],
+            endProjectRemark:{kRem:"",bRem:"",xRem:""},
             canonical:{
                 Image:/^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
                 File:/^https?:\/\/(.+\/)+.+(\.(docx|xlsx|ppt|pdf))$/i
@@ -466,26 +467,29 @@
                     uid:this.$store.state.userInfo.userid,
                     pid:this.$route.query["Id"]
                 }).then(res=>{
-                    console.log(res)
-                    let data = res.data;
-                    console.log(data)
-                    this.TitleMessage = data[0][0]
+                    // console.log(res)
+                    let FormData = res.data;
+                    this.TitleMessage = FormData[0][0]
                     this.TitleMessage['course_student'] = JSON.parse(this.TitleMessage['course_student']);
-                    this.DetailMessage= JSON.parse(data[1][0]['chapters'])[0];
-                    this.ProjectFile = JSON.parse(data[2][0]['projectFile'])
-                    this.ProjectLookFile = this.ProjectFile[0] || {url:''};
-                    this.ProjectEndFile = JSON.parse(data[3][0]['endFile']);
-                    this.ProjectEndLookFile = this.ProjectEndFile[0] || {url:''}
-                    this.AllActivity = data[4]
-                    // this.AllActivity.forEach(item=>item.open = false);
-                    console.log(this.AllActivity)
+                    this.DetailMessage= JSON.parse(FormData[1][0]['chapters'])[0];
+                    this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
+                    if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
+                    else this.ProjectLookFile = {url:'',type:""};
+                    this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
+                    if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
+                    else this.ProjectEndLookFile = {url:"",type:""}
+                    if(FormData[4][0]['title']!=null)this.AllActivity = FormData[4];
+                    this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                    console.log(this.endProjectRemark)
                 }).catch(err=>{
                     console.log(err)
                 })
             },
             checkFileType(url){
+                if(typeof url=='undefined')return {type:"",name:""};
                 let urlSplit = url.split(".");
                 const type = urlSplit[urlSplit.length-1]
+   
                 if(this.canonical.Image.test(url))return {type:type,name:"图片"}
                 if(this.canonical.File.test(url))return {type:type,name:"文档"}
             }
@@ -647,7 +651,7 @@
             height: 40px;
             display: flex;
             align-items: center;
-            margin-top: 10px;
+            // margin-top: 10px;
             font-size: 18px;
             i{
                 width: 30px;
@@ -903,4 +907,7 @@
         width: 100%;
         height: auto;
     }
+    .MarginTop30px{
+        margin-top: 30px;
+    }
   </style>