封面上传

src/components/tool/beUpload.vue

@@ -81,7 +81,7 @@ export default {
             if (err) {
               _this.$message.error("上传失败");
             } else {
-                _this.$emit('getFile',data.Location)
+                _this.$emit('getFile',{fileName:file.name,url:data.Location})
               console.log(data.Location);
             }
           });

src/views/projectApply/projectApplication2.vue

@@ -18,7 +18,7 @@
 
       <div class="PA2textArea">
         <div class="PA2textAreaTit">项目创新点</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0]"></vue-editor>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
       </div>
 
       <div class="PA2mid">
@@ -26,22 +26,22 @@
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、项目预期成果、数量及形式</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[1]"></vue-editor>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][1]"></vue-editor>
         
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">二、创客人才培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[2]"></vue-editor>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][2]"></vue-editor>
        
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">三、项目预期孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[3]"></vue-editor>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][3]"></vue-editor>
         
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit">项目实施计划</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[4]"></vue-editor>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][4]"></vue-editor>
         
       </div>
       <div class="baseBtn">
@@ -76,7 +76,7 @@ import { VueEditor } from "vue2-editor";
         },
         data() {
           return {
-            data:[],
+            data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
@@ -105,7 +105,7 @@ import { VueEditor } from "vue2-editor";
               this.ajax
                   .post(this.$store.state.api+'/UpdateProjectDetail',param)
                   .then(res=>{
-                    console.log(res);
+                    // console.log(res);
                     this.$message.success('修改成功')
                     this.init()
                   },err=>{
@@ -123,6 +123,7 @@ import { VueEditor } from "vue2-editor";
               this.ajax
                     .get(this.$store.state.api+'/GetProjectDetailMessage',param)
                     .then(res=>{
+                      // console.log(res)
                       let GetData=JSON.parse(res.data[0][0].chapters)
                       // console.log(GetData)
                       this.data=GetData

src/views/projectApply/projectApplicationApply.vue

@@ -92,22 +92,24 @@
               <!-- 活动申请填写信息区域结束 -->
 
           <!-- 项目封面上传开始 -->
-          <div style="position: relative;">
+          <div style="position: relative;height: 150px;">
               <div id="two" class="tabTit">
-                <div id="face"><p>封面上传</p></div>
+                <div><p>封面上传</p></div>
                 <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传封面</el-button> -->
               </div>
               <hr>
+              <BeUpload @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+
               <el-upload
                 class="upload-demo"
-                action="https://jsonplaceholder.typicode.com/posts/"
+                action="#"
                 :on-preview="handlePreview"
                 :on-remove="handleRemove"
-                :file-list="fileList"
+                :file-list="data.fileList"
+                :limit="1"
                 style="width: 40%;margin-top: -25px;"
                 list-type="picture">
-                <el-button size="small" style="position: absolute;top: -8px;right: 0;width: 100px;box-sizing: border-box;padding: 9px 0;font-size: 16px;background-color: #0e72e6;border-radius:5px" type="primary">上传封面</el-button>
-                <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+                <!-- <el-button size="small" style="position: absolute;top: -8px;right: 0;width: 100px;box-sizing: border-box;padding: 9px 0;font-size: 16px;background-color: #0e72e6;border-radius:5px" type="primary">上传封面</el-button> -->
               </el-upload>
             </div>
 
@@ -118,7 +120,7 @@
             <!-- <div> -->
   <!-- 项目成员表格开始 -->
               <div id="two" class="tabTit">
-                <div id="face"><p>项目成员</p></div>
+                <div><p>项目成员</p></div>
                 <el-button type="primary" @click="addMember"  size="mini">添加成员</el-button>
               </div>
               <hr>
@@ -288,12 +290,16 @@
 </template>
 
 <script>
-
-    export default {
+    import BeUpload from "../../components/tool/beUpload.vue";
+    export default { 
       props:["data","next",'back','addPerson','amend'],
+      components: {
+        BeUpload,
+      },
       data() {
         return {
-          fileList: [{name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}],
+          accept:"*",
+          // fileList: [],
           addMemberDialog:false,
           amendMemberDialog:false,
           delMember:false,
@@ -302,6 +308,15 @@
       },
       
       methods:{
+        getFile(val) {
+            console.log( val);
+            let data={
+              name:val.fileName,
+              url:val.url
+            }
+            this.data.fileList.push(data)
+            console.log(this.data.fileList);
+        },
         submitUpload() {
           this.$refs.upload.submit();
         },
@@ -413,7 +428,16 @@
     width: 100%;
     display: flex;
     justify-content: center;
-
+    .uploadPic{
+      position: absolute;
+      top: -8px;right: 0;
+      width: 100px;
+      box-sizing: border-box;
+      padding: 9px 0;
+      font-size: 16px;
+      background-color: #0e72e6;
+      border-radius:5px
+    }
         // 右边栏标题
         .projectApplicationApplypAHeader{
             width: 100%;

src/views/projectApply/projectApplicationApply3.vue

@@ -69,25 +69,25 @@
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
               >
               <el-table-column
-                prop="sort"
+                prop="type"
                 label="支出类别"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="disburseProject"
                 label="支出项目"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="Fund"
+                prop="fund"
                 label="金额(元)"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="remark"
+                prop="textarea"
                 label="备注"
                 align="center"
                 width="300">
@@ -311,22 +311,40 @@ import { VueEditor } from "vue2-editor";
           this.setFund=false;
         },
         finish(){    //添加经费明细对话框完成按钮
-          let p=0;
-            if(this.data2.select.fund=='' ||this.data2.select.fund==undefined ){
-              return this.$message.error('请输入项目预算总经费')
-            }
-            for(let key in this.data.dialog){
-              if ([key] == 'fund') {
-                // console.log(this.data.dialog[key]);
-                if (this.data.dialog[key] > (this.data2.select.fund)*10000) {
-                  this.$message.error('金额大于预算总经费')
-                  return
-                }
-              }
-            }
-
-            this.addFundDetail()
+            if(this.data2.select.fund == '' || this.data2.select.fund==undefined )return this.$message.error('请输入项目预算总经费')
+            let oldMoney = 0;
+            this.data.tableData2.reduce((pre,cur)=>{
+              pre+=cur.fund;
+            },oldMoney);
+            console.log(oldMoney)
+            oldMoney+=this.data.dialog.fund;
+            if(oldMoney>(this.data2.select.fund)*10000)return this.$message.error('经费明细超出预算总金额');
+            this.addFundDetail();
             this.init();
+          // let p=0;
+          
+          //   if(this.data2.select.fund == '' || this.data2.select.fund==undefined ){   //判断总金额是否为空
+          //     return this.$message.error('请输入项目预算总经费')
+          //   }
+          //   let val=this.data.tableData2.length
+          //   console.log(val);
+          //   if ( val < 1) {
+          //       if (this.data.dialog.fund > (this.data2.select.fund)*10000) {
+          //         return this.$message.error('经费明细超出预算总金额')
+          //       }
+          //   }else{
+          //     console.log(this.data.tableData2);
+          //     this.data.tableData2.forEach((e,i,arr)=>{
+          //       console.log(arr);
+          //       p=p+(e.fund)*1
+          //     })
+          //     console.log(p);
+          //     if(p>(this.data2.select.fund)*10000) return this.$message.error('经费明细超出预算总金额')
+          //   }
+              
+
+          //   this.addFundDetail()
+          //   this.init();
         },
         backBtn1(){    //上一步
           this.back();

src/views/projectApply/projectApplicationApplyMain.vue

@@ -90,7 +90,7 @@
                     score:'0'
                 },
                 tableData:[],  //成员列表
-                    
+                fileList:[]   //封面
             },
             projectApplicationApply2:{  //项目内容页面
                   contentOne:'',
@@ -156,7 +156,7 @@
             },
             addPerson(){  //立项基础信息页面添加人员
               let a=this.projectApplicationApply1
-              a.addMemberDialog=false;
+              // a.addMemberDialog=false;
               a.Member.id=uuid.v1()
               a.tableData.push(a.Member);
               this.$message.success('添加成功')
@@ -235,14 +235,7 @@
               },
             addFundDetail(){    //预算经费页面经费添加按钮
               let p=this.projectApplicationApply3;
-
-                let data={
-                  Fund:p.dialog.fund,
-                  projectName:p.dialog.disburseProject,
-                  sort:p.dialog.type,
-                  remark:p.dialog.textarea
-                }
-              p.tableData2.push(data)
+              p.tableData2.push(p.dialog)
               p.dialog={}
             },
             submitBtn(){   //预算经费页面提交按钮
@@ -270,12 +263,7 @@
               if(b.contentThree=='') return this.$message.error('请输入预期取得成果')
               if(b.contentFour=='') return this.$message.error('请输入预期取得成果')
               if(b.contentFive=='') return this.$message.error('请输入项目实施计划')
-              let p=0;
-              c.tableData2.forEach((e,i)=>{
-                // console.log(e);
-                p=p+Number(e.Fund)
-              })
-              if(p>(a.select.fund)*10000) return this.$message.error('经费明细超出预算总金额')
+              
 
 
 
@@ -301,6 +289,7 @@
                 message:JSON.stringify([d,[newData1,c.tableData2]]),
                 tid:a.select.sort,
                 mon:a.select.fund,
+                imgsrc:a.fileList[0].url,
                 beginTime:a.select.value1
               }
                 this.ajax

src/views/projectManage/ProjectManagement.vue

@@ -92,7 +92,7 @@
           <span v-if="item.isupload==2">已结题</span>
 
         </div>
-        <img src='@/assets/img/cocoClass.png' alt="">
+        <img :src="item.image" alt="">
         <div class="classBlock1">
             <div class="classBlock2">{{ item.title }}</div>
             <div class="classBlock3">