#

src/App.vue

@@ -613,6 +613,9 @@
           flex-wrap: wrap;
           align-items: center;
         }
+        .el-input.is-disabled .el-input__inner{
+          color: #000;
+        }
         .deleteContent{
           width: 100%;
           text-align: center;

src/views/activityManage/components/NomMarkerWord.vue

@@ -7,7 +7,7 @@
         </div>
         <table border="1" cellspacing="0" class="table">
             <tr id="two">
-                <td colspan="4"><span style="color:red">*</span>活动名称</td>
+                <td colspan="4" class="bold"><span style="color:red">*</span>活动名称</td>
                 <td colspan="5">
                     <el-input
                         type="textarea"
@@ -17,12 +17,12 @@
                         v-model="wordData['activityName']">
                     </el-input>
                 </td>
-                <td colspan="3">预算经费</td>
+                <td colspan="3" class="bold">预算经费</td>
                 <td @click="goto('#fund')" colspan="4" v-text="total">
                 </td>
             </tr>
             <tr id="three">
-                <td colspan="4"><span style="color:red">*</span>项目负责人</td><td colspan="3">
+                <td colspan="4" class="bold"><span style="color:red">*</span>项目负责人</td><td colspan="3">
                     <el-input
                         type="textarea"
                         autosize
@@ -30,7 +30,7 @@
                         placeholder="请输入负责人"
                         v-model="wordData['pro_leader']">
                     </el-input>
-                </td><td colspan="2"><span style="color:red">*</span>所在部门</td><td colspan="3">
+                </td><td colspan="2" class="bold"><span style="color:red">*</span>所在部门</td><td colspan="3">
                     <el-select v-model="wordData['college']" style="width: 100%;" placeholder="请选择所在学院">
                       <el-option
                         v-for="item in DepartmentData"
@@ -39,7 +39,7 @@
                         :value="item.id">
                       </el-option>
                     </el-select>
-                </td><td colspan="2"><span style="color:red">*</span>联系电话</td><td colspan="3">
+                </td><td colspan="2" class="bold"><span style="color:red">*</span>联系电话</td><td colspan="3">
                     <el-input
                         type="textarea"
                         autosize
@@ -50,7 +50,7 @@
                 </td>
             </tr>
             <tr id="four">
-                <td colspan="4"><span style="color:red">*</span>活动时间</td>
+                <td colspan="4" class="bold"><span style="color:red">*</span>活动时间</td>
                 <td colspan="5">
                   <el-date-picker
                     v-model="wordData['activityTime']"
@@ -62,7 +62,7 @@
                     end-placeholder="项目完成时间">
                   </el-date-picker>
                 </td>
-                <td colspan="3">参与学生人数</td><td colspan="5">
+                <td colspan="3" class="bold">参与学生人数</td><td colspan="5">
                     <el-input
                         type="number"
                         autosize
@@ -408,48 +408,52 @@
            
             tr{
               position: relative;
-            td{
-              border: none;
-              border-bottom: solid 1px black;
-              border-right: solid 1px black;
-              height: 50px;
-              text-align: center;
-              line-height: 30px;
-              width: 80px;
-              &:nth-child(1){
-                border-left:  solid 1px black;
-              }
-              p{
+              .bold{
                 font-weight: 600;
               }
-              :deep(.el-select .el-input .el-select__caret){
-                display: none;
-                font-family:Arial,"Microsoft Yahe","微软雅黑";
-              }
-              :deep(.el-textarea__inner){
-                // padding: 0;
-                border: none ;
-                border-radius: 0px;
+              td{
+                border: none;
+                border-bottom: solid 1px black;
+                border-right: solid 1px black;
+                height: 50px;
                 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;
+                line-height: 30px;
+                width: 80px;
+                &:nth-child(1){
+                  border-left:  solid 1px black;
                 }
-                &[type='number'] {
-                  -moz-appearance: textfield;
+              
+                p{
+                  font-weight: 600;
+                }
+                :deep(.el-select .el-input .el-select__caret){
+                  display: none;
+                  font-family:Arial,"Microsoft Yahe","微软雅黑";
+                }
+                :deep(.el-textarea__inner){
+                  // padding: 0;
+                  border: none ;
+                  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;
+                  }
+                  &[type='number'] {
+                    -moz-appearance: textfield;
+                  }
+                  
+                  border-radius: 0px;
+                  text-align: center;
+                  font-size: 16px;
                 }
-                
-                border-radius: 0px;
-                text-align: center;
-                font-size: 16px;
-              }
 
-            }
+              }
           }
             .textLeft{
               :deep(.el-textarea__inner){

src/views/activityManage/makerActivityWordDetail.vue

@@ -164,23 +164,23 @@
                         return false;;
                       }
                       break;
-                    case "member":
-                        let num = 0;
-                        this.wordData[i].forEach(item=>{
-                          if(cEmpty.test(item['name']))num++;
-                          // for(let j in item){
-                          //   if(cEmpty.test(item[j])){
-                          //     num++;
-                          //   }
-                          // }
+                    // case "member":
+                    //     let num = 0;
+                    //     this.wordData[i].forEach(item=>{
+                    //       if(cEmpty.test(item['name']))num++;
+                    //       // for(let j in item){
+                    //       //   if(cEmpty.test(item[j])){
+                    //       //     num++;
+                    //       //   }
+                    //       // }
                         
-                        })
-                        if(num>0){
-                          this.$message.error("请填完指导老师信息");
-                          document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
-                          return false;
-                        }
-                      break;
+                    //     })
+                    //     if(num>0){
+                    //       this.$message.error("请填完指导老师信息");
+                    //       document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
+                    //       return false;
+                    //     }
+                    //   break;
                     // case "activityPlan":
                     //   if(cEmpty.test(this.wordData[i][0])){
                     //     this.$message.error("请输入活动计划");

src/views/activityManage/makerActvity.vue

@@ -166,8 +166,8 @@
               <div class="operations">
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
 
-                        <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row,0)" size="mini">审核</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state>=1" class="disa" size="mini">审核</el-button>
+                        <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row,0)" size="mini">提交</el-button>
+                        <el-button type="primary" disabled v-show="scope.row.state>=1" class="disa" size="mini">已提交</el-button>
 
                         <!-- <el-button type="primary"  @click="audi(scope.row,1)" size="mini">管理审核</el-button> -->
                         <el-button type="primary"  v-show="scope.row.state==1" @click="audi(scope.row,1)" size="mini">审核1</el-button>

src/views/activityManage/newNomMarkerActivity.vue

@@ -50,7 +50,6 @@ export default {
           {name:"",collage:"",work:""},
           {name:"",collage:"",work:""},
           {name:"",collage:"",work:""},
-
         ],
         activityPlan:"",//活动计划
         expectations:"",//预期目标

src/views/fundManage/makerfund.vue

@@ -259,7 +259,7 @@
         <div class="diaTit1">
           <div class="spans1">项目类型</div>
           <div class="inp">
-            <el-select v-model="ProjectFundData.type" disabled placeholder="个人创客">
+            <el-select style="width: 100%;" v-model="ProjectFundData.type" disabled placeholder="个人创客">
               <el-option
                 v-for="item in options"
                 :key="item.value"

src/views/resultShow/components/resultDetail_student.vue

@@ -615,7 +615,7 @@
                 }).then(res=>{
                     let FormData = res.data;
 
-       console.log(FormData);
+                console.log(FormData);
                 //    return console.log(FormData)
                 //     //头部信息
                     this.TitleMessage = FormData[0][0]
@@ -626,13 +626,18 @@
                     this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student'])
                     this.TitleMessage['multiSelectProject']=JSON.parse(this.TitleMessage['multiSelectProject'])
                     console.log(this.TitleMessage['multiSelectProject']);
+
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters']);
                     this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
                     if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
                     else this.ProjectLookFile = {url:'',type:""};
-                    this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
-                    if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
+
+                     this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
+
+                    if(this.ProjectEndFile!=null) this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
+                    // return  
+
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{
@@ -643,7 +648,7 @@
                         })
                     };
                     if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
-                    this.loading = false;
+                   this.loading = false;
                 }).catch(err=>{
                     console.log(err)
                 })