项目结项

src/views/projectManage/ProjectManagementFund1.vue

@@ -221,18 +221,19 @@
                     .get(this.$store.state.api+'/GetProjectDetailMessage',param)
                     .then(res=>{
                       console.log(res.data);
-                      let GetData=JSON.parse(res.data[0][0].chapters)
+
+                      // let GetData=JSON.parse(res.data[0][0])
                       // console.log(GetData);
-                      // this.data=GetData
-                      this.tableData=[GetData[1][0]]
-                      this.tableData2=GetData[1][1]
-                      // console.log(this.tableData2);
-                      this.tableData2.forEach((e)=>{
-                        this.useFund=this.useFund+e.fund
-                      })
-                      this.allFund=res.data[0][0].money
-                      this.useFund=this.useFund / 10000
-                      this.remainFund=this.allFund - this.useFund
+                      // // this.data=GetData
+                      // this.tableData=[GetData[1][0]]
+                      // this.tableData2=GetData[1][1]
+                      // // console.log(this.tableData2);
+                      // this.tableData2.forEach((e)=>{
+                      //   this.useFund=this.useFund+e.fund
+                      // })
+                      // this.allFund=res.data[0][0].money
+                      // this.useFund=this.useFund / 10000
+                      // this.remainFund=this.allFund - this.useFund
                       // console.log((this.useFund / 10000));
                       // console.log();
                       this.loading = false;

src/views/projectSettlement/components/projectSettlementDetailBase_MakerSpace.vue

@@ -2,7 +2,7 @@
   <!-- 项目结项 项目基本内容 -->
     <div class="projectSettlement1" v-loading="loading">
       <div class="psSmallTit">
-        <span style="margin-right: 10px;">结题时间:</span>{{ select.endTime }}
+        <span style="margin-right: 10px;">结题时间:</span>{{ endTime }}
       </div>
 
 <!-- 活动申请填写信息区域开始 -->
@@ -406,6 +406,7 @@
             },  
           dialogImageUrl:'',  //图片地址
           index:0,
+          endTime:"",
           delMember:false,
           DelStudentDialog:false,
           amendMemberDialog:false,
@@ -556,10 +557,9 @@
           this.submitHint=true
         },
         submitAll(){
-
           let param = {
             uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid')),
+            pid:this.$route.query['pid'],
             title:this.select.project,
             pro_leader:this.select.person,
             lead_leader:this.select.lead_leader,
@@ -623,7 +623,7 @@
           this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid'))
+            pid:this.$route.query['pid']
           }
             this.ajax
                   .get(this.$store.state.api+'/SelectProjectMakerSpace',param)
@@ -641,6 +641,7 @@
                     this.select.lead_leader = data['lead_leader']
                     this.teacherData = JSON.parse(data['course_teacher'])
                     this.studentData = JSON.parse(data['course_student'])
+                    this.endTime = data['endProjectTime']
                     this.loading = false;
                   },err=>{
                     console.log(err);

src/views/projectSettlement/components/projectSettlementDetail_MakerSpace.vue

@@ -3,39 +3,51 @@
     <div class="ProjectManagement2" v-loading="loading">
     <!-- 跳转导航结束 -->
      
-    <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目创新点</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
+    <div class="PA2mid">项目建设内容及目标</div>
+      <div class="PA2textArea">
+        <div class="PA2textAreaTit PA2textAreaTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor>
       </div>
 
-      <div class="PA2mid">
-        预期取得成果
+      <div class="PA2mid">预项目建设论证报告</div>
+      <div class="PA2textArea">
+        <div class="PA2textAreaTit PA2textAreaTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor>
+      </div>
+
+      <div class="PA2mid">预期成果</div>
+      <div class="PA2textArea">
+        <div class="PA2textAreaTit PA2textAreaTit2">一、创客空间物理环境、制度建设及软件设施建设情况<span>（环境优化/制度完善/设施改造）</span></div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor>
       </div>
       <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">一、项目预期成果、数量及形式</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][1]"></vue-editor>
-        
+        <div class="PA2textAreaTit PA2textAreaTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor>
       </div>
       <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">二、创客人才培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][2]"></vue-editor>
-       
+        <div class="PA2textAreaTit PA2textAreaTit2">三、学生创客团队（人才）培养预期成果、数量</div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor>
       </div>
       <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">三、项目预期孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][3]"></vue-editor>
-        
+        <div class="PA2textAreaTit PA2textAreaTit2">四、学生创客活动组织实施情况</div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor>
       </div>
       <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目实施计划</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][4]"></vue-editor>
-        
+        <div class="PA2textAreaTit PA2textAreaTit2">五、学生创客团队孵化、转化创业项目情况</div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor>
       </div>
+
+      <div class="PA2mid">立项基础及条件</div>
+      <div class="PA2textArea">
+        <div class="PA2textAreaTit PA2textAreaTit2">一、基础条件<span>（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span></div>
+        <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor>
+      </div>
+
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary"  @click="audit">立即修改</el-button>
-          <!-- <el-button type="primary" v-show="isUpload==1"  @click="audit">立即修改</el-button> -->
-          <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2"  @click="$message.error('项目已结项，不可再修改')">立即修改</el-button> -->
+          <el-button type="primary" v-show="isUpload==0"  @click="submitHint=true">立即修改</el-button>
+          <el-button type="primary" disabled v-show="isUpload==1" style="background: #ccc !important;border: none;">立即修改</el-button>
+          <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button>
 
         </div>
       </div>
@@ -44,13 +56,12 @@
           title="提示"
           :visible.sync="submitHint"
           width="600px"
-          class="projectApplicationfundAddDialog"
-          :before-close="init">
+          class="projectApplicationfundAddDialog">
           <div class="addDialogLogo">LOGO</div>
           <div class="deleteContent">确定修改项目基本信息?</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>
-            <el-button @click="init" class="AllDialogBtn" size="small">取消</el-button>
+            <el-button @click="submitHint = false" class="AllDialogBtn" size="small">取消</el-button>
           </span>
         </el-dialog>
       <!-- 修改对话框结束 -->
@@ -66,73 +77,58 @@ import { VueEditor } from "vue2-editor";
         },
         data() {
           return {
-            isUpload:'',
+            isUpload:0,
             loading:false,
-            data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
               [{header:[false,1,2,3,4]}]
             ],
+            data:{
+                Construction:"",//建设内容
+                ProjectBasis:"",//立项依据
+                development:"",//创客空间物理环境、制度建设及软件设施建设情况
+                studio:"",//学生创客工作室建设情况
+                studentTeam:"",//学生创客团队（人才）培养预期成果、数量
+                studentActivities:"",//学生创客活动组织实施情况
+                Transforming:"",//学生创客团队孵化、转化创业项目情况
+                condition:"",//立 项基 础及条 件
+
+            },
           }
         },
         methods:{
-          content(){
-              this.$router.push('/projectSettlement1')
-            },
-            remark(){
-              this.$router.push('/projectSettlement2')
-            },
-            remark2(){
-              this.$router.push('/projectSettlement3')
-            },
-            remark4(){
-              this.$router.push('/projectSettlement4')
-            },
-            remark5(){
-              this.$router.push('/projectSettlement5')
-            },
-         
-            back(){
-            this.$router.push('/projectSettlement')
-          },
-          audit(){   //立即修改按钮
-            this.submitHint=true
-          },
           submitAll(){
             let param={
               uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid')),
-              message:JSON.stringify(this.data)
+              pid:this.$route.query['pid'],
+              chapters:JSON.stringify(this.data)
             }
-              this.ajax
-                  .post(this.$store.state.api+'/UpdateProjectDetail',param)
-                  .then(res=>{
-                    // console.log(res);
-                    this.$message.success('修改成功')
-                    this.init()
-                  },err=>{
-                    console.log(err);
-                  })
-          },
-          init(){
-            this.submitHint=false
+            this.ajax.post(this.$store.state.api+"/UpdateProjectChaptersMakerSpace",param).then(res=>{
+              if(res.data==1){
+                this.$message.success("修改成功")
+              }else{
+                this.$message.error("修改失败")
+              }
+              this.submitHint = false;
+              this.getData();
+            }).catch(err=>{
+              console.log(err)
+            })
           },
           getData(){   //初始化完成获取基本数据进行填充
             this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid'))
+              pid:this.$route.query['pid']
             }
               this.ajax
-                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+                    .get(this.$store.state.api+'/SelectProjectChapterMakerSpace',param)
                     .then(res=>{
-                      // console.log(res.data[0][0].isupload);
-                      this.isUpload=res.data[0][0].isupload;
-                      let GetData=JSON.parse(res.data[0][0].chapters)
-                      // console.log(GetData);
-                      this.data=GetData;
+                      this.isUpload = res.data[0][0]['isupload']
+                      this.data = JSON.parse(res.data[0][0]['chapters']);
+                      console.log(this.data)
                       this.loading = false;
                     },err=>{
                       console.log(err);
@@ -140,12 +136,13 @@ import { VueEditor } from "vue2-editor";
           },
         },
         mounted(){
-          // this.getData();
+          this.getData();
         }
       }
   </script>
   
   <style lang="less">
+  .ProjectManagement2{
 
  .projectApplicationfundAddDialog{    //项目修改对话框开始
  
@@ -250,4 +247,5 @@ import { VueEditor } from "vue2-editor";
         margin-bottom: 10px;
         color: #2387ff;
     }
+  }
   </style>