#

src/views/fundManage/newMarkerfundApply.vue

@@ -177,13 +177,14 @@ export default {
             //知识产权事务费：Transaction   TransactionRemarks
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:this.projectName,
+                aid:this.projectName,
             }
             this.ajax
             .get(this.$store.state.api+'/selectMarkerFundData',param)
             .then(res=>{
                 console.log(res.data);
                 let data=JSON.parse(res.data[0][0]['fund']);
+                let usedFund=JSON.parse(res.data[0][0]['usedFund']);
                 // console.log(data);
                 this.fundList[0].budget=data.device
                 this.fundList[1].budget=data.Material
@@ -193,6 +194,20 @@ export default {
                 this.fundList[5].budget=data.entery 
                 this.fundList[6].budget=data.activities 
                 this.fundList[7].budget=data.Transaction
+
+                if (res.data[0][0]['usedFund']!==null) {
+                    this.fundList[0].havePaid=usedFund.device
+                    this.fundList[1].havePaid=usedFund.Material
+                    this.fundList[2].havePaid=usedFund.processing 
+                    this.fundList[3].havePaid=usedFund.Collaboration 
+                    this.fundList[4].havePaid=usedFund.APPRAISAL
+                    this.fundList[5].havePaid=usedFund.entery 
+                    this.fundList[6].havePaid=usedFund.activities 
+                    this.fundList[7].havePaid=usedFund.Transaction
+                }
+                
+
+
                 this.allFund=res.data[0][0]['money']
             },err=>{
                 console.log(err);
@@ -245,6 +260,7 @@ export default {
                     if(res.data==1){
                         this.$message.success('提交成功')
                         this.submitDataDig=false
+                        this.$router.push('/makerfund')
                     }else{
                         this.$message.error('提交失败')
                     }

src/views/fundManage/newMarkerfundDetails.vue

@@ -40,7 +40,7 @@
             <td>
                {{ item.thisApply }}
             </td>
-            <td>
+            <td v-if="!state">
                 <el-input
                 type="number"
                 autosize
@@ -51,6 +51,9 @@
                 v-model="item.actualuse">
                 </el-input>
             </td>
+            <td v-if="state>0">
+                {{ item.actualuse }}
+            </td>
             <td>
                 {{ item.budget-item.havePaid-item.actualuse }}
             </td>
@@ -79,7 +82,8 @@
     <div class="baseBtn">
         <div class="blockWidth">
             <el-button type="primary" @click="download">生成表单</el-button>
-            <el-button type="primary" @click="submitData">提交</el-button>
+            <el-button type="primary" v-if="!state" @click="submitData">提交</el-button>
+            <el-button type="primary" v-if="state>0" class="disa">提交</el-button>
         </div>
     </div>
 
@@ -148,6 +152,7 @@ export default {
             ],
             haveFund:{}, //已支付经费
             intro:'',   //事由
+            state:0,
         }
     },
     methods:{
@@ -171,7 +176,7 @@ export default {
             .get(this.$store.state.api+'/selectActivityFundDetail',param)
             .then(res=>{
                 let data=res.data[0][0]
-                console.log(data);
+                // return console.log(data);
                 let applyfund=JSON.parse(data['applyfund'])
                 let fund=JSON.parse(data['fund'])
                 let actualuse=JSON.parse(data['actualuse'])
@@ -186,16 +191,16 @@ export default {
                 this.fundList[6].budget=fund.activities 
                 this.fundList[7].budget=fund.Transaction
 
-
-
-                this.fundList[0].havePaid=usedFund.device
-                this.fundList[1].havePaid=usedFund.Material
-                this.fundList[2].havePaid=usedFund.processing
-                this.fundList[3].havePaid=usedFund.Collaboration
-                this.fundList[4].havePaid=usedFund.APPRAISAL
-                this.fundList[5].havePaid=usedFund.entery
-                this.fundList[6].havePaid=usedFund.activities 
-                this.fundList[7].havePaid=usedFund.Transaction
+                if (data['usedFund']!=null) {
+                    this.fundList[0].havePaid=usedFund.device
+                    this.fundList[1].havePaid=usedFund.Material
+                    this.fundList[2].havePaid=usedFund.processing
+                    this.fundList[3].havePaid=usedFund.Collaboration
+                    this.fundList[4].havePaid=usedFund.APPRAISAL
+                    this.fundList[5].havePaid=usedFund.entery
+                    this.fundList[6].havePaid=usedFund.activities 
+                    this.fundList[7].havePaid=usedFund.Transaction
+                }
 
                 this.fundList[0].thisApply=applyfund.device
                 this.fundList[1].thisApply=applyfund.Material
@@ -206,16 +211,20 @@ export default {
                 this.fundList[6].thisApply=applyfund.activities 
                 this.fundList[7].thisApply=applyfund.Transaction
 
-                this.fundList[0].actualuse=actualuse.device
-                this.fundList[1].actualuse=actualuse.Material
-                this.fundList[2].actualuse=actualuse.processing
-                this.fundList[3].actualuse=actualuse.Collaboration
-                this.fundList[4].actualuse=actualuse.APPRAISAL
-                this.fundList[5].actualuse=actualuse.entery
-                this.fundList[6].actualuse=actualuse.activities 
-                this.fundList[7].actualuse=actualuse.Transaction
+                if (data['actualuse']!=null) {
+                    this.fundList[0].actualuse=actualuse.device
+                    this.fundList[1].actualuse=actualuse.Material
+                    this.fundList[2].actualuse=actualuse.processing
+                    this.fundList[3].actualuse=actualuse.Collaboration
+                    this.fundList[4].actualuse=actualuse.APPRAISAL
+                    this.fundList[5].actualuse=actualuse.entery
+                    this.fundList[6].actualuse=actualuse.activities
+                    this.fundList[7].actualuse=actualuse.Transaction
+                }
+                
 
                 this.intro=data.intro
+                this.state=data.state
                 this.allFund=data.money
 
 
@@ -238,7 +247,7 @@ export default {
             let arr=[this.fundList[0].actualuse,this.fundList[1].actualuse,this.fundList[2].actualuse,this.fundList[3].actualuse,this.fundList[4].actualuse,this.fundList[5].actualuse,this.fundList[6].actualuse,this.fundList[7].actualuse]
             let arr2=[this.fundList[0].havePaid,this.fundList[1].havePaid,this.fundList[2].havePaid,this.fundList[3].havePaid,this.fundList[4].havePaid,this.fundList[5].havePaid,this.fundList[6].havePaid,this.fundList[7].havePaid]
             
-            console.log(arr);
+            // console.log(arr);
             let fund=arr.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
             },0); 
@@ -284,6 +293,7 @@ export default {
                     if(res.data==1){
                         this.$message.success('提交成功')
                         this.submitDataDig=false
+                        this.$router.push('/makerfund')
                     }else{
                         this.$message.error('提交失败')
                     }

src/views/resultShow/components/resultDetail_student.vue

@@ -1,11 +1,9 @@
 <template>
     <!-- 成果展示 项目成果展示 -->
-    <div class="rs1apply" v-loading="loading">
+    <div class="rs1apply">
         <!-- 头部展示区开始 -->
         <div class="header">
-            <div class="imgBlock">
-                <img :src="TitleMessage.image" alt="">
-            </div>
+
             <div class="headerConcent">
                 <div class="rsHead1Tit">项目名称：<span>{{ TitleMessage.title }}</span></div>
                 <div class="rsHead2Tit rsHead3Tit">
@@ -82,10 +80,10 @@
                     </div>
                     <el-descriptions style="width: 100%;" :column="2" border>
                         <el-descriptions-item label="优先支持项目">
-                            {{ TitleMessage.multiSelectProject.indexOf(0)!=-1?'大赛选拔项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf(1)!=-1?'落地注册项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf(2)!=-1?'社会征集项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf(3)!=-1?'产业命题项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('0')!=-1?'大赛选拔项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('1')!=-1?'落地注册项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('2')!=-1?'社会征集项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('3')!=-1?'产业命题项目':'' }}
 
                         </el-descriptions-item>
                         <el-descriptions-item label="美丽校园改造项目">
@@ -114,12 +112,12 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="class"
+                            prop="collage"
                             label="所在学院/部门/专业"
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="division"
+                            prop="work"
                             label="项目组角色分工"
                             align="center">
                           </el-table-column>
@@ -144,12 +142,12 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="class"
+                            prop="collage"
                             label="所在学院/部门/专业"
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="division"
+                            prop="work"
                             label="项目组角色分工"
                             align="center">
                           </el-table-column>                        
@@ -162,12 +160,14 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>简介</span>
                     </div>
-                    <div class="TextView" v-text="TitleMessage.brief">
-                        <!-- {{ TitleMessage.brief }} -->
+                    <div class="TextView" style="display: block;">
+                        {{ TitleMessage.brief }}
                     </div>
                 </div>
             </div>
             <!--基础信息结束-->
+
+
             <!--项目详细开始-->
             <div class="BaseMessage" v-show="pageState==1">
                 <div class="BaseTitle" type="1">
@@ -180,7 +180,6 @@
                         <span>一、项目研发背景</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['back']">
-                        <!-- <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -190,7 +189,6 @@
                         <span>二、项目创新点</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['innovate']">
-                        <!-- <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -200,7 +198,6 @@
                         <span>三、技术研发路线</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['path']">
-                        <!-- <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -210,7 +207,6 @@
                         <span>四、项目应用场景</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['scene']">
-                        <!-- <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -223,7 +219,6 @@
                         <span>一、项目商业模式/社会价值</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['worth']">
-                        <!-- <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -236,7 +231,6 @@
                         <span>一、团队构成及优势</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['team']">
-                        <!-- <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -249,7 +243,6 @@
                         <span>一、研发成本来源及构成</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['cost']">
-                        <!-- <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -262,7 +255,6 @@
                         <span>一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['expectResults']">
-                        <!-- <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -271,7 +263,6 @@
                         <span>二、学生创客人才培养预期成果、数量（教师填写）</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['expectResultsTeacher']">
-                        <!-- <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -280,7 +271,6 @@
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['expectConversion']">
-                        <!-- <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="BaseTitle" type="1">
@@ -292,7 +282,6 @@
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div> -->
                     <div class="TextView" v-text="DetailMessage['plan']">
-                        <!-- <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
             </div>
@@ -304,7 +293,7 @@
                     <span>活动开展</span>
                 </div>
 
-                <div class="arrangement" v-for="(item,index) in AllActivity" :key="item.acId">
+                <div class="arrangement" v-for="(item,index) in AllActivity" :key="index">
                     <div class="arrangement_assignment">
                         <div class="arrangement_assignment_title">
                             <span>
@@ -378,7 +367,7 @@
                                   border
                                   style="width: 100%">
                                   <el-table-column
-                                    prop="Name"
+                                    prop="name"
                                     label="姓名"
                                     align="center">
                                   </el-table-column>
@@ -388,7 +377,7 @@
                                     align="center">
                                   </el-table-column>
                                   <el-table-column
-                                    prop="takeCharge"
+                                    prop="work"
                                     align="center"
                                     label="活动分工">
                                   </el-table-column>
@@ -399,7 +388,6 @@
                                 <span>活动简介</span>
                             </div>
                             <div class="TextView" v-text="item.brief">
-                                <!-- {{ item.brief }} -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -407,8 +395,7 @@
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).activityPlan">
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -416,8 +403,7 @@
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).expectations">
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -425,8 +411,7 @@
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).eventAudience">
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -434,8 +419,7 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).fundingPlan">
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -630,6 +614,8 @@
                     pid:this.$route.query["pid"]
                 }).then(res=>{
                     let FormData = res.data;
+
+       console.log(FormData);
                 //    return console.log(FormData)
                 //     //头部信息
                     this.TitleMessage = FormData[0][0]
@@ -867,6 +853,8 @@
             border-radius: 5px;
             background-color: rgb(240, 240, 240);
             line-height: 2em;
+            word-wrap: break-word;
+            word-break: break-all;
         }
         .FileView{
             width: 100%;