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

src/App.vue

@@ -417,16 +417,22 @@
             width: 100%;
             margin: 10px;
             .dialogLabel{      //label
-              width: 26%;
+              width: 14%;
               font-size: 16px;
+              align-items: center;
               margin-right: 10px;
+              line-height: 25px;
               display: inline-block;
               text-align: justify;
               text-justify:distribute-all-lines;
               text-align-last: justify;
-              transform: translate(0,22%);
             }
-            
+          }
+          .littleBlock:nth-last-of-type(-n+2){
+            // line-height: 20px !important;
+            // color: #0e72e6;
+            display: flex;
+            align-items: center;
           }
           .el-dialog__footer{
             padding-top: 0;

src/router/index.js

@@ -160,53 +160,53 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
-            {   //项目管理父组件
+            {   //项目管理父查看详情
                 name: 'ProjectManagementMain',
                 path: '/ProjectManagementMain',
                 component: () =>import ('@/views/projectManage/ProjectManagementMain.vue'),
                 meta: { isAuth: true }
             },
-            { //项目管理
-                name: 'ProjectManagement2',
-                path: '/ProjectManagement2',
-                component: () =>import ('@/views/projectManage/ProjectManagement2.vue'),
-                meta: { isAuth: true }
+            // { //项目管理
+            //     name: 'ProjectManagement2',
+            //     path: '/ProjectManagement2',
+            //     component: () =>import ('@/views/projectManage/ProjectManagement2.vue'),
+            //     meta: { isAuth: true }
 
-            },
-            { //项目管理
-                name: 'ProjectManagement3',
-                path: '/ProjectManagement3',
-                component: () =>import ('@/views/projectManage/ProjectManagement3.vue'),
-                meta: { isAuth: true }
+            // },
+            // { //项目管理
+            //     name: 'ProjectManagement3',
+            //     path: '/ProjectManagement3',
+            //     component: () =>import ('@/views/projectManage/ProjectManagement3.vue'),
+            //     meta: { isAuth: true }
 
-            },
-            { //项目管理
-                name: 'ProjectManagement4',
-                path: '/ProjectManagement4',
-                component: () =>import ('@/views/projectManage/ProjectManagement4.vue'),
-                meta: { isAuth: true }
-            },
-            {
-                name: 'ProjectManagement3_1',
-                path: '/ProjectManagement3_1',
-                component: () =>import ('@/views/projectManage/ProjectManagement3_1.vue'),
-                meta: { isAuth: true }
-            },
-            { //项目管理
-                name: 'ProjectManagement5',
-                path: '/ProjectManagement5',
-                component: () =>import ('@/views/projectManage/ProjectManagement5.vue'),
-                meta: { isAuth: true }
+            // },
+            // { //项目管理
+            //     name: 'ProjectManagement4',
+            //     path: '/ProjectManagement4',
+            //     component: () =>import ('@/views/projectManage/ProjectManagement4.vue'),
+            //     meta: { isAuth: true }
+            // },
+            // {
+            //     name: 'ProjectManagement3_1',
+            //     path: '/ProjectManagement3_1',
+            //     component: () =>import ('@/views/projectManage/ProjectManagement3_1.vue'),
+            //     meta: { isAuth: true }
+            // },
+            // { //项目管理
+            //     name: 'ProjectManagement5',
+            //     path: '/ProjectManagement5',
+            //     component: () =>import ('@/views/projectManage/ProjectManagement5.vue'),
+            //     meta: { isAuth: true }
 
-            },
+            // },
             
-            { //项目资金管理
-                name: 'ProjectManagementFund1',
-                path: '/ProjectManagementFund1',
-                component: () =>import ('@/views/projectManage/ProjectManagementFund1.vue'),
-                meta: { isAuth: true }
+            // { //项目资金管理
+            //     name: 'ProjectManagementFund1',
+            //     path: '/ProjectManagementFund1',
+            //     component: () =>import ('@/views/projectManage/ProjectManagementFund1.vue'),
+            //     meta: { isAuth: true }
 
-            },
+            // },
             { //项目资金管理
                 name: 'ProjectManagementFund2',
                 path: '/ProjectManagementFund2',

src/views/projectApply/projectApplicationApply.vue → src/views/projectApply/components/projectApplicationApply.vue

@@ -383,7 +383,7 @@
 </template>
 
 <script>
-    import BeUpload from "../../components/tool/beUpload.vue";
+    import BeUpload from "@/components/tool/beUpload.vue";
     export default { 
       props:["data","next",'back','addPerson'],
       components: {

src/views/projectApply/projectApplicationApplyMakerSpace.vue → src/views/projectApply/components/projectApplicationApplyMakerSpace.vue

@@ -404,7 +404,7 @@
 </template>
 
 <script>
-import BeUpload from "../../components/tool/beUpload.vue";
+import BeUpload from "@/components/tool/beUpload.vue";
     export default { 
       props:["data","next",'back','addPerson'],
       components: {

src/views/projectApply/projectApplicationApplyMain.vue

@@ -80,12 +80,13 @@
   <script>
   // 引入项目详情三个页面
   // import { uuid } from 'vue-uuid';
-  import projectApplicationApply from './projectApplicationApply.vue';
-  import projectApplicationApply2 from './projectApplicationApply2.vue';
-  import projectApplicationApply3 from './projectApplicationApply3.vue';
+  //学生创业项目
+  import projectApplicationApply from './components/projectApplicationApply.vue';
+  import projectApplicationApply2 from './components/projectApplicationApply2.vue';
+  import projectApplicationApply3 from './components/projectApplicationApply3.vue';
   //创客空间建设项目立项申报
-  import projectApplicationApplyMakerSpace from './projectApplicationApplyMakerSpace.vue';
-  import projectApplicationApplyMakerSpace2 from './projectApplicationApplyMakerSpace2.vue'
+  import projectApplicationApplyMakerSpace from './components/projectApplicationApplyMakerSpace.vue';
+  import projectApplicationApplyMakerSpace2 from './components/projectApplicationApplyMakerSpace2.vue'
       export default {
         // 进行注册使用
         components:{
@@ -334,9 +335,12 @@
               }
             },
             submitData(){  //提交页面所有数据
+
               let a=this.projectApplicationApply1;
               let b=this.projectApplicationApply2;
               let c=this.projectApplicationApply3
+              // return console.log(a.textarea.length);
+
               if(a.select.projectName=='') return this.$message.error('请输入项目名称')
               if(a.select.leader=='') return this.$message.error('请输入项目负责人')
               if(a.select.department=='') return this.$message.error('请选择所在部门')
@@ -347,10 +351,11 @@
               if(a.select.fund=='') return this.$message.error('请选择美丽校园改造计划')
               if(a.select.person=='') return this.$message.error('请选择项目申请人')
               if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
-              if(a.tableTeacherData.length<1 || a.tableTeacherData.length>4) return this.$message.error('老师成员2-3人')
+              if(a.tableTeacherData.length<2 || a.tableTeacherData.length>3) return this.$message.error('老师成员2-3人')
               if(a.tableStudentData.length<5) return this.$message.error('学生成员5人以上')
-
-              
+              // if (a.textarea) {
+                
+              // }
               // let d=[]   //按照后端格式传递数据，项目内容，要将经费支出，与项目明细放在一起，
               // for(let key in b){
               //     d.push(b[key])
@@ -364,26 +369,17 @@
               // }
               // console.log(a.select.sort);
               // console.log(this.pageType);
-              let typeId=this.pageType[0]
-              let typeName=this.pageType[1]
+              // let typeId=this.pageType[0]
+              // let typeName=this.pageType[1]
               // return console.log(typeId,typeName);
 
               // return console.log(JSON.stringify(a.select.projectDate));
 
               let param={
-                // title:a.select.projectName,
-                // brief:a.textarea,
-                // leader:a.select.person,
-                // phone:a.select.tel,
-                // cid:a.select.value,
-                // student:JSON.stringify(a.tableData),
-                // tid:typeId,
-                // tidName:typeName,
-                // mon:a.select.fund,
+
                 uid:this.$store.state.userInfo.userid,
                 tit:a.select.projectName,
                 leader:a.select.leader,
-
                 begDate:a.select.projectDate[0],
                 endDate:a.select.projectDate[1],
                 department:a.select.department,
@@ -393,8 +389,8 @@
                 student:JSON.stringify(a.tableStudentData),
                 con:a.textarea,
                 chapters:JSON.stringify(b),
-                tid:typeId,
-                tName:typeName,
+                tid:this.pageType[0],
+                tName:this.pageType[1],
                 // message:JSON.stringify([d,[newData1,c.tableData2]]),
                 mon:JSON.stringify(this.projectApplicationApply3),//预算经费,
                 tel:a.select.tel,

src/views/projectApply/projectApplicationDetails.vue

@@ -43,7 +43,7 @@
               <div class="inpBlock">
                 <div class="label">选择分类</div>
                 <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
-                <el-cascader disabled :options="sortOptions" clearable></el-cascader>
+                <el-cascader disabled v-model="pageType" :options="sortOptions" clearable></el-cascader>
               </div>
           </div>
 
@@ -394,7 +394,7 @@
                 value:0,
                 show:false
             },  
-
+          pageType:[], //选择分类
           
           delMember:false,
           amendMemberDialog:false,
@@ -680,7 +680,7 @@
                         this.content.tableTeacherData=JSON.parse(data.course_teacher)                       
                         this.content.textarea=data.brief
                         this.content.dialogImageUrl=data.image
-
+                        this.pageType=[data.typeid,data.typeName]
                         
                         // console.log(this.content);
                     },err=>{
@@ -688,11 +688,28 @@
                     })
             },
 
-
-            audit(){   //提交对话框显示
-              this.submitHint=true
+            getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
+              let param={
+                uid:this.$store.state.userInfo.userid
+              }
+                this.ajax
+                      .get(this.$store.state.api+'/SelectAllType',param)
+                      .then(res=>{
+                        console.log(res.data[0]);
+                        let data=res.data[0]
+                        this.sortOptions[0]['value']=data[0]['id']
+                        this.sortOptions[0]['label']=data[0]['name']
+                        this.sortOptions[1]['value']=data[1]['id']
+                        this.sortOptions[1]['label']=data[1]['name']
+                      },err=>{
+                        console.log(err);
+                      })
             },
 
+        audit(){   //提交对话框显示
+          this.submitHint=true
+        },
+
         submitAll(){   //提交修改数据
           let param={
             uid:this.$store.state.userInfo.userid,
@@ -732,6 +749,7 @@
       },
       mounted(){    //数据加载完成后触发
         this.getProjectDepartmentData()
+        this.getProjectTypeData()
         this.getData()
       },
     }

src/views/projectManage/ProjectManagement.vue

@@ -337,9 +337,9 @@ import { getNowDate } from '@/components/tool/Date';
           })
           this.endDialog=false;
         },
-        scheduleDetail(val,tid){      //进度详情
-          localStorage.setItem('pid',JSON.stringify(val))
-          this.$router.push(`/ProjectManagementMain?Id=${tid}`)
+        scheduleDetail(val,tid){           //进度详情
+          // localStorage.setItem('pid',JSON.stringify(val))
+          this.$router.push(`/ProjectManagementMain?Id=${tid}&pid=${val}`)
         },
         fundStatus(Id){     //资金情况
           localStorage.setItem('pid',JSON.stringify(Id))

src/views/projectManage/ProjectManagement1.vue

@@ -43,7 +43,7 @@
               <div class="inpBlock">
                 <div class="label">选择分类</div>
                 <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
-                <el-cascader disabled :options="sortOptions" clearable></el-cascader>
+                <el-cascader disabled v-model="pageType" :options="sortOptions" clearable></el-cascader>
               </div>
           </div>
 
@@ -394,6 +394,7 @@
                 value:0,
                 show:false
             },  
+            pageType:[], //选择分类
 
           
           delMember:false,
@@ -657,7 +658,7 @@
             getData(){     //过去基础数据
                 let param={
                     uid:this.$store.state.userInfo.userid,
-                    pid:JSON.parse(localStorage.getItem('pid'))
+                    pid:this.$route.query["pid"]
                 }
                 this.ajax
                     .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
@@ -680,6 +681,7 @@
                         this.content.tableTeacherData=JSON.parse(data.course_teacher)                       
                         this.content.textarea=data.brief
                         this.content.dialogImageUrl=data.image
+                        this.pageType=[data.typeid,data.typeName]
 
                         
                         // console.log(this.content);
@@ -688,7 +690,23 @@
                     })
             },
 
-
+            getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
+              let param={
+                uid:this.$store.state.userInfo.userid
+              }
+                this.ajax
+                      .get(this.$store.state.api+'/SelectAllType',param)
+                      .then(res=>{
+                        console.log(res.data[0]);
+                        let data=res.data[0]
+                        this.sortOptions[0]['value']=data[0]['id']
+                        this.sortOptions[0]['label']=data[0]['name']
+                        this.sortOptions[1]['value']=data[1]['id']
+                        this.sortOptions[1]['label']=data[1]['name']
+                      },err=>{
+                        console.log(err);
+                      })
+            },
             audit(){   //提交对话框显示
               this.submitHint=true
             },
@@ -696,7 +714,7 @@
         submitAll(){   //提交修改数据
           let param={
             uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid')),
+            pid:this.$route.query['pid'],
             tit:this.content.select.projectName,
             bri:this.content.textarea,
             lea:this.content.select.leader,
@@ -733,6 +751,7 @@
       mounted(){    //数据加载完成后触发
         this.getProjectDepartmentData()
         this.getData()
+        this.getProjectTypeData()
       },
     }
 </script>

src/views/projectManage/ProjectManagement1_MakerSpace.vue

@@ -554,7 +554,7 @@
 
           let param = {
             uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid')),
+            pid:this.$route.query['pid'],
             title:this.select.project,
             pro_leader:this.select.person,
             lead_leader:this.select.lead_leader,
@@ -618,7 +618,7 @@
           this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid'))
+            pid:this.$route.query['pid']
           }
             this.ajax
                   .get(this.$store.state.api+'/SelectProjectMakerSpace',param)

src/views/projectManage/ProjectManagement2.vue

@@ -147,7 +147,7 @@ import { VueEditor } from "vue2-editor";
           submitAll(){
             let param={
               uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid')),
+              pid:this.$route.query['pid'],
               message:JSON.stringify(this.content)
             }
               this.ajax
@@ -166,7 +166,7 @@ import { VueEditor } from "vue2-editor";
           // getData(){   //初始化完成获取基本数据进行填充
           //   let param={
           //     uid:this.$store.state.userInfo.userid,
-          //     pid:JSON.parse(localStorage.getItem('pid'))
+          //     pid:this.$route.query['pid']
           //   }
           //     this.ajax
           //           .get(this.$store.state.api+'/GetProjectDetailMessage',param)
@@ -181,7 +181,7 @@ import { VueEditor } from "vue2-editor";
           getData(){
                 let param={
                     uid:this.$store.state.userInfo.userid,
-                    pid:JSON.parse(localStorage.getItem('pid'))
+                    pid:this.$route.query['pid']
                 }
                 this.ajax
                     .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)

src/views/projectManage/ProjectManagement2_MakerSpace.vue

@@ -99,7 +99,7 @@
             submitAll(){
               let param={
                 uid:this.$store.state.userInfo.userid,
-                pid:JSON.parse(localStorage.getItem('pid')),
+                pid:this.$route.query['pid'],
                 chapters:JSON.stringify(this.data)
               }
               this.ajax.post(this.$store.state.api+"/UpdateProjectChaptersMakerSpace",param).then(res=>{
@@ -118,7 +118,7 @@
               this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
-                pid:JSON.parse(localStorage.getItem('pid'))
+                pid:this.$route.query['pid']
               }
                 this.ajax
                       .get(this.$store.state.api+'/SelectProjectChapterMakerSpace',param)

src/views/projectManage/ProjectManagement3.vue

@@ -128,7 +128,7 @@
             this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid')),
+              pid:this.$route.query['pid'],
               cid:"",
               leader:'',
               state:"",

src/views/projectManage/ProjectManagement3_1.vue

@@ -393,7 +393,7 @@
                       stu:this.selects.studentNum,
                       teacher:JSON.stringify(this.tableData),
                       chap:JSON.stringify(this.textareaS),
-                      pid:JSON.parse(localStorage.getItem('pid')),
+                      pid:this.$route.query['pid'],
                       cid:this.selects.classid,
                       ph:this.selects.tel,
                       beginTime:JSON.stringify(this.selects.beginDate)

src/views/projectManage/ProjectManagement4.vue

@@ -143,7 +143,7 @@
               this.tableData.splice(index,1)
               this.ajax.post(this.$store.state.api+"/AddProjectFile",{
                 uid:this.$store.state.userInfo.userid,
-                cid:JSON.parse(localStorage.getItem('pid')),
+                cid:this.$route.query['pid'],
                 file:JSON.stringify(this.tableData)
               }).then(res=>{
                 if(res.data==1){
@@ -194,7 +194,7 @@
           
             let param={
                 uid:this.$store.state.userInfo.userid,
-                cid:JSON.parse(localStorage.getItem('pid')),
+                cid:this.$route.query['pid'],
                 projectFile:JSON.stringify(oldData)
             }
             this.ajax
@@ -222,7 +222,7 @@
             this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
-                pid:JSON.parse(localStorage.getItem('pid')),
+                pid:this.$route.query['pid'],
                 // page:this.table.currentPage,
                 // lim:this.table.packageSize
               }

src/views/projectManage/ProjectManagement5.vue

@@ -143,7 +143,7 @@
               this.tableData.splice(index,1);
               this.ajax.post(this.$store.state.api+"/UpdateProjectEndFile",{
                 uid:this.$store.state.userInfo.userid,
-                pid:JSON.parse(localStorage.getItem('pid')),
+                pid:this.$route.query['pid'],
                 file:JSON.stringify(this.tableData)
               }).then(res=>{
                 console.log(res)
@@ -191,7 +191,7 @@
             }
             let param={
                 uid:this.$store.state.userInfo.userid,
-                cid:JSON.parse(localStorage.getItem('pid')),
+                cid:this.$route.query['pid'],
                 projectFile:JSON.stringify(oldData)
             }
             this.ajax
@@ -220,7 +220,7 @@
               this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
-                pid:JSON.parse(localStorage.getItem('pid')),
+                pid:this.$route.query['pid'],
               }
               // console.log(param);
               this.ajax

src/views/projectSettlement/components/projectSettlementDetailBase_Student.vue

@@ -0,0 +1,786 @@
+<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 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
+                      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" @click="audit">立即修改</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,      //删除学生对话框
+  
+            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]
+  
+                          
+                          // console.log(this.content);
+                      },err=>{
+                          console.log(err);
+                      })
+              },
+  
+              getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
+                let param={
+                  uid:this.$store.state.userInfo.userid
+                }
+                  this.ajax
+                        .get(this.$store.state.api+'/SelectAllType',param)
+                        .then(res=>{
+                          console.log(res.data[0]);
+                          let data=res.data[0]
+                          this.sortOptions[0]['value']=data[0]['id']
+                          this.sortOptions[0]['label']=data[0]['name']
+                          this.sortOptions[1]['value']=data[1]['id']
+                          this.sortOptions[1]['label']=data[1]['name']
+                        },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,
+              bri:this.content.textarea,
+              lea:this.content.select.leader,
+              pho:this.content.select.tel,
+              cos:JSON.stringify(this.content.tableStudentData),
+              cot:JSON.stringify(this.content.tableTeacherData),
+              img:this.content.dialogImageUrl,
+              cla:this.content.select.department,
+              mul:JSON.stringify(this.content.select.MultiSelectProjectNameS),
+              sch:this.content.select.schoolRemould,
+            }
+              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/projectSettlementDetail_Student.vue

@@ -0,0 +1,304 @@
+<template>
+    <!-- 项目管理 项目详细 -->
+      <div class="ProjectManagement2">
+     
+        <div id="w">
+                <p class="pTit">研发内容</p>
+                <div>
+                  <p class="pTit2">一、项目研发背景</p>
+                  <div class="editor">
+                    <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor>
+                  </div>
+                </div>
+                <div>
+                  <p class="pTit2">二、项目创新点</p>
+                  <div class="editor">
+                    <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor>
+                  </div>
+                </div>
+                <div>
+                  <p class="pTit2">三、技术研发路线</p>
+                  <div class="editor">
+                    <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor>
+                  </div>
+                </div>
+                <div>
+                  <p class="pTit2">四、项目应用场景</p>
+                  <div class="editor">
+                    <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">
+                    <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">
+                    <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">
+                    <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">
+                    <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor>
+                  </div>
+                </div>
+                <div>
+                  <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
+                  <div class="editor">
+                    <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor>
+                  </div>
+                </div>
+                <div>
+                  <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
+                  <div class="editor">
+                    <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">
+                  <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"  @click="audit">立即修改</el-button>
+            <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2"  @click="$message.error('项目已结项，不可再修改')">立即修改</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.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/projectSettlement1.vue

@@ -1,446 +0,0 @@
-<template>
-  <!-- 项目结项 项目基本内容 -->
-    <div class="projectSettlement1" v-loading="loading">
-
-        <!-- 详情页 -->
-      <div class="vfpHeader">
-          <div class="titleOne">项目管理</div>
-          <div class="smallTitle" style="left: 100px;">项目详情</div>
-          <el-button type="primary" @click="back">返回</el-button>
-      </div>
-      <hr>
-      <div class="AppBar">
-          <div @click="content" class="AppBarActive">项目基本内容</div>
-          <div @click="remark">项目详情</div>
-          <div @click="remark2">项目附件</div>
-          <div @click="remark4">项目结题附件</div>
-          <div @click="remark5">结项评语</div>
-      </div>
-      <div class="psSmallTit">
-        <span style="margin-right: 10px;">结题时间:</span>{{ select.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.tel" placeholder="请输入内容"></el-input>
-                    </div>
-                </div>
-
-                <div class="selectRight">
-                  <div class="inpBlock">
-                        <div class="label">项目开始时间</div>
-                        <el-date-picker
-                          v-model="select.Date"
-                          type="datetime"
-                          disabled
-                          style="width: 100%;"
-                          placeholder="选择日期">
-                        </el-date-picker>
-                    </div>
-                    <div class="inpBlock" style="position: relative;">
-                        <div class="label">预算总经费</div>
-                        <el-input disabled v-model="select.Fund" placeholder="请输入内容"></el-input>
-                        <span style="position: absolute;right: -20px;top: 9px;">万</span>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">选择分类</div>
-                        <!-- <el-select v-model="select.sort" style="width: 100%;" placeholder="请选择">
-                          <el-option
-                            v-for="item in select.sortOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                          </el-option>
-                        </el-select> -->
-                        <el-cascader v-model="select.sort" :options="select.sortOptions" clearable></el-cascader>
-
-                    </div>
-                </div>
-              </div>
-              
-     </div>
-        <!-- 活动申请填写信息区域结束 -->
-
-        <!-- 项目成员区域开始 -->
-        <div class="tabTit">
-            <div><p>项目成员</p></div>
-        </div>
-        <hr>
-        <el-table
-          :data="tableData"
-          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="phone"
-            label="电话"
-            align="center"
-            >
-          </el-table-column>
-  
-          <el-table-column
-            prop="score"
-            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.rows.id)" size="mini" style="background: #477edd">查看详情</el-button>
-                </div>
-            </template>
-          </el-table-column> -->
-        </el-table>
-        <!-- 项目成员区域结束 -->
-
-        <!-- 项目简介区域开始 -->
-      <div class="tabTit">
-            <div><p>项目简介</p></div>
-      </div>
-      <hr>
-        <el-input
-          type="textarea"
-          :rows="6"
-          class="textArea"
-          resize="none"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
-        <!-- 项目简介区域结束 -->
-
-      <div class="baseBtn">
-        <div class="blockWidth">
-          <el-button type="primary" class="backBtn" @click="back">返回</el-button>
-          <el-button type="primary" class="backBtn" @click="submitAmend">修改</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="submitHint=false" size="small" class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 修改对话框结束 -->
-    </div>
-  </template>
-  
-  <script>
-      export default {
-        data() {
-          return {
-            submitHint:false,
-            loading:false,
-            select:{    //数据详情框数据
-              project:'',   
-              person:'',
-              departmentData:"",  //部门框值
-              sort:[],     //分类值
-              tel:'',
-              Date:'',
-              Fund:'',
-              // sortOptions: [], //分类下拉框
-              sortOptions: [
-                    {
-                      value:"",
-                      label:'',
-                      children: [{
-                        value: 0,
-                        label: '创意组',
-                      },
-                       {
-                        value: 1,
-                        label: '初创组',
-                      }
-                    ]}, 
-                    {
-                    value:"",
-                    label:'',
-                    children: [{
-                      value: 0,
-                      label: '已建设',
-                    }, {
-                      value: 1,
-                      label: '待建设',
-                    }]
-                  }],
-              department:[],
-              endTime:''
-
-            },
-            textarea:'',     //项目简介
-            tableData:[],   //项目成员列表
-
-
-            value: '中德学院',
-            input:'',
-            
-          }
-        },
-        methods:{
-          init(){
-             this.submitHint=false
-          },
-          submitAmend(){
-             this.submitHint=true
-          },
-          submitAll(){
-            let tidId=this.select.sort[0];
-            let typeName=this.select.sort[1];
-            let param={
-                  uid:this.$store.state.userInfo.userid,
-                  pid:JSON.parse(localStorage.getItem('pid')),
-                  projectName:this.select.project,
-                  leader:this.select.person,
-                  department:this.select.departmentData,
-                  tel:this.select.tel,
-                  tid:tidId,
-                  tidName:typeName,
-                  intro:this.textarea
-              }
-              this.ajax
-                  .post(this.$store.state.api+'/UpdateSettlementDetail',param)
-                  .then(res=>{
-                    console.log(res);
-                    this.submitHint=false
-                    if (res.data==1) {
-                      this.$message.success('修改成功')
-                      this.getData()
-                    }else{
-                      this.$message.error('修改失败')
-                      console.log(res.data);
-                    }
-                  },err=>{
-                    console.log(err);
-                  })
-              console.log(param);
-          },
-          getData(){
-            this.loading = true;
-            let param={
-            uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid'))
-          }
-          // console.log(param);
-            this.ajax
-                  .get(this.$store.state.api+'/GetProjectBase',param)
-                  .then(res=>{
-                    console.log(res);
-                    let data=res.data[0][0]
-                    // console.log(data);
-                    this.select.project=data.title;
-                    this.select.Fund=data.money;
-                    this.select.person=data.pro_leader;
-                    this.select.Date=data.begintime;
-                    this.textarea=data.brief;
-                    this.tableData=JSON.parse(data.course_student) 
-                    this.select.tel=data.phone;
-                    this.select.endTime=data.endTime
-                    this.select.departmentData = data['classid']
-                    this.select.sort = [data['typeid'],data['typeName']]
-                    console.log(this.select.sort);
-                    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 param={
-              uid:this.$store.state.userInfo.userid
-            }
-              this.ajax
-                    .get(this.$store.state.api+'/SelectAllType',param)
-                    .then(res=>{
-                      // this.select.sortOptions=res.data[0]
-                      this.select.sortOptions[0].value=res.data[0][0].id
-                      this.select.sortOptions[0].label=res.data[0][0].name
-                      this.select.sortOptions[1].value=res.data[0][1].id
-                      this.select.sortOptions[1].label=res.data[0][1].name
-                      // console.log(this.select.sortOptions);
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-          lookDetail(){
-
-          },
-          content(){
-              this.$router.push('/projectSettlement1')
-            },
-            remark(){
-              this.$router.push('/projectSettlement2')
-            },
-            remark2(){
-              this.$router.push('/projectSettlement3')
-            },
-            remark4(){
-              this.$router.push('/projectSettlement4')
-            },
-            remark5(){
-              this.$router.push('/projectSettlement5')
-            },
-         
-            back(){
-            this.$router.push('/projectSettlement')
-          },
-          handleSelectionChange(val) {
-            this.multipleSelection = val;
-          },
-         
-        },
-        mounted(){
-          this.getData();
-          this.getProjectDepartmentData();
-          this.getProjectTypeData();
-          // this.value=(this.options[0].value)
-        }
-      }
-  </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/projectSettlement2.vue

@@ -1,269 +0,0 @@
-<template>
-  <!-- 项目管理 项目详细 -->
-    <div class="ProjectManagement2" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
-        <div class="smallTitle" style="left: 100px;">项目详情</div>
-        <el-button type="primary" @click="back">返回</el-button>
-    </div>
-      <hr>
-
-    <!-- 跳转导航开始 -->
-    <div class="AppBar">
-      <div @click="content">项目基本内容</div>
-      <div @click="remark" class="AppBarActive">项目详情</div>
-      <div @click="remark2">项目附件</div>
-      <div @click="remark4">项目结题附件</div>
-      <div @click="remark5">结项评语</div>
-    </div>
-    <!-- 跳转导航结束 -->
-     
-    <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目创新点</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
-      </div>
-
-      <div class="PA2mid">
-        预期取得成果
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">一、项目预期成果、数量及形式</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][1]"></vue-editor>
-        
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">二、创客人才培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][2]"></vue-editor>
-       
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">三、项目预期孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][3]"></vue-editor>
-        
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目实施计划</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][4]"></vue-editor>
-        
-      </div>
-      <div class="baseBtn">
-        <div class="blockWidth">
-          <el-button type="primary"  @click="audit">立即修改</el-button>
-          <!-- <el-button type="primary" v-show="isUpload==1"  @click="audit">立即修改</el-button> -->
-          <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2"  @click="$message.error('项目已结项，不可再修改')">立即修改</el-button> -->
-
-        </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:'',
-            loading:false,
-            data:[["","","","",""],[]],
-            submitHint:false,
-            customToolbar: [
-              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
-              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
-              [{header:[false,1,2,3,4]}]
-            ],
-          }
-        },
-        methods:{
-          content(){
-              this.$router.push('/projectSettlement1')
-            },
-            remark(){
-              this.$router.push('/projectSettlement2')
-            },
-            remark2(){
-              this.$router.push('/projectSettlement3')
-            },
-            remark4(){
-              this.$router.push('/projectSettlement4')
-            },
-            remark5(){
-              this.$router.push('/projectSettlement5')
-            },
-         
-            back(){
-            this.$router.push('/projectSettlement')
-          },
-          audit(){   //立即修改按钮
-            this.submitHint=true
-          },
-          submitAll(){
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid')),
-              message:JSON.stringify(this.data)
-            }
-              this.ajax
-                  .post(this.$store.state.api+'/UpdateProjectDetail',param)
-                  .then(res=>{
-                    // console.log(res);
-                    this.$message.success('修改成功')
-                    this.init()
-                  },err=>{
-                    console.log(err);
-                  })
-          },
-          init(){
-            this.submitHint=false
-          },
-          getData(){   //初始化完成获取基本数据进行填充
-            this.loading = true;
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid'))
-            }
-              this.ajax
-                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
-                    .then(res=>{
-                      // console.log(res.data[0][0].isupload);
-                      this.isUpload=res.data[0][0].isupload;
-                      let GetData=JSON.parse(res.data[0][0].chapters)
-                      // console.log(GetData);
-                      this.data=GetData;
-                      this.loading = false;
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-        },
-        mounted(){
-          this.getData();
-        }
-      }
-  </script>
-  
-  <style lang="less">
-
- .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/projectSettlement3.vue

@@ -1,342 +0,0 @@
-<template>
-  <!-- 项目管理 项目附件 -->
-    <div class="ProjectManagement4" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
-        <div class="smallTitle" style="left: 100px;">项目详情</div>
-        <el-button type="primary" @click="back">返回</el-button>
-    </div>
-      <hr>
-       <!-- 跳转导航开始 -->
-       <div class="AppBar">
-         <div @click="content" >项目基本内容</div>
-          <div @click="remark">项目详情</div>
-          <div @click="remark2" class="AppBarActive">项目附件</div>
-          <div @click="remark4" >项目结题附件</div>
-          <div @click="remark5">结项评语</div>
-      </div>
-      <!-- 跳转导航结束 -->
-      <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:JSON.parse(localStorage.getItem('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()
-                    }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:JSON.parse(localStorage.getItem('pid')),
-                // page:this.table.currentPage,
-                // lim:this.table.packageSize
-              }
-              // 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);
-                    })
-          },
-          content(){
-              this.$router.push('/projectSettlement1')
-            },
-            remark(){
-              this.$router.push('/projectSettlement2')
-            },
-            remark2(){
-              this.$router.push('/projectSettlement3')
-            },
-            remark4(){
-              this.$router.push('/projectSettlement4')
-            },
-            remark5(){
-              this.$router.push('/projectSettlement5')
-            },
-         
-            back(){
-            this.$router.push('/projectSettlement')
-          },
-        },
-        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/projectSettlement4.vue

@@ -1,350 +0,0 @@
-<template>
-  <!-- 项目管理 项目结题附件 -->
-    <div class="ProjectManagement5" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
-        <div class="smallTitle" style="left: 100px;">项目详情</div>
-        <el-button type="primary" @click="back">返回</el-button>
-    </div>
-      <hr>
-       <!-- 跳转导航开始 -->
-       <div class="AppBar">
-        <div @click="content" >项目基本内容</div>
-          <div @click="remark">项目详情</div>
-          <div @click="remark2">项目附件</div>
-          <div @click="remark4" class="AppBarActive">项目结题附件</div>
-          <div @click="remark5">结项评语</div>
-      </div>
-      <!-- 跳转导航结束 -->
-      <div class="pmInp">
-          <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <!-- <beUpload @getFile="getFile"  :navName="'上传文件'" :accept="accept"></beUpload> -->
-
-        </div>
-
-        <!-- 表格部分开始 -->
-        <el-table
-        :data="tableData"
-        tooltip-effect="dark"
-        stripe
-        height="550px"
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <!-- <el-table-column
-          prop="projectTitle"
-          label="项目名称"
-          align="center"
-         >
-          <template>
-            <span>{{ title }}</span>
-          </template>
-        </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"  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">
-        <!-- <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:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-            // table:{         // 分页数据
-            //   total:0,
-            //   packageSize:8,
-            //   currentPage:1
-            // }, 
-            showFileType: 0,
-            loading:false,
-            tableData:[],  //附件列表
-            file:'',    //上传文件数据
-            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)
-            // console.log(oldData)
-            // oldData.push(val)
-            // Object.assign(oldData,this.tableData)
-            // oldData.push(val)
-            // console.log(oldData)
-            // this.tableData.push(val)
-            // console.log(this.tableData);
-            let param={
-                uid:this.$store.state.userInfo.userid,
-                cid:JSON.parse(localStorage.getItem('pid')),
-                projectFile:JSON.stringify(oldData)
-            }
-            this.ajax
-                  .post(this.$store.state.api+'/AddProjectManageFile',param)
-                  .then(res=>{
-                    console.log(res);
-                    if (res.data==1) {
-                      this.getData()
-                      this.$message.success('上传成功')
-                    }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:JSON.parse(localStorage.getItem('pid')),
-                // page:this.table.currentPage,
-                // lim:this.table.packageSize
-              }
-              // console.log(param);
-              this.ajax
-                    .get(this.$store.state.api+'/SelectProjectManageFile',param)
-                    .then(res=>{
-                      let file = JSON.parse(res.data[0][0]['endFile']);
-                      // this.title = res.data[0][0]['title']
-                      // file.forEach(item=>item.projectTitle = res.data[0][0]['title'])
-                      // console.log(file)
-                     
-                      this.tableData=file
-                      this.loading = false;
-                    },err=>{
-                      console.log(err);
-                    })
-          },
-          content(){
-              this.$router.push('/projectSettlement1')
-            },
-            remark(){
-              this.$router.push('/projectSettlement2')
-            },
-            remark2(){
-              this.$router.push('/projectSettlement3')
-            },
-            remark4(){
-              this.$router.push('/projectSettlement4')
-            },
-            remark5(){
-              this.$router.push('/projectSettlement5')
-            },
-         
-            back(){
-            this.$router.push('/projectSettlement')
-          },
-        },
-        mounted(){
-          this.getData()
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagement5{
-    .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%;
-      margin: 10px 0 10px 0;
-      display: flex;  
-      justify-content: flex-end;
-      .btn{
-        height: 30px;
-        width: 100px;
-        font-size: 16px;
-        background: #477edd;
-        // margin-left: 10px;
-      }
-    }
-  }
-
-   
-  </style>

src/views/projectSettlement/projectSettlement5.vue

@@ -1,463 +0,0 @@
-<template>
-  <!-- 项目结项 结项评语 -->
-    <div class="projectSettlement2" v-loading="loading">
-      <div class="vfpHeader">
-          <div class="titleOne">项目管理</div>
-          <div class="smallTitle" style="left: 100px;">项目详情</div>
-          <el-button type="primary" @click="back">返回</el-button>
-      </div>
-      <hr>
-      <div class="AppBar">
-          <div @click="content">项目基本内容</div>
-          <div @click="remark">项目详情</div>
-          <div @click="remark2">项目附件</div>
-          <div @click="remark4">项目结题附件</div>
-          <div @click="remark5"  class="AppBarActive">结项评语</div>
-      </div>
-
-      <!-- 上传文件以及表格开始 -->
-      <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:JSON.parse(localStorage.getItem('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) {    //上传文件
-              this.file.push(val);
-              this.$message.success('上传成功')
-              this.progress.show = false;
-            },
-
-            getData(){       //获取基础信息
-              this.loading = true;
-              let param={
-                uid:this.$store.state.userInfo.userid,
-                pid:JSON.parse(localStorage.getItem('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);
-                    })
-          },
-          content(){
-              this.$router.push('/projectSettlement1')
-            },
-            remark(){
-              this.$router.push('/projectSettlement2')
-            },
-            remark2(){
-              this.$router.push('/projectSettlement3')
-            },
-            remark4(){
-              this.$router.push('/projectSettlement4')
-            },
-            remark5(){
-              this.$router.push('/projectSettlement5')
-            },
-         
-            back(){
-            this.$router.push('/projectSettlement')
-          },         
-        },
-       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/projectSettlementDetailMain.vue

@@ -20,6 +20,10 @@
         <projectSettlementDetailBase_MakerSpace v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
         <projectSettlementDetail_MakerSpace v-if="pageState==1 && $route.query['tid']=='5f7a66d5-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>
+
         <!-- 项目附件 -->
         <projectSettlementDetailAnnex v-if="pageState==2"/>
         <!-- 项目结题附件 -->
@@ -30,6 +34,10 @@
     </template>
     
     <script>
+    //学生创业项目
+    import projectSettlementDetailBase_StudentVue from './components/projectSettlementDetailBase_Student.vue';
+    import projectSettlementDetail_Student from './components/projectSettlementDetail_Student.vue'
+
     //特色创客空间建设项目
     import projectSettlementDetailBase_MakerSpace from './components/projectSettlementDetailBase_MakerSpace.vue';
     import projectSettlementDetail_MakerSpace from './components/projectSettlementDetail_MakerSpace.vue';
@@ -45,6 +53,8 @@
             projectSettlementDetailAnnex,
             projectSettlementDetailConclusion,
             projectSettlementDetailComment,
+            projectSettlementDetailBase_StudentVue,
+            projectSettlementDetail_Student
         },
         data() {
           return {