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

src/views/activityManage/components/NomMarkerWord.vue

@@ -424,6 +424,7 @@
               }
               :deep(.el-select .el-input .el-select__caret){
                 display: none;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(.el-textarea__inner){
                 // padding: 0;
@@ -431,9 +432,11 @@
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(.el-input__inner){
                 border: none ;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
                 &::-webkit-outer-spin-button,&::-webkit-inner-spin-button{
                   -webkit-appearance: none !important;
                 }

src/views/activityManage/components/markeractivityWord.vue

@@ -549,6 +549,7 @@
               }
               :deep(.el-select .el-input .el-select__caret){
                 display: none;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(.el-textarea__inner){
                 // padding: 0;
@@ -556,9 +557,11 @@
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(.el-input__inner){
                 border: none ;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
                 &::-webkit-outer-spin-button,&::-webkit-inner-spin-button{
                   -webkit-appearance: none !important;
                 }

src/views/activityManage/makerActivityWordDetail.vue

@@ -11,8 +11,8 @@
         <NomMarkerWord v-if="wordData['type']==1 && wordData['state']==0" :wordData="wordData" :total="total"/>
         <markeractivityWordShow v-if="wordData['state']!=0" :wordData="wordData" :total="total"/>
         <div>
-            <el-button type="primary" v-if="wordData['state']==0" @click="test">立即修改</el-button>
             <el-button type="primary" @click="getActivityWord">下载表单</el-button>
+            <el-button type="primary" v-if="wordData['state']==0" @click="test">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"
@@ -167,11 +167,12 @@
                     case "member":
                         let num = 0;
                         this.wordData[i].forEach(item=>{
-                          for(let j in item){
-                            if(cEmpty.test(item[j])){
-                              num++;
-                            }
-                          }
+                          if(cEmpty.test(item['name']))num++;
+                          // for(let j in item){
+                          //   if(cEmpty.test(item[j])){
+                          //     num++;
+                          //   }
+                          // }
                         
                         })
                         if(num>0){
@@ -180,34 +181,34 @@
                           return false;
                         }
                       break;
-                    case "activityPlan":
-                      if(cEmpty.test(this.wordData[i][0])){
-                        this.$message.error("请输入活动计划");
-                        document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
-                        return false;
-                      }
-                      break;
-                    case "expectations":
-                      if(cEmpty.test(this.wordData[i][0])){
-                        this.$message.error("预期目标");
-                        document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                        return false;
-                      }
-                      break;
-                    case "eventAudience":
-                      if(cEmpty.test(this.wordData[i][0])){
-                        this.$message.error("活动受众面")
-                        document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
-                        return false;
-                      }
-                      break;
-                    case "fundingPlan":
-                      if(cEmpty.test(this.wordData[i][0])){
-                        this.$message.error("经费支出计划")
-                        document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
-                        return false;
-                      }
-                      break;
+                    // case "activityPlan":
+                    //   if(cEmpty.test(this.wordData[i][0])){
+                    //     this.$message.error("请输入活动计划");
+                    //     document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
+                    //     return false;
+                    //   }
+                    //   break;
+                    // case "expectations":
+                    //   if(cEmpty.test(this.wordData[i][0])){
+                    //     this.$message.error("预期目标");
+                    //     document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+                    //     return false;
+                    //   }
+                    //   break;
+                    // case "eventAudience":
+                    //   if(cEmpty.test(this.wordData[i][0])){
+                    //     this.$message.error("活动受众面")
+                    //     document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
+                    //     return false;
+                    //   }
+                    //   break;
+                    // case "fundingPlan":
+                    //   if(cEmpty.test(this.wordData[i][0])){
+                    //     this.$message.error("经费支出计划")
+                    //     document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
+                    //     return false;
+                    //   }
+                    //   break;
                   }
                 }
                 this.submitHint = true;

src/views/activityManage/makerActvity.vue

@@ -2,7 +2,7 @@
   <!--创客活动 -->
   <div class="makerActvity" v-loading="loading">
     <div class="pAHeader">
-      <div class="pAHeader1">创客活动</div>
+      <div class="pAHeader1">活动申请</div>
       <!-- <el-button @click="makerActvityApply">创客活动申请</el-button> -->
     </div>
     <hr>

src/views/activityManage/newMarkerActivity.vue

@@ -42,7 +42,7 @@
           pro_leader:"",//活动负责人
           college: '',//所在学院
           tel:'',//联系电话
-          activityTime:"",//活动时间
+          activityTime:[],//活动时间
           student:0,//参与学生人数
           member:[
             {name:"",collage:"",work:""},
@@ -74,7 +74,6 @@
             let num = 0;
             for(let i in this.wordData['fund'])num += Number(this.wordData['fund'][i]);
             return num;
-            // return (this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.input*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1)/10000
           }
     },
     methods: {
@@ -132,47 +131,48 @@
               case "member":
                   let num = 0;
                   this.wordData[i].forEach(item=>{
-                    for(let j in item){
-                      if(cEmpty.test(item[j])){
-                        num++;
-                      }
-                    }
+                    if(cEmpty.test(item['name']))num++;
+                    // for(let j in item){
+                    //   if(cEmpty.test(item[j])){
+                    //     num++;
+                    //   }
+                    // }
                   
                   })
                   if(num>0){
-                    this.$message.error("请填完指导老师信息");
+                    this.$message.error("指导老师姓名不能为空");
                     document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
                     return false;
                   }
                 break;
-              case "activityPlan":
-                if(cEmpty.test(this.wordData[i][0])){
-                  this.$message.error("请输入活动计划");
-                  document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
-                  return false;
-                }
-                break;
-              case "expectations":
-                if(cEmpty.test(this.wordData[i][0])){
-                  this.$message.error("预期目标");
-                  document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                  return false;
-                }
-                break;
-              case "eventAudience":
-                if(cEmpty.test(this.wordData[i][0])){
-                  this.$message.error("活动受众面")
-                  document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
-                  return false;
-                }
-                break;
-              case "fundingPlan":
-                if(cEmpty.test(this.wordData[i][0])){
-                  this.$message.error("经费支出计划")
-                  document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
-                  return false;
-                }
-                break;
+              // case "activityPlan":
+              //   if(cEmpty.test(this.wordData[i][0])){
+              //     this.$message.error("请输入活动计划");
+              //     document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
+              //     return false;
+              //   }
+              //   break;
+              // case "expectations":
+              //   if(cEmpty.test(this.wordData[i][0])){
+              //     this.$message.error("预期目标");
+              //     document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+              //     return false;
+              //   }
+              //   break;
+              // case "eventAudience":
+              //   if(cEmpty.test(this.wordData[i][0])){
+              //     this.$message.error("活动受众面")
+              //     document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
+              //     return false;
+              //   }
+              //   break;
+              // case "fundingPlan":
+              //   if(cEmpty.test(this.wordData[i][0])){
+              //     this.$message.error("经费支出计划")
+              //     document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
+              //     return false;
+              //   }
+              //   break;
             }
           }
           this.submitHint = true;
@@ -207,6 +207,8 @@
           this.ajax.post(this.$store.state.api+'/ActivityApply',pram).then(result=>{
             if(result['data']==1){
               this.$message.success("活动提交成功");
+              //提交项目成功，查看sessionStore是否有数据，有则删
+              if(sessionStorage.getItem("makerActivityApplyData"))sessionStorage.removeItem('makerActivityApplyData');
               this.$router.push('/makerActvity');
             }else{
               this.$message.error("活动提交失败")
@@ -219,6 +221,15 @@
 
       },
     },
+    mounted(){      //跳转到此页面立刻获取数据
+      //判断，如果sessionStore里有MakerSpaceApplyData这个字段，则存到this.wordData里
+      if(sessionStorage.getItem('makerActivityApplyData'))this.wordData = JSON.parse(sessionStorage.getItem('makerActivityApplyData'))
+      },
+    beforeRouteLeave (to, from, next) {
+      //判断，如果还没提交然后切换页面了，则把数据存到sessionStore里;
+      if(!this.submitHint)sessionStorage.setItem('makerActivityApplyData',JSON.stringify(this.wordData));
+      next();
+    }
   };
   </script>
   

src/views/activityManage/newNomMarkerActivity.vue

@@ -42,7 +42,7 @@ export default {
         pro_leader:"",//活动负责人
         college: '',//所在学院
         tel:'',//联系电话
-        activityTime:"",//活动时间
+        activityTime:[],//活动时间
         student:0,//参与学生人数
         member:[
           {name:"",collage:"",work:""},
@@ -125,11 +125,12 @@ export default {
             case "member":
                 let num = 0;
                 this.wordData[i].forEach(item=>{
-                  for(let j in item){
-                    if(cEmpty.test(item[j])){
-                      num++;
-                    }
-                  }
+                  if(cEmpty.test(item['name']))num++;
+                  // for(let j in item){
+                  //   if(cEmpty.test(item[j])){
+                  //     num++;
+                  //   }
+                  // }
                 
                 })
                 if(num>0){
@@ -138,34 +139,34 @@ export default {
                   return false;
                 }
               break;
-            case "activityPlan":
-              if(cEmpty.test(this.wordData[i][0])){
-                this.$message.error("请输入活动计划");
-                document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
-                return false;
-              }
-              break;
-            case "expectations":
-              if(cEmpty.test(this.wordData[i][0])){
-                this.$message.error("预期目标");
-                document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                return false;
-              }
-              break;
-            case "eventAudience":
-              if(cEmpty.test(this.wordData[i][0])){
-                this.$message.error("活动受众面")
-                document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
-                return false;
-              }
-              break;
-            case "fundingPlan":
-              if(cEmpty.test(this.wordData[i][0])){
-                this.$message.error("经费支出计划")
-                document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
-                return false;
-              }
-              break;
+            // case "activityPlan":
+            //   if(cEmpty.test(this.wordData[i][0])){
+            //     this.$message.error("请输入活动计划");
+            //     document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
+            //     return false;
+            //   }
+            //   break;
+            // case "expectations":
+            //   if(cEmpty.test(this.wordData[i][0])){
+            //     this.$message.error("预期目标");
+            //     document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+            //     return false;
+            //   }
+            //   break;
+            // case "eventAudience":
+            //   if(cEmpty.test(this.wordData[i][0])){
+            //     this.$message.error("活动受众面")
+            //     document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
+            //     return false;
+            //   }
+            //   break;
+            // case "fundingPlan":
+            //   if(cEmpty.test(this.wordData[i][0])){
+            //     this.$message.error("经费支出计划")
+            //     document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
+            //     return false;
+            //   }
+            //   break;
           }
         }
         this.submitHint = true;
@@ -198,6 +199,8 @@ export default {
         this.ajax.post(this.$store.state.api+'/ActivityApply',pram).then(result=>{
           if(result['data']==1){
             this.$message.success("活动提交成功");
+            //提交项目成功，查看sessionStore是否有数据，有则删
+            if(sessionStorage.getItem("NomActivityApplyData"))sessionStorage.removeItem('NomActivityApplyData');
             this.$router.push('/makerActvity');
           }else{
             this.$message.error("活动提交失败")
@@ -208,6 +211,15 @@ export default {
       })
     },
   },
+  mounted(){      //跳转到此页面立刻获取数据
+    //判断，如果sessionStore里有MakerSpaceApplyData这个字段，则存到this.wordData里
+    if(sessionStorage.getItem('NomActivityApplyData'))this.wordData = JSON.parse(sessionStorage.getItem('NomActivityApplyData'))
+    },
+  beforeRouteLeave (to, from, next) {
+    //判断，如果还没提交然后切换页面了，则把数据存到sessionStore里;
+    if(!this.submitHint)sessionStorage.setItem('NomActivityApplyData',JSON.stringify(this.wordData));
+    next();
+  }
 };
 </script>
 

src/views/projectApply/MakerSpaceApply.vue

@@ -2,7 +2,7 @@
     <!-- 项目立项申请 -->
     <div id="MakerSpaceApply" v-loading="loading">
       <div class="pAHeader">
-        <div class="pAHeader1">创客空间项目申请</div>
+        <div class="pAHeader1">创客空间申请</div>
       </div>
       <hr>
       <MakerSpaceWord :wordData="wordData"/>
@@ -148,15 +148,16 @@
                     }else{
                       let num = 0;
                       this.wordData[i].forEach(item=>{
-                        for(let j in item){
-                          if(cEmpty.test(item[j])){
-                            num++;
-                          }
-                        }
+                        if(cEmpty.test(item['name']))num++;
+                        // for(let j in item){
+                        //   if(cEmpty.test(item[j])){
+                        //     num++;
+                        //   }
+                        // }
                     
                       })
                       if(num>0){
-                        this.$message.error("请填完教师信息");
+                        this.$message.error("教师姓名请不要留空");
                         document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
                         return false;
                       }
@@ -171,88 +172,96 @@
                     }else{
                       let num = 0;
                       this.wordData[i].forEach(item=>{
-                        for(let j in item){
-                          if(cEmpty.test(item[j])){
-                            num++;
-                          }
-                        }
+                        if(cEmpty.test(item['name']))num++;
+                        // for(let j in item){
+                        //   if(cEmpty.test(item[j])){
+                        //     num++;
+                        //   }
+                        // }
                       })
                       if(num>0){
-                        this.$message.error("请填完学生信息");
+                        this.$message.error("学生姓名请不要留空");
                         document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
                         return false;
                       }
                     }
                     break;
-                  case "brief":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写项目简介");
-                      document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }else{
-                      if(this.wordData[i].length<200||this.wordData>300){
-                        this.$message.error("项目简介需要200-300字")
-                        document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                        return false;
+                    case 'fund':
+                      if(this.wordData['fund']['total']==0){
+                        // console.log(document.querySelector('#fund'))
+                        document.querySelector('#fund').scrollIntoView({ behavior: "smooth" });
+                        return this.$message.error('请输入预算经费');
                       }
-                    }
-                    break;
-                  case "Construction":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写建设内容");
-                      document.querySelector('#eight').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "ProjectBasis":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写立项依据");
-                      document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "development":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写创客空间物理环境、制度建设及软件设施建设情况");
-                      document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "studio":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客工作室建设情况");
-                      document.querySelector('#eleven').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "studentTeam":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客团队（人才）培养预期成果、数量");
-                      document.querySelector('#twelve').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "studentActivities":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客活动组织实施情况");
-                      document.querySelector('#thirteen').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "Transforming":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客团队孵化、转化创业项目情况");
-                      document.querySelector('#fourteen').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "condition":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写基础条件");
-                      document.querySelector('#fifteen').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break
+                      break;
+                  // case "brief":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写项目简介");
+                  //     document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }else{
+                  //     if(this.wordData[i].length<200||this.wordData>300){
+                  //       this.$message.error("项目简介需要200-300字")
+                  //       document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+                  //       return false;
+                  //     }
+                  //   }
+                  //   break;
+                  // case "Construction":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写建设内容");
+                  //     document.querySelector('#eight').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "ProjectBasis":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写立项依据");
+                  //     document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "development":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写创客空间物理环境、制度建设及软件设施建设情况");
+                  //     document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "studio":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客工作室建设情况");
+                  //     document.querySelector('#eleven').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "studentTeam":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客团队（人才）培养预期成果、数量");
+                  //     document.querySelector('#twelve').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "studentActivities":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客活动组织实施情况");
+                  //     document.querySelector('#thirteen').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "Transforming":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客团队孵化、转化创业项目情况");
+                  //     document.querySelector('#fourteen').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "condition":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写基础条件");
+                  //     document.querySelector('#fifteen').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break
                 }
               }
               this.submitHint = true;
@@ -292,6 +301,8 @@
                   console.log(result)
                   if(result['data']==1){
                     this.$message.success("项目提交成功");
+                    //提交项目成功，查看sessionStore是否有数据，有则删
+                    if(sessionStorage.getItem("MakerSpaceApplyData"))sessionStorage.removeItem('MakerSpaceApplyData');
                     this.$router.push('/projectApplication')
                   }else{
                     this.$message.error("项目提交失败");
@@ -305,8 +316,14 @@
         mounted(){      //跳转到此页面立刻获取数据
         //   this.getData();     //获取表格数据
           // this.applyProject();
+          //判断，如果sessionStore里有MakerSpaceApplyData这个字段，则存到this.wordData里
+          if(sessionStorage.getItem('MakerSpaceApplyData'))this.wordData = JSON.parse(sessionStorage.getItem('MakerSpaceApplyData'))
+        },
+        beforeRouteLeave (to, from, next) {
+          //判断，如果还没提交然后切换页面了，则把数据存到sessionStore里;
+          if(!this.submitHint)sessionStorage.setItem('MakerSpaceApplyData',JSON.stringify(this.wordData));
+          next();
         }
-  
       }
   </script>
   

src/views/projectApply/components/MakerSpaceWord.vue

@@ -376,7 +376,7 @@
         </div>
 
         <div class="fund">
-          <div class="fundTitle">
+          <div class="fundTitle" id="fund">
             预算<br/>经费
           </div>
           <div class="fundTable">
@@ -962,6 +962,8 @@
     box-sizing: border-box;
     border: none;
     outline: none;
+    font-family:Arial,"Microsoft Yahe","微软雅黑";
+    // font-family: '微软雅黑';
     &::-webkit-outer-spin-button,&::-webkit-inner-spin-button{
       -webkit-appearance: none !important;
     }
@@ -980,6 +982,7 @@
     box-sizing: border-box;
     border: none;
     overflow: hidden;
+    font-family:Arial,"Microsoft Yahe","微软雅黑";
   }
   .noCenter{
     :deep(.el-textarea__inner ){
@@ -989,9 +992,11 @@
   :deep(.el-date-editor){
     width: 100%;
     height: 100%;
+    font-family:Arial,"Microsoft Yahe","微软雅黑";
   }
   :deep(.el-input__suffix){
     display:none;
+    font-family:Arial,"Microsoft Yahe","微软雅黑";
   }
   //去除input number样式
   input::-webkit-outer-spin-button,
@@ -1002,6 +1007,7 @@
     -moz-appearance: textfield;
   }
   .fontBold{
+    font-family:Arial,"Microsoft Yahe","微软雅黑";
     font-weight:bold;
   }
 }

src/views/projectApply/components/MakerSpaceWordDetail.vue

@@ -3,8 +3,8 @@
         <MakerSpaceWord :wordData="wordData" v-if="state==0"/>
         <MakerSpaceWordShow :wordData="wordData" v-if="state!=0"/>
         <div>
-            <el-button type="primary" @click="test" v-if="state==0">立即修改</el-button>
             <el-button type="primary" @click="getWord">下载表格</el-button>
+            <el-button type="primary" @click="test" v-if="state==0">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"
@@ -214,15 +214,10 @@
                     }else{
                       let num = 0;
                       this.wordData[i].forEach(item=>{
-                        for(let j in item){
-                          if(cEmpty.test(item[j])){
-                            num++;
-                          }
-                        }
-                    
+                        if(cEmpty.test(item['name']))num++;
                       })
                       if(num>0){
-                        this.$message.error("请填完教师信息");
+                        this.$message.error("教师姓名请不要留空");
                         document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
                         return false;
                       }
@@ -237,88 +232,96 @@
                     }else{
                       let num = 0;
                       this.wordData[i].forEach(item=>{
-                        for(let j in item){
-                          if(cEmpty.test(item[j])){
-                            num++;
-                          }
-                        }
+                        if(cEmpty.test(item['name']))num++;
+                        // for(let j in item){
+                        //   if(cEmpty.test(item[j])){
+                        //     num++;
+                        //   }
+                        // }
                       })
                       if(num>0){
-                        this.$message.error("请填完学生信息");
+                        this.$message.error("学生姓名请不要留空");
                         document.querySelector('#six').scrollIntoView({ behavior: "smooth" });
                         return false;
                       }
                     }
                     break;
-                  case "brief":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写项目简介");
-                      document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }else{
-                      if(this.wordData[i].length<200||this.wordData>300){
-                        this.$message.error("项目简介需要200-300字")
-                        document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
-                        return false;
+                    case 'fund':
+                      if(this.wordData['fund']['total']==0){
+                        // console.log(document.querySelector('#fund'))
+                        document.querySelector('#fund').scrollIntoView({ behavior: "smooth" });
+                        return this.$message.error('请输入预算经费');
                       }
-                    }
-                    break;
-                  case "Construction":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写建设内容");
-                      document.querySelector('#eight').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "ProjectBasis":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写立项依据");
-                      document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "development":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写创客空间物理环境、制度建设及软件设施建设情况");
-                      document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "studio":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客工作室建设情况");
-                      document.querySelector('#eleven').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "studentTeam":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客团队（人才）培养预期成果、数量");
-                      document.querySelector('#twelve').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "studentActivities":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客活动组织实施情况");
-                      document.querySelector('#thirteen').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "Transforming":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写学生创客团队孵化、转化创业项目情况");
-                      document.querySelector('#fourteen').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break;
-                  case "condition":
-                    if(cEmpty.test(this.wordData[i])){
-                      this.$message.error("请填写基础条件");
-                      document.querySelector('#fifteen').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                    break
+                      break;
+                  // case "brief":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写项目简介");
+                  //     document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }else{
+                  //     if(this.wordData[i].length<200||this.wordData>300){
+                  //       this.$message.error("项目简介需要200-300字")
+                  //       document.querySelector('#seven').scrollIntoView({ behavior: "smooth" });
+                  //       return false;
+                  //     }
+                  //   }
+                  //   break;
+                  // case "Construction":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写建设内容");
+                  //     document.querySelector('#eight').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "ProjectBasis":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写立项依据");
+                  //     document.querySelector('#nine').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "development":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写创客空间物理环境、制度建设及软件设施建设情况");
+                  //     document.querySelector('#ten').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "studio":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客工作室建设情况");
+                  //     document.querySelector('#eleven').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "studentTeam":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客团队（人才）培养预期成果、数量");
+                  //     document.querySelector('#twelve').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "studentActivities":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客活动组织实施情况");
+                  //     document.querySelector('#thirteen').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "Transforming":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写学生创客团队孵化、转化创业项目情况");
+                  //     document.querySelector('#fourteen').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break;
+                  // case "condition":
+                  //   if(cEmpty.test(this.wordData[i])){
+                  //     this.$message.error("请填写基础条件");
+                  //     document.querySelector('#fifteen').scrollIntoView({ behavior: "smooth" });
+                  //     return false;
+                  //   }
+                  //   break
                 }
               }
               this.submitHint = true;

src/views/projectApply/components/studentProjectWord.vue

@@ -614,6 +614,7 @@
               }
               :deep(.el-select .el-input .el-select__caret){
                 display: none;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(.el-textarea__inner){
                 // padding: 0;
@@ -621,12 +622,14 @@
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(.el-input__inner){
                 border: none ;
                 border-radius: 0px;
                 text-align: center;
                 font-size: 16px;
+                font-family:Arial,"Microsoft Yahe","微软雅黑";
               }
               :deep(input)::-webkit-outer-spin-button,
               :deep(input)::-webkit-inner-spin-button {

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -3,8 +3,8 @@
         <studentProjectWord v-if="isupload==0" :wordData="wordData" :reversedMessage="reversedMessage"/>
         <studentProjectWordShow v-if="isupload!=0" :downWordData="downWordData" :reversedMessage="reversedMessage"/>
           <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
-              <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary" v-if="isupload==0">立即修改</el-button>
               <el-button style="width: 120px;margin: 20px auto;" @click="downloadDig=true" type="primary">下载文档</el-button>
+              <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary" v-if="isupload==0">立即修改</el-button>
           </div>
           <!-- 立即修改开始 -->
                 <el-dialog
@@ -51,7 +51,56 @@
             DepartmentData:[], //部门学院
             downloadDig:false,  //下载文档对话框
             updatedWordDig:false, //立即修改对话框
-            downWordData:{},
+            downWordData:{
+              applicationDate:getNowDate(1),//申请日期
+                projectName:'',
+                radio:'',
+                checkList:[],
+                schoolRadio:'',
+                applyParsonRadio:'',
+                applyParsonName:'',
+                college:'',
+                tel:'',
+                beginTime:'',
+                endTime:'',
+                studentS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                teacherS:[
+                    {name:'',collage:'',work:''},
+                    {name:'',collage:'',work:''},
+                ],
+                brief:'',
+                introduce:{
+                    back:'',
+                    innovate:'',
+                    path:'',
+                    scene:'',
+                    worth:'',
+                    team:'',
+                    cost:'',
+                    expectResults:'',
+                    expectResultsTeacher:'',
+                    expectConversion:'',
+                    plan:''
+                },
+                total:'',
+                fund:{
+                    facility:'',
+                    materials:'',
+                    process:'',
+                    assist:'',
+                    authenticate:'',
+                    match:'',
+                    activity:'',
+                    affair:''
+                }
+            },
             wordData:{
                 applicationDate:getNowDate(1),//申请日期
                 projectName:'',
@@ -166,7 +215,7 @@
                     console.log(err);
                 })
             },
-          test(){
+            test(){    //验证
             const cEmpty = /^\s*$/g;
             for (let i in this.wordData){
               // console.log(this.wordData[i],i);
@@ -248,14 +297,15 @@
                 case 'studentS':
                       let snum = 0;
                       this.wordData[i].forEach(item=>{
-                        for(let j in item){
-                          if(cEmpty.test(item[j])){
-                            snum++;
-                          }
-                        }
+                        if(cEmpty.test(item['name']))snum++;
+                        // for(let j in item){
+                        //   if(cEmpty.test(item[j])){
+                        //     snum++;
+                        //   }
+                        // }
                       })
                       if(snum>0){
-                        this.$message.error("请填完学生信息");
+                        this.$message.error("学生姓名请不要留空");
                         document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
                         return false;
                       }
@@ -264,25 +314,30 @@
                 case 'teacherS':
                       let num = 0;
                       this.wordData[i].forEach(item=>{
-                        for(let j in item){
-                          if(cEmpty.test(item[j])){
-                            num++;
-                          }
-                        }
+                        if(cEmpty.test(item['name']))num++;
+                        // for(let j in item){
+                        //   if(cEmpty.test(item[j])){
+                        //     num++;
+                        //   }
+                        // }
                       })
                       if(num>0){
-                        this.$message.error("请填完老师信息");
+                        this.$message.error("老师姓名请不要留空");
                         document.querySelector('#teacherS').scrollIntoView({ behavior: "smooth" });
                         return false;
                       }
                 break;
-                case 'brief':
-                    if (cEmpty.test(this.wordData[i])) {
-                      this.$message.error('请填写项目简介')
-                      document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
-                      return false
-                    }
-                break;
+                // case 'brief':
+                //     if (cEmpty.test(this.wordData[i])) {
+                //       this.$message.error('请填写项目简介')
+                //       // this.$refs.brief.style.background='rgb(236, 141, 141)'
+                //       // setTimeout(() => {
+                //       //   this.$refs.brief.style.background='#ffffff'
+                //       // }, 2000);
+                //       document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
+                //       return false
+                //     }
+                // break;
                 case 'fund':
                     let mon=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
                     if(mon==0){
@@ -293,8 +348,8 @@
               }
             }
             this.wordData['total']=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
-            this.updatedWordDig=true
-
+          
+            this.updatedWordDig=true;
           },
           updatedWord(){
             let param={

src/views/projectApply/newStudentProjectApply.vue

@@ -185,14 +185,15 @@
             case 'studentS':
                   let snum = 0;
                   this.wordData[i].forEach(item=>{
-                    for(let j in item){
-                      if(cEmpty.test(item[j])){
-                        snum++;
-                      }
-                    }
+                    if(cEmpty.test(item['name']))snum++;
+                    // for(let j in item){
+                    //   if(cEmpty.test(item[j])){
+                    //     snum++;
+                    //   }
+                    // }
                   })
                   if(snum>0){
-                    this.$message.error("请填完学生信息");
+                    this.$message.error("学生姓名请不要留空");
                     document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
                     return false;
                   }
@@ -201,29 +202,30 @@
             case 'teacherS':
                   let num = 0;
                   this.wordData[i].forEach(item=>{
-                    for(let j in item){
-                      if(cEmpty.test(item[j])){
-                        num++;
-                      }
-                    }
+                    if(cEmpty.test(item['name']))num++;
+                    // for(let j in item){
+                    //   if(cEmpty.test(item[j])){
+                    //     num++;
+                    //   }
+                    // }
                   })
                   if(num>0){
-                    this.$message.error("请填完老师信息");
+                    this.$message.error("老师姓名请不要留空");
                     document.querySelector('#teacherS').scrollIntoView({ behavior: "smooth" });
                     return false;
                   }
             break;
-            case 'brief':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请填写项目简介')
-                  // this.$refs.brief.style.background='rgb(236, 141, 141)'
-                  // setTimeout(() => {
-                  //   this.$refs.brief.style.background='#ffffff'
-                  // }, 2000);
-                  document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
-            break;
+            // case 'brief':
+            //     if (cEmpty.test(this.wordData[i])) {
+            //       this.$message.error('请填写项目简介')
+            //       // this.$refs.brief.style.background='rgb(236, 141, 141)'
+            //       // setTimeout(() => {
+            //       //   this.$refs.brief.style.background='#ffffff'
+            //       // }, 2000);
+            //       document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
+            //       return false
+            //     }
+            // break;
             case 'fund':
                 let mon=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
                 if(mon==0){
@@ -268,6 +270,8 @@
                   console.log(result);
                   if(result['data']==1){
                     this.$message.success("项目提交成功");
+                    //提交项目成功，查看sessionStore是否有数据，有则删
+                    if(sessionStorage.getItem("StudentProjectApplyData"))sessionStorage.removeItem('StudentProjectApplyData');
                     this.$router.push('/projectApplication')
                   }else{
                     this.$message.error("项目提交失败");
@@ -279,6 +283,14 @@
                 })
             })
       }
+    },
+    mounted(){
+      if(sessionStorage.getItem('StudentProjectApplyData'))this.wordData = JSON.parse(sessionStorage.getItem('StudentProjectApplyData'))
+    },
+    beforeRouteLeave (to, from, next) {
+      //判断，如果还没提交然后切换页面了，则把数据存到sessionStore里;
+      if(!this.submitHint)sessionStorage.setItem('StudentProjectApplyData',JSON.stringify(this.wordData));
+      next();
     }
   };
   </script>

src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -292,12 +292,12 @@
             <span>1.表格可顺延或另附页。</span>
             <span>2.项目申报需附相关佐证材料。</span>
           </div>
-          <!-- <el-button type="primary" @click="getWord">下载表格</el-button> -->
+          <el-button type="primary" @click="getWord">下载表格</el-button>
     </div>
     </template>
       
     <script>
-    // import {getMakerSpaceWord} from '@/components/tool/getWord'
+    import {getMakerSpaceWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -349,6 +349,10 @@
           };
         },
         methods: {
+            getWord(){
+              this.$message.info("正在下载表格")
+              getMakerSpaceWord(this.wordData);
+            },
             getData(){
                 this.loading = true;
                 this.ajax.get(this.$store.state.api+'/getMakerSpaceWordData',{

src/views/projectManage/components/studentProjectWordShow.vue

@@ -252,10 +252,12 @@
             <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
             <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
           </div>
+          <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button>
     </div>
     </template>
       
     <script>
+      import {getWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -313,6 +315,10 @@
             }
         },
         methods: {
+          work(){
+            this.$message.info("正在下载表格")
+            getWord(this.downWordData)
+          },
           getData(){
               let param={
                   uid:this.$store.state.userInfo.userid,

src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -292,12 +292,12 @@
             <span>1.表格可顺延或另附页。</span>
             <span>2.项目申报需附相关佐证材料。</span>
           </div>
-          <!-- <el-button type="primary" @click="getWord">下载表格</el-button> -->
+          <el-button type="primary" @click="getWord">下载表格</el-button>
     </div>
     </template>
       
     <script>
-    // import {getMakerSpaceWord} from '@/components/tool/getWord'
+    import {getMakerSpaceWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -349,6 +349,10 @@
           };
         },
         methods: {
+            getWord(){
+              this.$message.info("正在下载表格")
+              getMakerSpaceWord(this.wordData);
+            },
             getData(){
                 this.loading = true;
                 this.ajax.get(this.$store.state.api+'/getMakerSpaceWordData',{

src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -90,7 +90,9 @@
           <tr id="brief">
             <td rowspan="5" ref="brief">研发内容</td><td colspan="6" class="textLeft">
               <p>项目简介（200-300字）</p>
-              <span v-text="downWordData.brief"></span>
+              <span>
+                {{ downWordData.brief }}
+              </span>
             </td>
           </tr>
           <tr>
@@ -250,10 +252,12 @@
             <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
             <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
           </div>
+          <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button>
     </div>
     </template>
       
     <script>
+      import {getWord} from '@/components/tool/getWord'
       export default {
         data() {
           return {
@@ -311,6 +315,10 @@
             }
         },
         methods: {
+          work(){
+            this.$message.info("正在下载表格")
+            getWord(this.downWordData)
+          },
           getData(){
               let param={
                   uid:this.$store.state.userInfo.userid,
@@ -393,6 +401,7 @@
         }
         .table{
             border: none;
+            width: 100%;
             border-top: solid 1px black;
             border-right:  solid 1px black;
             border-left:  solid 1px black;
@@ -404,7 +413,7 @@
               height: 200px;
               // white-space: nowrap;
               span{
-                // white-space: nowrap
+                // white-space: nowrap;
                 word-wrap: break-word;
                 word-break: break-all;
               }
@@ -424,7 +433,7 @@
                 height: 50px;
                 text-align: center;
                 line-height: 30px;
-                min-width: 80px;
+                width: 70px;
                 box-sizing: border-box;
                 padding: 5px;
               p{