Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/router/index.js

@@ -17,20 +17,6 @@ const routes = [{
             import ('@/views/login.vue'),
         meta: { isAuth: false }
     },
-    // { //项目立项申请
-    //     name: "projectApplicationApplyMain",
-    //     path: "/projectApplicationApplyMain",
-    //     component: () =>
-    //         import ('@/views/projectApply/projectApplicationApplyMain.vue'),
-    //     meta: { isAuth: true }
-    // },
-    { //活动管理
-        name: "makerActvityApplyMain",
-        path: "/makerActvityApplyMain",
-        component: () =>
-            import ('@/views/activityManage/makerActvityApplyMain.vue'),
-        meta: { isAuth: true }
-    },
 
     { //成果展示
         name: 'resultShowDetail',
@@ -40,7 +26,7 @@ const routes = [{
         meta: { isAuth: true }
 
     },
-    { //创客活动
+    { //测试
         name: 'test',
         path: '/test',
         component: () =>
@@ -48,7 +34,7 @@ const routes = [{
         meta: { isAuth: true }
 
     },
-    { //创客活动
+    { //测试2
         name: 'Word',
         path: '/Word',
         component: () =>
@@ -76,13 +62,6 @@ const routes = [{
                 component: () =>import ('@/views/activityManage/makerActivityWordDetail.vue'),
                 meta: { isAuth: true }
             },
-            // { //创客活动详情
-            //     name: 'makerActvityDetails',
-            //     path: '/makerActvityDetails',
-            //     component: () =>import ('@/views/activityManage/makerActvityDetails.vue'),
-            //     meta: { isAuth: true }
-            // },
-           
             { //项目立项申请
                 name: 'projectApplication',
                 path: '/projectApplication',
@@ -111,7 +90,7 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
-            {
+            {   //项目查看详细
                 name: 'projectApplicationDetailMain',
                 path: '/projectApplicationDetailMain',
                 component: () =>import ('@/views/projectApply/projectApplicationDetailMain.vue'),
@@ -133,12 +112,6 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
-            // { //创客资金申请
-            //     name: 'makerfundApply',
-            //     path: '/makerfundApply',
-            //     component: () =>import ('@/views/fundManage/makerfundApply.vue'),
-            //     meta: { isAuth: true }
-            // },
             { //新创客活动资金申请
                 name: 'newMarkerfundApply',
                 path: '/newMarkerfundApply',
@@ -152,12 +125,6 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
-            // { //创客资金详情
-            //     name: 'makerfundDetails',
-            //     path: '/makerfundDetails',
-            //     component: () =>import ('@/views/fundManage/makerfundDetails.vue'),
-            //     meta: { isAuth: true }
-            // },
             { //创客资金详情
                 name: 'newMarkerfundDetails',
                 path: '/newMarkerfundDetails',
@@ -189,19 +156,19 @@ const routes = [{
  
             
             { //项目资金管理
-                name: 'ProjectManagementFund1',
-                path: '/ProjectManagementFund1',
-                component: () =>import ('@/views/projectManage/ProjectManagementFund1.vue'),
+                name: 'ProjectManagementFundDetail',
+                path: '/ProjectManagementFundDetail',
+                component: () =>import ('@/views/projectManage/ProjectManagementFundDetail.vue'),
                 meta: { isAuth: true }
 
             },
-            { //项目资金管理
-                name: 'ProjectManagementFund2',
-                path: '/ProjectManagementFund2',
-                component: () =>import ('@/views/projectManage/ProjectManagementFund2.vue'),
-                meta: { isAuth: true }
+            // { //项目资金管理
+            //     name: 'ProjectManagementFund2',
+            //     path: '/ProjectManagementFund2',
+            //     component: () =>import ('@/views/projectManage/ProjectManagementFund2.vue'),
+            //     meta: { isAuth: true }
 
-            },
+            // },
             { //项目结项
                 name: 'projectSettlement',
                 path: '/projectSettlement',

src/views/activityManage/makerActivityWordDetail.vue

@@ -223,7 +223,7 @@
                 st:this.wordData['student'],//参与学生人数
                 ct:JSON.stringify(this.wordData['member']),//活动指导老师
                 chp:JSON.stringify({
-                  activityPlan:this.wordData['activityName'],//活动计划
+                  activityPlan:this.wordData['activityPlan'],//活动计划
                   expectations:this.wordData['expectations'],//预期目标
                   eventAudience:this.wordData['eventAudience'],//活动受众面
                   fundingPlan:this.wordData['fundingPlan'],//经费支出计划

src/views/activityManage/makerActvity.vue

@@ -312,9 +312,30 @@
         <el-button @click="endDialog=false" class="AllDialogBtn">取消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 未完结资金查看开始 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="endFundDialog"
+      width="600px"
+      class="endDialog"
+      :before-close="init">
+      <div class="addDialogLogo">LOGO</div>
+      <div class="deleteContent">"{{ endTable.title }}"项目活动还有资金未完结！</div>
+      <div class="deleteContent1">未完结资金编号</div>
+
+      <div class="download" v-for="(item,index) in endFundData" :key="item.fid">
+        <div>{{ item.fundNo }}</div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="endFundDialog = false" class="AllDialogBtn">确认</el-button>
+        <el-button @click="endFundDialog=false" class="AllDialogBtn">取消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 未完结资金查看结束 -->
     <!-- 完结对话框结束 -->
     <!-- 活动管理word文档预览开始 -->
-    <el-dialog
+    <!-- <el-dialog
       title="提示"
       :visible.sync="activityWord"
       width="65%"
@@ -329,7 +350,7 @@
         <el-button @click="activityWord = false" class="AllDialogBtn">取消</el-button>
       </div>
 
-    </el-dialog>
+    </el-dialog> -->
     <!-- 活动管理word文档预览结束 -->
     <!-- 分页 -->
     <el-pagination
@@ -362,7 +383,9 @@ import { ActivityWord } from '@/components/tool/getWord';
           endDialog:false,  //完结对话框
           auditDialog:false,   //审核对话框
           rejectDialog:false,   //驳回对话框
-          activityWord:false,
+          endFundDialog:false,//未完结资金
+          endFundData:[],
+          // activityWord:false,
           rejectApplyText:'',//驳回数据
           options:[],
           options1:[],
@@ -442,10 +465,25 @@ import { ActivityWord } from '@/components/tool/getWord';
 
 
         end(val){//完结按钮
-          this.endTable.title = val.title;
-          this.endTable.Id = val.acId;
-          this.endTable.file = val.reportFile==''||val.reportFile==null?[]:val.reportFile;
-          this.endDialog=true;
+          this.ajax.get(this.$store.state.api+'/getNoEndFundByActivity',{
+            uid:this.$store.state.userInfo.userid,
+            aid:val.acId
+          }).then(result=>{
+            console.log(result);
+            if(result['data'][0].length>0){
+              this.endTable.title = val.title;
+              this.endFundData = result['data'][0];
+              this.endFundDialog = true;
+            }else{
+              this.endTable.title = val.title;
+              this.endTable.Id = val.acId;
+              this.endTable.file = val.reportFile==''||val.reportFile==null?[]:val.reportFile;
+              this.endDialog=true;
+            }
+          }).catch(err=>{
+            console.log(err);
+          })
+   
         },
         ending(){   //完结提交
           if(this.endTable.file.length<=0)return this.$message.error("请上传完结报告");
@@ -477,19 +515,19 @@ import { ActivityWord } from '@/components/tool/getWord';
           })
         },
         
-        edit(Id){ // 申请表按钮
-          this.ajax.get(this.$store.state.api+"/SelectActivityWord",{
-            uid:this.$store.state.userInfo.userid,
-            aid:Id
-          }).then(res=>{
-            // ActivityWord(res.data[0][0])
-            this.wordData = res.data[0][0];
-            this.activityWord = true;
-          }).catch(err=>{
-            this.$message.error("错误"+err.message)
-          })
-          // downloadFile('/file/附件 2：创客专项资金项目申请表（创客活动）.doc',"创客专项资金项目申请表（创客活动）.doc",(_b)=>this.loading = _b);
-        },
+        // edit(Id){ // 申请表按钮
+        //   this.ajax.get(this.$store.state.api+"/SelectActivityWord",{
+        //     uid:this.$store.state.userInfo.userid,
+        //     aid:Id
+        //   }).then(res=>{
+        //     // ActivityWord(res.data[0][0])
+        //     this.wordData = res.data[0][0];
+        //     this.activityWord = true;
+        //   }).catch(err=>{
+        //     this.$message.error("错误"+err.message)
+        //   })
+        //   // downloadFile('/file/附件 2：创客专项资金项目申请表（创客活动）.doc',"创客专项资金项目申请表（创客活动）.doc",(_b)=>this.loading = _b);
+        // },
 
         //下载申请表
         getWord(){

src/views/activityManage/makerActvityApply.vue

@@ -1,364 +0,0 @@
-<template>
-  <!-- 创客创新-活动申请基础信息表单 -->
-    <div class="makerActvityApplyPAapply">
-      <div class="pAmid">
-        <!-- 左边栏导航区开始 -->
-        <div class="left">
-            <div class="sx">
-              <div class="qiu"></div>
-            </div>
-            <div class="leftTits">
-              <span @click="toPage(1)">活动信息填写</span>
-              <span @click="toPage(2)">活动指导老师</span>
-              <span @click="toPage(3)">活动介绍</span>
-              <span @click="toPage(4)">下一步</span>
-            </div>
-        </div>
-      <!-- 左边导航区结束 -->
-
-        <!-- 右边填写信息区域开始 -->
-        <div class="right">
-              <div id="a" class="vfpHeader">
-                  <div class="titleOne">创客创新-活动申请</div>
-                  <el-button type="primary" @click="$router.back()">返回</el-button>
-              </div>
-              <hr>
-
-              
-              <!-- 活动申请填写信息区域开始 -->
-                  <div class="select">
-                    <div class="selectTop">
-                      <div class="label">活动名称</div>
-                      <el-input v-model="data.select.activityName" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="selectMid">
-                      <div class="selectLeft">
-                          <div class="inpBlock">
-                              <div class="label">所属项目</div>
-                              <el-select v-model="data.select.pid" @change="checkProjectMoney(data.select.pid,data.select.fund)" style="width: 100%;" placeholder="请选择">
-                                <el-option
-                                  v-for="item in data.project"
-                                  :key="item.courseId"
-                                  :label="item.title"
-                                  :value="item.courseId">
-                                </el-option>
-                              </el-select>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">预算经费</div>
-                              <el-input type="number" v-model.number="data.select.fund" @blur="checkProjectMoney(data.select.pid,data.select.fund)" placeholder="请输入内容"></el-input>
-                              <div style="position: absolute;right: -30px;top: 10px;">(元)</div>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">负责人</div>
-                              <el-input v-model="data.select.leader" placeholder="请输入内容"></el-input>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">所在部门</div>
-                              <el-select v-model="data.select.value" style="width: 100%;" placeholder="请选择">
-                                <el-option
-                                  v-for="item in data.class"
-                                  :key="item.id"
-                                  :label="item.name"
-                                  :value="item.id">
-                                </el-option>
-                              </el-select>
-                          </div>
-
-                      </div>
-
-                      <div class="selectRight">
-                        <div class="inpBlock">
-                              <div class="label">活动时间</div>
-    
-                              <el-date-picker
-                                v-model="data.select.time"
-                                type="daterange"
-                                value-format="yyyy-MM-dd"
-                                style="width: 100%;"
-                                range-separator="至"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期">
-                              </el-date-picker>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">参加学生人数</div>
-                              <el-input type="number" v-model.number="data.select.people" placeholder="请输入内容"></el-input>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">联系电话</div>
-                              <el-input v-model="data.select.tel" @blur="checkPhone(data.select.tel)" placeholder="请输入内容"></el-input>
-                          </div>
-                          
-                      </div>
-                    </div>
-                   
-              </div>
-              <!-- 活动申请填写信息区域结束 -->
-
-              <!-- 活动指导老师开始 -->
-              <div id="s" class="tabTit">
-                  <div><p>活动指导老师</p></div>
-                  <el-button type="primary" @click="addTeacher"  size="mini">添加教师</el-button>
-              </div>
-              <hr>
-              <el-table
-                :data="data.select.teacher"
-                tooltip-effect="dark"
-                stripe
-                class="fontSize"
-                :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                >
-              
-                <el-table-column
-                  prop="Name"
-                  label="姓名"
-                  align="center"
-                  >
-                </el-table-column>
-                <el-table-column
-                  prop="work"
-                  label="工作单位"
-                  align="center"
-                  >
-                </el-table-column>
-  
-                <el-table-column
-                  prop="takeCharge"
-                  label="活动分工"
-                  align="center"
-                  >
-                </el-table-column>
-               
-                <el-table-column
-                  prop="operation"
-                  align="center"
-                  label="操作"
-                  >
-                  <template #default="scope">
-                      <div class="operations">
-                              <el-button type="primary" size="mini" @click="updateTeacher(scope.$index)">修改</el-button>
-                              <el-button type="primary" size="mini" @click="deleteRow(scope.$index)">删除</el-button>
-                      </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <!-- 活动指导老师结束 -->
-
-            <!-- 活动介绍区域开始 -->
-            <div id="d" class="tabTit">
-                  <div><p>活动介绍</p></div>
-            </div>
-            <hr>
-            <div class="textArea">
-              <el-input
-                type="textarea"
-                :rows="6"
-                resize="none"
-                class="textArea"
-                placeholder="请输入内容"
-                v-model="data.select.introduce">
-              </el-input>
-            </div>
-            <!-- 活动介绍区域结束 -->
-
-
-            <div id="f" class="baseBtn">
-              <div class="blockWidth">
-                <el-button type="primary"  @click="backBtn1" size:small>上一步</el-button>
-                <el-button type="primary"  @click="next()" size:small>下一步</el-button>
-              </div>
-            </div>
-        </div>
-        <!-- 右边填写信息区域结束 -->
-      </div>
-  
-        <!--添加成员dialog对话框开始 -->
-         <el-dialog
-            :title="isAddTeacher?'添加指导老师':'修改指导老师'"
-            :visible.sync="addMemberDialog"
-            class="AddMember"
-            :before-close="handleClose">
-
-              <div class="littleBlock">
-                <div class="dialogLabel">姓名</div>
-                <div>
-                  <el-input v-model="Member.Name"></el-input>
-                </div>
-              </div>
-
-              <div class="littleBlock">
-                <div class="dialogLabel">工作单位</div>
-                <div>
-                  <el-input v-model="Member.work"></el-input>
-                </div>
-              </div>
-
-              <div class="littleBlock">
-                <div class="dialogLabel">活动分工</div>
-                <div>
-                  <el-input v-model="Member.takeCharge"></el-input>
-                </div>
-              </div>
-              <div slot="footer" class="footer">
-                <el-button v-if="isAddTeacher" type="primary" @click="commit" class="AllDialogBtn" size="small">确认提交</el-button>
-                <el-button v-if="!isAddTeacher"  type="primary" @click="change" class="AllDialogBtn" size="small">确认修改</el-button>
-                <el-button @click="handleClose" class="AllDialogBtn" size="small">取消</el-button>
-              </div>
-        </el-dialog>
-      <!--添加成员dialog对话框结束 -->
-      <!-- 删除指导老师开始 -->
-      <el-dialog
-        title="提示"
-        :visible.sync="DelTeacherDialog"
-        width="600px"
-        class="MAputIn AddMember">
-        <div class="addDialogLogo">LOGO</div>
-        <div class="deleteContent">是否删除“{{ delTeacherTable.Name}}”指导老师？</div>
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="DelTeacherYes" class="AllDialogBtn" size="small">确认删除</el-button>
-            <el-button @click="DelTeacherDialog=false;" class="AllDialogBtn" size="small">取消</el-button>
-        </span>
-      </el-dialog>
-      <!-- 删除指导老师结束 -->
-
-
-    </div>
-      
-  </template>
-  
-  <script>
-      export default {
-        props:["next","data","checkPhone","checkProjectMoney"],
-        data() {
-          return {
-            addMemberDialog:false,
-            Member:{
-              Name:'',
-              work:'',
-              takeCharge:''
-            },
-            isAddTeacher:true,
-            delTeacherTable:{
-              index:"",
-              Name:"",
-            },
-            DelTeacherDialog:false,
-          }
-        },
-        methods:{
-          handleSelectionChange(val) {
-            this.multipleSelection = val;
-          },
-          
-          addTeacher(){
-              this.addMemberDialog=true;
-          },
-          backBtn1(){
-            this.$router.push('/makerActvity')
-          },
-          commit(){
-            //判断是否全部填写
-            for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-            let pushData={};
-            Object.assign(pushData,this.Member)
-            this.data.select.teacher.push(pushData);
-            for(let i in this.Member)this.Member[i] = '';
-            this.addMemberDialog=false;
-            this.$message({
-              message:"添加成功",
-              type:"success"
-            });
-            this.isAddTeacher = true;
-          },
-          
-          handleClose(){
-            for(let i in this.Member)this.Member[i] = '';
-            this.addMemberDialog=false;
-            this.isAddTeacher = true;
-          },
-          updateTeacher(index){    //显示修改对话框
-            Object.assign(this.Member,this.data.select.teacher[index]);
-            this.Member['index'] = index;
-            this.isAddTeacher = false;
-            this.addMemberDialog = true;
-          },
-          change(){  //成员信息确定修改
-            if(this.isAddTeacher)return this.$message.error("错误");
-            for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-            Object.assign(this.data.select.teacher[this.Member.index],this.Member)
-            for(let i in this.Member)this.Member[i]='';
-            this.addMemberDialog = false;
-            this.isAddTeacher = true;
-          },
-          deleteRow(index){
-            this.delTeacherTable = this.data.select.teacher[index];
-            this.delTeacherTable["index"] = index;
-            this.DelTeacherDialog = true;
-          },
-          DelTeacherYes(){
-            this.data.select.teacher.splice(this.delTeacherTable["index"],1);
-            this.DelTeacherDialog = false;
-            this.$message.success("删除成功")
-          },
-          toPage(val){
-            if (val==1) {
-              document.getElementById("a").scrollIntoView({ behavior: "smooth" });
-            }else if(val==2){
-              document.getElementById("s").scrollIntoView({ behavior: "smooth" });
-            }else if(val==3){
-              document.getElementById("d").scrollIntoView({ behavior: "smooth" });
-            }else if(val==4){
-              document.getElementById("f").scrollIntoView({ behavior: "smooth" });
-            }
-          },
-
-        },
-      }
-  </script>
-  
-  <style lang="less">
-  .makerActvityApplyPAapply{
-      width: 100%;
-      position: relative;
-    }
-    .MAputIn{   //提交对话框样式
-  .deleteContent{
-    width: 100%;
-    text-align: center;
-    font-size: 25px;
-    color: #000;
-  }
-  .addDialogLogo{
-    width: 60px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        border-radius: 5px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-  }
- 
-  .el-dialog__title{
-    color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-  }
-  
-  .dialog-footer{
-    display: flex;
-    justify-content: center;
-  }
-}
-.littleBlock{
-  .dialogLabel{
-    width: 15% !important;
-  }
-}
-
-  </style>

src/views/activityManage/makerActvityApply2.vue

@@ -1,192 +0,0 @@
-<template>
-  <!-- 创客创新-活动申请 详细信息表单 -->
-    <div class="makerActvityContent">
-      <div class="pAmid">
-
-        <!-- 左边栏导航区开始 -->
-        <div class="left">
-          <div class="sx">
-            <div class="qiu"></div>
-          </div>
-          <div class="leftTits">
-            <span @click="toPage(1)">活动计划</span>
-            <span @click="toPage(2)">预期目标</span>
-            <span @click="toPage(3)">活动受面</span>
-            <span @click="toPage(4)">经费支出计划</span>
-            <span @click="toPage(5)">完成</span>
-          </div>
-        </div>
-        <!-- 左边导航区结束 -->
-        
-        <!-- 右方数据展示区开始 -->
-        <div class="right">
-          <!-- 标题 -->
-          <div class="vfpHeader">
-              <div class="titleOne">活动申请</div>
-              <el-button type="primary" @click="back()">返回</el-button>
-          </div>
-            <hr>
-
-            <div id="z">
-              <p class="pTit">活动计划</p>
-              <div class="editor">
-                <vue-editor :editorToolbar="customToolbar" v-model="data[0]"></vue-editor>
-              </div>
-            </div>
-
-            <div id="x">
-                <p class="pTit">预期目标</p>
-                <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data[1]"></vue-editor>
-                </div>
-              </div>
-
-              <div id="c">
-                <p class="pTit">活动受面</p>
-                <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data[2]"></vue-editor>
-                </div>
-              </div>
-              <div id="v">
-                <p class="pTit">经费支出计划</p>
-                <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data[3]"></vue-editor>
-                </div>
-              </div>
-              
-            <div id="b" class="baseBtn">
-              <div class="blockWidth">
-                <el-button type="primary" class="backBtn" @click="back()" size:small>上一步</el-button>
-                <el-button type="primary" class="backBtn" @click="putIn" size:small>提交</el-button>
-              </div>
-            </div>
-        </div>
-        <!-- 右方数据展示区结束-->
-
-
-      </div>
-
-      <!-- 提交对话框开始 -->
-      <el-dialog
-        title="提示"
-        :visible.sync="dialogVisible1"
-        width="600px"
-        class="MAputIn">
-        <div class="addDialogLogo">LOGO</div>
-        <div class="deleteContent">是否提交“{{activityName}}”项目活动？</div>
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submit" class="AllDialogBtn" size="small">确认提交</el-button>
-            <el-button @click="dialogVisible1=false;" class="AllDialogBtn" size="small">取消</el-button>
-        </span>
-      </el-dialog>
-      <!-- 提交对话框结束 -->
-    </div>
-      
-  </template>
-  
-  <script>
-  import { VueEditor } from "vue2-editor";
-      export default {
-        props:["back","submit","activityName","data","check"],
-        components:{
-          VueEditor
-        },
-        data() {
-          return {
-            dialogVisible1:false,
-            customToolbar: [
-              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
-              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
-              [{header:[false,1,2,3,4]}]
-            ],
-          }
-        },
-        methods:{
-          putIn(){
-              if(this.check()==1)this.dialogVisible1=true;
-          },
-          backBtn1(){
-              this.$router.push('/makerActvityApply')
-          },
-          toPage(val){
-            if (val==1) {
-              document.getElementById("z").scrollIntoView({ behavior: "smooth" });
-            }else if(val==2){
-              document.getElementById("x").scrollIntoView({ behavior: "smooth" });
-            }else if(val==3){
-              document.getElementById("c").scrollIntoView({ behavior: "smooth" });
-            }else if(val==4){
-              document.getElementById("v").scrollIntoView({ behavior: "smooth" });
-            }else if(val==5){
-              document.getElementById("b").scrollIntoView({ behavior: "smooth" });
-            }
-          }
-        },
-      }
-  </script>
-  
-  <style lang="less">
-   .makerActvityContent{
-      width: 100%;
-      position: relative;
-
-      .el-dialog__header{
-        font-size: 18px;
-        background: #32455b;
-        justify-content: center;
-      }
-      .el-dialog{
-        border-radius: 5px;
-        overflow: hidden;
-      }
-
-    .pTit{
-      margin: 20px 5px 0px 0; 
-      color: #3994ff;
-      font-weight: 550;
-      font-size: 18px;
-    }
-
-    .editor{
-      min-width: 700px;
-      box-sizing: border-box;
-      padding: 15px 20px 10px 0px;
-    }
-
-
-.MAputIn{   //提交对话框样式
-  .el-dialog__title{
-        color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-  }
-  .deleteContent{
-    width: 100%;
-    text-align: center;
-    font-size: 25px;
-    color: #000;
-  }
-  .addDialogLogo{
-        width: 60px;
-        height: 30px;
-        border-radius: 5px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-  }
- 
-  
-  
-  .dialog-footer{
-    display: flex;
-    justify-content: center;
-  }
-}
-   }
-  </style>

src/views/activityManage/makerActvityApplyMain.vue

@@ -1,268 +0,0 @@
-<template>
-    <!-- 创客创新-活动申请 -->
-  <div>
-        <makerActvityApply :data="makerActvityApplyData" :checkProjectMoney="checkProjectMoney" :checkPhone="checkPhone"  :next="next"  v-if="status==0" />
-        <makerActvityApply2 :data="makerActvityApply2Data" :activityName="makerActvityApplyData.select.activityName" :check="check" :submit="submit" :back="back" v-if="status==1" />
-  </div>
-</template>
-
-<script>
-import makerActvityApply from './makerActvityApply.vue';
-import makerActvityApply2 from './makerActvityApply2.vue';
-    export default {
-        components:{makerActvityApply,makerActvityApply2},
-        data() {
-            return {
-                status:0,
-                makerActvityApplyData:{
-                    select:{
-                        activityName:'',
-                        pid:"",
-                        leader:'',
-                        tel:'',
-                        time:'',
-                        fund:0,
-                        people:0,
-                        value:'',
-                        teacher:[],
-                        introduce:'',
-                    },
-                    class:[],
-                    project:[],
-                },
-                makerActvityApply2Data:["","","","",]
-            }
-        },
-        methods:{
-            next(){
-                if(this.status>=1) return
-                this.status++
-            },
-            back(){
-                if(this.status==0) return
-                this.status--
-            },
-            submit(){
-                let data1 = this.makerActvityApplyData.select;
-                let param = {
-                    uid:this.$store.state.userInfo.userid,
-                    tit:data1['activityName'],
-                    con:data1['introduce'],
-                    leader:data1['leader'],
-                    money:data1['fund'],
-                    students:data1['people'],
-                    teacher:JSON.stringify(data1['teacher']),
-                    chapters:JSON.stringify(this.makerActvityApply2Data),
-                    pid:data1['pid'],
-                    cid:data1['value'],
-                    phone:data1['tel'],
-                    beginTime:JSON.stringify(data1['time']),
-                }
-                this.ajax.post(this.$store.state.api+"/CreateActivity",param).then(res=>{
-                    if(res.data==1){
-                        this.$message({message:"创建创客活动成功！",type:"success"})
-                        this.$router.push("/makerActvity")
-                    }else{
-                        this.$message.error(`创建创客活动失败：${res.data}`);
-                    }
-                    console.log(res)
-                }).catch(err=>{
-                    this.$message.error(err.message);
-                })
-
-            },
-            getAllClass(){
-                this.ajax.get(this.$store.state.api+"/SelectAllDepartment",{
-                    uid:this.$store.state.userInfo.userid,
-                }).then(res=>{
-                    this.makerActvityApplyData.class = res.data[0];
-                }).catch(err=>{
-                    this.$message.error(err.message)
-                })
-            },
-            getProject(){
-                this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
-                    uid:this.$store.state.userInfo.userid,
-                }).then(res=>{
-                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload!=3 && item.isupload!=4 );
-                }).catch(err=>{
-                    this.$message.error(err.message)
-                })
-            },
-            check(){
-                let checkData = {...this.makerActvityApplyData.select,...this.makerActvityApply2Data}
-                const cEmpty = /^\s*$/g;
-                for(let i in checkData){
-                    switch(i){
-                        // case "0":
-                        //     if(cEmpty.test(checkData[i]))return this.$message.error("活动计划不能为空");
-                        //     break;
-                        // case "1":
-                        //     if(cEmpty.test(checkData[i]))return this.$message.error("预期目标不能为空");
-                        //     break;
-                        // case "2":
-                        //     if(cEmpty.test(checkData[i]))return this.$message.error("活动受面不能为空");
-                        //     break;
-                        // case "3":
-                        //     if(cEmpty.test(checkData[i]))return this.$message.error("经费支出计划不能为空");
-                        //     break;
-                        case "activityName":
-                            if(cEmpty.test(checkData[i]))return this.$message.error("活动名称不能为空");
-                            break;
-                        case "teacher":
-                            if(checkData[i].length==0)return this.$message.error("请添加至少一名指导老师")
-                            break;
-                        case "fund":
-                            break;
-                        case "people":
-                            break;
-                        case "leader":
-                            if(cEmpty.test(checkData[i]))return this.$message.error("负责人不能为空");
-                            break;
-                        case "pid":
-                            if(cEmpty.test(checkData[i]))return this.$message.error("请选择所属项目");
-                            break;
-                        case "tel":
-                            if(cEmpty.test(checkData[i]))return this.$message.error("电话号码不能为空");
-                            if(!this.checkPhone(checkData[i]))return;
-                            break;
-                        case "time":
-                            if(checkData[i].length<2)return this.$message.error("请选择项目开始时间");
-                            break;
-                        case "value":
-                            if(cEmpty.test(checkData[i]))return this.$message.error("请选择所在部门");
-                            break;
-                        // case "introduce":
-                        //     if(cEmpty.test(checkData[i]))return this.$message.error("活动介绍不能为空");
-                        //     break;
-                    }
-                }
-                return 1;
-            },
-            checkPhone(val){
-                if(/^\s*$/g.test(val))return;
-                const cPhone = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/
-                if(!cPhone.test(val)){
-                    this.$message.error("电话号码格式不正确");
-                    return false;
-                }
-                return true;
-            },
-            checkProjectMoney(pid,aMoney){
-            if(aMoney==0){
-              return 1;
-            }else if(/^\s*$/g.test(pid) && aMoney!=0){
-              this.makerActvityApplyData.select.fund = 0;
-              return this.$message.info("请先选择所属项目");
-            } else if(!/^\s*$/g.test(pid) && aMoney!=0){
-              this.ajax.get(this.$store.state.api+"/GetAllActivityMoneyByProjectId",{
-                uid:this.$store.state.userInfo.userid,
-                projectid:pid
-              }).then(res=>{
-                console.log(res.data)
-                let PMoney = res.data[0][0]['PMoney'];
-                let AMoney = res.data[1][0]["AMoney"];
-                if(PMoney<(AMoney+aMoney)){
-                    this.makerActvityApplyData.select.fund = PMoney-AMoney;
-                    return this.$message.warning(`项目预算不足,项目预算只剩：${PMoney-AMoney}`);
-                }else{
-                  return 1;
-                }
-              }).catch(err=>{
-                console.log(err)
-              })
-            }
-          }
-        },
-        mounted() {
-            //获取部门
-            this.getAllClass();
-            //获取项目
-            this.getProject();
-        },
-    }
-</script>
-
-<style lang="less">
-        .back{  //返回按钮
-            padding-top: 15px;
-            color: #000;
-            cursor: pointer;
-        }
-
-
-        .pAmid{
-            position: absolute;
-            top: 20px;
-            width: 100%;
-            display: flex;
-            justify-content: center;
-            background: #e6eaf0;
-            box-sizing: border-box;
-            // padding-bottom: 30px;
-            .left{
-            width: 10%;
-            min-width: 130px;
-            height: 800px;
-            background: #32455b;
-            display: flex;
-            border-radius: 5px;
-            justify-content: center;
-            margin-right: 2%;
-            .leftTits{
-                display: flex;
-                flex-direction: column;
-                margin: 47px 0 0 15px;
-                span{
-                    cursor: pointer;
-                    color: #fff;
-                    margin-bottom: 30px;
-                }
-                span:hover{
-                    color: #ccc;
-                }
-            }
-            .sx{
-                margin-top: 50px;
-                width: 1px;
-                height: 400px;
-                background: #84888d;
-                .qiu{
-                width: 10px;
-                height: 10px;
-                background: #fff;
-                border-radius: 50px;
-                margin-left: -4.5px;
-                }
-            }
-            }
-            .right{
-                width: 83%;
-                background: #fff;
-                box-sizing: border-box;
-                padding: 20px 20px;
-                margin-bottom: 30px; 
-                border-radius: 5px;
-                .pAHeader{
-                    width: 85%;
-                    display: flex;
-                    justify-content:space-between;
-                    .pAHeader1{
-                        width: 200px;
-                        font-weight: 600;
-                        font-size: 22px;
-                        flex-shrink: 0;
-                    }
-                    .pAHeader2{
-                    padding-top: 15px;
-                    color: #000;
-                    cursor: pointer;
-                    }
-                }
-            }
-        }
-
-  
-
-
-</style>

src/views/activityManage/makerActvityDetails.vue

@@ -1,755 +0,0 @@
-<template>
-  <!-- 创客创新-查看详细 -->
-     <div class="makerActvityDetails" v-loading="loading">
-
-            <div class="vfpHeader">
-              <div class="titleOne">活动详情</div>
-              <el-button type="primary" @click="$router.back()">返回</el-button>
-            </div>
-            <hr>
-            <!-- 活动基本信息开始 -->
-            <div class="tabTit">
-              <div><p>活动基本信息</p></div>
-            </div>
-          <!-- 活动申请填写信息区域开始 -->
-          <div class="select">
-                    <div class="selectTop">
-                      <div class="label">活动名称</div>
-                      <el-input v-model="tableData.title" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="selectMid">
-                      <div class="selectLeft">
-                          <div class="inpBlock" style="position: relative;">
-                              <div class="label">所属项目</div>
-                              <el-select v-model="tableData.pid" disabled style="width: 100%;" placeholder="请选择">
-                                <el-option
-                                  v-for="item in selectInput.project"
-                                  :key="item.courseId"
-                                  :label="item.title"
-                                  :value="item.courseId">
-                                </el-option>
-                              </el-select>
-                              <!-- <el-select v-model="tableData.pid" @change="checkProjectMoney(tableData.pid,tableData.money)" style="width: 100%;" placeholder="请选择">
-                                <el-option
-                                  v-for="item in selectInput.project"
-                                  :key="item.courseId"
-                                  :label="item.title"
-                                  :value="item.courseId">
-                                </el-option>
-                              </el-select> -->
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">预算经费</div>
-                              <el-input type="number" v-model.number="tableData.money" @blur="checkProjectMoney(tableData.pid,tableData.money)" placeholder="请输入预算经费"></el-input>
-                              <div style="position: absolute;right: -28px;top:8px">(元)</div>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">负责人</div>
-                              <el-input v-model="tableData.pro_leader"></el-input>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">所在部门</div>
-                               <el-select v-model="tableData.classid" style="width: 100%;" placeholder="请选择">
-                                <el-option
-                                  v-for="item in selectInput.class"
-                                  :key="item.id"
-                                  :label="item.name"
-                                  :value="item.id">
-                                </el-option>
-                              </el-select>
-                          </div>
-                      </div>
-
-                      <div class="selectRight">
-                        <div class="inpBlock" style="position: relative;">
-                              <div class="label">活动时间</div>
-                              <el-date-picker
-                                v-model="tableData.begin_at"
-                                type="daterange"
-                                value-format="yyyy-MM-dd"
-                                style="width: 100%;"
-                                range-separator="至"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期">
-                              </el-date-picker>
-                              <!-- <el-input v-model="data.fund" placeholder="请输入内容"></el-input>
-                              <div style="position: absolute;right: -28px;top:8px">(元)</div> -->
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">参与学生人数</div>
-                              <el-input type="number" v-model.number="tableData.students" placeholder="请输入内容"></el-input>
-                          </div>
-                          <div class="inpBlock">
-                              <div class="label">联系电话</div>
-                              <el-input @blur="checkPhone(tableData.phone)" v-model="tableData.phone" placeholder="请输入内容"></el-input>
-                          </div>
-                      </div>
-                    </div>
-                   
-          </div>
-             
-            <!-- 活动完结报告开始 -->
-            <div class="tabTit">
-                <div><p>活动完结报告</p></div>
-            </div>
-            <div style="width: 85%" v-loading="downloadNow" element-loading-text="文件正在下载中">
-              <div style="display: flex;width: 100%;flex-direction: column;" >
-                  <div class="download" v-for="item in tableData.reportFile" :key="item.url">
-                      <span>{{ item.fileName }}</span>
-                      <div class="downloadBtn">
-                        <el-button type="primary" size="mini" @click="download(item)">下载文件</el-button>
-                        <el-button type="primary" @click="checkDelFile(item.url)" size="mini">删除文件</el-button>
-                      </div>
-                  </div>
-                  <el-progress style="margin-top:20px" v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-                  <div class="addMoneyBtn">
-                      <div class="jia">+</div>添加
-                      <div id="upFile">
-                        <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept" :progress="progress"> </beUpload>
-                      </div>
-                  </div>
-              </div>
-            </div>
-            <!-- 活动完结报告结束 -->
-
-            <!-- 活动指导老师开始 -->
-              <div class="tabTit">
-                <div>
-                  <p>活动指导老师</p>
-                </div>
-                <el-button type="primary"  @click="addTeacher" size="mini">添加教师</el-button>
-                <!-- <el-button type="primary" v-if="tableData.state==0" @click="addTeacher" size="mini">添加教师</el-button> -->
-                <!-- <el-button type="info" v-show="tableData.state==1 || tableData.state==2" disabled  size='small'>添加教师</el-button> -->
-              </div>
-              <hr>
-              <el-table
-                :data="tableData.course_teacher"
-                tooltip-effect="dark"
-                stripe
-                class="fontSize"
-                :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                >
-                <!-- 数据根据prop进行遍历填充 -->
-                <el-table-column
-                  prop="Name"
-                  label="姓名"
-                  align="center"
-                  >
-                </el-table-column>
-                <el-table-column
-                  prop="work"
-                  label="工作单位"
-                  align="center"
-                  >
-                </el-table-column>
-  
-                <el-table-column
-                  prop="takeCharge"
-                  label="活动分工"
-                  align="center"
-                  >
-                </el-table-column>
-                
-                <el-table-column
-                  prop="operation"
-                  align="center"
-                  label="操作"
-                  >
-                  <template #default="scope">
-                      <div class="operations">
-                          <!-- <el-button type="primary" > -->
-                              <el-button type="primary" size="mini" @click="updateTeacher(scope.$index)" style="font-size: 14px;">修改</el-button>
-                              <el-button type="primary" size="mini" style="font-size: 14px;" @click="DeleteS(scope.$index)">删除</el-button>
-                          <!-- </el-button> -->
-                      </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-            <!-- 活动指导老师结束 -->
-
-            <!-- 多行文本框部分开始 -->
-            <div class="tabTit">
-                 <div><p>活动介绍</p></div>
-            </div>
-              <el-input
-                type="textarea"
-                :rows="6"
-                placeholder="请输入内容"
-                v-model="tableData.brief">
-              </el-input>
-              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.brief"></vue-editor> -->
-            <div class="tabTit">
-                 <div><p>活动计划</p></div>
-            </div>
-            <el-input
-              type="textarea"
-              :rows="6"
-              placeholder="请输入内容"
-              v-model="tableData.chapters[0]">
-            </el-input>
-              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[0]"></vue-editor> -->
-            <div class="tabTit">
-                 <div><p>预期目标</p></div>
-            </div>
-            <el-input
-              type="textarea"
-              :rows="6"
-              placeholder="请输入内容"
-              v-model="tableData.chapters[1]">
-            </el-input>
-                <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[1]"></vue-editor> -->
-            <div class="tabTit">
-                 <div><p>活动受面</p></div>
-            </div>
-            <el-input
-              type="textarea"
-              :rows="6"
-              placeholder="请输入内容"
-              v-model="tableData.chapters[2]">
-            </el-input>
-              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[2]"></vue-editor> -->
-            <div class="tabTit">
-                 <div><p>经费支出计划</p></div>
-            </div>
-            <el-input
-              type="textarea"
-              :rows="6"
-              placeholder="请输入内容"
-              v-model="tableData.chapters[3]">
-            </el-input>
-              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[3]"></vue-editor> -->
-            <!-- 多行文本框部分结束 -->
-
-            <div class="baseBtn">
-              <div class="BtnStyle">
-                <el-button type="primary" v-show="tableData.state==0" @click="submit" size='small'>保存</el-button>
-                <el-button  type="info" v-show="tableData.state==1 || tableData.state==2" disabled size='small'>保存</el-button>
-                <el-button type="primary"  @click="getData" size='small'>重置</el-button>
-                <el-button v-if="tableData.state==0" type="primary" @click="processDialog = true" size='small'>立即审核</el-button>
-                <el-button type="info" v-show="tableData.state==1 || tableData.state==2" disabled size='small'>立即审核</el-button>
-              </div>
-            </div>
-
-
-            <!--修改成员dialog对话框开始 -->
-              <el-dialog
-                  :title="isAddTeacher?'添加指导老师':'修改指导老师信息'"
-                  :visible.sync="addMemberDialog"
-                  class="AddMember"
-                  :before-close="handleClose">
-
-                    <div class="littleBlock">
-                      <div class="dialogLabel">姓名</div>
-                      <div>
-                        <el-input v-model="Member.Name"></el-input>
-                      </div>
-                    </div>
-
-                    <div class="littleBlock">
-                      <div class="dialogLabel">工作单位</div>
-                      <div>
-                        <el-input v-model="Member.work"></el-input>
-                      </div>
-                    </div>
-
-                    <div class="littleBlock">
-                      <div class="dialogLabel">活动分工</div>
-                      <div>
-                        <el-input v-model="Member.takeCharge"></el-input>
-                      </div>
-                    </div>
-                    <div slot="footer" class="footer">
-                      <el-button v-if="isAddTeacher" type="primary" @click="commit" class="AllDialogBtn"  >确认提交</el-button>
-                      <el-button v-if="!isAddTeacher" type="primary" @click="change" class="AllDialogBtn"  >确认修改</el-button>
-                      <el-button @click="handleClose" class="AllDialogBtn" >取消</el-button>
-                    </div>
-              </el-dialog>
-            <!--修改成员dialog对话框结束 -->
-                  <!-- 提交对话框开始 -->
-                  <el-dialog
-                    title="提示"
-                    :visible.sync="dialogVisible1"
-                    width="600px"
-                    class="MAputIn AddMember">
-                    <div class="addDialogLogo">LOGO</div>
-                    <div class="deleteContent">是否修改“{{ tableData.title}}”项目活动？</div>
-                    <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="save" class="AllDialogBtn" >确认提交</el-button>
-                        <el-button @click="dialogVisible1=false;" class="AllDialogBtn" >取消</el-button>
-                    </span>
-                  </el-dialog>
-                  <!-- 删除文件对话框结束 -->
-                  <el-dialog
-                    title="提示"
-                    :visible.sync="DelFileDialog"
-                    width="600px"
-                    class="MAputIn AddMember">
-                    <div class="addDialogLogo">LOGO</div>
-                    <div class="deleteContent" >是否删除“{{DelFileData.fileName}}”文件？</div>
-                    <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="DelFileYes" class="AllDialogBtn" >确认删除</el-button>
-                        <el-button @click="DelFileDialog=false;" class="AllDialogBtn" >取消</el-button>
-                    </span>
-                  </el-dialog>
-                  <!-- 删除文件对话框结束 -->
-                  <!-- 审核对话框开始 -->
-                  <el-dialog
-                    title="提示"
-                    :visible.sync="processDialog"
-                    width="600px"
-                    class="MAputIn AddMember">
-                    <div class="addDialogLogo">LOGO</div>
-                    <div class="deleteContent">是否审核“{{ tableData.title}}”项目活动？</div>
-                    <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="process" class="AllDialogBtn" >确认审核</el-button>
-                        <el-button @click="processDialog=false;" class="AllDialogBtn">取消</el-button>
-                    </span>
-                  </el-dialog>
-                  <!-- 审核对话框结束 -->
-                  <!-- 删除老师对话框开始 -->
-                  <el-dialog
-                    title="提示"
-                    :visible.sync="DelTeacherDialog"
-                    width="600px"
-                    class="MAputIn AddMember">
-                    <!-- <div class="addDialogLogo">LOGO</div> -->
-                    <div class="deleteContent">是否删除“{{ delTeacherTable.Name}}”指导老师？</div>
-                    <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="DelTeacherYes" class="AllDialogBtn" >确认删除</el-button>
-                        <el-button @click="DelTeacherDialog=false;" class="AllDialogBtn" >取消</el-button>
-                    </span>
-                  </el-dialog>
-                  <!-- 删除老师对话框结束 -->
-      </div>
-</template>
-
-<script>
-import { VueEditor } from "vue2-editor";
-import BeUpload from '../../components/tool/beUpload.vue'
-import downloadFile from '@/components/tool/downloadFile.js'
-export default {
-  components:{
-    VueEditor,
-    BeUpload
-  },
-  data() {
-    return {
-      downloadNow:false,
-      accept:"*",
-      loading:false,
-      DelFileDialog:false,
-      dialogVisible1:false,
-      addMemberDialog:false,
-      processDialog:false,
-      DelTeacherDialog:false,
-      customToolbar: [
-        ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
-        [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
-        [{header:[false,1,2,3,4]}]
-      ],
-      tableData:{
-        acId:"",
-        title:"",
-        pid:"",
-        userid:"",
-        money:0,
-        pro_leader:"",
-        classid:"",
-        begin_at:[],
-        students:0,
-        state:0,
-        phone:"",
-        course_teacher:[],
-        brief:"",
-        chapters:["","","",""],
-        reportFile:"",
-      },
-      oldMoney:0,
-      selectInput:{
-        project:[],
-        class:[]
-      },
-      DelFileData:{
-        fid:"",
-        fileName:"",
-      },
-      delTeacherTable:{
-        Id:"",
-        name:"",
-      },
-      Member:{
-        Name:'',
-        work:'',
-        takeCharge:''
-      },
-      isAddTeacher:true,
-      progress:{
-        value:0,
-        show:false
-      }
-      }
-      
-  },
-  methods:{
-    download(item){
-      downloadFile(item['url'],item['fileName'],(_b)=>this.downloadNow = _b);
-    },
-    DelFileYes(){
-      let newFile = this.tableData.reportFile.filter(item=>item.url!=this.DelFileData.url);
-      this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
-        uid:this.$store.state.userInfo.userid,
-        aid:this.$route.query['Id'],
-        file:JSON.stringify(newFile)
-      }).then(res=>{
-        if(res.data==1){
-          this.$message.success("删除成功");
-        }else{
-          this.$message.error("删除失败")
-        }
-        this.getData();
-        this.DelFileDialog = false;
-      }).catch(err=>{
-        this.$message.error(err.message)
-      })
-    },
-    checkDelFile(url){
-      this.DelFileData = this.tableData.reportFile.filter(item=>item.url==url)[0];
-      this.DelFileDialog = true;
-    },
-    getFile(val) {//上传文件
-      let newData = [...this.tableData.reportFile,val];
-      this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
-        uid:this.$store.state.userInfo.userid,
-        aid:this.$route.query['Id'],
-        file:JSON.stringify(newData)
-      }).then(res=>{
-        if(res.data==1){
-          this.$message.success("添加成功");
-          this.getData();
-          this.progress.show = false;
-        }else{
-          this.$message.error("添加失败")
-        }
-      }).catch(err=>{
-        this.$message.error(err.message);
-      })
-    },
-    submit(){
-      if(this.check()!=1)return;
-      this.dialogVisible1 = true;
-    },
-    DeleteS(index){
-      this.delTeacherTable = this.tableData.course_teacher[index];
-      this.delTeacherTable.index = index;
-      this.DelTeacherDialog = true;
-    },
-    DelTeacherYes(){
-      this.tableData.course_teacher.splice(this.delTeacherTable.index);
-      this.DelTeacherDialog = false;
-
-    },
-    //保存修改
-    save(){
-      const data = this.tableData;
-
-      const param = {
-        uid:this.$store.state.userInfo.userid,
-        aid:data.acId,
-        tit:data.title,
-        con:data.brief,
-        leader:data.pro_leader,
-        mon:data.money,
-        stu:data.students,
-        teacher:JSON.stringify(data.course_teacher),
-        chap:JSON.stringify(data.chapters),
-        pid:data.pid,
-        cid:data.classid,
-        ph:data.phone,
-        beginTime:JSON.stringify(data.begin_at)
-      }
-      this.ajax.post(this.$store.state.api+"/UpdateActivity",param).then(res=>{
-        if(res.data==1){
-          this.$message.success("修改成功");
-          this.dialogVisible1=false
-          this.getData();
-        }else{
-          this.$message.error("修改失败"+res.data);
-        }
-      }).catch(err=>{
-        this.$message.error(err.message)
-      })
-    },
-    change(){
-      if(this.isAddTeacher)return this.$message.error("错误");
-      for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-      Object.assign(this.tableData.course_teacher[this.Member.index],this.Member)
-      for(let i in this.Member)this.Member[i]='';
-      this.addMemberDialog = false;
-    },
-    updateTeacher(index){      
-      Object.assign(this.Member,this.tableData.course_teacher[index])
-      this.Member.index = index;
-      this.isAddTeacher = false;
-      this.addMemberDialog = true;
-    },
-    
-    check(){   //检查整个表单
-        let checkData = this.tableData;
-        const cEmpty = /^\s*$/g;
-        for(let i in checkData){
-            switch(i){
-                // case "chapters":
-                //   for(let a in checkData[i]){
-                //     switch(a){
-                //         case "0":
-                //           if(cEmpty.test(checkData[i][a]))return this.$message.error("活动计划不能为空");  
-                //           break;
-                //         case "1":
-                //           if(cEmpty.test(checkData[i][a]))return this.$message.error("预期目标不能为空");
-                //           break;
-                //         case "2":
-                //           if(cEmpty.test(checkData[i][a]))return this.$message.error("活动受面不能为空");
-                //           break;
-                //         case "3":
-                //           if(cEmpty.test(checkData[i][a]))return this.$message.error("经费支出计划不能为空");
-                //           break;
-                //     }
-                //   }
-                //     break;
-                case "title":
-                    if(cEmpty.test(checkData[i]))return this.$message.error("活动名称不能为空");
-                    break;
-                case "course_teacher":
-                    if(checkData[i].length==0)return this.$message.error("请添加至少一名指导老师")
-                    break;
-                case "fund":
-                    break;
-                case "people":
-                    break;
-                case "pro_leader":
-                    if(cEmpty.test(checkData[i]))return this.$message.error("负责人不能为空");
-                    break;
-                case "pid":
-                    if(cEmpty.test(checkData[i]))return this.$message.error("请选择所属项目");
-                    break;
-                case "phone":
-                    if(cEmpty.test(checkData[i]))return this.$message.error("电话号码不能为空");
-                    if(!this.checkPhone(checkData[i]))return;
-                    break;
-                case "begin_at":
-                    if(checkData[i]==null||checkData[i].length<2)return this.$message.error("请选择项目开始时间");
-                    break;
-                case "classid":
-                    if(cEmpty.test(checkData[i]))return this.$message.error("请选择所在部门");
-                    break;
-                // case "brief":
-                //     if(cEmpty.test(checkData[i]))return this.$message.error("活动介绍不能为空");
-                //     break;
-            }
-        }
-        return 1;
-    },
-   
-    checkPhone(val){     //检查手机号
-        if(/^\s*$/g.test(val))return;
-        const cPhone = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/
-        if(!cPhone.test(val)){
-            this.$message.error("电话号码格式不正确");
-            return false;
-        }
-        return true;
-    },
-    commit(){     //判断是否全部填写
-      
-      for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-      let pushData={};
-      delete this.Member.index
-      Object.assign(pushData,this.Member)
-      this.tableData.course_teacher.push(pushData);
-      for(let i in this.Member)this.Member[i] = '';
-      this.addMemberDialog=false;
-    },
-    handleClose(){
-      this.addMemberDialog=false;
-    },
-    addTeacher(){
-      this.isAddTeacher = true;
-      this.addMemberDialog=true;
-    },
-    getAllClass(){
-        this.ajax.get(this.$store.state.api+"/SelectAllDepartment",{
-            uid:this.$store.state.userInfo.userid,
-        }).then(res=>{
-            this.selectInput.class = res.data[0];
-        }).catch(err=>{
-            this.$message.error(err.message)
-        })
-    },
-    getProject(){
-      this.loading = true;
-        this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
-            uid:this.$store.state.userInfo.userid,
-        }).then(res=>{
-          console.log(res)
-          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||(item.isupload!=3 && item.isupload!=4 )));
-          this.loading = false
-        }).catch(err=>{
-            this.$message.error(err.message)
-        })
-    },
-    getData(){
-      this.loading = true;
-      this.ajax.get(this.$store.state.api+"/GetActivityDetail",{
-        uid:this.$store.state.userInfo.userid,
-        aId:this.$route.query["Id"]
-      }).then(res=>{
-        if(!res.data[0][0])return this.$message.error("错误")
-        let data = res.data[0][0];
-        data.begin_at = JSON.parse(data.begin_at);
-        data.course_teacher = JSON.parse(data.course_teacher);
-        data.chapters = JSON.parse(data.chapters)
-        data.reportFile = data.reportFile==''||data.reportFile==null?[]:JSON.parse(data.reportFile)
-        this.tableData = data;
-        this.oldMoney += Number(this.tableData.money)
-        this.getProject();
-        console.log(this.tableData)
-        this.loading = false;
-      }).catch(err=>{
-        this.$message.error(err.message)
-      })
-    },
-  
-    process(){     //立项审核
-      this.ajax.post(this.$store.state.api+"/UpdateActivityState",{
-        uid:this.$store.state.userInfo.userid,
-        aid:this.$route.query["Id"],
-        st:1,
-      }).then(res=>{
-        if(res.data==1){
-          this.$message.success("审核成功");
-          this.processDialog = false;
-        }else{
-          this.$message.error("审核失败")
-        }
-        this.getData();
-      }).catch(err=>{
-        this.$message.error(err.message)
-      })
-    },
-   
-    checkProjectMoney(pid,aMoney){    //检查经费是否超出
-      if(aMoney==0){
-        return 1;
-      }else if(/^\s*$/g.test(pid) && aMoney!=0){
-        this.tableData.money = 0;
-        return this.$message.info("请先选择所属项目");
-      } else if(!/^\s*$/g.test(pid) && aMoney!=0){
-        this.ajax.get(this.$store.state.api+"/GetAllActivityMoneyByProjectId",{
-          uid:this.$store.state.userInfo.userid,
-          projectid:pid
-        }).then(res=>{
-          let PMoney = res.data[0][0]['PMoney'];
-          let AMoney = res.data[1][0]["AMoney"];
-          if(PMoney<((AMoney-this.oldMoney)+aMoney)){
-            this.tableData.money = PMoney-AMoney+this.oldMoney;
-            return this.$message.warning(`项目预算不足,项目预算只剩：${PMoney-AMoney+this.oldMoney}`);
-          }else{
-            return 1;
-          }
-        }).catch(err=>{
-          console.log(err)
-        })
-      }
-    },
-    ProgressFormat(value){       
-      return value ==100?'100%':`${value}%`
-    }
-  },
-  mounted(){
-    this.getAllClass();
-
-    this.getData();
-  }
-}
-</script>
-
-<style lang="less">
-.makerActvityDetails{
-
-    
-  .download{   //pdf下载
-    margin: 10px 10px;
-    width: 500px;
-    line-height: 35px;
-    text-align: left;
-    font-size: 16px;
-    font-weight: bold;
-    color: #5391fd;
-    display: flex;
-    justify-content: space-between;
-    cursor: pointer;
-    span{
-      display: block;
-      max-width: 250px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-    
-  textarea{
-    font-size: 16px;
-    resize: none;
-  }
-
-  }
-  .MAputIn{   //提交对话框样式
-  .deleteContent{
-    width: 100%;
-    text-align: center;
-    font-size: 22px;
-    color: #000;
-  }
-  .addDialogLogo{
-    width: 60px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        border-radius: 5px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-  }
- 
-  .el-dialog__title{
-    color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-  }
-  
-  .dialog-footer{
-    display: flex;
-    justify-content: center;
-    
-  }
-}
-.BtnStyle{
-  display: flex;
-  justify-content:space-between;
-  [type='button']{
-      color: #fff !important;
-      display: flex;
-      justify-content: center;
-      font-size: 16px;
-      width: 120px;
-      margin-left: 20px;
-      height: 40px;
-      align-items: center;
-    }
-}
-</style>

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="studentProjectWordDetail">
         <studentProjectWord v-if="isupload==0" :wordData="wordData" :reversedMessage="reversedMessage"/>
-        <studentProjectWordShow v-if="isupload==1" :downWordData="downWordData" :reversedMessage="reversedMessage"/>
+        <studentProjectWordShow v-if="isupload!=0" :downWordData="downWordData" :reversedMessage="reversedMessage"/>
           <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
               <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary" v-if="isupload==0">立即修改</el-button>
               <el-button style="width: 120px;margin: 20px auto;" @click="downloadDig=true" type="primary">下载文档</el-button>
@@ -360,6 +360,7 @@
         display: flex;
         flex-direction: column;
         align-items: center;
+        position: relative;
     }
     
     </style>

src/views/projectApply/components/studentProjectWordShow.vue

@@ -88,9 +88,9 @@
             <td colspan="3" v-text="item.work"></td>
           </tr>
           <tr id="brief">
-            <td rowspan="5" ref="brief">研发内容</td><td style="text-align: left;position: relative;" colspan="6" class="textLeft">
+            <td rowspan="5" ref="brief">研发内容</td><td colspan="6" class="textLeft">
               <p>项目简介（200-300字）</p>
-              <span v-text="downWordData.brief"></span>
+              <div style="word-wrap: break-word;word-break: break-all;" v-text="downWordData.brief"></div>
             </td>
           </tr>
           <tr>
@@ -281,7 +281,7 @@
         align-items: center;
         background-color: #ffff;
         margin: 0;
-        padding:40px 100px;
+        padding: 40px 100px;
         box-sizing:border-box;
         #title{
             width: 100%;
@@ -313,21 +313,36 @@
             border: none;
             border-top: solid 1px black;
             border-right:  solid 1px black;
+            border-left:  solid 1px black;
             .textLeft{
-              // align-items: flex-start;
-              text-align: start;
+              text-align: left ;
               vertical-align: top;
-              padding: 0 10px 40px 10px;
+              position: relative;
+              max-width:100% ;
               height: 200px;
+              white-space: nowrap;
+              span{
+                white-space: nowrap
+              }
+              :deep(.el-textarea__inner){
+                border: none ;
+                border-radius: 0px;
+                text-align: left !important;
+                font-size: 16px;
+              }
             }
-            tr td{
-              border: none;
-              border-bottom: solid 1px black;
-              border-left: solid 1px black;
-              height: 50px;
-              text-align: center;
-              line-height: 30px;
-              width: 14.3%;
+            tr{
+              position: relative;
+              td{
+                border: none;
+                border-bottom: solid 1px black;
+                border-right: solid 1px black;
+                height: 50px;
+                text-align: center;
+                line-height: 30px;
+                min-width: 80px;
+                box-sizing: border-box;
+                padding: 5px;
               p{
                 font-weight: 600;
               }
@@ -355,6 +370,7 @@
                   -moz-appearance: textfield;
               }
             }
+          }
             
         }
         .notes{
@@ -363,23 +379,6 @@
           flex-direction:column;
         }
         
-    }
-       
-    .operate{
-        right:-85px;
-        width:85px;
-        height: 50px;
-        display:flex;
-        justify-content:space-between;
-        align-items:center;
-        position:absolute;
-        .el-button{
-          max-width:10px;
-          display:flex;
-          justify-content:center;
-          align-items:center;
-          margin-left:10px;
-        }
     }
       .checkArea{
         td{

src/views/projectManage/ProjectManagement.vue

@@ -196,70 +196,17 @@
           >
           <template #default="scope">
               <div class="operations">
-                <!-- <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
-                <span @click="fundStatus(item.courseId)">资金情况</span>
-                <span v-show="item.isupload==2"  @click="finish(item.courseId,item.title)">结项</span>
-                <span v-show="item.isupload==3"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-                <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>    -->
                 <el-button type="primary" @click="scheduleDetail(scope.row.courseId,scope.row.typeid)"   size="mini" >进度详细</el-button>
                 <el-button type="primary" @click="fundStatus(scope.row.courseId)"  size="mini" >资金情况</el-button>
                 <el-button type="primary" v-show="scope.row.isupload==2"  @click="finish(scope.row.courseId,scope.row.title)"   size="mini">结项</el-button>
                 <el-button type="primary" v-show="scope.row.isupload==3"  @click="amendFinish(scope.row.courseId,scope.row.title)" size="mini">修改结项</el-button>
                 <el-button type="primary" v-show="scope.row.isupload==4" disabled class="disa" size="mini">已结项</el-button>
-                <!-- {{ scope.row.isupload }} -->
-                        <!-- <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId,scope.row.typeid)">查看详情</el-button>
-
-                        <el-button type="primary" v-show="scope.row.isupload==0" @click="audit(scope.row,0)"  size="mini" >审核</el-button>
-                        <el-button type="primary" v-show="scope.row.isupload==1 " class="disa" size="mini" >审核中</el-button>
-                        <el-button type="primary" v-show="scope.row.isupload==2"  class="disa"  size="mini">已审核</el-button>
-                        <el-button type="primary" v-show="scope.row.isupload==3" class="disa" size="mini">待结项</el-button>
-                        <el-button type="primary" v-show="scope.row.isupload==4" class="disa" size="mini">已结项</el-button>
-
-                        
-                        <el-button  v-show="scope.row.isupload==0" type="primary" class="disa" size="mini">审核</el-button> 
-                        <el-button  v-show="scope.row.isupload==1" type="primary" size="mini" @click="audit(scope.row,1)">审核1</el-button>
-                        <el-button  v-show="scope.row.isupload==2" type="primary" class="disa" size="mini">已审核</el-button>
-                        <el-button  v-show="scope.row.isupload==3" type="primary" class="disa" size="mini">待结项</el-button>
-                        <el-button  v-show="scope.row.isupload==4" type="primary" class="disa" size="mini">已结项</el-button>
-
-                        <el-button type="primary"  size="mini" @click="del(scope.row)">删除</el-button> -->
               </div>
           </template>
         </el-table-column>
       </el-table>
     </div>
 <!-- 表格结束 -->
-<!-- 循环展示框列表开始 -->
-    <!-- <div class="projectBlock core_dialogue">
-      <div class="classBlock" v-for="(item,index) in items" :key="index">
-        <div class="projectBlockPosition">
-          <span v-if="item.isupload==2">进行中</span>
-          <span v-if="item.isupload==3">待结题</span>
-          <span v-if="item.isupload==4">已结题</span>
-
-        </div>
-        <img :src="item.image" alt="">
-        <div class="classBlock1">
-            <div class="classBlock2">{{ item.title }}</div>
-            <div class="classBlock3">
-              <div><span style="color: #000;">创建日期:</span>{{ item.createTime }}</div>
-            </div>
-            <div class="classBlock3">
-              <div><span style="color: #000;">修改日期:</span>{{ item.updateTime}}</div>
-            </div>
-        </div>
-
-            <div class="classBlockBtn">
-              <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
-              <span @click="fundStatus(item.courseId)">资金情况</span>
-              <span v-show="item.isupload==2"  @click="finish(item.courseId,item.title)">结项</span>
-              <span v-show="item.isupload==3"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-              <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>          
-            </div>
-       
-      </div>
-    </div> -->
-<!-- 循环展示框列表结束 -->
 
     <!-- 完结对话框开始 -->
     <el-dialog
@@ -271,8 +218,8 @@
       <div class="addDialogLogo">LOGO</div>
       <div class="deleteContent">"{{ tit }}"项目，是否确定完结？</div>
       <div class="download checkActivity" v-show="checkFundEndData.length>0">
-            <span style="color: black;">剩余资金:</span><span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundEndData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}
-              （元）</span>
+            <span style="color: black;">剩余资金:</span>
+            <!-- <span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundEndData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}（元）</span> -->
       </div>
       <div class="deleteContent1">活动完结报告</div>
         <div class="download" v-for="item in file" :key="item.fid">
@@ -308,8 +255,8 @@
             <span style="color: black;">未完结活动:</span><span v-for="(item,index) in checkActivityFinishData" :key="index">{{ item.title }}</span>
       </div>
       <div class="download checkActivity" v-show="checkFundFinishData.length>0">
-            <span style="color: black;">未完结资金:</span><span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundFinishData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}
-              （元）</span>
+            <span style="color: black;">未完结资金:</span>
+            <!-- <span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundFinishData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}（元）</span> -->
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="init" class="AllDialogBtn">确认</el-button>
@@ -335,7 +282,6 @@
 
 <script>
 import beUpload from '../../components/tool/beUpload'
-import { getNowDate } from '@/components/tool/Date';
     export default {
       components:{beUpload},
       data() {
@@ -424,13 +370,14 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            this.checkFundEndData = res.data[1].filter(i=>{
-              return (i.fund !=i.usedFund)
-            })
+            console.log(res);
+            // this.checkFundEndData = res.data[1].filter(i=>{
+            //   return (i.fund !=i.usedFund)
+            // })
 
-            this.checkFundEndData=res.data[1].filter(i=>{
-                  return (i.fund != i.usedFund)
-            })
+            // this.checkFundEndData=res.data[1].filter(i=>{
+            //       return (i.fund != i.usedFund)
+            // })
 
             let data=JSON.parse(res.data[0][0].endFile)
             this.file=data;
@@ -464,12 +411,12 @@ import { getNowDate } from '@/components/tool/Date';
           })
           this.endDialog=false;
         },
-        scheduleDetail(val,tid){           //进度详情
+        scheduleDetail(val,tid){//进度详情
           this.$router.push(`/ProjectManagementMain?Id=${tid}&pid=${val}`)
         },
-        fundStatus(Id){     //资金情况
+        fundStatus(Id){//资金情况
           // localStorage.setItem('pid',JSON.stringify(Id))
-          this.$router.push(`/ProjectManagementFund1?pid=${Id}`)
+          this.$router.push(`/ProjectManagementFundDetail?pid=${Id}`)
         },
         init(){       //对话框重置
           this.endDialog=false;
@@ -483,7 +430,6 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            console.log(res['data'])
             if(res.data[0].length>0 || res.data[1].length>0){
               this.checkActivityFinishData = res.data[0];
               this.checkFundFinishData = res.data[1];

src/views/projectManage/ProjectManagementFund1.vue

@@ -1,307 +0,0 @@
-<template>
-  <!-- 项目管理 项目资金使用情况 -->
-  <div class="ProjectManagementFund1" v-loading="loading">
-        <div class="vfpHeader">
-            <div class="titleOne">预算经费</div>
-            <el-button type="primary" @click="back">返回</el-button>
-        </div>
-          <hr>
-
-
-          <!-- 跳转导航开始 -->
-          <div class="AppBar">
-              <div @click="content" class="AppBarActive">
-                项目资金使用详情
-                <div class='pr1TitBass'></div>
-              </div>
-              <div @click="remark">资金申报明细</div>
-          </div>
-
-          <!-- 三个输入框开始 -->
-          <div class="totalFund">
-            <div class="totalFund1">
-                <div class="totalFundLabel">预算总经费</div>
-                <el-input v-model="allFund" placeholder="请输入内容"></el-input><span>(万)</span>
-            </div>
-            <div class="totalFund1">
-                <div class="totalFundLabel" style="display: flex;justify-content: flex-end;">已经支出</div>
-                <el-input v-model="useFund" placeholder="请输入内容"></el-input><span>(万)</span>
-            </div>
-            <div class="totalFund1">
-                <div class="totalFundLabel" style="display: flex;justify-content: flex-end;">剩余</div>
-                <el-input v-model="remainFund" placeholder="请输入内容"></el-input><span>(万)</span>
-            </div>
-          </div>
-          <!-- 三个输入框结束 -->
-
-          <!-- 经费月支出计划开始 -->
-            <div class="tabTit">
-              <div><p>经费月支出计划(元)</p></div>
-            </div>
-            <el-table
-              :data="tableData"
-              tooltip-effect="dark"
-              stripe
-              class="fontSize core_dialogue"
-              :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-              >
-              <el-table-column
-                prop="one"
-                label="1月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="two"
-                label="2月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="three"
-                label="3月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="four"
-                label="4月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="five"
-                label="5月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="six"
-                label="6月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="seven"
-                label="7月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="eight"
-                label="8月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="nine"
-                label="9月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="ten"
-                label="10月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="eleven"
-                label="11月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="twelve"
-                label="12月"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="remark"
-                label="备注"
-                align="center"
-                width="100">
-
-              </el-table-column>
-            </el-table>
-          <!-- 经费月支出计划结束-->
-
-          <!-- 经费明细开始 -->
-            <div class="tabTit">
-              <div><p>经费明细</p></div>
-              <!-- <el-button type="primary" @click="addBtn" >设置</el-button> -->
-            </div>
-
-            <el-table
-              :data="tableData2"
-              tooltip-effect="dark"
-              stripe
-              class="fontSize"
-              style="height: 360px;"
-              :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-              >
-              <el-table-column
-                prop="type"
-                label="支出类别"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="disburseProject"
-                label="支出项目"
-                align="center"
-                >
-              </el-table-column>
-              <el-table-column
-                prop="fund"
-                label="金额(元)"
-                align="center"
-                >
-              </el-table-column>
-<!--               
-              <el-table-column
-                prop="state"
-                label="状态"
-                align="center"
-                >
-              </el-table-column> -->
-              <el-table-column
-                prop="textarea"
-                label="备注"
-                align="center"
-               >
-              </el-table-column>
-              <!-- <el-table-column
-                prop="operation"
-                align="center"
-                label="操作"
-                >
-                <template #default="scope">
-                    <div class="operations">
-                            <el-button type="primary" @click="lookDetail(scope)" size="mini">明细查看</el-button>
-                    </div>
-                </template>
-                </el-table-column> -->
-            </el-table>
-          <!-- 经费明细结束 -->
-            
-          <!-- <div class="pmFund1Footer">
-            <el-pagination
-            background
-            layout="prev, pager, next"
-            :total="1">
-            </el-pagination>
-          </div> -->
-</div>
-</template>
-
-<script>
-    export default {
-      data() {
-        return {
-          dialogVisible1:false,
-          fundDetail:false,
-          allFund:0,  //总经费
-          useFund:0,   //已使用
-          remainFund:0,  //剩余多少钱
-          tableData:[],  //经费月支出经费计划
-          tableData2:[],  //经费明细
-          textarea:'',
-          input:'',
-          value: '',
-          loading:false,
-        }
-      },
-      methods:{
-        getData(){   //初始化完成获取基本数据进行填充
-          this.loading = true;
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:this.$route.query['pid']
-            }
-              this.ajax
-                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
-                    .then(res=>{
-                      let data = res.data[0][0]
-                      let fund = JSON.parse(data['money'])
-                      this.tableData = fund['tableData']
-                      this.tableData2 = fund['tableData2']
-                      this.allFund = data['fund']
-                      this.tableData2.forEach((e)=>{
-                        this.useFund=this.useFund+e.fund
-                      })
-                      this.useFund=this.useFund / 10000
-                      this.remainFund=this.allFund - this.useFund
-                      this.loading = false;
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-        content(){
-          this.$router.push(`/ProjectManagementFund1?pid=${this.$route.query['pid']}`)
-        },
-        remark(){
-          this.$router.push(`/ProjectManagementFund2?pid=${this.$route.query['pid']}`)
-        },
-        back(){
-          this.$router.push('/ProjectManagement')
-        }
-      },
-      mounted(){
-        this.getData()
-      }
-    }
-</script>
-
-<style lang="less">
-.ProjectManagementFund1{
-
-
-
-  .pmFund1Footer{
-      float: right;
-      margin-top: 30px;
-  }
-
-  .totalFund{  //输入框样式  
-    width: 85%;
-    display: flex;
-    justify-content: space-between;
-    line-height: 25px;
-    margin: 20px 0 30px;
-    .totalFundLabel{
-      min-width: 80px;
-      display: inline-block;
-      text-align: justify;
-      text-justify:distribute-all-lines;
-      text-align-last: justify;
-      padding-right: 10px;
-      font-size: 16px;
-    }
-    .totalFund1{
-      width:320px;
-      display: flex;
-      align-items: center;
-      position: relative;
-      margin-right: 40px;
-      span{
-        position: absolute;
-        top: 8px;
-        right: -30px;
-      }
-    }
-  
-  }
-.el-table .cell{
-        // 不换行
-        white-space:nowrap !important;
-    }
-  
-
-  .newWidth{
-    width: 150px;
-  }
-
-}
-</style>

src/views/projectManage/ProjectManagementFundDetail.vue

@@ -0,0 +1,75 @@
+<template>
+  <!-- 项目管理 项目资金使用情况 -->
+  <div class="ProjectManagementFundDetail" v-loading="loading">
+        <div class="vfpHeader">
+            <div class="titleOne">预算经费</div>
+            <el-button type="primary" @click="back">返回</el-button>
+        </div>
+          <hr>
+          <!-- 跳转导航开始 -->
+          <div class="AppBar">
+              <div @click="state=0" class="AppBarActive">项目资金使用详情<div v-if="state==0" class='pr1TitBass'></div></div>
+              <div @click="state=1">资金申报明细<div v-if="state==1" class='pr1TitBass'></div></div>
+          </div>
+          <div id="ShowArea">
+            <fundDetail v-if="state==0"/>
+          </div>
+
+         
+</div>
+</template>
+
+<script>
+import fundDetail from './components/FundDetail.vue'
+    export default {
+      components:{fundDetail},
+      data() {
+        return {
+          state:0,
+          loading:false,
+        }
+      },
+      methods:{
+        // getData(){   //初始化完成获取基本数据进行填充
+        //   this.loading = true;
+        //     let param={
+        //       uid:this.$store.state.userInfo.userid,
+        //       pid:this.$route.query['pid']
+        //     }
+        //       this.ajax
+        //             .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+        //             .then(res=>{
+        //               let data = res.data[0][0]
+        //               let fund = JSON.parse(data['money'])
+        //               this.tableData = fund['tableData']
+        //               this.tableData2 = fund['tableData2']
+        //               this.allFund = data['fund']
+        //               this.tableData2.forEach((e)=>{
+        //                 this.useFund=this.useFund+e.fund
+        //               })
+        //               this.useFund=this.useFund / 10000
+        //               this.remainFund=this.allFund - this.useFund
+        //               this.loading = false;
+        //             },err=>{
+        //               console.log(err);
+        //             })
+        //   },
+        back(){
+          this.$router.push('/ProjectManagement')
+        }
+      },
+      mounted(){
+        // this.getData()
+      }
+    }
+</script>
+
+<style lang="less">
+.ProjectManagementFundDetail{
+  width: 100%;
+  height: 100%;
+  #ShowArea{
+    width: 100%;
+  }
+}
+</style>

src/views/projectManage/ProjectManagementMain.vue

@@ -14,13 +14,8 @@
                 <div :class="index==show?item.cl:''"></div>
             </div>
         </div>
-        <!-- <ProjectManagement1 v-if="show==0 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement1> -->
-        <!-- <ProjectManagement2 v-if="show==1 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2> -->
-
-        <!-- 特色创客空间建设 -->
-        <!-- <ProjectManagement1_MakerSpace v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
-        <!-- <ProjectManagement2_MakerSpace v-if="show==1 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2_MakerSpace> -->
-
+        <!-- 创客项目 -->
+        <studentProjectWordShow v-if="show==0 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- 特色创客空间建设 -->
         <MakerSpaceWordShow v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- 活动开展 -->
@@ -35,8 +30,7 @@
 </template>
 
 <script>
-    // import ProjectManagement1 from './components/ProjectManagement1.vue'
-    // import ProjectManagement2 from './components/ProjectManagement2.vue'
+
     import ProjectManagement3 from './components/ProjectManagement3.vue'
     import ProjectManagement3_1 from './components/ProjectManagement3_1.vue'
     // import ProjectManagement4 from './components/ProjectManagement4.vue'
@@ -44,6 +38,8 @@
 
     // //特色创客空间建设
     import MakerSpaceWordShow from './components/MakerSpaceWordShow.vue'
+    //创客空间
+    import studentProjectWordShow from './components/studentProjectWordShow.vue'
     export default {
         components:{
             MakerSpaceWordShow,
@@ -53,6 +49,7 @@
             ProjectManagement3_1,
             // ProjectManagement4,
             ProjectManagement5,
+            studentProjectWordShow,
             // ProjectManagement1_MakerSpace,
             // ProjectManagement2_MakerSpace,
         },

src/views/projectManage/components/FundDetail.vue

@@ -0,0 +1,138 @@
+<template>
+    <div id="fundDetail">
+        <table border="1" cellspacing="0" class="table">
+            <tr id="fund">
+            <td rowspan="12" ref="fund" style="white-space: ;">实际使用经费</td><td>总经费</td><td colspan="5" v-text="'xxxxxx'"></td>
+          </tr>
+          <tr>
+            <td>支出类别</td><td colspan="2">支出项目</td><td>金额（元）</td><td colspan="4">备 注</td>
+          </tr>
+          <tr>
+            <td rowspan="5">直接费用</td>
+          </tr>
+          <tr>
+            <td colspan="2">小型仪器设备费</td>
+            <td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">材料费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">测试化验加工费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">项目协作费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              按合同规定支付给协作单位的费用
+            </td>
+          </tr>
+    
+          <tr>
+            <td rowspan="5">间接费用</td>
+          </tr>
+          <tr>
+            <td colspan="2">项目成果鉴定费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              学术会务费、评审费、鉴定费、成果集制作费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">参展参赛费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">创客交流活动费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">知识产权事务费</td><td v-text="'xxxxxx'">
+            </td><td colspan="2">
+              论文版面费、专利及其他知识产权事务等费用。
+            </td>
+          </tr>
+        </table>
+    </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+
+    }
+  },
+  methods:{
+    // getData(){   //初始化完成获取基本数据进行填充
+    //   this.loading = true;
+    //     let param={
+    //       uid:this.$store.state.userInfo.userid,
+    //       pid:this.$route.query['pid']
+    //     }
+    //       this.ajax
+    //             .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+    //             .then(res=>{
+    //               let data = res.data[0][0]
+    //               let fund = JSON.parse(data['money'])
+    //               this.tableData = fund['tableData']
+    //               this.tableData2 = fund['tableData2']
+    //               this.allFund = data['fund']
+    //               this.tableData2.forEach((e)=>{
+    //                 this.useFund=this.useFund+e.fund
+    //               })
+    //               this.useFund=this.useFund / 10000
+    //               this.remainFund=this.allFund - this.useFund
+    //               this.loading = false;
+    //             },err=>{
+    //               console.log(err);
+    //             })
+    //   },
+  },
+  mounted(){
+    // this.getData()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+#fundDetail{
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .table{
+        width: 100%;
+        border: none;
+        border-top: solid 1px black;
+        border-right:  solid 1px black;
+        border-left:  solid 1px black;
+        tr{
+          position: relative;
+          td{
+            border: none;
+            border-bottom: solid 1px black;
+            border-right: solid 1px black;
+            height: 65px;
+            text-align: center;
+            line-height: 30px;
+            min-width: 80px;
+            box-sizing: border-box;
+            padding: 5px;
+            }
+        }      
+    }
+}
+</style>

src/views/projectManage/components/ProjectManagement1.vue

@@ -1,848 +0,0 @@
-<template>
-  <!-- 项目管理 项目基本内容 -->
-  <div class="ProjectManagement1" v-loading="loading">
-
- <!-- 活动申请填写信息区域开始 -->
- <div class="select">
-        <div class="selectTop">
-          <div class="label">项目名称</div>
-          <el-input v-model="content.select.projectName" placeholder="请输入内容"></el-input>
-        </div>
-        <div class="selectMid">
-          <div class="selectLeft">
-              <div class="inpBlock">
-                  <div class="label">项目负责人</div>
-                  <el-input v-model="content.select.leader" placeholder="请输入内容"></el-input>
-              </div>
-              <div class="inpBlock">
-                  <div class="label">所在部门</div>
-                  <el-select v-model="content.select.department" style="width: 100%;" placeholder="请选择">
-                    <el-option
-                      v-for="item in this.departmentOptions"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-              </div>
-              <div class="inpBlock">
-                  <div class="label" style="width: 50px;font-size: 14px;position: relative;top: -8px;">优先支持项目(可多选)</div>
-                  <el-select style="width: 100%;" v-model="content.select.MultiSelectProjectNameS" multiple placeholder="请选择">
-                    <el-option
-                      v-for="item in this.MultiSelectProject"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-              </div>
-              <div class="inpBlock">
-                  <div class="label">联系电话</div>
-                  <el-input type="number" v-model="content.select.tel"  @blur="getText(content.select.tel)" placeholder="请输入联系方式"></el-input>
-              </div>
-              <div class="inpBlock">
-                <div class="label">选择分类</div>
-                <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
-                <el-cascader disabled style="width: 100%;" v-model="pageType" :options="sortOptions" clearable></el-cascader>
-              </div>
-          </div>
-
-          <div class="selectRight">
-            <div class="inpBlock">
-                  <div class="label">项目开始时间</div>
-                  <el-date-picker
-                    v-model="content.select.projectDate"
-                    type="daterange"
-                    disabled
-                    style="width: 100%;"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期">
-                  </el-date-picker>
-              </div>
-              <div class="inpBlock" style="position: relative;">
-                  <div class="label">预算总经费</div>
-                  <el-input type="number" disabled v-model="content.select.fund" placeholder="请输入内容"></el-input>
-                  <div style="position: absolute;right: -30px;top: 10px;">(万)</div>
-              </div>
-              <div class="inpBlock">
-                  <div class="label" style="font-size: 14px;max-width: 50px;position: relative;top: -8px;">美丽校园改造项目(特色项目)</div>
-                  <el-select v-model="content.select.schoolRemould" style="width: 100%;" placeholder="请选择">
-                    <el-option
-                      v-for="item in this.schoolRemouldOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-              </div>
-              <div class="inpBlock">
-                  <div class="label">项目申请人</div>
-                  <el-select v-model="content.select.projectApplyPerson" style="width: 100%;" placeholder="请选择">
-                    <el-option
-                      v-for="item in this.personType"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-              </div>
-              <!-- <div class="inpBlock">
-                  <div class="label">选择分类</div>
-                  <el-cascader v-model="data.select.sort" :options="data.sortOptions" clearable></el-cascader>
-              </div> -->
-          </div>
-        </div>
-        
-  </div>
-        <!-- 活动申请填写信息区域结束 -->
-
-
-        <!-- 项目封面修改上传开始 -->
-        <!-- <div style="height: 260px;">
-              <div class="tabTit">
-                <div><p>封面上传</p></div>
-              </div>
-              <hr>
-              <div style="margin-bottom: 10px;">修改项目封面</div>
-              <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-
-              <el-upload
-                class="avatar-uploader"
-                action="#"
-                disabled
-                style="position: relative;"
-                :show-file-list="false"
-                >
-                <img v-if="content.dialogImageUrl" :src="content.dialogImageUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <BeUpload :progress="progress" style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
-              </el-upload>
-        </div> -->
-        <!-- 项目封面修改上传开始结束 -->
-
-      <!-- 老师项目成员表格开始 -->
-      <div class="tabTit">
-                <div><p>项目组-老师成员<span>(2个学院以上,团队2-3人)</span> </p></div>
-                <el-button type="primary" @click="addTeacherMember"  size="mini">添加成员</el-button>
-              </div>
-              <hr>
-              <el-table
-                :data="content.tableTeacherData"
-                tooltip-effect="dark"
-                stripe
-                :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                class="fontSize"
-                >
-              
-                <el-table-column
-                  prop="name"
-                  label="姓名"
-                  align="center"
-                  >
-                </el-table-column>
-                <el-table-column
-                  prop="class"
-                  label="所在学院/部门/专业"
-                  align="center"
-                  >
-                </el-table-column>
-
-                <el-table-column
-                  prop="division"
-                  label="项目组角色分工"
-                  align="center"
-                  >
-                </el-table-column>
-
-              
-                
-                <el-table-column
-                  align="center"
-                  prop="operation"
-                  label="操作"
-                  >
-                  <template #default="scope">
-                      <div class="operations">
-                          <!-- <el-button type="primary" > -->
-                              <el-button type="primary" @click="amendTeacherDialogData(scope.$index)" size="mini">修改</el-button>
-                              <el-button type="primary" @click="DelTeacher(scope.$index)" size="mini">删除</el-button>
-                          <!-- </el-button> -->
-                      </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-          <!--添加修改老师成员dialog对话框开始 -->
-            <el-dialog
-                :title= "isAddMember==1?'添加老师成员':'修改老师成员'"
-                :visible.sync="addTeacherMemberDialog"
-                :modal="true"
-                :close-on-click-modal="true"
-                class="AddMember"
-                :before-close="init">
-                  <div class="littleBlock">
-                    <div class="dialogLabel">姓名</div>
-                    <div>
-                      <el-input v-model="Member.name"></el-input>
-                    </div>
-                  </div>
-
-                  <div class="littleBlock">
-                    <div class="dialogLabel">所在学院/部门/专业</div>
-                    <div>
-                      <el-input v-model="Member.class"></el-input>
-                    </div>
-                  </div>
-
-                  <div class="littleBlock">
-                    <div class="dialogLabel">项目组角色分工</div>
-                    <div>
-                      <el-input  v-model="Member.division" ></el-input>
-                    </div>
-                  </div>
-                  <div slot="footer" class="footer">
-                    <el-button v-show="isAddMember==1" type="primary" @click="commitAddTeacher" class="AllDialogBtn" >确认提交</el-button>
-                    <el-button v-show="isAddMember==2" type="primary" @click="commitAmendTeacher" class="AllDialogBtn" >确认修改</el-button>
-
-                    <el-button @click="init" class="AllDialogBtn">取消</el-button>
-                  </div>
-            </el-dialog>
-          <!--添加修改老师成员dialog对话框结束 -->
-
-          <!-- 删除老师成员对话框开始 -->
-          <el-dialog
-              title="删除成员"
-              :visible.sync="delTeacherMember"
-              width="600px"
-              class="pageSubmitData">
-              <div class="deleteContent">确定删除老师成员?</div>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelTeacherMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="delTeacherMember=false" class="AllDialogBtn" >取消</el-button>
-              </span>
-            </el-dialog>
-          <!-- 删除老师成员对话框结束 -->
-  <!-- 老师项目成员表格结束 -->
-
-    <!-- 学生项目成员表格开始 -->
-    <div id="two" class="tabTit">
-                <div><p>项目组-学生成员<span>(至少2个学院以上学生构成,团队5人以上)</span> </p></div>
-                <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
-              </div>
-              <hr>
-              <el-table
-                :data="content.tableStudentData"
-                tooltip-effect="dark"
-                stripe
-                :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                class="fontSize"
-                >
-              
-                <el-table-column
-                  prop="name"
-                  label="姓名"
-                  align="center"
-                  >
-                </el-table-column>
-                <el-table-column
-                  prop="class"
-                  label="所在学院/部门/专业"
-                  align="center"
-                  >
-                </el-table-column>
-
-                <el-table-column
-                  prop="division"
-                  label="项目组角色分工"
-                  align="center"
-                  >
-                </el-table-column>
-
-              
-                
-                <el-table-column
-                  align="center"
-                  prop="operation"
-                  label="操作"
-                  >
-                  <template #default="scope">
-                      <div class="operations">
-                          <!-- <el-button type="primary" > -->
-                              <el-button type="primary" @click="amendStudentDialogData(scope.$index)" size="mini">修改</el-button>
-                              <el-button type="primary" @click="DelStudent(scope.$index)" size="mini">删除</el-button>
-                          <!-- </el-button> -->
-                      </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-   <!-- 学生项目成员表格结束 -->
-
-
-          <!-- 项目简介开始 -->
-            <div class="tabTit">
-                  <div><p>项目简介</p></div>
-            </div>
-            <hr>
-            <el-input
-              type="textarea"
-              :rows="6"
-              resize="none"
-              class="textArea"
-              placeholder="请输入内容"
-              v-model="content.textarea">
-            </el-input>
-          <!-- 项目简介结束 -->
-
-          <!--添加修改学生成员dialog对话框开始 -->
-            <el-dialog
-                :title= "isAddMember==1?'添加学生成员':'修改学生成员'"
-                :visible.sync="addStudentMemberDialog"
-                :modal="true"
-                :close-on-click-modal="true"
-                class="AddMember"
-                :before-close="init">
-                  <div class="littleBlock">
-                    <div class="dialogLabel">姓名</div>
-                    <div>
-                      <el-input v-model="Member.name"></el-input>
-                    </div>
-                  </div>
-
-                  <div class="littleBlock">
-                    <div class="dialogLabel">所在学院/部门/专业</div>
-                    <div>
-                      <el-input v-model="Member.class"></el-input>
-                    </div>
-                  </div>
-
-                  <div class="littleBlock">
-                    <div class="dialogLabel">项目组角色分工</div>
-                    <div>
-                      <el-input v-model="Member.division"></el-input>
-                    </div>
-                  </div>
-                  <div slot="footer" class="footer">
-                    <el-button v-show="isAddMember==1" type="primary" @click="commitAddStudent" class="AllDialogBtn" >确认提交</el-button>
-                    <el-button v-show="isAddMember==2" type="primary" @click="commitAmendStudent" class="AllDialogBtn" >确认修改</el-button>
-
-                    <el-button @click="init" class="AllDialogBtn">取消</el-button>
-                  </div>
-            </el-dialog>
-          <!--添加修改学生成员dialog对话框结束 -->
-
-          <!-- 删除学生成员对话框开始 -->
-          <el-dialog
-              title="删除成员"
-              :visible.sync="delStudentMember"
-              width="600px"
-              class="pageSubmitData">
-              <div class="deleteContent">确定删除学生成员?</div>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelStudentMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="delStudentMember=false" class="AllDialogBtn" >取消</el-button>
-              </span>
-            </el-dialog>
-          <!-- 删除学生成员对话框结束 -->
-  <!-- 学生项目成员表格结束 -->
-
-
-
-            
-    <div class="baseBtn">
-      <div class="blockWidth">
-        <!-- <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button> -->
-        <!-- <el-button type="primary" v-show="isUpload==3 || isUpload==4" class="disa">立即修改</el-button> -->
-        <!-- <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button> -->
-      </div>
-    </div>
-
-
-
-   <!-- 提交对话框开始 -->
-        <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          class="pageSubmitData"
-          :before-close="init">
-          <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">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 提交对话框结束 -->
-
-
-
-
-
-  </div>
-</template>
-
-<script>
-    export default {
-      data() {
-        return {
-          accept:"image/*",
-          isAddMember:1,  //判断是添加学生还是修改学生
-          apIsupload:0,  //判断是否可以修改
-          progress:{   //进度条
-                value:0,
-                show:false
-            },  
-            pageType:[], //选择分类
-
-          loading:false,
-          delMember:false,
-          amendMemberDialog:false,
-          addMemberDialog:false,
-          submitHint:false,          
-
-          delTeacherMember:false,  //删除老师对话框
-          addTeacherMemberDialog:false,   //添加修改对话框
-
-          addStudentMemberDialog:false,   //添加学生对话框
-          delStudentMember:false,      //删除学生对话框
-          isUpload:'',
-          endProject:'',
-          textarea:'',   //项目简介
-          tableData:[],   //成员列表数据
-
-          content:{
-            dialogImageUrl:"",  //封面!!!!!!!!
-            tableStudentData:[],  //学生成员成员列表！！！！！！！！
-            tableTeacherData:[],  //老师成员成员列表！！！！！！！
-            textarea:'',   //项目简介！！！！！！！
-            select:{    //要提交的数据!!!!!!!!!!!!!!!!!!!!!!!
-                projectName:'',     //项目名称
-                leader:'',          //项目负责人
-                projectDate:[],   //开始结束日期
-                department:"",   //部门
-                fund:'',         //资金
-                MultiSelectProjectNameS:[],   //优先支持项目
-                schoolRemould:'',        //校园改造项目
-                tel:'',  //电话
-                projectApplyPerson:'',  //项目申请人
-            },
-          },
-
-
-          departmentOptions: [],  //部门下拉框
-          Member:{    //添加、修改成员对话框数据
-              name:'',
-              class:'',
-              division:'',
-              score:'0'
-          },
-          MultiSelectProject:[   //优先支持项目下拉框数据
-                    {
-                      value: 1,
-                      label: '大赛选拔项目'
-                    }, {
-                      value: 2,
-                      label: '落地注册项目'
-                    }, {
-                      value: 3,
-                      label: '社会征集项目'
-                    }, {
-                      value: 4,
-                      label: '产业命题项目'
-                    }
-          ],
-          schoolRemouldOptions:[   //美丽校园下拉框数据
-              {
-                value: '1',
-                label: '校园安全项目'
-              }, {
-                value: '2',
-                label: '环境治理项目'
-              }, {
-                value: '3',
-                label: '校园服务项目'
-              }, {
-                value: '4',
-                label: '文创装置项目'
-              }
-          ],
-          personType:[     //项目申请人下拉框数据
-              {
-                value: '1',
-                label: '在校学生'
-              }, {
-                value: '2',
-                label: '入驻学校孵化基地的初创企业法人'
-              }
-          ],
-          sortOptions: [      //选择分类下拉框数据
-              {
-                value:"",
-                label: '',
-                children: [{
-                  value: 0,
-                  label: '创意组',
-                },
-                  {
-                  value: 1,
-                  label: '初创组',
-                }
-              ]}, 
-              {
-              value:"",
-              label: '',
-              children: [{
-                value: 0,
-                label: '已建设',
-              }, {
-                value: 1,
-                label: '待建设',
-              }]
-            }],
-            
-        }
-      },
-      methods:{
-        getText(value) {     //电话验证
-          let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
-          let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
-          if(result){
-            return result;
-          }else{
-            this.$message.error("请输入正确的手机号格式")
-            return false;
-          }
-          // if()
-          // return verify.test(value.trim())
-          // if(!result && value != "") {
-          // if(!result) {
-          //       return false;
-          // }else{
-          //   return true;
-          // }
-        },
-        ProgressFormat(value){        //进度条
-          return value ==100?'100%':`${value}%`
-        },
-        // getFile(val) {       //上传封面
-        //     // console.log(val);
-        //     this.progress.show = false;
-        //     this.content.dialogImageUrl=val.url
-        //     this.$message.success('上传成功')
-        // },
-
-
-
-        // 项目组老师成员方法开始
-                  addTeacherMember(){   //添加项目成员对话框显示
-                    this.addTeacherMemberDialog=true
-                    for(let i in this.Member){
-                      if(i=='score')this.Member[i] = "0"
-                      else this.Member[i] = "";
-                    }
-                    this.isAddMember=1;
-                  },
-                  DelTeacher(val){    //删除对话框显示
-                    this.delTeacherMember=true;
-                    this.index=val
-                  },
-                  amendTeacherDialogData(val){   //修改项目成员信息对话框显示
-                    Object.assign(this.Member,this.content.tableTeacherData[val])
-                    this.isAddMember=2;
-                    this.Member['index']=val    //为下面修改提供下标
-                    // console.log(this.Member['index']);
-                    this.addTeacherMemberDialog=true
-                  },
-                  commitAddTeacher(){   //确定添加成员  
-                        console.log(this.Member.name);
-                        if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
-                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
-                        if (this.Member.division=="" ||this.Member.division==undefined) return this.$message.error('请输入项目组角色分工')
-                        let newData = {};
-                        for(let j in this.Member)newData[j] = this.Member[j];
-                        this.content.tableTeacherData.push(newData);
-                        this.$message.success('添加成功')
-                        for(let i in this.Member){      
-                          if(i=='score')this.Member[i] = "0"
-                          else this.Member[i] = "";
-                        }
-                        this.init()
-                  },
-
-                  commitAmendTeacher(){   //确定修改成员
-                        Object.assign(this.content.tableTeacherData[this.Member['index']],this.Member)
-                        for(let k in this.Member) this.Member[k]=''
-                        this.addTeacherMemberDialog=false;
-                        this.$message.success('修改成功')
-                  },
-
-                  commitDelTeacherMember(){   //对话框确定删除成员
-                    let a=this.index;
-                    this.content.tableTeacherData.splice(a,1);
-                    this.$message.success('删除成功');
-                    this.delTeacherMember=false;
-                  },
-        // 项目组老师成员方法开始
-
-            // 项目组学生成员方法开始
-                addStudentMember(){   //添加项目成员对话框显示
-                    this.addStudentMemberDialog=true
-                    for(let i in this.Member){
-                      if(i=='score')this.Member[i] = "0"
-                      else this.Member[i] = "";
-                    }
-                    this.isAddMember=1;
-                  },
-                  DelStudent(val){    //删除对话框显示
-                    this.delStudentMember=true;
-                    this.index=val
-                  },
-                  amendStudentDialogData(val){   //修改项目成员信息对话框显示
-                    Object.assign(this.Member,this.content.tableStudentData[val])
-                    this.isAddMember=2;
-                    this.Member['index']=val    //为下面修改提供下标
-                    // console.log(this.Member['index']);
-                    this.addStudentMemberDialog=true
-                  },
-                  commitAddStudent(){   //确定添加成员  
-                        if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
-                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
-                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入项目组角色分工')
-                        let newData = {};
-                        for(let j in this.Member)newData[j] = this.Member[j];
-                        this.content.tableStudentData.push(newData);
-                        this.$message.success('添加成功')
-                        for(let i in this.Member){      
-                          if(i=='score')this.Member[i] = "0"
-                          else this.Member[i] = "";
-                        }
-                        this.addStudentMemberDialog=false;
-                  },
-
-                  commitAmendStudent(){   //确定修改成员
-                        Object.assign(this.content.tableStudentData[this.Member['index']],this.Member)
-                        for(let k in this.Member) this.Member[k]=''
-                        this.addStudentMemberDialog=false;
-                        this.$message.success('修改成功')
-
-                        console.log(this.content.tableData);
-                  },
-
-                  commitDelStudentMember(){   //对话框确定删除成员
-                    let a=this.index;
-                    this.content.tableStudentData.splice(a,1);
-                    this.$message.success('删除成功');
-                    this.delStudentMember=false;
-                  },
-        // 项目组学生成员方法开始
-
-
-
-
-        getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
-              let param={
-                uid:this.$store.state.userInfo.userid
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectAllDepartment',param)
-                      .then(res=>{
-                        this.departmentOptions=res.data[0];
-                      },err=>{
-                        console.log(err);
-                      })
-            },
-
-
-
-            getData(){     //过去基础数据
-              this.loading = true;
-                let param={
-                    uid:this.$store.state.userInfo.userid,
-                    pid:this.$route.query["pid"]
-                }
-                this.ajax
-                    .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
-                    .then(res=>{
-                      // console.log(data.);
-                        console.log(res.data);
-                        let data=res.data[0][0]
-    
-                        // console.log(data.multiSelectProject);
-                        this.content.select.projectName=data.title
-                        this.content.select.leader=data.leader
-                        this.content.select.projectDate=[data.startTime,data.endTime]
-                        this.content.select.department=data.classid
-                        this.content.select.fund=data.fund
-                        this.content.select.MultiSelectProjectNameS=JSON.parse(data.multiSelectProject)
-                        this.content.select.schoolRemould=data.schoolRemould
-                        this.content.select.tel=data.phone
-                        this.content.select.projectApplyPerson=data.projectApplyperson
-                        this.content.select.dialogImageUrl=data.image
-                        this.content.tableStudentData=JSON.parse(data.course_student)
-                        this.content.tableTeacherData=JSON.parse(data.course_teacher)                       
-                        this.content.textarea=data.brief
-                        this.content.dialogImageUrl=data.image
-                        this.pageType=[data.typeid,data.typeName]
-                        this.isUpload=data.isupload
-                        this.loading = false;
-                        this.apIsupload=data.apIsupload
-                        // console.log(this.content);
-                    },err=>{
-                        console.log(err);
-                    })
-            },
-
-            getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
-              let TypeList = [];
-              let param={
-                uid:this.$store.state.userInfo.userid
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectAllType',param)
-                      .then(res=>{
-                       //获取主分类
-                    let master = res.data[0].filter(item=>item['pid']=='');
-                        //获取子分类
-                        let minion = res.data[0].filter(item=>item['pid']!='');
-                        master.forEach(item=>{
-                          let type = {
-                            value:item['id'],
-                            label:item['name'],
-                            children:[],
-                          }
-                          minion.forEach(min=>{
-                            if(min['pid']==item['id']){
-                              let minType = {
-                                value:min['id'],
-                                label:min['name']
-                              }
-                              type['children'].push(minType);
-                            }
-                          })
-                          TypeList.push(type);
-                        })
-                        this.sortOptions = TypeList;
-                      },err=>{
-                        console.log(err);
-                      })
-            },
-            audit(){   //提交对话框显示
-              this.submitHint=true
-            },
-
-        submitAll(){   //提交修改数据
-          let param={
-            uid:this.$store.state.userInfo.userid,
-            pid:this.$route.query['pid'],
-            tit:this.content.select.projectName,
-            lea:this.content.select.leader,
-            cla:this.content.select.department,
-            mul:JSON.stringify(this.content.select.MultiSelectProjectNameS),
-            pho:this.content.select.tel,
-            sch:this.content.select.schoolRemould,
-            per:this.content.select.projectApplyPerson,
-            img:this.content.dialogImageUrl,
-            cot:JSON.stringify(this.content.tableTeacherData),
-            cos:JSON.stringify(this.content.tableStudentData),
-            bri:this.content.textarea,
-          }
-
-          const cEmpty = /^\s*$/g;
-              for(let i in param){
-                switch(i){
-                  case 'tit':
-                    if(cEmpty.test(param[i]))return this.$message.error("项目名称不能为空")
-                    break;
-                  case 'lea':
-                    if(cEmpty.test(param[i]))return this.$message.error("项目负责人不能为空")
-                    break;
-                  case 'cla':
-                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目所属部门")
-                    break;
-                  case 'mul':
-                    console.log(111);
-                    if(!JSON.parse(param[i]).length) return this.$message.error("请选择优先支持项目")
-                    break;
-                  case 'sch':
-                    if(!param[i])return this.$message.error("请选择美丽校园改造项目")
-                    break;
-                  case "pho":
-                    if(cEmpty.test(param[i]))return this.$message.error("请输入联系方式")
-                    break;
-                  case 'person':
-                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目申请人")
-                    break;
-                  case 'img':
-                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
-                    break;
-                  case 'cot':
-                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>3)return this.$message.error("需要教师团队2-3人，至少应包含1名教研室主任")
-                    break;
-                  case 'cos':
-                    if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
-                    break;
-                  case 'bri':
-                    if(param[i].length<200 || param[i].length>=300)return this.$message.error("项目简介需要200-300字")
-                    break;
-                }
-              }
-            this.ajax
-                  .post(this.$store.state.api+'/updateProjectApplyDetailStudent',param)
-                  .then(res=>{
-                    // console.log(res);
-                    if (res.data==1) {
-                      this.$message.success('修改成功')
-                      this.submitHint=false
-                      this.getData()
-                      return
-                    }
-                    this.$message.error('修改失败')
-                  },err=>{
-                    console.log(err);
-                  })
-        },
-        init(){
-          this.addStudentMemberDialog=false;
-          this.submitHint=false;
-          this.addTeacherMemberDialog=false;
-        },
-
-      },
-      mounted(){    //数据加载完成后触发
-        this.getProjectDepartmentData()
-        this.getData()
-        this.getProjectTypeData()
-      },
-    }
-</script>
-
-<style lang="less">
-.projectApplication1{
-
-  .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    // position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 300px;
-    // height: 100%;
-    line-height: 178px;
-    text-align: center;
-  }
-  .avatar {
-    width: 300px;
-    height:178px !important;
-    display: block;
-  }
-}
-</style>

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -1,812 +0,0 @@
-<template>
-    <!-- 项目管理 项目基本内容 -->
-    <div class="ProjectManagement1" v-loading="loading">
-  
-   <!-- 活动申请填写信息区域开始 -->
-   <div class="select">
-              <div class="selectTop">
-                <div class="label">项目名称</div>
-                <el-input v-model="select.project" placeholder="请输入内容"></el-input>
-              </div>
-              <div class="selectMid">
-                <div class="selectLeft">
-                 
-                    <div class="inpBlock">
-                        <div class="label">负责人</div>
-                        <el-input v-model="select.person" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">所在部门</div>
-                        <el-select v-model="select.departmentData" style="width: 100%;" placeholder="请选择">
-                          <el-option
-                            v-for="item in select.department"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                          </el-option>
-                        </el-select>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">学院牵头领导</div>
-                        <el-input v-model="select.lead_leader" placeholder="请输入学院牵头领导"></el-input>
-                    </div>
-                </div>
-
-                <div class="selectRight">
-                  <div class="inpBlock">
-                        <div class="label">项目时间</div>
-                        <el-date-picker
-                          v-model="select.Date"
-                          type="daterange"
-                          style="width: 100%;"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          range-separator="至"
-                          start-placeholder="项目起始时间"
-                          end-placeholder="项目完成时间">
-                          
-                        </el-date-picker>
-                        <!-- <el-date-picker
-                          v-model="select.Date"
-                          type="datetime"
-                          style="width: 100%;"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期">
-                        </el-date-picker> -->
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">预算总经费</div>
-                        <el-input type="number" v-model.number="select.Fund" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">选择分类</div>
-                        <el-cascader disabled="" v-model="select.sort" :options="select.sortOptions" clearable></el-cascader>
-
-                    </div>
-                </div>
-              </div>
-              
-        </div>
-        <!-- 活动申请填写信息区域结束 -->
-
-
-         <!-- 项目封面修改上传开始 -->
-         <!-- <div style="height: 260px;">
-              <div class="tabTit">
-                <div><p>封面上传</p></div>
-              </div>
-              <hr>
-              <div style="margin-bottom: 10px;">修改项目封面</div>
-              <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-
-              <el-upload
-                class="avatar-uploader"
-                action="#"
-                disabled
-                style="position: relative;"
-                :show-file-list="false"
-                >
-                <img v-if="dialogImageUrl" :src="dialogImageUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <BeUpload :progress="progress" style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
-              </el-upload>
-            </div> -->
-
-          <!-- 项目封面修改上传开始结束 -->
-
-
-
-
-      <!-- 项目教师开始 -->
-      <div class="tabTit">
-          <div><p>项目组-教师团队</p><span>（团队3人以上，至少应包含1名教研室主任）</span></div>
-          <el-button type="primary" @click="addMember"  size="mini">添加教师</el-button>
-      </div>
-      <hr>
-      <el-table
-        :data="teacherData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <el-table-column
-          prop="name"
-          label="姓名"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="speciality"
-          label="专业"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="title"
-          label="职称"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="education"
-          label="学历"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="section"
-          label="所在教研室"
-          align="center"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="work"
-          label="项目组任务分工"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                      <!-- <el-button type="primary" @click="lookDetail(scope)" size="mini">查看详情</el-button> -->
-                      <el-button type="primary" @click="amendDialogData(scope.$index)" size="mini">修改</el-button>
-                      <el-button type="primary" @click="Del(scope.$index)" size="mini">删除</el-button>
-              </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 项目教师结束 -->
-
-      <!-- 项目学生开始 -->
-      <div class="tabTit">
-        <div><p>项目组-学生团队</p><span>（团队5人以上，学生团队年级结构安排合理）</span></div>
-          <el-button type="primary" @click="addMemberStudent"  size="mini">添加学生</el-button>
-      </div>
-      <hr>
-      <el-table
-        :data="studentData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <el-table-column
-          prop="name"
-          label="姓名"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="class"
-          label="班级"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="age"
-          label="年龄"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="work"
-          label="项目组任务分工"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                      <el-button type="primary" @click="updateStudent(scope.$index)" size="mini">修改</el-button>
-                      <el-button type="primary" @click="DelStudent(scope.$index)" size="mini">删除</el-button>
-              </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 项目学生结束 -->
-
-
-      <!-- 项目简介开始 -->
-    <div class="tabTit">
-          <div><p>项目简介</p></div>
-    </div>
-    <hr>
-      <el-input
-        type="textarea"
-        :rows="6"
-        resize="none"
-        class="textArea"
-        placeholder="请输入内容"
-        v-model="textarea">
-      </el-input>
-    <!-- 项目简介结束 -->
-
-
-    <div class="baseBtn">
-      <div class="blockWidth">
-        <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
-
-        <!-- <el-button v-show="isUpload==2 || isUpload ==3" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button> -->
-        <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-        <!-- <el-button v-show="isUpload==4" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-
-      </div>
-    </div>
-      <!--添加教师dialog对话框开始 -->
-      <el-dialog
-          :title= "isAddMember==1?'添加教师':'修改教师'"
-          :visible.sync="addMemberDialog"
-          :modal="true"
-          :close-on-click-modal="true"
-          class="AddMember">
-            <div class="littleBlock">
-              <div class="dialogLabel">姓名</div>
-              <div>
-                <el-input v-model="teacher.name" placeholder="请输入教师姓名"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">专业</div>
-              <div>
-                <el-input v-model="teacher.speciality" placeholder="请输入教师专业"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">职称</div>
-              <div>
-                <el-input v-model="teacher.title" placeholder="请输入教师职称"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">学历</div>
-              <div>
-                <el-input v-model="teacher.education" placeholder="请输入教师学历"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel" style="transform: translate(0,0);">所在教研室</div>
-              <div>
-                <el-input v-model="teacher.section" placeholder="请输入所在教研室"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel" style="transform: translate(0,0);">项目组角色分工</div>
-              <div>
-                <el-input v-model="teacher.work" placeholder="请输入项目组角色分工"></el-input>
-              </div>
-            </div>
-
-
-            <div slot="footer" class="footer">
-              <el-button v-show="isAddMember==1" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="isAddMember==2" type="primary" @click="commit2" class="AllDialogBtn" >确认修改</el-button>
-
-              <el-button @click="addMemberDialog = false" class="AllDialogBtn">取消</el-button>
-            </div>
-      </el-dialog>
-      <!--添加教师dialog对话框结束 -->
-
-      <!-- 添加学生dialog对话框开始 -->
-      <el-dialog
-          :title= "isAddStudent==1?'添加学生':'修改学生'"
-          :visible.sync="addStudentDialog"
-          :modal="true"
-          :close-on-click-modal="true"
-          class="AddMember">
-            <div class="littleBlock">
-              <div class="dialogLabel">姓名</div>
-              <div>
-                <el-input v-model="student.name" placeholder="请输入学生姓名"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">班级</div>
-              <div>
-                <el-input v-model="student.class" placeholder="请输入学生班级"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">年龄</div>
-              <div>
-                <el-input v-model="student.age" placeholder="请输入学生年龄"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel" style="transform: translate(0,0);">项目组角色分工</div>
-              <div>
-                <el-input v-model="student.work" placeholder="请输入项目组角色分工"></el-input>
-              </div>
-            </div>
-
-
-            <div slot="footer" class="footer">
-              <el-button v-show="isAddStudent==1" type="primary" @click="commitStudent" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="isAddStudent==2" type="primary" @click="commitStudent2" class="AllDialogBtn" >确认修改</el-button>
-
-              <el-button @click="addStudentDialog=false" class="AllDialogBtn">取消</el-button>
-            </div>
-      </el-dialog>
-      <!-- 添加学生dialog对话框结束 -->
-       <!-- 删除教师对话框开始 -->
-      <el-dialog
-              title="删除教师"
-              :visible.sync="delMember"
-              width="600px"
-              class="delMemberDialog">
-              <span class="deleteContent">确定删除该教师?</span>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="delMember=false" class="AllDialogBtn" >取消</el-button>
-              </span>
-      </el-dialog>
-      <!-- 删除教师对话框结束 -->
-      <!-- 删除学生成员对话框开始 -->
-            <el-dialog
-              title="删除学生成员"
-              :visible.sync="DelStudentDialog"
-              width="600px"
-              class="delMemberDialog">
-              <span class="deleteContent">确定删除该学生成员?</span>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelStudent" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="DelStudentDialog = false" class="AllDialogBtn" >取消</el-button>
-              </span>
-            </el-dialog>
-      <!-- 删除学生成员对话框结束 -->
-
-       <!-- 修改对话框开始 -->
-       <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          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="submitHint = false" size="small" class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 修改对话框结束 -->
-  </div>
-</template>
-
-<script>
-    export default {
-      data() {
-        return {
-          iid:'',
-          isUpload:'',
-          accept:"image/*",
-          isAddMember:1,
-          isAddStudent:1,
-          progress:{   //进度条
-                value:0,
-                show:false
-            },  
-          dialogImageUrl:'',  //图片地址
-          index:0,
-          delMember:false,
-          DelStudentDialog:false,
-          amendMemberDialog:false,
-          addMemberDialog:false,
-          addStudentDialog:false,
-          submitHint:false,
-          loading:false,
-          select:{    //数据详情框数据
-            project:'',   
-            person:'',
-            departmentData:"",  //部门框值
-            sort:[],     //分类值
-            tel:'',
-            Date:'',
-            Fund:'',
-            sortOptions: [],
-            department:[],
-          },
-          textarea:'周四福利大放送',   //项目简介
-
-          teacherData:[],   //成员列表数据
-          studentData:[],
-          addTabMember:{       //添加项目成员
-            // id:'',
-            name:'',
-            class:'',
-            phone:'',
-            score:0
-          },
-          teacher:{ //添加老师团队表
-            name:"",  //姓名
-            speciality:"",//专业
-            title:"",//职称
-            education:"",//学历
-            section:"",//所在教研室
-            work:"",//项目组角色分工
-          },
-          student:{ //添加学生团队表
-            name:"",//姓名
-            class:"",//班级
-            age:"",//年龄
-            work:'',//项目组任务分工
-          }
-        }
-      },
-      methods:{
-        addMemberStudent(){//添加项目组-学生成员
-          this.isAddStudent=1;
-          this.addStudentDialog = true;
-        },
-        commitStudent(){//确定添加学生
-            for(let i in this.student){if(this.student[i]==''||this.student[i]==undefined)return this.$message.error("请填完所有内容");}
-            let newData={};
-            for(let a in this.student)newData[a] = this.student[a];
-            this.studentData.push(newData);
-            this.$message.success("添加成功");
-            this.addStudentDialog = false;
-            //清空表单
-            for(let j in this.student)this.student[j]='';
-        },
-        updateStudent(val){ //修改学生信息
-          Object.assign(this.student,this.studentData[val]);
-          this.isAddStudent=2;
-          this.index=val;
-          this.addStudentDialog = true;
-        },
-        commitStudent2(){//确定修改学生
-            Object.assign(this.studentData[this.index],this.student)
-            this.addStudentDialog=false;
-            for(let k in this.student) this.student[k]=''
-            this.$message.success('修改成功')
-        },
-        DelStudent(val){//删除学生对话框
-          this.index = val;
-          this.DelStudentDialog=true;
-        },
-        commitDelStudent(){ //对话框确定删除学生成员
-          this.studentData.splice(this.index,1);
-          this.$message.success('删除成功');
-          this.DelStudentDialog=false;
-        },
-        addMember(){    //添加教师按钮，显示对话框
-            this.addMemberDialog=true;
-            this.isAddMember=1;
-        },
-        commit(){   //确定添加教师
-              for(let i in this.teacher){if(this.teacher[i]==''||this.teacher[i]==undefined)return this.$message.error("请填完所有内容");}
-              let newData = {};
-              for(let a in this.teacher)newData[a] = this.teacher[a];
-              this.teacherData.push(newData);
-              this.$message.success('添加成功');
-              this.addMemberDialog = false;
-              for(let j in this.teacher)this.teacher[j]='';
-        },
-        amendDialogData(val){   //修改项目成员信息对话框显示
-          Object.assign(this.teacher,this.teacherData[val])
-          this.isAddMember=2;
-          this.index=val;
-          this.addMemberDialog=true;
-        },
-        commit2(){   //确定修改老师
-            Object.assign(this.teacherData[this.index],this.teacher)
-            for(let k in this.teacher) this.teacher[k]=''
-            this.addMemberDialog=false;
-            this.$message.success('修改成功')
-        },
-        Del(val){ //删除老师按钮
-          this.index=val;   
-          this.delMember=true;
-        },
-        commitDelMember(){  //确定删除老师按钮
-          this.teacherData.splice(this.index,1)
-          this.$message.success('删除成功')
-          this.delMember=false;
-        },
-
-        ProgressFormat(value){        //进度条
-          return value ==100?'100%':`${value}%`
-        },
-        audit(){    //立即修改对话框显示
-          this.submitHint=true
-        },
-        submitAll(){
-
-          let param = {
-            uid:this.$store.state.userInfo.userid,
-            pid:this.$route.query['pid'],
-            title:this.select.project,
-            pro_leader:this.select.person,
-            lead_leader:this.select.lead_leader,
-            startTime:this.select.Date[0],
-            endTime:this.select.Date[1],
-            cid:this.select.departmentData,
-            fund:this.select.Fund,
-            img:this.dialogImageUrl,
-            teacher:JSON.stringify(this.teacherData),
-            student:JSON.stringify(this.studentData),
-            brief:this.textarea,
-          }
-          //判断数据
-          const cEmpty = /^\s*$/g;
-          for(let i in param){
-            switch(i){
-              case 'title':
-                if(cEmpty.test(param[i]))return this.$message.error("项目名称不能为空")
-                break;
-              case 'pro_leader':
-                if(cEmpty.test(param[i]))return this.$message.error("项目负责人不能为空")
-                break;
-              case 'startTime':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目开始时间")
-                break;
-              case 'endTime':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目计划结束时间")
-                break
-              case 'cid':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目所属部门")
-                break;
-              case "lead_leader":
-                if(cEmpty.test(param[i]))return this.$message.error("请输入学院牵头领导")
-                break;
-              case 'img':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
-                break;
-              case 'teacher':
-                if(JSON.parse(param[i]).length<3)return this.$message.error("需要教师团队3人以上，至少应包含1名教研室主任")
-                break;
-              case 'student':
-                if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
-                break;
-              case 'brief':
-                if(param[i].length<200&&param[i]<=300)return this.$message.error("项目简介需要200-300字")
-                break;
-            }
-          }
-          this.ajax.post(this.$store.state.api+'/UpdateProjectMakerSpaceBase',param).then(res=>{
-            if(res.data==1){
-              this.$message.success("修改项目信息成功")
-              this.submitHint = false;
-            }else{
-              this.$message.error('修改项目信息失败')
-            }
-            this.getData();
-          }).catch(err=>{
-            console.log(err)
-          })
-        },
-        getData(){   //初始化完成获取基本数据进行填充
-          this.loading = true;
-          let param={
-            uid:this.$store.state.userInfo.userid,
-            pid:this.$route.query['pid']
-          }
-            this.ajax
-                  .get(this.$store.state.api+'/SelectProjectMakerSpace',param)
-                  .then(res=>{
-                    let data=res.data[0][0]
-                    this.select.project=data.title;
-                    this.select.Fund=data.fund;
-                    this.select.person=data.pro_leader;
-                    this.select.Date=[data.begintime,data.planTime];
-                    this.textarea=data.brief;
-                    this.dialogImageUrl=data.image;
-                    this.select.departmentData = data['classid']
-                    this.select.sort = [data['typeid'],data['typeName']]
-                    this.isUpload=data['isupload']
-                    this.select.lead_leader = data['lead_leader']
-                    this.teacherData = JSON.parse(data['course_teacher'])
-                    this.studentData = JSON.parse(data['course_student'])
-                    this.loading = false;
-                  },err=>{
-                    console.log(err);
-                  })
-        },
-        getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
-              let param={
-                uid:this.$store.state.userInfo.userid
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectAllDepartment',param)
-                      .then(res=>{
-                        this.select.department=res.data[0]
-                      },err=>{
-                        console.log(err);
-                      })
-            },
-        getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
-          let TypeList = [];
-          let param={
-            uid:this.$store.state.userInfo.userid
-          }
-            this.ajax
-                  .get(this.$store.state.api+'/SelectAllType',param)
-                  .then(res=>{
-                    //获取主分类
-                    let master = res.data[0].filter(item=>item['pid']=='');
-                        //获取子分类
-                        let minion = res.data[0].filter(item=>item['pid']!='');
-                        master.forEach(item=>{
-                          let type = {
-                            value:item['id'],
-                            label:item['name'],
-                            children:[],
-                          }
-                          minion.forEach(min=>{
-                            if(min['pid']==item['id']){
-                              let minType = {
-                                value:min['id'],
-                                label:min['name']
-                              }
-                              type['children'].push(minType);
-                            }
-                          })
-                          TypeList.push(type);
-                        })
-                        this.select.sortOptions = TypeList;
-                  },err=>{
-                    console.log(err);
-                  })
-        },
-      },
-      mounted(){    //数据加载完成后触发
-        this.getData();
-        this.getProjectDepartmentData();
-        this.getProjectTypeData();
-      },
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagement1{
-
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  // position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 300px;
-  // height: 100%;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  width: 300px;
-  height:178px !important;
-  display: block;
-}
-
-
-.delMemberDialog{      //删除对话框
-    .el-dialog{
-      border-radius: 5px;
-      overflow: hidden;
-    }
-    .deleteContent{
-      margin: 30px 0;
-      font-size: 22px;
-      color: #000;
-    }
-    .el-dialog__header{
-      background: #32455b;
-      display: flex;
-      justify-content: center;
-    }
-    .el-dialog__title{
-      color:#fff;
-      display: flex;
-      justify-content: center;
-      font-size: 18px;
-      position: relative;
-      top: -2px;
-    }
-    .el-dialog__body{
-      display: flex;
-      justify-content: center;
-    }
-    .dialog-footer{
-      display: flex;
-      justify-content: center;
-      box-sizing: border-box;
-
-    }
-  }
-
-
-//项目修改对话框开始
-.projectApplicationfundAddDialog{  
-
-      .el-dialog__header{
-          background: #32455b;
-
-      }
-      .el-dialog{
-        border-radius:5px ;
-        overflow: hidden;
-      }
-      
-      .deleteContent{
-        width: 100%;
-        text-align: center;
-        font-size: 22px;
-        color: #000;
-      }
-      .addDialogLogo{
-              width: 60px;
-              height: 30px;
-              border-radius: 5px;
-              display: flex;
-              justify-content: center;
-              line-height: 30px;
-              background: #f2f2f2;
-              position: absolute;
-              left: 20px; top: 15px; 
-      }
-
-      .el-dialog__title{
-              color:#fff;
-              display: flex;
-              justify-content: center;
-              font-size: 18px;
-              position: relative;
-              top: -2px;
-      }
-      .addDialogMid{
-        box-sizing: border-box;
-        padding:0 60px 0 10px;
-        .addDialogTit{
-          display: flex;
-          span{
-            width: 80px;
-            line-height: 40px;
-            text-align: left;
-          }
-        }
-      .addDialogTit1{
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 15px;
-      }
-      .addDialogTit2{
-        margin-top: 10px;
-        font-size: 18px;
-        color: #000;
-        text-indent: 2em;
-      }
-      .addDialogCon{
-        margin-top: 20px;
-      }
-      }
-      .dialog-footer{
-      display: flex;
-      justify-content: center;
-
-      }
-  }
-}
-  </style>

src/views/projectManage/components/ProjectManagement2.vue

@@ -1,394 +0,0 @@
-<template>
-  <!-- 项目管理 项目详细 -->
-    <div class="ProjectManagement2">
-   
-      <div id="w">
-              <p class="pTit">研发内容</p>
-              <div>
-                <p class="pTit2">一、项目研发背景</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.back">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor> -->
-                </div>
-              </div>
-              <div>
-                <p class="pTit2">二、项目创新点</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.innovate">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor> -->
-                </div>
-              </div>
-              <div>
-                <p class="pTit2">三、技术研发路线</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.path">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor> -->
-                </div>
-              </div>
-              <div>
-                <p class="pTit2">四、项目应用场景</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.scene">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor> -->
-                </div>
-              </div>
-              <!-- <div class="editor">
-                <vue-editor  :editorToolbar="customToolbar" v-model="content.contentOne"></vue-editor>
-              </div> -->
-            </div>
-            <div>
-              <p class="pTit">商业模式及社会价值</p>
-              <div>
-                <p class="pTit2">一、项目商业模式/社会价值</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.worth">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor> -->
-                </div>
-              </div>
-            </div>
-            <div>
-              <p class="pTit">团队优势</p>
-              <div>
-                <p class="pTit2">一、团队构成及优势</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.team">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor> -->
-                </div>
-              </div>
-            </div>
-
-            <div>
-              <p class="pTit">研发成本</p>
-              <div>
-                <p class="pTit2">一、研发成本来源及构成</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.cost">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor> -->
-                </div>
-              </div>
-            </div>
-            <div id="e">
-              <p class="pTit">预期成果</p>
-              <div>
-                <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.expectResults">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor> -->
-                </div>
-              </div>
-              <div>
-                <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.expectResultsTeacher">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor> -->
-                </div>
-              </div>
-              <div>
-                <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
-                <div class="editor">
-                  <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.expectConversion">
-                  </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor> -->
-                </div>
-              </div>
-            </div>
-            <div>
-              <p class="pTit" style="margin-bottom: 0;">实施计划</p>
-              <div class="editor">
-                <el-input
-                    type="textarea"
-                    :rows="6"
-                    resize="none"
-                    class="textArea"
-                    placeholder="请输入内容"
-                    v-model="content.plan">
-                  </el-input>
-                <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor> -->
-              </div>
-            </div>
-      <div class="baseBtn">
-        <div class="blockWidth">
-          <!-- <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button> -->
-          <!-- <el-button type="primary" v-show="isUpload==3 || isUpload ==4" class="disa">立即修改</el-button> -->
-
-        </div>
-      </div>
-      <!-- 修改对话框开始 -->
-      <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          class="projectApplicationfundAddDialog"
-          :before-close="init">
-          <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>
-          </span>
-        </el-dialog>
-      <!-- 修改对话框结束 -->
-    </div>
-  </template>
-  
-  <script>
-import { VueEditor } from "vue2-editor";
-
-      export default {
-        components:{
-          VueEditor
-        },
-        data() {
-          return {
-            isUpload:'',
-            apIsupload:0,
-            data:[["","","","",""],[]],
-            submitHint:false,
-            customToolbar: [
-              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
-              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
-              [{header:[false,1,2,3,4]}]
-            ],
-            content:'',
-          }
-        },
-        methods:{
-          // content(){      //导航栏项目详情跳转
-          //   this.$router.push('/projectApplicationDetails')
-          // },
-         
-          // backBtn(){
-          //   this.$router.push('/projectApplicationApply2')
-          // },
-          audit(){   //立即修改按钮
-            this.submitHint=true
-          },
-          submitAll(){
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:this.$route.query['pid'],
-              message:JSON.stringify(this.content)
-            }
-              this.ajax
-                  .post(this.$store.state.api+'/updateProjectApplication2Student',param)
-                  .then(res=>{
-                    // console.log(res);
-                    this.$message.success('修改成功')
-                    this.init()
-                  },err=>{
-                    console.log(err);
-                  })
-          },
-          init(){
-            this.submitHint=false
-          },
-          // getData(){   //初始化完成获取基本数据进行填充
-          //   let param={
-          //     uid:this.$store.state.userInfo.userid,
-          //     pid:this.$route.query['pid']
-          //   }
-          //     this.ajax
-          //           .get(this.$store.state.api+'/GetProjectDetailMessage',param)
-          //           .then(res=>{
-          //             this.isUpload=res.data[0][0].isupload;
-          //             let GetData=JSON.parse(res.data[0][0].chapters)
-          //             this.data=GetData;
-          //           },err=>{
-          //             console.log(err);
-          //           })
-          // },
-          getData(){
-                let param={
-                    uid:this.$store.state.userInfo.userid,
-                    pid:this.$route.query['pid']
-                }
-                this.ajax
-                    .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
-                    .then(res=>{
-                        let data=res.data[0][0]
-                        this.isUpload=data.isupload
-                        // console.log(data.chapters);
-                        this.content=JSON.parse(data.chapters)
-                        this.apIsupload=data.apIsupload
-                        // console.log(this.content);
-                    },err=>{
-                        console.log(err);
-                    })
-            },
-        },
-        mounted(){
-          this.getData();
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  // .projectApplication2{
- .projectApplicationfundAddDialog{    //项目修改对话框开始
- 
-
- .el-dialog{
-   border-radius:5px ;
-   overflow: hidden;
- }
- 
- .deleteContent{
-   width: 100%;
-   text-align: center;
-   font-size: 22px;
-   color: #000;
- }
- .addDialogLogo{
-  width: 60px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        border-radius: 5px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
- }
- .el-dialog__header{
- background: #32455b;
- }
- .el-dialog__title{
-  color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
- }
- .addDialogMid{
-   box-sizing: border-box;
-   padding:0 60px 0 10px;
-   .addDialogTit{
-     display: flex;
-     span{
-       width: 80px;
-       line-height: 40px;
-       text-align: left;
-     }
-   }
- .addDialogTit1{
-   display: flex;
-   justify-content: space-between;
-   margin-bottom: 15px;
- }
- .addDialogTit2{
-   margin-top: 10px;
-   font-size: 18px;
-   color: #000;
-   text-indent: 2em;
- }
- .addDialogCon{
-   margin-top: 20px;
- }
-}
-.dialog-footer{
- display: flex;
- justify-content: center;
-//  .btn5{
-//    height: 40px;
-//    font-size: 16px;
-//    background: #0e72e6;
-//    width: 200px;
-//  }
-}
-}
-
-    .PA2textArea{     //标题栏
-        margin: 15px 0;
-        .PA2textAreaTit{
-            width: 80%;
-            text-align: left;
-            font-size: 18px;
-            font-weight: 550;
-            margin-bottom: 15px;
-            color: #2387ff;
-        }
-        .ql-toolbar.ql-snow{
-          display: flex;
-        }
-        .PA2textAreaTit2{
-            font-size: 16px;
-        }
-        .el-textarea__inner{
-            background: #f2f2f2;
-        }
-    }
-    
-
-
-  // }
-  </style>

src/views/projectManage/components/ProjectManagement2_MakerSpace.vue

@@ -1,306 +0,0 @@
-<template>
-    <!-- 项目立项申请查看详细项目详细 -->
-      <div class="projectApplication2" v-loading="loading">
-        <div class="PA2mid">项目建设内容及目标</div>
-        <div class="PA2textArea">
-          <div class="PA2textAreaTit PA2textAreaTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.Construction">
-          </el-input>
-          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor> -->
-        </div>
-  
-        <div class="PA2mid">预项目建设论证报告</div>
-        <div class="PA2textArea">
-          <div class="PA2textAreaTit PA2textAreaTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.ProjectBasis">
-          </el-input>
-          <!-- <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>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.development">
-          </el-input>
-          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor> -->
-        </div>
-        <div class="PA2textArea">
-          <div class="PA2textAreaTit PA2textAreaTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.studio">
-          </el-input>
-          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor> -->
-        </div>
-        <div class="PA2textArea">
-          <div class="PA2textAreaTit PA2textAreaTit2">三、学生创客团队（人才）培养预期成果、数量</div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.studentTeam">
-          </el-input>
-          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor> -->
-        </div>
-        <div class="PA2textArea">
-          <div class="PA2textAreaTit PA2textAreaTit2">四、学生创客活动组织实施情况</div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.studentActivities">
-          </el-input>
-          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor> -->
-        </div>
-        <div class="PA2textArea">
-          <div class="PA2textAreaTit PA2textAreaTit2">五、学生创客团队孵化、转化创业项目情况</div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.Transforming">
-          </el-input>
-          <!-- <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>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.condition">
-          </el-input>
-          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor> -->
-        </div>
-  
-        <div class="baseBtn">
-          <div class="blockWidth">
-            <!-- <el-button type="primary" v-show="isUpload==2 || isUpload==3"  @click="submitHint=true">立即修改</el-button> -->
-            <!-- <el-button type="primary" disabled v-show="isUpload ==4" 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>
-        <!-- 修改对话框开始 -->
-        <el-dialog
-            title="提示"
-            :visible.sync="submitHint"
-            width="600px"
-            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="submitHint = false" class="AllDialogBtn" size="small">取消</el-button>
-            </span>
-          </el-dialog>
-        <!-- 修改对话框结束 -->
-      </div>
-    </template>
-    
-    <script>
-  import { VueEditor } from "vue2-editor";
-  
-        export default {
-          components:{
-            VueEditor
-          },
-          data() {
-            return {
-              isUpload:0,
-              loading:false,
-              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:{
-            submitAll(){
-              let param={
-                uid:this.$store.state.userInfo.userid,
-                pid:this.$route.query['pid'],
-                chapters:JSON.stringify(this.data)
-              }
-              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:this.$route.query['pid']
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectProjectChapterMakerSpace',param)
-                      .then(res=>{
-                        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);
-                      })
-            },
-          },
-          mounted(){
-            this.getData();
-          }
-        }
-    </script>
-    
-    <style lang="less">
-    .projectApplication2{
-  
-   .projectApplicationfundAddDialog{    //项目修改对话框开始
-   
-  
-   .el-dialog{
-     border-radius:5px ;
-     overflow: hidden;
-   }
-   
-   .deleteContent{
-     width: 100%;
-     text-align: center;
-     font-size: 22px;
-     color: #000;
-   }
-   .addDialogLogo{
-    width: 60px;
-          height: 30px;
-          display: flex;
-          justify-content: center;
-          line-height: 30px;
-          border-radius: 5px;
-          background: #f2f2f2;
-          position: absolute;
-          left: 20px; top: 15px; 
-   }
-   .el-dialog__header{
-   background: #32455b;
-   }
-   .el-dialog__title{
-    color:#fff;
-          display: flex;
-          justify-content: center;
-          font-size: 18px;
-          position: relative;
-          top: -2px;
-   }
-   .addDialogMid{
-     box-sizing: border-box;
-     padding:0 60px 0 10px;
-     .addDialogTit{
-       display: flex;
-       span{
-         width: 80px;
-         line-height: 40px;
-         text-align: left;
-       }
-     }
-   .addDialogTit1{
-     display: flex;
-     justify-content: space-between;
-     margin-bottom: 15px;
-   }
-   .addDialogTit2{
-     margin-top: 10px;
-     font-size: 18px;
-     color: #000;
-     text-indent: 2em;
-   }
-   .addDialogCon{
-     margin-top: 20px;
-   }
-  }
-  .dialog-footer{
-   display: flex;
-   justify-content: center;
-  }
-  }
-  //项目修改对话框结束
-      .PA2textArea{     //标题栏
-          margin: 15px 0;
-          .PA2textAreaTit{
-              width: 80%;
-              text-align: left;
-              font-size: 18px;
-              font-weight: 550;
-              margin-bottom: 15px;
-              color: #2387ff;
-          }
-          .ql-toolbar.ql-snow{
-            display: flex;
-          }
-          .PA2textAreaTit2{
-              font-size: 16px;
-          }
-          .el-textarea__inner{
-              background: #f2f2f2;
-          }
-      }
-      
-      .PA2mid{    //预期取得成果单独一栏
-          width: 100%;
-          text-align: left;
-          font-size: 18px;
-          font-weight: 550;
-          margin-bottom: 10px;
-          color: #2387ff;
-      }
-    }
-    </style>

src/views/projectManage/components/ProjectManagement4.vue

@@ -1,368 +0,0 @@
-<template>
-  <!-- 项目管理 项目附件 -->
-    <div class="ProjectManagement4" v-loading="loading">
-
-      <div class="pmInp">
-          <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-          <beUpload @getFile="getFile" v-show="state==2 || state==3"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <!-- <beUpload @getFile="getFile"  v-show="state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload> -->
-          <el-button v-show="state==4"  style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;height: 40px;">上传文件</el-button>
-        </div>
-        <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-
-        <!-- 表格开始 -->
-        <el-table
-        :data="tableData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-       
-
-        <!-- <el-table-column
-          prop="title"
-          label="活动名称"
-          align="center"
-          >
-        </el-table-column> -->
-
-        <el-table-column
-          prop="fileName"
-          label="活动中期报告"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="size"
-          label="大小"
-          align="center"
-          >
-        </el-table-column>
-       
-        <el-table-column
-          prop="uploadTime"
-          label="时间"
-          align="center"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                  <el-button type="primary" class="bt1" size="mini" @click="checkFile(scope.row.url)"  style="background: #477edd">详情查看</el-button>
-                  <el-button type="primary" class="bt1" size="mini" @click="DelFile(scope.$index)"  style="background: #477edd">删除</el-button>
-              </div>
-          </template>
-        </el-table-column>
-        </el-table>
-        <!-- 表格结束 -->
-      <!-- 展示文档开始 -->
-      <el-dialog
-            title="展示文件"
-            :visible.sync="showFile"
-            width="80vw"
-            class="addDialog showDialog"
-          >
-      <div class="addDialogLogo">LOGO</div>
-      <div class="showFileArea">
-        <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
-        <vword
-            style="width: 100%; height: 100%; overflow: auto"
-            class="fullStyle"
-            v-if="Wordss['type']!='pdf' && Wordss['name']!='图片'"
-            :pdfUrl="'https://view.officeapps.live.com/op/view.aspx?src='+showFileUrl"
-        ></vword>
-        <vpdf
-            style="width: 100%; height: 100%; overflow: auto"
-            class="fullStyle"
-            :pdfUrl="showFileUrl"
-            v-if="Wordss['type']=='pdf'"
-        ></vpdf>
-        <img :src="showFileUrl" alt="图片哦" v-if="Wordss['name']=='图片'" style="width: auto;height: auto;max-width: 100%;max-height: 100%;">
-      </div>
-    </el-dialog>
-    <!-- 展示文档结束 -->
-        <!-- 分页 -->
-        <!-- <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="table.currentPage"
-            :page-size="table.packageSize"
-            layout=" prev, pager, next"
-            background
-            class="paginations"
-            :total="table.total">
-          </el-pagination> -->
-        <!-- 分页结束 -->
-    </div>
-  </template>
-  
-  <script>
-  import beUpload from '@/components/tool/beUpload'
-  import vpdf from "@/components/vpdf.vue";
-  import vword from "@/components/vword.vue";
-      export default {
-        components: { beUpload, vpdf, vword },
-        data() {
-          return {
-          accept:"*",
-            // table:{         // 分页数据
-            //   total:0,
-            //   packageSize:2,
-            //   currentPage:1
-            // }, 
-            loading:false,
-            state:'',
-            showFile:false,
-            showFileType: 0,
-            showFileUrl: "",
-            Wordss:{type:"",name:""},
-            canonical:{
-                Image:/^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
-                File:/^https?:\/\/(.+\/)+.+(\.(docx|xlsx|ppt|pdf))$/i
-            },
-            tableData:[],
-            progress:{
-              value:0,
-              show:false
-            },  
-          }
-        },
-        methods:{
-          DelFile(index){
-            this.$confirm("你确定要删除该文件吗?",'删除文件确认').then(res=>{
-              this.tableData.splice(index,1)
-              this.ajax.post(this.$store.state.api+"/AddProjectFile",{
-                uid:this.$store.state.userInfo.userid,
-                cid:this.$route.query['pid'],
-                file:JSON.stringify(this.tableData)
-              }).then(res=>{
-                if(res.data==1){
-                  this.$message.success("删除成功")
-                }else{
-                  this.$message.error("删除失败")
-                }
-                this.getData();
-              }).catch(err=>{
-                console.log(err)
-              })
-            }).catch(err=>{
-              console.log("取消删除文件")
-            })
-   
-          },
-          ProgressFormat(value){        //进度条
-            return value ==100?'100%':`${value}%`
-          },
-          //展示文件
-          checkFile(url) {
-            this.showFileUrl = url;
-            this.showFile = true;
-            // console.log(url);
-            if(typeof url=='undefined')return {type:"",name:""};
-                let urlSplit = url.split(".");
-                const type = urlSplit[urlSplit.length-1]
-                if(this.canonical.Image.test(url)){
-                
-                  this.Wordss={type:type,name:"图片"}
-                  return console.log(this.Wordss);
-                }
-                if(this.canonical.File.test(url)){
-                  this.Wordss={type:type,name:"文档"}
-                  return console.log(this.Wordss);
-                }
-                else return this.Wordss={type:type,name:type}
-          },
-          getFile(val) {    //上传文件
-            console.log(val);
-            this.file = val;
-            let oldData = [];
-            if (this.tableData!=null) {
-              this.tableData.forEach(item=>oldData.push(item))
-              oldData.push(val)
-            }else{
-                oldData.push(val)
-            }
-          
-            let param={
-                uid:this.$store.state.userInfo.userid,
-                cid:this.$route.query['pid'],
-                projectFile:JSON.stringify(oldData)
-            }
-            this.ajax
-                  .post(this.$store.state.api+'/AddProjectFile',param)
-                  .then(res=>{
-                    // console.log(res);
-                    if (res.data==1) {
-                      this.$message.success('上传成功')
-                      this.getData()
-                      this.progress.show = false;
-                    }else{
-                      this.$message.error('上传失败')
-                    }
-                    
-                  },err=>{
-                    console.log(err);
-                  })
-          },
-        //   handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
-        //   // console.log(`当前页: ${val}`);
-        //   this.table.currentPage=val
-        //   this.getData()
-        // },
-          getData(){       //获取基础信息
-            this.loading = true;
-              let param={
-                uid:this.$store.state.userInfo.userid,
-                pid:this.$route.query['pid'],
-                // page:this.table.currentPage,
-                // lim:this.table.packageSize
-              }
-              // console.log(param);
-              this.ajax
-                    .get(this.$store.state.api+'/SelectProjectFile',param)
-                    .then(res=>{
-                      console.log(res.data[0][0]);
-                      this.state=res.data[0][0].isupload;
-                      let k=[]
-                      res.data[0].forEach((e,i) => {
-                        let { projectFile: l } = e;
-                        k=JSON.parse(l)
-                      });
-                      this.tableData=k
-                      this.loading = false;
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-          content(){
-            this.$router.push('/ProjectManagement1')
-          },
-          remark(){
-            this.$router.push('/ProjectManagement2')
-          },
-          remark2(){
-            this.$router.push('/ProjectManagement3')
-          },
-      
-          remark5(){
-            this.$router.push('/ProjectManagement5')
-          },
-          
-          backBtn2(){
-            this.$router.push('/ProjectManagement1')
-          },
-          lookDetails(){
-            console.log(111);
-          },
-          back(){
-            this.$router.push('/ProjectManagement')
-          },
-        },
-        mounted(){
-          this.getData()
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagement4{
-    .pagination{
-      float: right;
-      margin: 20px 55px 10px;
-    }
-  
-    .addDialog {
-        font-size: 18px;
-        .el-dialog {
-          border-radius: 5px;
-          overflow: hidden;
-        }
-        .deleteContent {
-          width: 100%;
-          margin: 30px 0;
-          font-size: 22px;
-          color: #000;
-        }
-        .addDialogLogo {
-          width: 60px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        border-radius: 5px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-        }
-        .el-dialog__header {
-          display: flex;
-          justify-content: center;
-          background: #32455b;
-        }
-        .el-dialog__title {
-          color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-        }
-        .addDialogMid {
-          box-sizing: border-box;
-          padding: 0 60px 0 10px;
-          .addDialogTit {
-            display: flex;
-            span {
-              width: 80px;
-              font-size: 16px;
-              line-height: 40px;
-              text-align: left;
-            }
-          }
-          .addDialogTit1 {
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 15px;
-          }
-          .addDialogTit2 {
-            margin-top: 10px;
-            font-size: 16px;
-            color: #000;
-            text-indent: 2em;
-          }
-          .addDialogCon {
-            margin-top: 20px;
-          }
-        }
-        .dialog-footer {
-          display: flex;
-          justify-content: center;
-          box-sizing: border-box;
-         
-        }
-      }
-   
-    
-    .pmInp{
-      width: 100%;
-      display: flex;
-      margin: 10px 0 10px 0;
-      justify-content: flex-end;
-
-      // .btn{
-      //   width: 120px !important;
-      //   height: 40px !important;
-      //   font-size: 16px !important;
-      //   margin-left: 10px;
-      // }
-    }
-    
-  }
-   
-  </style>

src/views/projectManage/components/studentProjectWordShow.vue

@@ -0,0 +1,477 @@
+<template>
+    <div id="studentProjectWord">
+        <div id="title">
+            <div class="school">深圳技师学院</div>
+            <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
+            <div class="date">申请日期：{{downWordData.applicationDate}}</div>
+        </div>
+        <table border="1" cellspacing="0" class="table">
+    
+          <tr id="projectName">
+            <td colspan="2" ref="projectName">项目名称</td><td colspan="5" v-text='downWordData.projectName'></td>
+          </tr>
+          <tr id="radio">
+            <td rowspan="2" colspan="2" ref="radio">项目分组</td><td v-text="downWordData.radio=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?'√ 创意组':'□ 创意组'">
+            </td>
+            <td colspan="4">立项项目为新立项项目，项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式，产生较好的社会效益。</td>
+          </tr> 
+          <tr>
+            <td v-text="downWordData.radio=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?'□ 初创组':'√ 初创组'">
+            </td>
+            <td colspan="4">立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目（毕业两年内），项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。</td>
+          </tr> 
+          <tr id="checkList" class="checkArea">
+            <td colspan="2" ref="checkList">优先支持项目（可多选）</td> <td colspan="5">
+              <span><span v-text="downWordData['checkList'].indexOf('1')!=-1?'√ ':'□ '"></span><span>大赛选拔项目</span></span>
+              <span><span v-text="downWordData['checkList'].indexOf('2')!=-1?'√ ':'□ '"></span><span>落地注册项目</span></span>
+              <span><span v-text="downWordData['checkList'].indexOf('3')!=-1?'√ ':'□ '"></span><span>社会征集项目</span></span>
+              <span><span v-text="downWordData['checkList'].indexOf('4')!=-1?'√ ':'□ '"></span><span>产业命题项目</span></span>
+              
+              <!-- <el-checkbox-group v-model="downWordData.checkList">
+                <el-checkbox label="1">大赛选拔项目</el-checkbox>
+                <el-checkbox label="2">大赛选拔项目</el-checkbox>
+                <el-checkbox label="3">社会征集项目</el-checkbox>
+                <el-checkbox label="4">产业命题项目</el-checkbox>
+              </el-checkbox-group> -->
+            </td>
+          </tr>
+          <tr id="schoolRadio" class="checkArea">
+            <td colspan="2" ref="schoolRadio">美丽校园改造项目（特色项目）</td> <td colspan="5">
+              <span><span v-text="downWordData['schoolRadio']=='1'?'√ ':'□ '"></span><span>校园安全项目</span></span>
+              <span><span v-text="downWordData['schoolRadio']=='2'?'√ ':'□ '"></span><span>环境治理项目</span></span>
+              <span><span v-text="downWordData['schoolRadio']=='3'?'√ ':'□ '"></span><span>校园服务项目</span></span>
+              <span><span v-text="downWordData['schoolRadio']=='4'?'√ ':'□ '"></span><span>文创装置项目</span></span>
+              <!-- <el-radio v-model="downWordData.schoolRadio" label="1">校园安全项目</el-radio>
+              <el-radio v-model="downWordData.schoolRadio" label="2">环境治理项目</el-radio>
+              <el-radio v-model="downWordData.schoolRadio" label="3">校园服务项目</el-radio>
+              <el-radio v-model="downWordData.schoolRadio" label="4">文创装置项目</el-radio> -->
+            </td>
+          </tr>
+          <tr id="applyParsonRadio">
+            <td colspan="2" ref="applyParsonRadio" >项 目 申 请 人</td><td colspan="2">
+              <span v-text="downWordData['applyParsonRadio']=='1'?'√ ':'□ '"></span><span>在校学生</span>
+              <!-- <el-radio v-model="downWordData.applyParsonRadio" label="1">在校学生</el-radio> -->
+            </td><td colspan="3">
+              <span v-text="downWordData['applyParsonRadio']=='2'?'√ ':'□ '"></span><span>入驻学校孵化基地的初创企业法人</span>
+              <!-- <el-radio v-model="downWordData.applyParsonRadio" label="2">入驻学校孵化基地的初创企业法人</el-radio> -->
+            </td>
+          </tr>
+          <tr id="applyParsonName">
+            <td colspan="2" ref="applyParsonName">申 请 人 姓 名</td><td colspan="1" v-text="downWordData.applyParsonName">
+            </td>
+            <td ref="college">参与学院/公司</td><td v-text="downWordData.dp">
+            </td><td ref="tel">联系电话</td><td v-text="downWordData.tel"></td>
+          </tr>
+          <tr id="beginTime">
+            <td colspan="2" ref="beginTime">项 目 起 始 时 间</td><td colspan="2" v-text="downWordData.beginTime.split(' ')[0]"></td>
+            <td ref="endTime">计划完成时间</td><td colspan="2" v-text="downWordData.endTime.split(' ')[0]"></td>
+          </tr>
+          <tr>
+            <td colspan="2">项 目 组 人 数</td><td v-text="downWordData.studentS.length + downWordData.teacherS.length"></td>
+            <td>参与学生人数</td><td v-text='downWordData.studentS.length'> </td>
+            <td>参与教师人数</td><td v-text="downWordData.teacherS.length"></td>
+          </tr>
+          <tr id="studentS">
+            <td :rowspan="downWordData.studentS.length+1" ref="studentS">项目组学生成员（至少2个学院以上学生构成，团队5人以上）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+          </tr>
+          <tr style="position: relative;" v-for="(item,index) in downWordData.studentS" :key="index+'a'">
+            <td v-text="item.name"></td>
+            <td colspan="2" v-text="item.collage"></td>
+            <td colspan="3" v-text="item.work"></td>
+          </tr>
+          <tr id="teacherS">
+            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS">项目组指导教师（2个学院以上，团队2-3人）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+          </tr>
+          <tr style="position: relative !important;" v-for="(item,index) in downWordData.teacherS" :key="index+'b'">
+            <td v-text="item.name"></td>
+            <td colspan="2" v-text="item.collage"></td>
+            <td colspan="3" v-text="item.work"></td>
+          </tr>
+          <tr id="brief">
+            <td rowspan="5" ref="brief">研发内容</td><td colspan="6" class="textLeft">
+              <p>项目简介（200-300字）</p>
+              <span v-text="downWordData.brief"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目研发背景</p>
+              <span v-text="downWordData.introduce.back"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目创新点</p>
+              <span v-text="downWordData.introduce.innovate"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>技术研发路线</p>
+              <span v-text="downWordData.introduce.path"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目应用场景 </p>
+              <span v-text="downWordData.introduce.scene"></span>
+            </td>
+          </tr>
+          <tr>
+            <td>商业模式及社会价值</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目商业模式/社会价值</p>
+              <span v-text="downWordData.introduce.worth"></span>
+            </td>
+          </tr>
+          <tr>
+            <td>团队优势</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>团队构成及优势</p>
+              <span v-text='downWordData.introduce.team'></span>
+            </td>
+          </tr>
+          <tr>
+            <td>研发成本</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>研发成本来源及构成</p>
+              <span v-text="downWordData.introduce.cost"></span>
+            </td>
+          </tr>
+          <tr>
+            <td rowspan="3">预期成果</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
+              <span v-text="downWordData.introduce.expectResults"></span>
+            </td>
+          </tr>
+          <tr class="textLeft">
+            <td style="text-align: left;" colspan="6">
+              <p>学生创客人才培养预期成果、数量（教师填写）</p>
+              <span v-text="downWordData.introduce.expectResultsTeacher"></span>
+            </td>
+          </tr>
+          <tr class="textLeft">
+            <td style="text-align: left;" colspan="6">
+              <p>项目预期孵化、转化创业项目情况</p>
+              <span v-text="downWordData.introduce.expectConversion"></span>
+            </td>
+          </tr>
+          <tr>
+            <td>实施计划</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <span v-text="downWordData.introduce.plan"></span>
+            </td>
+          </tr>
+          <tr id="fund">
+            <td rowspan="12" ref="fund">预算经费</td><td>总经费</td><td colspan="5" v-text="reversedMessage==0?'':reversedMessage"></td>
+          </tr>
+          <tr>
+            <td>支出类别</td><td colspan="2">支出项目</td><td>金额（元）</td><td colspan="4">备 注</td>
+          </tr>
+          <tr>
+            <td rowspan="5">直接费用</td>
+          </tr>
+          <tr>
+            <td colspan="2">小型仪器设备费</td>
+            <td v-text="downWordData.fund.facility">
+            </td><td colspan="2">
+              项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">材料费</td><td v-text="downWordData.fund.materials">
+            </td><td colspan="2">
+              项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">测试化验加工费</td><td v-text="downWordData.fund.process">
+            </td><td colspan="2">
+              项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">项目协作费</td><td v-text="downWordData.fund.assist">
+            </td><td colspan="2">
+              按合同规定支付给协作单位的费用
+            </td>
+          </tr>
+    
+          <tr>
+            <td rowspan="5">间接费用</td>
+          </tr>
+          <tr>
+            <td colspan="2">项目成果鉴定费</td><td v-text="downWordData.fund.authenticate">
+            </td><td colspan="2">
+              学术会务费、评审费、鉴定费、成果集制作费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">参展参赛费</td><td v-text="downWordData.fund.match">
+            </td><td colspan="2">
+              参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">创客交流活动费</td><td v-text="downWordData.fund.activity">
+            </td><td colspan="2">
+              创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.affair">
+            </td><td colspan="2">
+              论文版面费、专利及其他知识产权事务等费用。
+            </td>
+          </tr>
+          <tr>
+            <td>所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
+                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
+                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+            </td>
+          </tr>
+          <tr>
+            <td>财务部门意见</td><td colspan="6" class="textLeft" style="height:200px">
+                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
+                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+            </td>
+          </tr>
+          <tr>
+            <td>创新创业学院审核意见</td><td colspan="6" class="textLeft" style="height:200px">
+                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
+                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+            </td>
+          </tr>
+        </table>
+          <div class="notes">
+            <span>备注：</span>
+            <span>1.表格可顺延或另附页。</span>
+            <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
+            <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
+          </div>
+    </div>
+    </template>
+      
+    <script>
+      export default {
+        data() {
+          return {
+              downWordData:{
+                applicationDate:'',//申请日期
+                projectName:'',
+                radio:'',
+                checkList:[],
+                schoolRadio:'',
+                applyParsonRadio:'',
+                applyParsonName:'',
+                college:'',
+                tel:'',
+                beginTime:'',
+                endTime:'',
+                studentS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                teacherS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                brief:'',
+                introduce:{
+                    back:'',
+                    innovate:'',
+                    path:'',
+                    scene:'',
+                    worth:'',
+                    team:'',
+                    cost:'',
+                    expectResults:'',
+                    expectResultsTeacher:'',
+                    expectConversion:'',
+                    plan:''
+                },
+                total:'',
+                fund:{
+                    facility:'',
+                    materials:'',
+                    process:'',
+                    assist:'',
+                    authenticate:'',
+                    match:'',
+                    activity:'',
+                    affair:''
+                }
+              },
+              
+            }
+        },
+        methods: {
+          getData(){
+              let param={
+                  uid:this.$store.state.userInfo.userid,
+                  pid:this.$route.query['pid']
+              }
+              this.ajax
+              .get(this.$store.state.api+'/studentProjectData',param)
+              .then(res=>{
+                  let data=res.data[0][0];
+                  let wordData = {};
+                  wordData.projectName=data.title;
+                  wordData.radio=data.typeName;
+                  wordData.checkList=JSON.parse(data.multiSelectProject);
+                  wordData.schoolRadio=data.schoolRemould;
+                  wordData.applyParsonRadio=data.projectApplyperson;
+                  wordData.applyParsonName=data.pro_leader;
+                  wordData.college=data.classid;
+                  wordData.tel=data.phone;
+                  wordData.beginTime=data.bTime;
+                  wordData.endTime=data.eTime;
+                  wordData.studentS=JSON.parse(data.course_student);
+                  wordData.teacherS=JSON.parse(data.course_teacher);
+                  wordData.brief=data.brief;
+                  wordData.introduce=JSON.parse(data.chapters)
+                  wordData.fund=JSON.parse(data.money)
+                  this.downWordData={...wordData,...{etime:data.eTime,btime:data.bTime,dp:data.className}}
+              },err=>{
+                  console.log(err);
+              })
+          },
+        },
+        computed:{   //经费总合
+          reversedMessage: function () {
+            let num = 0;
+            for(let i in this.downWordData.fund)num+=Number(this.downWordData.fund[i]);
+            return num;
+          }
+        },
+        mounted(){
+          this.getData();
+        }
+      };
+    </script>
+      
+    <style lang="less" scoped>
+    #studentProjectWord{
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        background-color: #ffff;
+        margin: 0;
+        padding: 40px 100px;
+        box-sizing:border-box;
+        #title{
+            width: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            position: relative;
+            // margin-top: 40px;
+            .school{
+                font-size: 2.5em;
+                font-weight: bold;
+                letter-spacing: 20px;
+            }
+            .wordTitle{
+                font-size: 2em;
+                letter-spacing: .15em;
+                margin-bottom:40px ;
+            }
+            .date{
+    
+                font-size: 1em;
+                position: absolute;
+                bottom: 0;
+                right: 100px;
+                font-weight: bold;
+            }
+        }
+        .table{
+            border: none;
+            border-top: solid 1px black;
+            border-right:  solid 1px black;
+            border-left:  solid 1px black;
+            .textLeft{
+              text-align: left ;
+              vertical-align: top;
+              position: relative;
+              max-width:100% ;
+              height: 200px;
+              white-space: nowrap;
+              span{
+                white-space: nowrap
+              }
+              :deep(.el-textarea__inner){
+                border: none ;
+                border-radius: 0px;
+                text-align: left !important;
+                font-size: 16px;
+              }
+            }
+            tr{
+              position: relative;
+              td{
+                border: none;
+                border-bottom: solid 1px black;
+                border-right: solid 1px black;
+                height: 50px;
+                text-align: center;
+                line-height: 30px;
+                min-width: 80px;
+                box-sizing: border-box;
+                padding: 5px;
+              p{
+                font-weight: 600;
+              }
+              :deep(.el-select .el-input .el-select__caret){
+                display: none;
+              }
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(.el-input__inner){
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(input)::-webkit-outer-spin-button,
+              :deep(input)::-webkit-inner-spin-button {
+                -webkit-appearance: none;
+              }
+              :deep(input)[type="number"]{
+                  -moz-appearance: textfield;
+              }
+            }
+          }
+            
+        }
+        .notes{
+          width: 100%;
+          display: flex;
+          flex-direction:column;
+        }
+        
+    }
+      .checkArea{
+        td{
+          span{
+          margin-left: 50px;
+          span{
+            margin: 0;
+          }
+        }
+        }
+
+      }
+    
+    </style>

src/views/projectSettlement/components/projectSettlementDetailAnnex.vue

@@ -1,304 +0,0 @@
-<template>
-  <!-- 项目管理 项目附件 -->
-    <div class="ProjectManagement4" v-loading="loading">
-      <div class="pmInp">
-          <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-          <!-- <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept"></beUpload> -->
-
-        </div>
-        <!-- 表格开始 -->
-        <el-table
-        :data="tableData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-       
-
-        <!-- <el-table-column
-          prop="title"
-          label="活动名称"
-          align="center"
-          >
-        </el-table-column> -->
-
-        <el-table-column
-          prop="fileName"
-          label="活动中期报告"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="size"
-          label="大小"
-          align="center"
-          >
-        </el-table-column>
-       
-        <el-table-column
-          prop="uploadTime"
-          label="时间"
-          align="center"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="operation"
-          align="center"
-
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                      <el-button type="primary" class="bt1" size="mini" @click="checkFile(scope.row.url)" style="background: #477edd">详情查看</el-button>
-              </div>
-          </template>
-        </el-table-column>
-        </el-table>
-        <!-- 表格结束 -->
-      <!-- 展示文档开始 -->
-      <el-dialog
-            title="展示文件"
-            :visible.sync="showFile"
-            width="80vw"
-            class="addDialog showDialog"
-          >
-      <div class="addDialogLogo">LOGO</div>
-      <div class="showFileArea">
-        <vword
-            style="width: 100%; height: 100%; overflow: auto"
-            class="fullStyle"
-            v-if="Wordss['type']!='pdf' && Wordss['name']!='图片'"
-            :pdfUrl="'https://view.officeapps.live.com/op/view.aspx?src='+showFileUrl"
-        ></vword>
-        <vpdf
-            style="width: 100%; height: 100%; overflow: auto"
-            class="fullStyle"
-            :pdfUrl="showFileUrl"
-            v-if="Wordss['type']=='pdf'"
-        ></vpdf>
-        <img :src="showFileUrl" alt="图片哦" v-if="Wordss['name']=='图片'" style="width: auto;height: auto;max-width: 100%;max-height: 100%;">
-      </div>
-    </el-dialog>
-    <!-- 展示文档结束 -->
-        <!-- 分页 -->
-        <!-- <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="table.currentPage"
-            :page-size="table.packageSize"
-            layout=" prev, pager, next"
-            background
-            class="paginations"
-            :total="table.total">
-          </el-pagination> -->
-        <!-- 分页结束 -->
-    </div>
-  </template>
-  
-  <script>
-  import beUpload from '@/components/tool/beUpload'
-  import vpdf from "@/components/vpdf.vue";
-  import vword from "@/components/vword.vue";
-      export default {
-        components: { beUpload, vpdf, vword },
-        data() {
-          return {
-          accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-            table:{         // 分页数据
-              total:0,
-              packageSize:8,
-              currentPage:1
-            }, 
-            // showFile:false,
-            showFileType: 0,
-            loading:false,
-            // showFileUrl: "",
-            tableData:[],
-            showFile: false,
-            showFileUrl: "",
-            Wordss:{type:"",name:""},
-            canonical:{
-                Image:/^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
-                File:/^https?:\/\/(.+\/)+.+(\.(docx|xlsx|ppt|pdf))$/i
-            },
-          }
-        },
-        methods:{
-          //展示文件
-          checkFile(url) {
-            this.showFileUrl = url;
-            this.showFile = true;
-
-            if(typeof url=='undefined')return {type:"",name:""};
-                let urlSplit = url.split(".");
-                const type = urlSplit[urlSplit.length-1]
-                if(this.canonical.Image.test(url)){
-                
-                  this.Wordss={type:type,name:"图片"}
-                  return console.log(this.Wordss);
-                }
-                if(this.canonical.File.test(url)){
-                  this.Wordss={type:type,name:"文档"}
-                  return console.log(this.Wordss);
-                }
-                else return this.Wordss={type:type,name:type}
-          },
-          getFile(val) {    //上传文件
-            this.file = val;
-            let oldData = [];
-            this.tableData.forEach(item=>oldData.push(item))
-            oldData.push(val)
-          
-            let param={
-                uid:this.$store.state.userInfo.userid,
-                cid:this.$route.query['pid'],
-                projectFile:JSON.stringify(oldData)
-            }
-            this.ajax
-                  .post(this.$store.state.api+'/AddProjectFile',param)
-                  .then(res=>{
-                    if (res.data==1) {
-                      this.$message.success('上传成功')
-                      this.getData()
-                    }else{
-                      this.$message.error('上传失败')
-                    }
-                    
-                  },err=>{
-                    console.log(err);
-                  })
-          },
-          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
-          // console.log(`当前页: ${val}`);
-          this.table.currentPage=val
-          this.getData()
-        },
-          getData(){       //获取基础信息
-            this.loading = true;
-              let param={
-                uid:this.$store.state.userInfo.userid,
-                pid:this.$route.query['pid'],
-              }
-              // console.log(param);
-              this.ajax
-                    .get(this.$store.state.api+'/SelectProjectFile',param)
-                    .then(res=>{
-                      let k=[]
-                      res.data[0].forEach((e,i) => {
-                        let { projectFile: l } = e;
-                        k=JSON.parse(l)
-                      });
-                      this.tableData=k
-                      this.loading = false;
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-        },
-        mounted(){
-          this.getData()
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagement4{
-    .pagination{
-      float: right;
-      margin: 20px 55px 10px;
-    }
-    .addDialog {
-        font-size: 18px;
-        .el-dialog {
-          border-radius: 5px;
-          overflow: hidden;
-        }
-        .deleteContent {
-          width: 100%;
-          margin: 30px 0;
-          font-size: 22px;
-          color: #000;
-        }
-        .addDialogLogo {
-          width: 60px;
-          height: 30px;
-          display: flex;
-          justify-content: center;
-          line-height: 30px;
-          border-radius: 5px;
-          background: #f2f2f2;
-          position: absolute;
-          left: 20px; top: 15px; 
-        }
-        .el-dialog__header {
-          display: flex;
-          justify-content: center;
-          background: #32455b;
-        }
-        .el-dialog__title {
-          color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-        }
-        .addDialogMid {
-          box-sizing: border-box;
-          padding: 0 60px 0 10px;
-          .addDialogTit {
-            display: flex;
-            span {
-              width: 80px;
-              font-size: 16px;
-              line-height: 40px;
-              text-align: left;
-            }
-          }
-          .addDialogTit1 {
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 15px;
-          }
-          .addDialogTit2 {
-            margin-top: 10px;
-            font-size: 16px;
-            color: #000;
-            text-indent: 2em;
-          }
-          .addDialogCon {
-            margin-top: 20px;
-          }
-        }
-        .dialog-footer {
-          display: flex;
-          justify-content: center;
-          box-sizing: border-box;
-          // .btn5 {
-          //   font-size: 16px;
-          // }
-        }
-      }
-   
-
-   
-
-    .pmInp{
-      width: 100%;
-      display: flex;
-      margin: 10px 0 10px 0;
-      justify-content: flex-end;
-      .btn{
-        height: 30px;
-        width: 100px;
-        font-size: 16px !important;
-        background: #477edd;
-        margin-left: 10px;
-      }
-    }
-    
-  }
-
-  </style>

src/views/projectSettlement/components/projectSettlementDetailBase_MakerSpace.vue

@@ -1,758 +0,0 @@
-<template>
-  <!-- 项目结项 项目基本内容 -->
-    <div class="projectSettlement1" v-loading="loading">
-      <div class="psSmallTit">
-        <span style="margin-right: 10px;">结题时间:</span>{{ endTime }}
-      </div>
-
-<!-- 活动申请填写信息区域开始 -->
-     <!-- 活动申请填写信息区域开始 -->
-     <div class="select">
-              <div class="selectTop">
-                <div class="label">项目名称</div>
-                <el-input v-model="select.project" placeholder="请输入内容"></el-input>
-              </div>
-              <div class="selectMid">
-                <div class="selectLeft">
-                 
-                    <div class="inpBlock">
-                        <div class="label">负责人</div>
-                        <el-input v-model="select.person" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">所在部门</div>
-                        <el-select v-model="select.departmentData" style="width: 100%;" placeholder="请选择">
-                          <el-option
-                            v-for="item in select.department"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                          </el-option>
-                        </el-select>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">学院牵头领导</div>
-                        <el-input v-model="select.lead_leader" placeholder="请输入学院牵头领导"></el-input>
-                    </div>
-                </div>
-
-                <div class="selectRight">
-                  <div class="inpBlock">
-                        <div class="label">项目时间</div>
-                        <el-date-picker
-                          v-model="select.Date"
-                          type="daterange"
-                          style="width: 100%;"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          range-separator="至"
-                          start-placeholder="项目起始时间"
-                          end-placeholder="项目完成时间">
-                          
-                        </el-date-picker>
-                        <!-- <el-date-picker
-                          v-model="select.Date"
-                          type="datetime"
-                          style="width: 100%;"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期">
-                        </el-date-picker> -->
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">预算总经费</div>
-                        <el-input type="number" v-model.number="select.Fund" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">选择分类</div>
-                        <el-cascader disabled="" v-model="select.sort" :options="select.sortOptions" clearable></el-cascader>
-
-                    </div>
-                </div>
-              </div>
-              
-        </div>
-        <!-- 活动申请填写信息区域结束 -->
-
-
-         <!-- 项目封面修改上传开始 -->
-         <!-- <div style="height: 260px;">
-              <div class="tabTit">
-                <div><p>封面上传</p></div>
-              </div>
-              <hr>
-              <div style="margin-bottom: 10px;">修改项目封面</div>
-              <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-
-              <el-upload
-                class="avatar-uploader"
-                action="#"
-                disabled
-                style="position: relative;"
-                :show-file-list="false"
-                >
-                <img v-if="dialogImageUrl" :src="dialogImageUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <BeUpload :progress="progress" style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
-              </el-upload>
-            </div> -->
-
-          <!-- 项目封面修改上传开始结束 -->
-
-
-
-
-      <!-- 项目教师开始 -->
-      <div class="tabTit">
-          <div><p>项目组-教师团队</p><span>（团队3人以上，至少应包含1名教研室主任）</span></div>
-          <el-button type="primary" @click="addMember"  size="mini">添加教师</el-button>
-      </div>
-      <hr>
-      <el-table
-        :data="teacherData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <el-table-column
-          prop="name"
-          label="姓名"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="speciality"
-          label="专业"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="title"
-          label="职称"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="education"
-          label="学历"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="section"
-          label="所在教研室"
-          align="center"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="work"
-          label="项目组任务分工"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                      <!-- <el-button type="primary" @click="lookDetail(scope)" size="mini">查看详情</el-button> -->
-                      <el-button type="primary" @click="amendDialogData(scope.$index)" size="mini">修改</el-button>
-                      <el-button type="primary" @click="Del(scope.$index)" size="mini">删除</el-button>
-              </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 项目教师结束 -->
-
-      <!-- 项目学生开始 -->
-      <div class="tabTit">
-        <div><p>项目组-学生团队</p><span>（团队5人以上，学生团队年级结构安排合理）</span></div>
-          <el-button type="primary" @click="addMemberStudent"  size="mini">添加学生</el-button>
-      </div>
-      <hr>
-      <el-table
-        :data="studentData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <el-table-column
-          prop="name"
-          label="姓名"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="class"
-          label="班级"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="age"
-          label="年龄"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="work"
-          label="项目组任务分工"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                      <el-button type="primary" @click="updateStudent(scope.$index)" size="mini">修改</el-button>
-                      <el-button type="primary" @click="DelStudent(scope.$index)" size="mini">删除</el-button>
-              </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 项目学生结束 -->
-
-
-      <!-- 项目简介开始 -->
-    <div class="tabTit">
-          <div><p>项目简介</p></div>
-    </div>
-    <hr>
-      <el-input
-        type="textarea"
-        :rows="6"
-        resize="none"
-        class="textArea"
-        placeholder="请输入内容"
-        v-model="textarea">
-      </el-input>
-    <!-- 项目简介结束 -->
-
-
-    <div class="baseBtn">
-      <div class="blockWidth">
-        <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
-
-        <!-- <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
-        <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
-        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-
-      </div>
-    </div>
-      <!--添加教师dialog对话框开始 -->
-      <el-dialog
-          :title= "isAddMember==1?'添加教师':'修改教师'"
-          :visible.sync="addMemberDialog"
-          :modal="true"
-          :close-on-click-modal="true"
-          class="AddMember">
-            <div class="littleBlock">
-              <div class="dialogLabel">姓名</div>
-              <div>
-                <el-input v-model="teacher.name" placeholder="请输入教师姓名"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">专业</div>
-              <div>
-                <el-input v-model="teacher.speciality" placeholder="请输入教师专业"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">职称</div>
-              <div>
-                <el-input v-model="teacher.title" placeholder="请输入教师职称"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">学历</div>
-              <div>
-                <el-input v-model="teacher.education" placeholder="请输入教师学历"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel" style="transform: translate(0,0);">所在教研室</div>
-              <div>
-                <el-input v-model="teacher.section" placeholder="请输入所在教研室"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel" style="transform: translate(0,0);">项目组角色分工</div>
-              <div>
-                <el-input v-model="teacher.work" placeholder="请输入项目组角色分工"></el-input>
-              </div>
-            </div>
-
-
-            <div slot="footer" class="footer">
-              <el-button v-show="isAddMember==1" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="isAddMember==2" type="primary" @click="commit2" class="AllDialogBtn" >确认修改</el-button>
-
-              <el-button @click="addMemberDialog = false" class="AllDialogBtn">取消</el-button>
-            </div>
-      </el-dialog>
-      <!--添加教师dialog对话框结束 -->
-
-      <!-- 添加学生dialog对话框开始 -->
-      <el-dialog
-          :title= "isAddStudent==1?'添加学生':'修改学生'"
-          :visible.sync="addStudentDialog"
-          :modal="true"
-          :close-on-click-modal="true"
-          class="AddMember">
-            <div class="littleBlock">
-              <div class="dialogLabel">姓名</div>
-              <div>
-                <el-input v-model="student.name" placeholder="请输入学生姓名"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">班级</div>
-              <div>
-                <el-input v-model="student.class" placeholder="请输入学生班级"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">年龄</div>
-              <div>
-                <el-input v-model="student.age" placeholder="请输入学生年龄"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel" style="transform: translate(0,0);">项目组角色分工</div>
-              <div>
-                <el-input v-model="student.work" placeholder="请输入项目组角色分工"></el-input>
-              </div>
-            </div>
-
-
-            <div slot="footer" class="footer">
-              <el-button v-show="isAddStudent==1" type="primary" @click="commitStudent" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="isAddStudent==2" type="primary" @click="commitStudent2" class="AllDialogBtn" >确认修改</el-button>
-
-              <el-button @click="addStudentDialog=false" class="AllDialogBtn">取消</el-button>
-            </div>
-      </el-dialog>
-      <!-- 添加学生dialog对话框结束 -->
-       <!-- 删除教师对话框开始 -->
-      <el-dialog
-              title="删除教师"
-              :visible.sync="delMember"
-              width="600px"
-              class="delMemberDialog">
-              <span class="deleteContent">确定删除该教师?</span>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="delMember=false" class="AllDialogBtn" >取消</el-button>
-              </span>
-      </el-dialog>
-      <!-- 删除教师对话框结束 -->
-      <!-- 删除学生成员对话框开始 -->
-            <el-dialog
-              title="删除学生成员"
-              :visible.sync="DelStudentDialog"
-              width="600px"
-              class="delMemberDialog">
-              <span class="deleteContent">确定删除该学生成员?</span>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelStudent" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="DelStudentDialog = false" class="AllDialogBtn" >取消</el-button>
-              </span>
-            </el-dialog>
-      <!-- 删除学生成员对话框结束 -->
-
-       <!-- 修改对话框开始 -->
-       <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          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="submitHint = false" size="small" class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 修改对话框结束 -->
-  </div>
-</template>
-
-<script>
-    export default {
-      data() {
-        return {
-          iid:'',
-          isUpload:'',
-          accept:"image/*",
-          isAddMember:1,
-          isAddStudent:1,
-          progress:{   //进度条
-                value:0,
-                show:false
-            },  
-          index:0,
-          endTime:"",
-          delMember:false,
-          dialogImageUrl:"",//项目封面
-          DelStudentDialog:false,
-          amendMemberDialog:false,
-          addMemberDialog:false,
-          addStudentDialog:false,
-          submitHint:false,
-          loading:false,
-          select:{    //数据详情框数据
-            project:'',   
-            person:'',
-            departmentData:"",  //部门框值
-            sort:[],     //分类值
-            tel:'',
-            Date:'',
-            Fund:'',
-            sortOptions: [],
-            department:[],
-          },
-          textarea:'',   //项目简介
-
-          teacherData:[],   //成员列表数据
-          studentData:[],
-          addTabMember:{       //添加项目成员
-            // id:'',
-            name:'',
-            class:'',
-            phone:'',
-            score:0
-          },
-          teacher:{ //添加老师团队表
-            name:"",  //姓名
-            speciality:"",//专业
-            title:"",//职称
-            education:"",//学历
-            section:"",//所在教研室
-            work:"",//项目组角色分工
-          },
-          student:{ //添加学生团队表
-            name:"",//姓名
-            class:"",//班级
-            age:"",//年龄
-            work:'',//项目组任务分工
-          }
-        }
-      },
-      methods:{
-        addMemberStudent(){//添加项目组-学生成员
-          this.isAddStudent=1;
-          this.addStudentDialog = true;
-        },
-        commitStudent(){//确定添加学生
-            for(let i in this.student){if(this.student[i]==''||this.student[i]==undefined)return this.$message.error("请填完所有内容");}
-            let newData={};
-            for(let a in this.student)newData[a] = this.student[a];
-            this.studentData.push(newData);
-            this.$message.success("添加成功");
-            this.addStudentDialog = false;
-            //清空表单
-            for(let j in this.student)this.student[j]='';
-        },
-        updateStudent(val){ //修改学生信息
-          Object.assign(this.student,this.studentData[val]);
-          this.isAddStudent=2;
-          this.index=val;
-          this.addStudentDialog = true;
-        },
-        commitStudent2(){//确定修改学生
-            Object.assign(this.studentData[this.index],this.student)
-            this.addStudentDialog=false;
-            for(let k in this.student) this.student[k]=''
-            this.$message.success('修改成功')
-        },
-        DelStudent(val){//删除学生对话框
-          this.index = val;
-          this.DelStudentDialog=true;
-        },
-        commitDelStudent(){ //对话框确定删除学生成员
-          this.studentData.splice(this.index,1);
-          this.$message.success('删除成功');
-          this.DelStudentDialog=false;
-        },
-        addMember(){    //添加教师按钮，显示对话框
-            this.addMemberDialog=true;
-            this.isAddMember=1;
-        },
-        commit(){   //确定添加教师
-              for(let i in this.teacher){if(this.teacher[i]==''||this.teacher[i]==undefined)return this.$message.error("请填完所有内容");}
-              let newData = {};
-              for(let a in this.teacher)newData[a] = this.teacher[a];
-              this.teacherData.push(newData);
-              this.$message.success('添加成功');
-              this.addMemberDialog = false;
-              for(let j in this.teacher)this.teacher[j]='';
-        },
-        amendDialogData(val){   //修改项目成员信息对话框显示
-          Object.assign(this.teacher,this.teacherData[val])
-          this.isAddMember=2;
-          this.index=val;
-          this.addMemberDialog=true;
-        },
-        commit2(){   //确定修改老师
-            Object.assign(this.teacherData[this.index],this.teacher)
-            for(let k in this.teacher) this.teacher[k]=''
-            this.addMemberDialog=false;
-            this.$message.success('修改成功')
-        },
-        Del(val){ //删除老师按钮
-          this.index=val;   
-          this.delMember=true;
-        },
-        commitDelMember(){  //确定删除老师按钮
-          this.teacherData.splice(this.index,1)
-          this.$message.success('删除成功')
-          this.delMember=false;
-        },
-
-        ProgressFormat(value){        //进度条
-          return value ==100?'100%':`${value}%`
-        },
-        audit(){    //立即修改对话框显示
-          this.submitHint=true
-        },
-        submitAll(){
-          let param = {
-            uid:this.$store.state.userInfo.userid,
-            pid:this.$route.query['pid'],
-            title:this.select.project,
-            pro_leader:this.select.person,
-            lead_leader:this.select.lead_leader,
-            startTime:this.select.Date[0],
-            endTime:this.select.Date[1],
-            cid:this.select.departmentData,
-            fund:this.select.Fund,
-            img:this.dialogImageUrl,
-            teacher:JSON.stringify(this.teacherData),
-            student:JSON.stringify(this.studentData),
-            brief:this.textarea,
-          }
-          //判断数据
-          const cEmpty = /^\s*$/g;
-          for(let i in param){
-            switch(i){
-              case 'title':
-                if(cEmpty.test(param[i]))return this.$message.error("项目名称不能为空")
-                break;
-              case 'pro_leader':
-                if(cEmpty.test(param[i]))return this.$message.error("项目负责人不能为空")
-                break;
-              case 'startTime':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目开始时间")
-                break;
-              case 'endTime':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目计划结束时间")
-                break
-              case 'cid':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目所属部门")
-                break;
-              case "lead_leader":
-                if(cEmpty.test(param[i]))return this.$message.error("请输入学院牵头领导")
-                break;
-              case 'img':
-                if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
-                break;
-              case 'teacher':
-                if(JSON.parse(param[i]).length<3)return this.$message.error("需要教师团队3人以上，至少应包含1名教研室主任")
-                break;
-              case 'student':
-                if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
-                break;
-              case 'brief':
-                if(param[i].length<200&&param[i]<=300)return this.$message.error("项目简介需要200-300字")
-                break;
-            }
-          }
-          this.ajax.post(this.$store.state.api+'/UpdateProjectMakerSpaceBase',param).then(res=>{
-            if(res.data==1){
-              this.$message.success("修改项目信息成功")
-            }else{
-              this.$message.error('修改项目信息失败')
-            }
-            this.getData();
-          }).catch(err=>{
-            console.log(err)
-          })
-        },
-        getData(){   //初始化完成获取基本数据进行填充
-          this.loading = true;
-          let param={
-            uid:this.$store.state.userInfo.userid,
-            pid:this.$route.query['pid']
-          }
-            this.ajax
-                  .get(this.$store.state.api+'/SelectProjectMakerSpace',param)
-                  .then(res=>{
-                    let data=res.data[0][0]
-                    this.select.project=data.title;
-                    this.select.Fund=data.fund;
-                    this.select.person=data.pro_leader;
-                    this.select.Date=[data.begintime,data.planTime];
-                    this.textarea=data.brief;
-                    this.dialogImageUrl=data.image;
-                    this.select.departmentData = data['classid']
-                    this.select.sort = [data['typeid'],data['typeName']]
-                    this.isUpload=data['isupload']
-                    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);
-                  })
-        },
-        getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
-              let param={
-                uid:this.$store.state.userInfo.userid
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectAllDepartment',param)
-                      .then(res=>{
-                        this.select.department=res.data[0]
-                      },err=>{
-                        console.log(err);
-                      })
-            },
-        getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
-          let TypeList = [];
-          let param={
-            uid:this.$store.state.userInfo.userid
-          }
-            this.ajax
-                  .get(this.$store.state.api+'/SelectAllType',param)
-                  .then(res=>{
-                    let master = res.data[0].filter(item=>item['pid']=='');
-                        //获取子分类
-                        let minion = res.data[0].filter(item=>item['pid']!='');
-                        master.forEach(item=>{
-                          let type = {
-                            value:item['id'],
-                            label:item['name'],
-                            children:[],
-                          }
-                          minion.forEach(min=>{
-                            if(min['pid']==item['id']){
-                              let minType = {
-                                value:min['id'],
-                                label:min['name']
-                              }
-                              type['children'].push(minType);
-                            }
-                          })
-                          TypeList.push(type);
-                        })
-                        this.select.sortOptions = TypeList;
-                  },err=>{
-                    console.log(err);
-                  })
-        },
-      },
-      mounted(){    //数据加载完成后触发
-        this.getData();
-        this.getProjectDepartmentData();
-        this.getProjectTypeData();
-      },
-      }
-  </script>
-  
-  <style lang="less">
-  .projectSettlement1{
-    .psSmallTit{
-        width: 100%;
-        margin: 15px 0px 20px 0px;
-        text-align: left;
-        font-size: 16px;
-    }
-  }
-  .projectApplicationfundAddDialog{  
- 
- .el-dialog__header{
-     background: #32455b;
-
- }
- .el-dialog{
-   border-radius:5px ;
-   overflow: hidden;
- }
- 
- .deleteContent{
-   width: 100%;
-   text-align: center;
-   font-size: 22px;
-   color: #000;
- }
- .addDialogLogo{
-         width: 60px;
-         height: 30px;
-         border-radius: 5px;
-         display: flex;
-         justify-content: center;
-         line-height: 30px;
-         background: #f2f2f2;
-         position: absolute;
-         left: 20px; top: 15px; 
- }
-
- .el-dialog__title{
-         color:#fff;
-         display: flex;
-         justify-content: center;
-         font-size: 18px;
-         position: relative;
-         top: -2px;
- }
- .addDialogMid{
-   box-sizing: border-box;
-   padding:0 60px 0 10px;
-   .addDialogTit{
-     display: flex;
-     span{
-       width: 80px;
-       line-height: 40px;
-       text-align: left;
-     }
-   }
- .addDialogTit1{
-   display: flex;
-   justify-content: space-between;
-   margin-bottom: 15px;
- }
- .addDialogTit2{
-   margin-top: 10px;
-   font-size: 18px;
-   color: #000;
-   text-indent: 2em;
- }
- .addDialogCon{
-   margin-top: 20px;
- }
- }
- .dialog-footer{
- display: flex;
- justify-content: center;
-
- }
-}
-  </style>

src/views/projectSettlement/components/projectSettlementDetailBase_Student.vue

@@ -1,847 +0,0 @@
-<template>
-    <!-- 项目管理 项目基本内容 -->
-    <div class="ProjectManagement1">
-  
-   <!-- 活动申请填写信息区域开始 -->
-   <div class="select">
-          <div class="selectTop">
-            <div class="label">项目名称</div>
-            <el-input v-model="content.select.projectName" placeholder="请输入内容"></el-input>
-          </div>
-          <div class="selectMid">
-            <div class="selectLeft">
-                <div class="inpBlock">
-                    <div class="label">项目负责人</div>
-                    <el-input v-model="content.select.leader" placeholder="请输入内容"></el-input>
-                </div>
-                <div class="inpBlock">
-                    <div class="label">所在部门</div>
-                    <el-select v-model="content.select.department" style="width: 100%;" placeholder="请选择">
-                      <el-option
-                        v-for="item in this.departmentOptions"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id">
-                      </el-option>
-                    </el-select>
-                </div>
-                <div class="inpBlock">
-                    <div class="label" style="width: 50px;font-size: 14px;position: relative;top: -8px;">优先支持项目(可多选)</div>
-                    <el-select style="width: 100%;" v-model="content.select.MultiSelectProjectNameS" multiple placeholder="请选择">
-                      <el-option
-                        v-for="item in this.MultiSelectProject"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                </div>
-                <div class="inpBlock">
-                    <div class="label">联系电话</div>
-                    <el-input type="number" v-model="content.select.tel"  @blur="getText(content.select.tel)" placeholder="请输入联系方式"></el-input>
-                </div>
-                <div class="inpBlock">
-                  <div class="label">选择分类</div>
-                  <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
-                  <el-cascader disabled style="width: 100%;" v-model="pageType" :options="sortOptions" clearable></el-cascader>
-                </div>
-            </div>
-  
-            <div class="selectRight">
-              <div class="inpBlock">
-                    <div class="label">项目开始时间</div>
-                    <el-date-picker
-                      v-model="content.select.projectDate"
-                      type="daterange"
-                      disabled
-                      style="width: 100%;"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期">
-                    </el-date-picker>
-                </div>
-                <div class="inpBlock" style="position: relative;">
-                    <div class="label">预算总经费</div>
-                    <el-input type="number" disabled v-model="content.select.fund" placeholder="请输入内容"></el-input>
-                    <div style="position: absolute;right: -30px;top: 10px;">(万)</div>
-                </div>
-                <div class="inpBlock">
-                    <div class="label" style="font-size: 14px;max-width: 50px;position: relative;top: -8px;">美丽校园改造项目(特色项目)</div>
-                    <el-select v-model="content.select.schoolRemould" style="width: 100%;" placeholder="请选择">
-                      <el-option
-                        v-for="item in this.schoolRemouldOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                </div>
-                <div class="inpBlock">
-                    <div class="label">项目申请人</div>
-                    <el-select v-model="content.select.projectApplyPerson" style="width: 100%;" placeholder="请选择">
-                      <el-option
-                        v-for="item in this.personType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                </div>
-                <!-- <div class="inpBlock">
-                    <div class="label">选择分类</div>
-                    <el-cascader v-model="data.select.sort" :options="data.sortOptions" clearable></el-cascader>
-                </div> -->
-            </div>
-          </div>
-          
-    </div>
-          <!-- 活动申请填写信息区域结束 -->
-  
-  
-          <!-- 项目封面修改上传开始 -->
-          <!-- <div style="height: 260px;">
-                <div class="tabTit">
-                  <div><p>封面上传</p></div>
-                </div>
-                <hr>
-                <div style="margin-bottom: 10px;">修改项目封面</div>
-                <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-  
-                <el-upload
-                  class="avatar-uploader"
-                  action="#"
-                  disabled
-                  style="position: relative;"
-                  :show-file-list="false"
-                  >
-                  <img v-if="content.dialogImageUrl" :src="content.dialogImageUrl" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                  <BeUpload :progress="progress" style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
-                </el-upload>
-          </div> -->
-          <!-- 项目封面修改上传开始结束 -->
-  
-        <!-- 老师项目成员表格开始 -->
-        <div class="tabTit">
-                  <div><p>项目组-老师成员<span>(2个学院以上,团队2-3人)</span> </p></div>
-                  <el-button type="primary" @click="addTeacherMember"  size="mini">添加成员</el-button>
-                </div>
-                <hr>
-                <el-table
-                  :data="content.tableTeacherData"
-                  tooltip-effect="dark"
-                  stripe
-                  :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                  class="fontSize"
-                  >
-                
-                  <el-table-column
-                    prop="name"
-                    label="姓名"
-                    align="center"
-                    >
-                  </el-table-column>
-                  <el-table-column
-                    prop="class"
-                    label="所在学院/部门/专业"
-                    align="center"
-                    >
-                  </el-table-column>
-  
-                  <el-table-column
-                    prop="division"
-                    label="项目组角色分工"
-                    align="center"
-                    >
-                  </el-table-column>
-  
-                
-                  
-                  <el-table-column
-                    align="center"
-                    prop="operation"
-                    label="操作"
-                    >
-                    <template #default="scope">
-                        <div class="operations">
-                            <!-- <el-button type="primary" > -->
-                                <el-button type="primary" @click="amendTeacherDialogData(scope.$index)" size="mini">修改</el-button>
-                                <el-button type="primary" @click="DelTeacher(scope.$index)" size="mini">删除</el-button>
-                            <!-- </el-button> -->
-                        </div>
-                    </template>
-                  </el-table-column>
-                </el-table>
-  
-            <!--添加修改老师成员dialog对话框开始 -->
-              <el-dialog
-                  :title= "isAddMember==1?'添加老师成员':'修改老师成员'"
-                  :visible.sync="addTeacherMemberDialog"
-                  :modal="true"
-                  :close-on-click-modal="true"
-                  class="AddMember"
-                  :before-close="init">
-                    <div class="littleBlock">
-                      <div class="dialogLabel">姓名</div>
-                      <div>
-                        <el-input v-model="Member.name"></el-input>
-                      </div>
-                    </div>
-  
-                    <div class="littleBlock">
-                      <div class="dialogLabel">所在学院/部门/专业</div>
-                      <div>
-                        <el-input v-model="Member.class"></el-input>
-                      </div>
-                    </div>
-  
-                    <div class="littleBlock">
-                      <div class="dialogLabel">项目组角色分工</div>
-                      <div>
-                        <el-input  v-model="Member.division" ></el-input>
-                      </div>
-                    </div>
-                    <div slot="footer" class="footer">
-                      <el-button v-show="isAddMember==1" type="primary" @click="commitAddTeacher" class="AllDialogBtn" >确认提交</el-button>
-                      <el-button v-show="isAddMember==2" type="primary" @click="commitAmendTeacher" class="AllDialogBtn" >确认修改</el-button>
-  
-                      <el-button @click="init" class="AllDialogBtn">取消</el-button>
-                    </div>
-              </el-dialog>
-            <!--添加修改老师成员dialog对话框结束 -->
-  
-            <!-- 删除老师成员对话框开始 -->
-            <el-dialog
-                title="删除成员"
-                :visible.sync="delTeacherMember"
-                width="600px"
-                class="pageSubmitData">
-                <div class="deleteContent">确定删除老师成员?</div>
-                <span slot="footer" class="dialog-footer">
-                  <el-button type="primary" @click="commitDelTeacherMember" class="AllDialogBtn">确认删除</el-button>
-                  <el-button @click="init" class="AllDialogBtn" >取消</el-button>
-                </span>
-              </el-dialog>
-            <!-- 删除老师成员对话框结束 -->
-    <!-- 老师项目成员表格结束 -->
-  
-      <!-- 学生项目成员表格开始 -->
-      <div id="two" class="tabTit">
-                  <div><p>项目组-学生成员<span>(至少2个学院以上学生构成,团队5人以上)</span> </p></div>
-                  <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
-                </div>
-                <hr>
-                <el-table
-                  :data="content.tableStudentData"
-                  tooltip-effect="dark"
-                  stripe
-                  :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-                  class="fontSize"
-                  >
-                
-                  <el-table-column
-                    prop="name"
-                    label="姓名"
-                    align="center"
-                    >
-                  </el-table-column>
-                  <el-table-column
-                    prop="class"
-                    label="所在学院/部门/专业"
-                    align="center"
-                    >
-                  </el-table-column>
-  
-                  <el-table-column
-                    prop="division"
-                    label="项目组角色分工"
-                    align="center"
-                    >
-                  </el-table-column>
-  
-                
-                  
-                  <el-table-column
-                    align="center"
-                    prop="operation"
-                    label="操作"
-                    >
-                    <template #default="scope">
-                        <div class="operations">
-                            <!-- <el-button type="primary" > -->
-                                <el-button type="primary" @click="amendStudentDialogData(scope.$index)" size="mini">修改</el-button>
-                                <el-button type="primary" @click="DelStudent(scope.$index)" size="mini">删除</el-button>
-                            <!-- </el-button> -->
-                        </div>
-                    </template>
-                  </el-table-column>
-                </el-table>
-     <!-- 学生项目成员表格结束 -->
-  
-  
-            <!-- 项目简介开始 -->
-              <div class="tabTit">
-                    <div><p>项目简介</p></div>
-              </div>
-              <hr>
-              <el-input
-                type="textarea"
-                :rows="6"
-                resize="none"
-                class="textArea"
-                placeholder="请输入内容"
-                v-model="content.textarea">
-              </el-input>
-            <!-- 项目简介结束 -->
-  
-            <!--添加修改学生成员dialog对话框开始 -->
-              <el-dialog
-                  :title= "isAddMember==1?'添加学生成员':'修改学生成员'"
-                  :visible.sync="addStudentMemberDialog"
-                  :modal="true"
-                  :close-on-click-modal="true"
-                  class="AddMember"
-                  :before-close="init">
-                    <div class="littleBlock">
-                      <div class="dialogLabel">姓名</div>
-                      <div>
-                        <el-input v-model="Member.name"></el-input>
-                      </div>
-                    </div>
-  
-                    <div class="littleBlock">
-                      <div class="dialogLabel">所在学院/部门/专业</div>
-                      <div>
-                        <el-input v-model="Member.class"></el-input>
-                      </div>
-                    </div>
-  
-                    <div class="littleBlock">
-                      <div class="dialogLabel">项目组角色分工</div>
-                      <div>
-                        <el-input v-model="Member.division"></el-input>
-                      </div>
-                    </div>
-                    <div slot="footer" class="footer">
-                      <el-button v-show="isAddMember==1" type="primary" @click="commitAddStudent" class="AllDialogBtn" >确认提交</el-button>
-                      <el-button v-show="isAddMember==2" type="primary" @click="commitAmendStudent" class="AllDialogBtn" >确认修改</el-button>
-  
-                      <el-button @click="init" class="AllDialogBtn">取消</el-button>
-                    </div>
-              </el-dialog>
-            <!--添加修改学生成员dialog对话框结束 -->
-  
-            <!-- 删除学生成员对话框开始 -->
-            <el-dialog
-                title="删除成员"
-                :visible.sync="delStudentMember"
-                width="600px"
-                class="pageSubmitData">
-                <div class="deleteContent">确定删除学生成员?</div>
-                <span slot="footer" class="dialog-footer">
-                  <el-button type="primary" @click="commitDelStudentMember" class="AllDialogBtn">确认删除</el-button>
-                  <el-button @click="init" class="AllDialogBtn" >取消</el-button>
-                </span>
-              </el-dialog>
-            <!-- 删除学生成员对话框结束 -->
-    <!-- 学生项目成员表格结束 -->
-  
-  
-  
-              
-      <div class="baseBtn">
-        <div class="blockWidth">
-          <!-- <el-button type="primary" class="backBtn" v-show="isUpload==0" @click="audit">立即修改</el-button>
-          <el-button type="primary" class="backBtn" v-show="isUpload==1" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button>
-          <el-button type="primary" class="backBtn" v-show="isUpload==2" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button> -->
-
-        </div>
-      </div>
-  
-  
-  
-     <!-- 提交对话框开始 -->
-          <el-dialog
-            title="提示"
-            :visible.sync="submitHint"
-            width="600px"
-            class="pageSubmitData"
-            :before-close="init">
-            <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">取消</el-button>
-            </span>
-          </el-dialog>
-        <!-- 提交对话框结束 -->
-  
-  
-  
-  
-  
-    </div>
-  </template>
-  
-  <script>
-    import BeUpload from "../../../components/tool/beUpload.vue";
-      export default {
-        components: {
-          BeUpload,
-        },
-        data() {
-          return {
-            accept:"image/*",
-            isAddMember:1,  //判断是添加学生还是修改学生
-            progress:{   //进度条
-                  value:0,
-                  show:false
-              },  
-              pageType:[], //选择分类
-  
-            
-            delMember:false,
-            amendMemberDialog:false,
-            addMemberDialog:false,
-            submitHint:false,          
-  
-            delTeacherMember:false,  //删除老师对话框
-            addTeacherMemberDialog:false,   //添加修改对话框
-  
-            addStudentMemberDialog:false,   //添加学生对话框
-            delStudentMember:false,      //删除学生对话框
-            isUpload:'',
-            textarea:'',   //项目简介
-            tableData:[],   //成员列表数据
-  
-            content:{
-              dialogImageUrl:"",  //封面!!!!!!!!
-              tableStudentData:[],  //学生成员成员列表！！！！！！！！
-              tableTeacherData:[],  //老师成员成员列表！！！！！！！
-              textarea:'',   //项目简介！！！！！！！
-              select:{    //要提交的数据!!!!!!!!!!!!!!!!!!!!!!!
-                  projectName:'',     //项目名称
-                  leader:'',          //项目负责人
-                  projectDate:[],   //开始结束日期
-                  department:"",   //部门
-                  fund:'',         //资金
-                  MultiSelectProjectNameS:[],   //优先支持项目
-                  schoolRemould:'',        //校园改造项目
-                  tel:'',  //电话
-                  projectApplyPerson:'',  //项目申请人
-              },
-            },
-  
-  
-            departmentOptions: [],  //部门下拉框
-            Member:{    //添加、修改成员对话框数据
-                name:'',
-                class:'',
-                division:'',
-                score:'0'
-            },
-            MultiSelectProject:[   //优先支持项目下拉框数据
-                      {
-                        value: 1,
-                        label: '大赛选拔项目'
-                      }, {
-                        value: 2,
-                        label: '落地注册项目'
-                      }, {
-                        value: 3,
-                        label: '社会征集项目'
-                      }, {
-                        value: 4,
-                        label: '产业命题项目'
-                      }
-            ],
-            schoolRemouldOptions:[   //美丽校园下拉框数据
-                {
-                  value: '1',
-                  label: '校园安全项目'
-                }, {
-                  value: '2',
-                  label: '环境治理项目'
-                }, {
-                  value: '3',
-                  label: '校园服务项目'
-                }, {
-                  value: '4',
-                  label: '文创装置项目'
-                }
-            ],
-            personType:[     //项目申请人下拉框数据
-                {
-                  value: '1',
-                  label: '在校学生'
-                }, {
-                  value: '2',
-                  label: '入驻学校孵化基地的初创企业法人'
-                }
-            ],
-            sortOptions: [      //选择分类下拉框数据
-                {
-                  value:"",
-                  label: '',
-                  children: [{
-                    value: 0,
-                    label: '创意组',
-                  },
-                    {
-                    value: 1,
-                    label: '初创组',
-                  }
-                ]}, 
-                {
-                value:"",
-                label: '',
-                children: [{
-                  value: 0,
-                  label: '已建设',
-                }, {
-                  value: 1,
-                  label: '待建设',
-                }]
-              }],
-              
-          }
-        },
-        methods:{
-          getText(value) {     //电话验证
-            let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
-            let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
-            if(result){
-              return result;
-            }else{
-              this.$message.error("请输入正确的手机号格式")
-              return false;
-            }
-            // if()
-            // return verify.test(value.trim())
-            // if(!result && value != "") {
-            // if(!result) {
-            //       return false;
-            // }else{
-            //   return true;
-            // }
-          },
-          ProgressFormat(value){        //进度条
-            return value ==100?'100%':`${value}%`
-          },
-          getFile(val) {       //上传封面
-              // console.log(val);
-              this.progress.show = false;
-              this.dialogImageUrl=val.url
-  
-          },
-  
-  
-  
-          // 项目组老师成员方法开始
-                    addTeacherMember(){   //添加项目成员对话框显示
-                      this.addTeacherMemberDialog=true
-                      for(let i in this.Member){
-                        if(i=='score')this.Member[i] = "0"
-                        else this.Member[i] = "";
-                      }
-                      this.isAddMember=1;
-                    },
-                    DelTeacher(val){    //删除对话框显示
-                      this.delTeacherMember=true;
-                      this.index=val
-                    },
-                    amendTeacherDialogData(val){   //修改项目成员信息对话框显示
-                      Object.assign(this.Member,this.content.tableTeacherData[val])
-                      this.isAddMember=2;
-                      this.Member['index']=val    //为下面修改提供下标
-                      // console.log(this.Member['index']);
-                      this.addTeacherMemberDialog=true
-                    },
-                    commitAddTeacher(){   //确定添加成员  
-                          console.log(this.Member.name);
-                          if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
-                          if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
-                          if (this.Member.division=="" ||this.Member.division==undefined) return this.$message.error('请输入项目组角色分工')
-                          let newData = {};
-                          for(let j in this.Member)newData[j] = this.Member[j];
-                          this.content.tableTeacherData.push(newData);
-                          this.$message.success('添加成功')
-                          for(let i in this.Member){      
-                            if(i=='score')this.Member[i] = "0"
-                            else this.Member[i] = "";
-                          }
-                          this.init()
-                    },
-  
-                    commitAmendTeacher(){   //确定修改成员
-                          Object.assign(this.content.tableTeacherData[this.Member['index']],this.Member)
-                          for(let k in this.Member) this.Member[k]=''
-                          this.addTeacherMemberDialog=false;
-                          this.$message.success('修改成功')
-                    },
-  
-                    commitDelTeacherMember(){   //对话框确定删除成员
-                      let a=this.index;
-                      this.content.tableTeacherData.splice(a,1);
-                      this.$message.success('删除成功');
-                      this.delTeacherMember=false;
-                    },
-          // 项目组老师成员方法开始
-  
-              // 项目组学生成员方法开始
-                  addStudentMember(){   //添加项目成员对话框显示
-                      this.addStudentMemberDialog=true
-                      for(let i in this.Member){
-                        if(i=='score')this.Member[i] = "0"
-                        else this.Member[i] = "";
-                      }
-                      this.isAddMember=1;
-                    },
-                    DelStudent(val){    //删除对话框显示
-                      this.delStudentMember=true;
-                      this.index=val
-                    },
-                    amendStudentDialogData(val){   //修改项目成员信息对话框显示
-                      Object.assign(this.Member,this.content.tableStudentData[val])
-                      this.isAddMember=2;
-                      this.Member['index']=val    //为下面修改提供下标
-                      // console.log(this.Member['index']);
-                      this.addStudentMemberDialog=true
-                    },
-                    commitAddStudent(){   //确定添加成员  
-                          if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
-                          if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
-                          if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入项目组角色分工')
-                          let newData = {};
-                          for(let j in this.Member)newData[j] = this.Member[j];
-                          this.content.tableStudentData.push(newData);
-                          this.$message.success('添加成功')
-                          for(let i in this.Member){      
-                            if(i=='score')this.Member[i] = "0"
-                            else this.Member[i] = "";
-                          }
-                          this.addStudentMemberDialog=false;
-                    },
-  
-                    commitAmendStudent(){   //确定修改成员
-                          Object.assign(this.content.tableStudentData[this.Member['index']],this.Member)
-                          for(let k in this.Member) this.Member[k]=''
-                          this.addStudentMemberDialog=false;
-                          this.$message.success('修改成功')
-  
-                          console.log(this.content.tableData);
-                    },
-  
-                    commitDelStudentMember(){   //对话框确定删除成员
-                      let a=this.index;
-                      this.content.tableStudentData.splice(a,1);
-                      this.$message.success('删除成功');
-                      this.delStudentMember=false;
-                    },
-          // 项目组学生成员方法开始
-  
-  
-  
-  
-          getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
-                let param={
-                  uid:this.$store.state.userInfo.userid
-                }
-                  this.ajax
-                        .get(this.$store.state.api+'/SelectAllDepartment',param)
-                        .then(res=>{
-                          this.departmentOptions=res.data[0];
-                        },err=>{
-                          console.log(err);
-                        })
-              },
-  
-  
-  
-              getData(){     //过去基础数据
-                  let param={
-                      uid:this.$store.state.userInfo.userid,
-                      pid:this.$route.query["pid"]
-                  }
-                  this.ajax
-                      .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
-                      .then(res=>{
-                        // console.log(data.);
-                          let data=res.data[0][0]
-                          // console.log(data);
-                          // console.log(data.multiSelectProject);
-                          this.content.select.projectName=data.title
-                          this.content.select.leader=data.leader
-                          this.content.select.projectDate=[data.startTime,data.endTime]
-                          this.content.select.department=data.classid
-                          this.content.select.fund=data.fund
-                          this.content.select.MultiSelectProjectNameS=JSON.parse(data.multiSelectProject)
-                          this.content.select.schoolRemould=data.schoolRemould
-                          this.content.select.tel=data.phone
-                          this.content.select.projectApplyPerson=data.projectApplyperson
-                          this.content.select.dialogImageUrl=data.image
-                          this.content.tableStudentData=JSON.parse(data.course_student)
-                          this.content.tableTeacherData=JSON.parse(data.course_teacher)                       
-                          this.content.textarea=data.brief
-                          this.content.dialogImageUrl=data.image
-                          this.pageType=[data.typeid,data.typeName]
-                          this.isUpload=data.isupload
-                          
-                          // console.log(this.content);
-                      },err=>{
-                          console.log(err);
-                      })
-              },
-  
-              getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
-                let TypeList = [];
-                let param={
-                  uid:this.$store.state.userInfo.userid
-                }
-                  this.ajax
-                        .get(this.$store.state.api+'/SelectAllType',param)
-                        .then(res=>{
-                          let master = res.data[0].filter(item=>item['pid']=='');
-                              //获取子分类
-                              let minion = res.data[0].filter(item=>item['pid']!='');
-                              master.forEach(item=>{
-                                let type = {
-                                  value:item['id'],
-                                  label:item['name'],
-                                  children:[],
-                                }
-                                minion.forEach(min=>{
-                                  if(min['pid']==item['id']){
-                                    let minType = {
-                                      value:min['id'],
-                                      label:min['name']
-                                    }
-                                    type['children'].push(minType);
-                                  }
-                                })
-                                TypeList.push(type);
-                              })
-                              this.sortOptions = TypeList;
-                        },err=>{
-                          console.log(err);
-                        })
-              },
-              audit(){   //提交对话框显示
-                this.submitHint=true
-              },
-  
-          submitAll(){   //提交修改数据
-            let param={
-            uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid')),
-            tit:this.content.select.projectName,
-            lea:this.content.select.leader,
-            cla:this.content.select.department,
-            mul:JSON.stringify(this.content.select.MultiSelectProjectNameS),
-            pho:this.content.select.tel,
-            sch:this.content.select.schoolRemould,
-            per:this.content.select.projectApplyPerson,
-            img:this.content.dialogImageUrl,
-            cot:JSON.stringify(this.content.tableTeacherData),
-            cos:JSON.stringify(this.content.tableStudentData),
-            bri:this.content.textarea,
-          }
-
-          const cEmpty = /^\s*$/g;
-              for(let i in param){
-                switch(i){
-                  case 'tit':
-                    if(cEmpty.test(param[i]))return this.$message.error("项目名称不能为空")
-                    break;
-                  case 'lea':
-                    if(cEmpty.test(param[i]))return this.$message.error("项目负责人不能为空")
-                    break;
-                  case 'cla':
-                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目所属部门")
-                    break;
-                  case 'mul':
-                    if(!JSON.parse(param[i]).length) return this.$message.error("请选择优先支持项目")
-                    break;
-                  case 'sch':
-                    if(!param[i])return this.$message.error("请选择美丽校园改造项目")
-                    break;
-                  case "pho":
-                    if(cEmpty.test(param[i]))return this.$message.error("请输入联系方式")
-                    break;
-                  case 'person':
-                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目申请人")
-                    break;
-                  case 'img':
-                    if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
-                    break;
-                  case 'cot':
-                    console.log(JSON.parse(param[i]).length);
-                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>4)return this.$message.error("需要教师团队3人以上，至少应包含1名教研室主任")
-                    break;
-                  case 'cos':
-                    if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
-                    break;
-                  case 'bri':
-                    if(param[i].length<200 || param[i].length>=300)return this.$message.error("项目简介需要200-300字")
-                    break;
-                }
-              }
-              this.ajax
-                    .post(this.$store.state.api+'/updateProjectApplyDetailStudent',param)
-                    .then(res=>{
-                      // console.log(res);
-                      if (res.data==1) {
-                        this.$message.success('修改成功')
-                        this.submitHint=false
-                        this.getData()
-                        return
-                      }
-                      this.$message.error('修改失败')
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-          init(){
-            this.addStudentMemberDialog=false;
-            this.submitHint=false;
-            this.addTeacherMemberDialog=false;
-          },
-  
-        },
-        mounted(){    //数据加载完成后触发
-          this.getProjectDepartmentData()
-          this.getData()
-          this.getProjectTypeData()
-        },
-      }
-  </script>
-  
-  <style lang="less">
-  .projectApplication1{
-  
-    .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      // position: relative;
-      overflow: hidden;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409EFF;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 300px;
-      // height: 100%;
-      line-height: 178px;
-      text-align: center;
-    }
-    .avatar {
-      width: 300px;
-      height:178px !important;
-      display: block;
-    }
-  }
-  </style>

src/views/projectSettlement/components/projectSettlementDetailComment.vue

@@ -1,447 +0,0 @@
-<template>
-  <!-- 项目结项 结项评语 -->
-    <div class="projectSettlement2" v-loading="loading">
-      <!-- 上传文件以及表格开始 -->
-      <div class="pmInp">
-          <beUpload @getFile="getFile" :progress="progress" :navName="'上传文件'" :accept="accept"></beUpload>
-        </div>
-      <!-- 表格部分开始 -->
-      <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
-
-        <el-table
-        :data="file"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <el-table-column
-          prop="fileName"
-          label="项目中期报告"
-          align="center"
-         >
-        </el-table-column>
-        
-        <el-table-column
-          prop="size"
-          label="大小"
-          align="center"
-          >
-        </el-table-column>
-       
-        <el-table-column
-          prop="uploadTime"
-          label="时间"
-          align="center"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                  <el-button type="primary"  size="mini" @click="checkFile(scope.row.url)" style="background: #477edd">明细查看</el-button>
-              </div>
-          </template>
-        </el-table-column>
-        </el-table>
-
-      <!-- 多行文本框区域开始 -->
-      <!-- <div class="PS2tabTit0">
-        结项评价
-      </div>
-      <div class="tabTit">
-            <div><p>科研办</p></div>
-      </div>
-      <hr>
-      <div class="ps1textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          resize="none"
-          class="textArea"
-          placeholder="请输入内容"
-          v-model="AllRemark.kRem">
-        </el-input>
-      </div>
-      <div class="tabTit">
-            <div><p>学术委员会</p></div>
-      </div>
-      <hr>
-      <div class="ps1textArea">
-        <el-input
-          type="textarea"
-          class="textArea"
-          :rows="6"
-          resize="none"
-          placeholder="请输入内容"
-          v-model="AllRemark.xRem">
-        </el-input>
-      </div>
-      <div class="tabTit">
-            <div><p>部门审核评语</p></div>
-      </div>
-      <hr>
-      <div class="ps1textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          resize="none"
-          class="textArea"
-          placeholder="请输入内容"
-          v-model="AllRemark.bRem">
-        </el-input>
-      </div> -->
-      <!-- 多行文本框区域结束 -->
-      <div class="baseBtn">
-        <div class="blockWidth">
-          <el-button type="primary" class="backBtn" @click="submitRemark">提交</el-button>
-        </div>
-      </div>
-
-    <!-- 提交对话框开始 -->
-    <el-dialog
-          title="提示"
-          :visible.sync="dialogVisible1"
-          width="600px"
-          class="submitDialog">
-          <div class="addDialogLogo">LOGO</div>
-          <span class="deleteContent">确定提交?</span>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="confirmSubmit" class="AllDialogBtn">确认提交</el-button>
-            <el-button @click="dialogVisible1=false" class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
-    <!-- 提交对话框结束-->
-    <!-- 展示文档开始 -->
-    <el-dialog
-            title="展示文件"
-            :visible.sync="showFile"
-            width="80vw"
-            class="addDialog showDialog"
-          >
-      <div class="addDialogLogo">LOGO</div>
-      <div class="showFileArea">
-        <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
-        <vword
-            style="width: 100%; height: 100%; overflow: auto"
-            class="fullStyle"
-            v-if="Wordss['type']!='pdf' && Wordss['name']!='图片'"
-            :pdfUrl="'https://view.officeapps.live.com/op/view.aspx?src='+showFileUrl"
-        ></vword>
-        <vpdf
-            style="width: 100%; height: 100%; overflow: auto"
-            class="fullStyle"
-            :pdfUrl="showFileUrl"
-            v-if="Wordss['type']=='pdf'"
-        ></vpdf>
-        <img :src="showFileUrl" alt="图片哦" v-if="Wordss['name']=='图片'" style="width: auto;height: auto;max-width: 100%;max-height: 100%;">
-      </div>
-    </el-dialog>
-
-    </div>
-  </template>
-  
-  <script>
-    import beUpload from '@/components/tool/beUpload'
-    import vpdf from "@/components/vpdf.vue";
-    import vword from "@/components/vword.vue";
-      export default {
-        components: { beUpload, vpdf, vword },
-        data() {
-          return {
-            accept:"*",
-            dialogVisible1:false,
-            loading:false,
-            showFile:false,
-            showFileType: 0,
-            showFileUrl: "",
-            Wordss:{type:"",name:""},
-            canonical:{
-                Image:/^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
-                File:/^https?:\/\/(.+\/)+.+(\.(docx|xlsx|ppt|pdf))$/i
-            },
-            // tableData:[],
-            file:[],
-            progress:{     //进度条
-              value:0,
-              show:false
-            },
-            AllRemark:{
-              kRem:'',
-              xRem:'',
-              bRem:''
-            }
-          }
-        },
-        methods:{
-          ProgressFormat(value){        //进度条
-            return value ==100?'100%':`${value}%`
-          },
-          //展示文件
-          checkFile(url) {
-              // console.log(url);
-              this.showFileUrl = url;
-              this.showFile = true;
-
-              if(typeof url=='undefined')return {type:"",name:""};
-                  let urlSplit = url.split(".");
-                  const type = urlSplit[urlSplit.length-1]
-                  if(this.canonical.Image.test(url)){
-                  
-                    this.Wordss={type:type,name:"图片"}
-                    return console.log(this.Wordss);
-                  }
-                  if(this.canonical.File.test(url)){
-                    this.Wordss={type:type,name:"文档"}
-                    return console.log(this.Wordss);
-                  }
-                  else return this.Wordss={type:type,name:type}
-          },
-            confirmSubmit(){    //确定提交
-                let param={
-                  uid:this.$store.state.userInfo.userid,
-                  pid:this.$route.query['pid'],
-                  file:JSON.stringify(this.file),
-                  remark:JSON.stringify(this.AllRemark)
-                }
-                this.ajax
-                    .post(this.$store.state.api+'/UpdateSettlementRemark',param)
-                    .then(res=>{
-                      console.log(res);
-                      this.dialogVisible1=false
-                      this.$message.success('提交成功')
-                    },err=>{
-                      console.log(err);
-                    })
-            },
-            submitRemark(){      //显示提交对话框
-              this.dialogVisible1=true;
-            },
-            getFile(val) {    //上传文件
-              let param={
-                  uid:this.$store.state.userInfo.userid,
-                  pid:this.$route.query['pid'],
-                  file:JSON.stringify([...this.file,val]),
-                  remark:JSON.stringify(this.AllRemark)
-                }
-                this.ajax
-                    .post(this.$store.state.api+'/UpdateSettlementRemark',param)
-                    .then(res=>{
-                      if(res.data==1){
-                        this.$message.success('提交成功')
-                      }else{
-                        this.$message.error("提交失败")
-                      }
-                      this.getData();
-                      this.progress.show = false;
-                      
-                    },err=>{
-                      console.log(err);
-                    })
-            },
-
-            getData(){       //获取基础信息
-              this.loading = true;
-              let param={
-                uid:this.$store.state.userInfo.userid,
-                pid:this.$route.query['pid'],
-              }
-              this.ajax
-                    .get(this.$store.state.api+'/SelectSettlementRemark',param)
-                    .then(res=>{
-                      console.log(res);
-                      let data=res.data[0];
-                      console.log(data);
-                      this.file=JSON.parse(data[0].endFile)
-                      if(JSON.parse(data[0].endProjectRemark)!=null){
-                        this.AllRemark=JSON.parse(data[0].endProjectRemark)
-                      }
-                      this.loading = false;
-                    },err=>{
-                      console.log(err);
-                    })
-          },        
-        },
-       mounted(){
-        this.getData()
-       }
-      }
-  </script>
-  
-  <style lang="less">
-  .projectSettlement2{
-
-    .pmInp{
-      width: 100%;
-      margin: 10px 0 10px 0;
-      display: flex;  
-      justify-content: flex-end;
-      .btn{
-        height: 30px;
-        width: 100px;
-        font-size: 16px;
-        background: #477edd;
-        // margin-left: 10px;
-      }
-    }
-
-    .addDialog {
-        font-size: 18px;
-        .el-dialog {
-          border-radius: 5px;
-          overflow: hidden;
-        }
-        .deleteContent {
-          width: 100%;
-          margin: 30px 0;
-          font-size: 22px;
-          color: #000;
-        }
-        .addDialogLogo {
-          width: 60px;
-          height: 30px;
-          border-radius: 5px;
-          display: flex;
-          justify-content: center;
-          line-height: 30px;
-          background: #f2f2f2;
-          position: absolute;
-          left: 20px; top: 15px; 
-        }
-        .el-dialog__header {
-          display: flex;
-          justify-content: center;
-          background: #32455b;
-        }
-        .el-dialog__title {
-          color:#fff;
-          display: flex;
-          justify-content: center;
-          font-size: 18px;
-          position: relative;
-          top: -2px;
-        }
-        .addDialogMid {
-          box-sizing: border-box;
-          padding: 0 60px 0 10px;
-          .addDialogTit {
-            display: flex;
-            span {
-              width: 80px;
-              font-size: 16px;
-              line-height: 40px;
-              text-align: left;
-            }
-          }
-          .addDialogTit1 {
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 15px;
-          }
-          .addDialogTit2 {
-            margin-top: 10px;
-            font-size: 16px;
-            color: #000;
-            text-indent: 2em;
-          }
-          .addDialogCon {
-            margin-top: 20px;
-          }
-        }
-        
-      }
-
-
-    .submitDialog{
-      font-size: 18px;
-      .el-dialog{
-        border-radius: 5px;
-        overflow: hidden;
-      }
-      .deleteContent{
-        font-size: 22px;
-        color: #000;
-      }
-      .el-dialog__body{
-          display: flex;
-          justify-content: center;
-        }
-      .addDialogLogo{
-        width: 60px;
-        height: 30px;
-        border-radius: 5px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-      }
-      .el-dialog__header{
-      background: #32455b;
-      }
-      .el-dialog__title{
-        color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-      }
-      .addDialogMid{
-        box-sizing: border-box;
-        padding:0 60px 0 10px;
-        .addDialogTit{
-          display: flex;
-          span{
-            width: 80px;
-            font-size: 16px;
-            line-height: 40px;
-            text-align: left;
-            
-          }
-        }
-        .addDialogTit1{
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 15px;
-        }
-        .addDialogTit2{
-          margin-top: 10px;
-          font-size: 16px;
-          color: #000;
-          text-indent: 2em;
-          text-align: left;
-          line-height: 1.7em;
-        }
-        .addDialogCon{
-          margin-top: 20px;
-        }
-        
-      }
-      .dialog-footer {
-          display: flex;
-          justify-content: center;
-          box-sizing: border-box;
-          // .btn5 {
-          //   font-size: 16px;
-          // }
-        }
-    }
-
-
-    .PS2tabTit0{
-      width: 100%;
-      text-align: left;
-      margin: 20px 15px 20px 0px;
-      color: #ccc;
-      font-size: 22px;
-    }
-
-  }
-
-  </style>

src/views/projectSettlement/components/projectSettlementDetail_MakerSpace.vue

@@ -1,307 +0,0 @@
-<template>
-  <!-- 项目管理 项目详细 -->
-    <div class="ProjectManagement2" v-loading="loading">
-    <!-- 跳转导航结束 -->
-     
-    <div class="PA2mid">项目建设内容及目标</div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></div>
-          <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.Construction">
-          </el-input>
-        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor> -->
-      </div>
-
-      <div class="PA2mid">预项目建设论证报告</div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></div>
-        <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.ProjectBasis">
-          </el-input>
-        <!-- <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>
-        <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.development">
-          </el-input>
-        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor> -->
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></div>
-        <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.studio">
-          </el-input>
-        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor> -->
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">三、学生创客团队（人才）培养预期成果、数量</div>
-        <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.studentTeam">
-          </el-input>
-        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor> -->
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">四、学生创客活动组织实施情况</div>
-        <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.studentActivities">
-          </el-input>
-        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor> -->
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">五、学生创客团队孵化、转化创业项目情况</div>
-        <el-input
-            type="textarea"
-            :rows="6"
-            resize="none"
-            class="textArea"
-            placeholder="请输入内容"
-            v-model="data.Transforming">
-          </el-input>
-          <!-- <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" 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>
-      <!-- 修改对话框开始 -->
-      <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          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="submitHint = false" class="AllDialogBtn" size="small">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 修改对话框结束 -->
-    </div>
-  </template>
-  
-  <script>
-import { VueEditor } from "vue2-editor";
-
-      export default {
-        components:{
-          VueEditor
-        },
-        data() {
-          return {
-            isUpload:0,
-            loading:false,
-            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:{
-          submitAll(){
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:this.$route.query['pid'],
-              chapters:JSON.stringify(this.data)
-            }
-            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:this.$route.query['pid']
-            }
-              this.ajax
-                    .get(this.$store.state.api+'/SelectProjectChapterMakerSpace',param)
-                    .then(res=>{
-                      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);
-                    })
-          },
-        },
-        mounted(){
-          this.getData();
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagement2{
-
- .projectApplicationfundAddDialog{    //项目修改对话框开始
- 
-
- .el-dialog{
-   border-radius:5px ;
-   overflow: hidden;
- }
- 
- .deleteContent{
-   width: 100%;
-   text-align: center;
-   font-size: 22px;
-   color: #000;
- }
- .addDialogLogo{
-  width: 60px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        border-radius: 5px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
- }
- .el-dialog__header{
- background: #32455b;
- }
- .el-dialog__title{
-  color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
- }
- .addDialogMid{
-   box-sizing: border-box;
-   padding:0 60px 0 10px;
-   .addDialogTit{
-     display: flex;
-     span{
-       width: 80px;
-       line-height: 40px;
-       text-align: left;
-     }
-   }
- .addDialogTit1{
-   display: flex;
-   justify-content: space-between;
-   margin-bottom: 15px;
- }
- .addDialogTit2{
-   margin-top: 10px;
-   font-size: 18px;
-   color: #000;
-   text-indent: 2em;
- }
- .addDialogCon{
-   margin-top: 20px;
- }
-}
-.dialog-footer{
- display: flex;
- justify-content: center;
-//  .btn5{
-//    height: 40px;
-//    font-size: 16px;
-//    background: #0e72e6;
-//    width: 200px;
-//  }
-}
-}
-//项目修改对话框结束
-    .PA2textArea{     //标题栏
-        margin: 15px 0;
-        .PA2textAreaTit{
-            width: 80%;
-            text-align: left;
-            font-size: 18px;
-            font-weight: 550;
-            margin-bottom: 15px;
-            color: #2387ff;
-        }
-        .ql-toolbar.ql-snow{
-          display: flex;
-        }
-        .PA2textAreaTit2{
-            font-size: 16px;
-        }
-        .el-textarea__inner{
-            background: #f2f2f2;
-        }
-    }
-    
-    .PA2mid{    //预期取得成果单独一栏
-        width: 100%;
-        text-align: left;
-        font-size: 18px;
-        font-weight: 550;
-        margin-bottom: 10px;
-        color: #2387ff;
-    }
-  }
-  </style>

src/views/projectSettlement/components/projectSettlementDetail_Student.vue

@@ -1,393 +0,0 @@
-<template>
-    <!-- 项目管理 项目详细 -->
-      <div class="ProjectManagement2">
-     
-        <div id="w">
-                <p class="pTit">研发内容</p>
-                <div>
-                  <p class="pTit2">一、项目研发背景</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.back">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor> -->
-                  </div>
-                </div>
-                <div>
-                  <p class="pTit2">二、项目创新点</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.innovate">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor> -->
-                  </div>
-                </div>
-                <div>
-                  <p class="pTit2">三、技术研发路线</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.path">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor> -->
-                  </div>
-                </div>
-                <div>
-                  <p class="pTit2">四、项目应用场景</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.scene">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor> -->
-                  </div>
-                </div>
-                <!-- <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.contentOne"></vue-editor>
-                </div> -->
-              </div>
-              <div>
-                <p class="pTit">商业模式及社会价值</p>
-                <div>
-                  <p class="pTit2">一、项目商业模式/社会价值</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.worth">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor> -->
-                  </div>
-                </div>
-              </div>
-              <div>
-                <p class="pTit">团队优势</p>
-                <div>
-                  <p class="pTit2">一、团队构成及优势</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.team">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor> -->
-                  </div>
-                </div>
-              </div>
-  
-              <div>
-                <p class="pTit">研发成本</p>
-                <div>
-                  <p class="pTit2">一、研发成本来源及构成</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.cost">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor> -->
-                  </div>
-                </div>
-              </div>
-              <div id="e">
-                <p class="pTit">预期成果</p>
-                <div>
-                  <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.expectResults">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor> -->
-                  </div>
-                </div>
-                <div>
-                  <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.expectResultsTeacher">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor> -->
-                  </div>
-                </div>
-                <div>
-                  <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
-                  <div class="editor">
-                    <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.expectConversion">
-                    </el-input>
-                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor> -->
-                  </div>
-                </div>
-              </div>
-              <div>
-                <p class="pTit" style="margin-bottom: 0;">实施计划</p>
-                <div class="editor">
-                  <el-input
-                      type="textarea"
-                      :rows="6"
-                      resize="none"
-                      class="textArea"
-                      placeholder="请输入内容"
-                      v-model="content.plan">
-                    </el-input>
-                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor> -->
-                </div>
-              </div>
-        <div class="baseBtn">
-          <div class="blockWidth">
-            <!-- <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
-            <el-button type="primary" v-show="isUpload==1" disabled style="background: #ccc !important;border: none;" >立即修改</el-button>
-            <el-button type="primary"  v-show="isUpload==2"  disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-  
-          </div>
-        </div>
-        <!-- 修改对话框开始 -->
-        <el-dialog
-            title="提示"
-            :visible.sync="submitHint"
-            width="600px"
-            class="projectApplicationfundAddDialog"
-            :before-close="init">
-            <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>
-            </span>
-          </el-dialog>
-        <!-- 修改对话框结束 -->
-      </div>
-    </template>
-    
-    <script>
-  import { VueEditor } from "vue2-editor";
-  
-        export default {
-          components:{
-            VueEditor
-          },
-          data() {
-            return {
-              isUpload:'',
-              data:[["","","","",""],[]],
-              submitHint:false,
-              customToolbar: [
-                ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
-                [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
-                [{header:[false,1,2,3,4]}]
-              ],
-              content:'',
-            }
-          },
-          methods:{
-            // content(){      //导航栏项目详情跳转
-            //   this.$router.push('/projectApplicationDetails')
-            // },
-           
-            // backBtn(){
-            //   this.$router.push('/projectApplicationApply2')
-            // },
-            audit(){   //立即修改按钮
-              this.submitHint=true
-            },
-            submitAll(){
-              let param={
-                uid:this.$store.state.userInfo.userid,
-                pid:this.$route.query['pid'],
-                message:JSON.stringify(this.content)
-              }
-                this.ajax
-                    .post(this.$store.state.api+'/updateProjectApplication2Student',param)
-                    .then(res=>{
-                      // console.log(res);
-                      this.$message.success('修改成功')
-                      this.init()
-                    },err=>{
-                      console.log(err);
-                    })
-            },
-            init(){
-              this.submitHint=false
-            },
-            // getData(){   //初始化完成获取基本数据进行填充
-            //   let param={
-            //     uid:this.$store.state.userInfo.userid,
-            //     pid:this.$route.query['pid']
-            //   }
-            //     this.ajax
-            //           .get(this.$store.state.api+'/GetProjectDetailMessage',param)
-            //           .then(res=>{
-            //             this.isUpload=res.data[0][0].isupload;
-            //             let GetData=JSON.parse(res.data[0][0].chapters)
-            //             this.data=GetData;
-            //           },err=>{
-            //             console.log(err);
-            //           })
-            // },
-            getData(){
-                  let param={
-                      uid:this.$store.state.userInfo.userid,
-                      pid:this.$route.query['pid']
-                  }
-                  this.ajax
-                      .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
-                      .then(res=>{
-                          let data=res.data[0][0]
-                          // console.log(data.chapters);
-                          this.isUpload=data.isupload
-                          this.content=JSON.parse(data.chapters)
-                          // console.log(this.content);
-                      },err=>{
-                          console.log(err);
-                      })
-              },
-          },
-          mounted(){
-            this.getData();
-          }
-        }
-    </script>
-    
-    <style lang="less">
-    // .projectApplication2{
-   .projectApplicationfundAddDialog{    //项目修改对话框开始
-   
-  
-   .el-dialog{
-     border-radius:5px ;
-     overflow: hidden;
-   }
-   
-   .deleteContent{
-     width: 100%;
-     text-align: center;
-     font-size: 22px;
-     color: #000;
-   }
-   .addDialogLogo{
-    width: 60px;
-          height: 30px;
-          display: flex;
-          justify-content: center;
-          line-height: 30px;
-          border-radius: 5px;
-          background: #f2f2f2;
-          position: absolute;
-          left: 20px; top: 15px; 
-   }
-   .el-dialog__header{
-   background: #32455b;
-   }
-   .el-dialog__title{
-    color:#fff;
-          display: flex;
-          justify-content: center;
-          font-size: 18px;
-          position: relative;
-          top: -2px;
-   }
-   .addDialogMid{
-     box-sizing: border-box;
-     padding:0 60px 0 10px;
-     .addDialogTit{
-       display: flex;
-       span{
-         width: 80px;
-         line-height: 40px;
-         text-align: left;
-       }
-     }
-   .addDialogTit1{
-     display: flex;
-     justify-content: space-between;
-     margin-bottom: 15px;
-   }
-   .addDialogTit2{
-     margin-top: 10px;
-     font-size: 18px;
-     color: #000;
-     text-indent: 2em;
-   }
-   .addDialogCon{
-     margin-top: 20px;
-   }
-  }
-  .dialog-footer{
-   display: flex;
-   justify-content: center;
-  //  .btn5{
-  //    height: 40px;
-  //    font-size: 16px;
-  //    background: #0e72e6;
-  //    width: 200px;
-  //  }
-  }
-  }
-  
-      .PA2textArea{     //标题栏
-          margin: 15px 0;
-          .PA2textAreaTit{
-              width: 80%;
-              text-align: left;
-              font-size: 18px;
-              font-weight: 550;
-              margin-bottom: 15px;
-              color: #2387ff;
-          }
-          .ql-toolbar.ql-snow{
-            display: flex;
-          }
-          .PA2textAreaTit2{
-              font-size: 16px;
-          }
-          .el-textarea__inner{
-              background: #f2f2f2;
-          }
-      }
-      
-  
-  
-    // }
-    </style>

src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -0,0 +1,477 @@
+<template>
+    <div id="studentProjectWord">
+        <div id="title">
+            <div class="school">深圳技师学院</div>
+            <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
+            <div class="date">申请日期：{{downWordData.applicationDate}}</div>
+        </div>
+        <table border="1" cellspacing="0" class="table">
+    
+          <tr id="projectName">
+            <td colspan="2" ref="projectName">项目名称</td><td colspan="5" v-text='downWordData.projectName'></td>
+          </tr>
+          <tr id="radio">
+            <td rowspan="2" colspan="2" ref="radio">项目分组</td><td v-text="downWordData.radio=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?'√ 创意组':'□ 创意组'">
+            </td>
+            <td colspan="4">立项项目为新立项项目，项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式，产生较好的社会效益。</td>
+          </tr> 
+          <tr>
+            <td v-text="downWordData.radio=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?'□ 初创组':'√ 初创组'">
+            </td>
+            <td colspan="4">立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目（毕业两年内），项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。</td>
+          </tr> 
+          <tr id="checkList" class="checkArea">
+            <td colspan="2" ref="checkList">优先支持项目（可多选）</td> <td colspan="5">
+              <span><span v-text="downWordData['checkList'].indexOf('1')!=-1?'√ ':'□ '"></span><span>大赛选拔项目</span></span>
+              <span><span v-text="downWordData['checkList'].indexOf('2')!=-1?'√ ':'□ '"></span><span>落地注册项目</span></span>
+              <span><span v-text="downWordData['checkList'].indexOf('3')!=-1?'√ ':'□ '"></span><span>社会征集项目</span></span>
+              <span><span v-text="downWordData['checkList'].indexOf('4')!=-1?'√ ':'□ '"></span><span>产业命题项目</span></span>
+              
+              <!-- <el-checkbox-group v-model="downWordData.checkList">
+                <el-checkbox label="1">大赛选拔项目</el-checkbox>
+                <el-checkbox label="2">大赛选拔项目</el-checkbox>
+                <el-checkbox label="3">社会征集项目</el-checkbox>
+                <el-checkbox label="4">产业命题项目</el-checkbox>
+              </el-checkbox-group> -->
+            </td>
+          </tr>
+          <tr id="schoolRadio" class="checkArea">
+            <td colspan="2" ref="schoolRadio">美丽校园改造项目（特色项目）</td> <td colspan="5">
+              <span><span v-text="downWordData['schoolRadio']=='1'?'√ ':'□ '"></span><span>校园安全项目</span></span>
+              <span><span v-text="downWordData['schoolRadio']=='2'?'√ ':'□ '"></span><span>环境治理项目</span></span>
+              <span><span v-text="downWordData['schoolRadio']=='3'?'√ ':'□ '"></span><span>校园服务项目</span></span>
+              <span><span v-text="downWordData['schoolRadio']=='4'?'√ ':'□ '"></span><span>文创装置项目</span></span>
+              <!-- <el-radio v-model="downWordData.schoolRadio" label="1">校园安全项目</el-radio>
+              <el-radio v-model="downWordData.schoolRadio" label="2">环境治理项目</el-radio>
+              <el-radio v-model="downWordData.schoolRadio" label="3">校园服务项目</el-radio>
+              <el-radio v-model="downWordData.schoolRadio" label="4">文创装置项目</el-radio> -->
+            </td>
+          </tr>
+          <tr id="applyParsonRadio">
+            <td colspan="2" ref="applyParsonRadio" >项 目 申 请 人</td><td colspan="2">
+              <span v-text="downWordData['applyParsonRadio']=='1'?'√ ':'□ '"></span><span>在校学生</span>
+              <!-- <el-radio v-model="downWordData.applyParsonRadio" label="1">在校学生</el-radio> -->
+            </td><td colspan="3">
+              <span v-text="downWordData['applyParsonRadio']=='2'?'√ ':'□ '"></span><span>入驻学校孵化基地的初创企业法人</span>
+              <!-- <el-radio v-model="downWordData.applyParsonRadio" label="2">入驻学校孵化基地的初创企业法人</el-radio> -->
+            </td>
+          </tr>
+          <tr id="applyParsonName">
+            <td colspan="2" ref="applyParsonName">申 请 人 姓 名</td><td colspan="1" v-text="downWordData.applyParsonName">
+            </td>
+            <td ref="college">参与学院/公司</td><td v-text="downWordData.dp">
+            </td><td ref="tel">联系电话</td><td v-text="downWordData.tel"></td>
+          </tr>
+          <tr id="beginTime">
+            <td colspan="2" ref="beginTime">项 目 起 始 时 间</td><td colspan="2" v-text="downWordData.beginTime.split(' ')[0]"></td>
+            <td ref="endTime">计划完成时间</td><td colspan="2" v-text="downWordData.endTime.split(' ')[0]"></td>
+          </tr>
+          <tr>
+            <td colspan="2">项 目 组 人 数</td><td v-text="downWordData.studentS.length + downWordData.teacherS.length"></td>
+            <td>参与学生人数</td><td v-text='downWordData.studentS.length'> </td>
+            <td>参与教师人数</td><td v-text="downWordData.teacherS.length"></td>
+          </tr>
+          <tr id="studentS">
+            <td :rowspan="downWordData.studentS.length+1" ref="studentS">项目组学生成员（至少2个学院以上学生构成，团队5人以上）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+          </tr>
+          <tr style="position: relative;" v-for="(item,index) in downWordData.studentS" :key="index+'a'">
+            <td v-text="item.name"></td>
+            <td colspan="2" v-text="item.collage"></td>
+            <td colspan="3" v-text="item.work"></td>
+          </tr>
+          <tr id="teacherS">
+            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS">项目组指导教师（2个学院以上，团队2-3人）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+          </tr>
+          <tr style="position: relative !important;" v-for="(item,index) in downWordData.teacherS" :key="index+'b'">
+            <td v-text="item.name"></td>
+            <td colspan="2" v-text="item.collage"></td>
+            <td colspan="3" v-text="item.work"></td>
+          </tr>
+          <tr id="brief">
+            <td rowspan="5" ref="brief">研发内容</td><td colspan="6" class="textLeft">
+              <p>项目简介（200-300字）</p>
+              <span v-text="downWordData.brief"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目研发背景</p>
+              <span v-text="downWordData.introduce.back"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目创新点</p>
+              <span v-text="downWordData.introduce.innovate"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>技术研发路线</p>
+              <span v-text="downWordData.introduce.path"></span>
+            </td>
+          </tr>
+          <tr>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目应用场景 </p>
+              <span v-text="downWordData.introduce.scene"></span>
+            </td>
+          </tr>
+          <tr>
+            <td>商业模式及社会价值</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目商业模式/社会价值</p>
+              <span v-text="downWordData.introduce.worth"></span>
+            </td>
+          </tr>
+          <tr>
+            <td>团队优势</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>团队构成及优势</p>
+              <span v-text='downWordData.introduce.team'></span>
+            </td>
+          </tr>
+          <tr>
+            <td>研发成本</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>研发成本来源及构成</p>
+              <span v-text="downWordData.introduce.cost"></span>
+            </td>
+          </tr>
+          <tr>
+            <td rowspan="3">预期成果</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <p>项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
+              <span v-text="downWordData.introduce.expectResults"></span>
+            </td>
+          </tr>
+          <tr class="textLeft">
+            <td style="text-align: left;" colspan="6">
+              <p>学生创客人才培养预期成果、数量（教师填写）</p>
+              <span v-text="downWordData.introduce.expectResultsTeacher"></span>
+            </td>
+          </tr>
+          <tr class="textLeft">
+            <td style="text-align: left;" colspan="6">
+              <p>项目预期孵化、转化创业项目情况</p>
+              <span v-text="downWordData.introduce.expectConversion"></span>
+            </td>
+          </tr>
+          <tr>
+            <td>实施计划</td>
+            <td style="text-align: left;" colspan="6" class="textLeft">
+              <span v-text="downWordData.introduce.plan"></span>
+            </td>
+          </tr>
+          <tr id="fund">
+            <td rowspan="12" ref="fund">预算经费</td><td>总经费</td><td colspan="5" v-text="reversedMessage==0?'':reversedMessage"></td>
+          </tr>
+          <tr>
+            <td>支出类别</td><td colspan="2">支出项目</td><td>金额（元）</td><td colspan="4">备 注</td>
+          </tr>
+          <tr>
+            <td rowspan="5">直接费用</td>
+          </tr>
+          <tr>
+            <td colspan="2">小型仪器设备费</td>
+            <td v-text="downWordData.fund.facility">
+            </td><td colspan="2">
+              项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">材料费</td><td v-text="downWordData.fund.materials">
+            </td><td colspan="2">
+              项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">测试化验加工费</td><td v-text="downWordData.fund.process">
+            </td><td colspan="2">
+              项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">项目协作费</td><td v-text="downWordData.fund.assist">
+            </td><td colspan="2">
+              按合同规定支付给协作单位的费用
+            </td>
+          </tr>
+    
+          <tr>
+            <td rowspan="5">间接费用</td>
+          </tr>
+          <tr>
+            <td colspan="2">项目成果鉴定费</td><td v-text="downWordData.fund.authenticate">
+            </td><td colspan="2">
+              学术会务费、评审费、鉴定费、成果集制作费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">参展参赛费</td><td v-text="downWordData.fund.match">
+            </td><td colspan="2">
+              参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">创客交流活动费</td><td v-text="downWordData.fund.activity">
+            </td><td colspan="2">
+              创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">知识产权事务费</td><td v-text="downWordData.fund.affair">
+            </td><td colspan="2">
+              论文版面费、专利及其他知识产权事务等费用。
+            </td>
+          </tr>
+          <tr>
+            <td>所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
+                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
+                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+            </td>
+          </tr>
+          <tr>
+            <td>财务部门意见</td><td colspan="6" class="textLeft" style="height:200px">
+                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
+                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+            </td>
+          </tr>
+          <tr>
+            <td>创新创业学院审核意见</td><td colspan="6" class="textLeft" style="height:200px">
+                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
+                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+            </td>
+          </tr>
+        </table>
+          <div class="notes">
+            <span>备注：</span>
+            <span>1.表格可顺延或另附页。</span>
+            <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
+            <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
+          </div>
+    </div>
+    </template>
+      
+    <script>
+      export default {
+        data() {
+          return {
+              downWordData:{
+                applicationDate:'',//申请日期
+                projectName:'',
+                radio:'',
+                checkList:[],
+                schoolRadio:'',
+                applyParsonRadio:'',
+                applyParsonName:'',
+                college:'',
+                tel:'',
+                beginTime:'',
+                endTime:'',
+                studentS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                teacherS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                brief:'',
+                introduce:{
+                    back:'',
+                    innovate:'',
+                    path:'',
+                    scene:'',
+                    worth:'',
+                    team:'',
+                    cost:'',
+                    expectResults:'',
+                    expectResultsTeacher:'',
+                    expectConversion:'',
+                    plan:''
+                },
+                total:'',
+                fund:{
+                    facility:'',
+                    materials:'',
+                    process:'',
+                    assist:'',
+                    authenticate:'',
+                    match:'',
+                    activity:'',
+                    affair:''
+                }
+              },
+              
+            }
+        },
+        methods: {
+          getData(){
+              let param={
+                  uid:this.$store.state.userInfo.userid,
+                  pid:this.$route.query['pid']
+              }
+              this.ajax
+              .get(this.$store.state.api+'/studentProjectData',param)
+              .then(res=>{
+                  let data=res.data[0][0];
+                  let wordData = {};
+                  wordData.projectName=data.title;
+                  wordData.radio=data.typeName;
+                  wordData.checkList=JSON.parse(data.multiSelectProject);
+                  wordData.schoolRadio=data.schoolRemould;
+                  wordData.applyParsonRadio=data.projectApplyperson;
+                  wordData.applyParsonName=data.pro_leader;
+                  wordData.college=data.classid;
+                  wordData.tel=data.phone;
+                  wordData.beginTime=data.bTime;
+                  wordData.endTime=data.eTime;
+                  wordData.studentS=JSON.parse(data.course_student);
+                  wordData.teacherS=JSON.parse(data.course_teacher);
+                  wordData.brief=data.brief;
+                  wordData.introduce=JSON.parse(data.chapters)
+                  wordData.fund=JSON.parse(data.money)
+                  this.downWordData={...wordData,...{etime:data.eTime,btime:data.bTime,dp:data.className}}
+              },err=>{
+                  console.log(err);
+              })
+          },
+        },
+        computed:{   //经费总合
+          reversedMessage: function () {
+            let num = 0;
+            for(let i in this.downWordData.fund)num+=Number(this.downWordData.fund[i]);
+            return num;
+          }
+        },
+        mounted(){
+          this.getData();
+        }
+      };
+    </script>
+      
+    <style lang="less" scoped>
+    #studentProjectWord{
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        background-color: #ffff;
+        margin: 0;
+        padding: 40px 100px;
+        box-sizing:border-box;
+        #title{
+            width: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            position: relative;
+            // margin-top: 40px;
+            .school{
+                font-size: 2.5em;
+                font-weight: bold;
+                letter-spacing: 20px;
+            }
+            .wordTitle{
+                font-size: 2em;
+                letter-spacing: .15em;
+                margin-bottom:40px ;
+            }
+            .date{
+    
+                font-size: 1em;
+                position: absolute;
+                bottom: 0;
+                right: 100px;
+                font-weight: bold;
+            }
+        }
+        .table{
+            border: none;
+            border-top: solid 1px black;
+            border-right:  solid 1px black;
+            border-left:  solid 1px black;
+            .textLeft{
+              text-align: left ;
+              vertical-align: top;
+              position: relative;
+              max-width:100% ;
+              height: 200px;
+              white-space: nowrap;
+              span{
+                white-space: nowrap
+              }
+              :deep(.el-textarea__inner){
+                border: none ;
+                border-radius: 0px;
+                text-align: left !important;
+                font-size: 16px;
+              }
+            }
+            tr{
+              position: relative;
+              td{
+                border: none;
+                border-bottom: solid 1px black;
+                border-right: solid 1px black;
+                height: 50px;
+                text-align: center;
+                line-height: 30px;
+                min-width: 80px;
+                box-sizing: border-box;
+                padding: 5px;
+              p{
+                font-weight: 600;
+              }
+              :deep(.el-select .el-input .el-select__caret){
+                display: none;
+              }
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(.el-input__inner){
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(input)::-webkit-outer-spin-button,
+              :deep(input)::-webkit-inner-spin-button {
+                -webkit-appearance: none;
+              }
+              :deep(input)[type="number"]{
+                  -moz-appearance: textfield;
+              }
+            }
+          }
+            
+        }
+        .notes{
+          width: 100%;
+          display: flex;
+          flex-direction:column;
+        }
+        
+    }
+      .checkArea{
+        td{
+          span{
+          margin-left: 50px;
+          span{
+            margin: 0;
+          }
+        }
+        }
+
+      }
+    
+    </style>

src/views/projectSettlement/projectSettlementDetailMain.vue

@@ -22,6 +22,7 @@
         <!-- <projectSettlementDetail_MakerSpace v-if="pageState==1 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
         
         <!-- 学生创业项目 -->
+        <studentProjectWordShow v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- <projectSettlementDetailBase_StudentVue v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'" ></projectSettlementDetailBase_StudentVue> -->
         <!-- <projectSettlementDetail_Student v-if="pageState==1 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></projectSettlementDetail_Student> -->
 
@@ -36,8 +37,7 @@
     
     <script>
     //学生创业项目
-    // import projectSettlementDetailBase_StudentVue from './components/projectSettlementDetailBase_Student.vue';
-    // import projectSettlementDetail_Student from './components/projectSettlementDetail_Student.vue'
+    import studentProjectWordShow from './components/studentProjectWordShow.vue';
 
     //特色创客空间建设项目
     import MakerSpaceWordShowVue from './components/MakerSpaceWordShow.vue';
@@ -49,6 +49,7 @@
         export default {
         components:{
           MakerSpaceWordShowVue,
+          studentProjectWordShow,
             // projectSettlementDetailBase_MakerSpace,
             // projectSettlementDetail_MakerSpace,
             // projectSettlementDetailAnnex,