合并

src/App.vue

@@ -264,10 +264,15 @@
               // align-items: center;              
             }
             .selectRight{
-              width: 29%;
+              width: 30%;
               height: 150px;
               display: flex;
               flex-direction: column;
+              .el-cascader{
+                width: 100%;
+              }
+
+              
             }
             
           }
@@ -343,6 +348,7 @@
     display: flex;
     justify-content: flex-end;
     margin: 10px 0;
+    margin-top: 30px;
     .blockWidth{
       display: flex;
       justify-content:space-between;

src/views/activityManage/makerActvity.vue

@@ -465,9 +465,10 @@ import downloadFile from '@/components/tool/downloadFile.js';
             lim:this.Page.lim,
           }).then(res=>{
             let data = res.data;
+            // console.log(data);
             if(data[0].length==0&&data[4][0]['total']!=0){
               this.Page.nowPage = 1;
-              this.getData();
+              this.getData(); 
             }
             data[0].forEach(item=>item.reportFile = item.reportFile==''||item.reportFile==null?[]:JSON.parse(item.reportFile));
             this.tableData = data[0];

src/views/fundManage/makerfund.vue

@@ -557,12 +557,15 @@ import downloadFile from '@/components/tool/downloadFile.js';
                 .get(this.$store.state.api+'/SelectMakerFund',param)
                 .then(res=>{
                   let data=res.data;
+                  if (data[0].length==0 && data[4][0]['total'] != 0) {
+                    this.table.currentPage=1
+                    this.getData()
+                  }
                   console.log(data);
                   this.tableData=data[0];
                   this.filterSelects=data[1];
                   this.departmentSelect=data[2];
                   this.leaderSelects=data[3];
-                  console.log(data[4][0]);
                   this.table.total=data[4][0].total
                   this.loading = false;
                 },err=>{

src/views/projectApply/projectApplication.vue

@@ -104,11 +104,27 @@
           label="项目负责人"
           min-width="9%">
         </el-table-column>
+
         <el-table-column
           prop="name"
           align="center"
           label="所在部门"
           min-width="10%">
+          
+        </el-table-column>
+        <el-table-column
+          prop="sort"
+          align="center"
+          label="分类"
+          min-width="10%">
+          <template #default="scope">
+            <div>
+              <!-- <span v-show="scope.row.typeid==options.sort[0].typeid">学生</span> -->
+              <!-- <span v-show="scope.row.typeid==options.sort[1].typeid">特色</span> -->
+              <span v-show="scope.row.typeid==options.sort[1].typeid">{{ scope.row.sort==0?'已建设':'待建设' }}</span>
+              <span v-show="scope.row.typeid==options.sort[0].typeid">{{ scope.row.sort==0?'创意组':'初创组' }}</span>
+            </div>
+          </template>
         </el-table-column>
         <el-table-column
           prop="money"
@@ -477,6 +493,11 @@ import downloadFile from '@/components/tool/downloadFile.js';
               .then(res=>{
                 // console.log(res);
                 let data=res.data;
+                if (data[0].length==0 && data[5][0]['total'] != 0) {
+                  this.table.currentPage=1
+                  this.getData()
+                }
+                console.log(data);
                 let a=this.options;
                 this.tableData=data[0];
                 a.projectFilter=data[1];
@@ -485,7 +506,8 @@ import downloadFile from '@/components/tool/downloadFile.js';
                 a.person=data[4];
                 this.table.total=data[5][0].total
                 this.loading = false;
-                console.log(this.tableData)
+
+                // console.log(this.tableData)
               },err=>{
                 console.log(err);
               })  

src/views/projectApply/projectApplicationDetails.vue

@@ -183,13 +183,11 @@
 
     <div class="baseBtn">
       <div class="blockWidth">
-        <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
+        <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button>
 
-        <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="audit">立即修改</el-button>
-        <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
-        <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项，不可再修改')">立即修改</el-button>
-
-        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项，不可再修改')">立即修改</el-button>
+        <!-- <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
+        <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项，不可再修改')">立即修改</el-button> -->
+        <!-- <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项，不可再修改')">立即修改</el-button> -->
 
       </div>
     </div>
@@ -257,7 +255,6 @@
           :visible.sync="submitHint"
           width="600px"
           class="projectApplicationfundAddDialog"
-          style="top: 120px;"
           :before-close="init">
           <div class="addDialogLogo">LOGO</div>
           <div class="deleteContent">确定修改项目基本信息?</div>
@@ -296,7 +293,7 @@
             project:'',   
             person:'',
             departmentData:"",  //部门框值
-            sort:["5e21b204-c206-11ed-a4cd-509a4c5b67cf",0],     //分类值
+            sort:[],     //分类值
             tel:'',
             Date:'',
             Fund:'',
@@ -310,7 +307,7 @@
                         label: '创意组',
                       },
                        {
-                        value: '1',
+                        value: 1,
                         label: '初创组',
                       }
                     ]}, 
@@ -613,72 +610,72 @@
   //项目修改对话框开始
   .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__header{
+            background: #32455b;
 
- .el-dialog__title{
-        color:#fff;
+        }
+        .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;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
- }
- .addDialogMid{
-   box-sizing: border-box;
-   padding:0 60px 0 10px;
-   .addDialogTit{
-     display: flex;
-     span{
-       width: 80px;
-       line-height: 40px;
-       text-align: left;
-     }
-   }
- .addDialogTit1{
-   display: flex;
-   justify-content: space-between;
-   margin-bottom: 15px;
- }
- .addDialogTit2{
-   margin-top: 10px;
-   font-size: 18px;
-   color: #000;
-   text-indent: 2em;
- }
- .addDialogCon{
-   margin-top: 20px;
- }
-}
-.dialog-footer{
- display: flex;
- justify-content: center;
 
-}
-}
+        }
+    }
 }
 </style>

src/views/projectManage/ProjectManagement.vue

@@ -398,15 +398,21 @@ import { getNowDate } from '@/components/tool/Date';
             leader:this.selectInp.leader,  //负责人
             st:this.selectInp.state,  //审核状态
             year:this.selectInp.year,
+            // year:'',
             textInp:this.selectText,
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize,  //限制获取几条数据
           }
+          // console.log(param);
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                // console.log(res.data);
                 let data=res.data;
+                if (data[0].length==0 && data[5][0]['total'] != 0&&this.table.currentPage!=1) {
+                  this.table.currentPage=1
+                  return this.getData()
+                }
+                console.log(data);
                 let a=this.options;
                 this.items=data[0];
                 a.projectFilter=data[1];

src/views/projectManage/ProjectManagement1.vue

@@ -66,14 +66,16 @@
                     </div>
                     <div class="inpBlock">
                         <div class="label">选择分类</div>
-                        <el-select v-model="select.sort" style="width: 100%;" placeholder="请选择">
+                        <!-- <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-select> -->
+                        <el-cascader v-model="select.sort" :options="select.sortOptions" clearable></el-cascader>
+
                     </div>
                 </div>
               </div>
@@ -292,11 +294,34 @@
             project:'',   
             person:'',
             departmentData:"",  //部门框值
-            sort:'',     //分类值
+            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:[],
           },
           textarea:'周四福利大放送',   //项目简介
@@ -418,6 +443,8 @@
           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')),
@@ -427,7 +454,8 @@
             cid:this.select.departmentData,
             mon:this.select.Fund,
             phone:this.select.tel,
-            tid:this.select.sort,
+            tid:tidId,
+            tidName:typeName,
             student:JSON.stringify(this.tableData),
             con:this.textarea,
             imgsrc:this.dialogImageUrl
@@ -477,7 +505,9 @@
                     this.select.tel=data.phone;
                     this.dialogImageUrl=data.image
                     this.select.departmentData = data['classid']
-                    this.select.sort = data['typeid']
+                    // this.select.sort = data['typeid']
+                    this.select.sort = [data['typeid'],data['typeName']]
+
                     this.isUpload=data['isupload']
                     this.loading = false;
                   },err=>{
@@ -504,7 +534,11 @@
             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
                   },err=>{
                     console.log(err);
                   })

src/views/projectSettlement/projectSettlement1.vue

@@ -58,25 +58,28 @@
                         <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 v-model="select.Fund" placeholder="请输入内容"></el-input>
+                        <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-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-select> -->
+                        <el-cascader v-model="select.sort" :options="select.sortOptions" clearable></el-cascader>
+
                     </div>
                 </div>
               </div>
@@ -155,9 +158,26 @@
       <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>
   
@@ -165,20 +185,41 @@
       export default {
         data() {
           return {
-            options: [{
-              value: '选项1',
-              label: '中德学院'
-            }],
+            submitHint:false,
             loading:false,
             select:{    //数据详情框数据
               project:'',   
               person:'',
               departmentData:"",  //部门框值
-              sort:'',     //分类值
+              sort:[],     //分类值
               tel:'',
               Date:'',
               Fund:'',
-              sortOptions: [], //分类下拉框
+              // sortOptions: [], //分类下拉框
+              sortOptions: [
+                    {
+                      value:"",
+                      label:'',
+                      children: [{
+                        value: 0,
+                        label: '创意组',
+                      },
+                       {
+                        value: '1',
+                        label: '初创组',
+                      }
+                    ]}, 
+                    {
+                    value:"",
+                    label:'',
+                    children: [{
+                      value: 0,
+                      label: '已建设',
+                    }, {
+                      value: 1,
+                      label: '待建设',
+                    }]
+                  }],
               department:[],
               endTime:''
 
@@ -193,6 +234,43 @@
           }
         },
         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={
@@ -203,7 +281,7 @@
             this.ajax
                   .get(this.$store.state.api+'/GetProjectBase',param)
                   .then(res=>{
-                    // console.log(res);
+                    console.log(res);
                     let data=res.data[0][0]
                     // console.log(data);
                     this.select.project=data.title;
@@ -215,7 +293,8 @@
                     this.select.tel=data.phone;
                     this.select.endTime=data.endTime
                     this.select.departmentData = data['classid']
-                    this.select.sort = data['typeid']
+                    this.select.sort = [data['typeid'],data['typeName']]
+                    console.log(this.select.sort);
                     this.loading=false;
                   },err=>{
                     console.log(err);
@@ -240,7 +319,11 @@
               this.ajax
                     .get(this.$store.state.api+'/SelectAllType',param)
                     .then(res=>{
-                      this.select.sortOptions=res.data[0]
+                      // 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
                     },err=>{
                       console.log(err);
                     })
@@ -290,4 +373,73 @@
         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

@@ -19,15 +19,14 @@
     </div>
     <!-- 跳转导航结束 -->
      
-      <div class="PA2textArea">
+    <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>
@@ -41,19 +40,36 @@
       <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="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" class="backBtn" @click="backBtn2">返回</el-button>
+          <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> -->
-  
+      </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>
   
@@ -66,8 +82,9 @@ import { VueEditor } from "vue2-editor";
         },
         data() {
           return {
-            data:[["","","","",""],[]],
+            isUpload:'',
             loading:false,
+            data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
@@ -77,25 +94,6 @@ import { VueEditor } from "vue2-editor";
           }
         },
         methods:{
-          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)
-                      let GetData=JSON.parse(res.data[0][0].chapters)
-                      // console.log(GetData)
-                      this.data=GetData
-                      this.loading = false;
-                      // console.log(this.data);
-                    },err=>{
-                      console.log(err);
-                    })
-          },
           content(){
               this.$router.push('/projectSettlement1')
             },
@@ -115,46 +113,152 @@ import { VueEditor } from "vue2-editor";
             back(){
             this.$router.push('/projectSettlement')
           },
-          edit(){
-  
+          audit(){   //立即修改按钮
+            this.submitHint=true
           },
-          // backBtn2(){
-          //   this.$router.push('/ProjectManagement1')
-          // },
-          handleSelectionChange(val) {
-            this.multipleSelection = val;
+          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);
+                  })
           },
-          back(){
-            this.$router.push('/projectSettlement')
+          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);
+                    })
           },
         },
-        created(){
+        mounted(){
           this.getData();
         }
       }
   </script>
   
   <style lang="less">
-  .ProjectManagement2{
 
+ .projectApplicationfundAddDialog{    //项目修改对话框开始
+ 
 
-    .PA2textArea{
-        margin: 15px 0px;
+ .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: 100%;
+            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{
-        margin: 15px 0px;
+    .PA2mid{    //预期取得成果单独一栏
         width: 100%;
         text-align: left;
         font-size: 18px;
@@ -162,8 +266,4 @@ import { VueEditor } from "vue2-editor";
         margin-bottom: 10px;
         color: #2387ff;
     }
-    .homePage .homeBody .main[data-v-7eb2bc79]{
-      text-align: left !important;
-    }
-  }
   </style>

src/views/projectSettlement/projectSettlement5.vue

@@ -64,7 +64,7 @@
         </el-table>
 
       <!-- 多行文本框区域开始 -->
-      <div class="PS2tabTit0">
+      <!-- <div class="PS2tabTit0">
         结项评价
       </div>
       <div class="tabTit">
@@ -108,7 +108,7 @@
           placeholder="请输入内容"
           v-model="AllRemark.bRem">
         </el-input>
-      </div>
+      </div> -->
       <!-- 多行文本框区域结束 -->
       <div class="baseBtn">
         <div class="blockWidth">

src/views/resultShow/resultsShow.vue

@@ -180,6 +180,10 @@
             .get(this.$store.state.api+'/GetProjectIsConclusion',param)
               .then(res=>{
                 let data = res.data;
+                if (data[0].length==0 && data[5][0]['total'] != 0&&this.Page.currentPage!=1) {
+                  this.Page.currentPage=1
+                  return this.getData()
+                }
                 this.items = data[0];
                 this.options = data[1];
                 this.options1 = data[2];