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

src/views/activityManage/components/markeractivityWord.vue

@@ -7,7 +7,7 @@
         </div>
         <table border="1" cellspacing="0" class="table">
             <tr id="one">
-              <td colspan="4"><span style="color:red">*</span>关联项目</td>
+              <td colspan="4" class="bold"><span style="color:red">*</span>关联项目</td>
               <td colspan="12">
                 <el-select v-model="wordData['associatedProjects']" @change="getProjectFund()" style="width: 100%;" placeholder="请选择关联项目">
                   <el-option
@@ -20,7 +20,7 @@
               </td>
             </tr>
             <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"
@@ -30,13 +30,13 @@
                         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
@@ -44,7 +44,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-input
                         type="textarea"
                         autosize
@@ -60,7 +60,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
@@ -71,7 +71,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']"
@@ -83,11 +83,10 @@
                     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
-                        :min="0"
                         style="width: 100%;"
                         resize="none"
                         placeholder="请输入参与学生人数"
@@ -330,9 +329,8 @@
 
             <tr class="textLeft">
                 <td><p>所在部</p> <p>门意见</p></td><td colspan="15" style="height: 200px;">
-                 
-                    <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章：</div>
-                    <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
+                    <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;position: relative;bottom: -50px;">负责人签章：</div>
+                    <div style="text-align: right;font-size: 18px;width: 90%;position: relative;bottom: -30px;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
                 </td>
             </tr>
             <tr>
@@ -510,7 +508,9 @@
         .table{
             border: none;
             border-top: solid 1px black;
-           
+            .bold{
+              font-weight: 600;
+            }
             tr{
               position: relative;
             td{

src/views/fundManage/makerfund.vue

@@ -184,7 +184,7 @@
               <div class="operations">
                 <el-button type="primary" size="mini" @click="details(scope.row.fid,scope.row.title,scope.row.acId)">查看详情</el-button>
 
-                <el-button type="primary" v-show="scope.row.state==0" size="mini" @click="Audit(scope.row,0)">提交审核</el-button>
+                <el-button type="primary" v-show="scope.row.state==0" size="mini" @click="Audit(scope.row,0)">提交</el-button>
                 <el-button type="primary"  v-show="scope.row.state==1" class="disa" size="mini">已提交</el-button>
                 <el-button type="primary"  v-show="scope.row.state!=1 && scope.row.state!=0" class="disa" size="mini">已提交</el-button>
 

src/views/projectApply/components/studentProjectWord.vue

@@ -521,6 +521,11 @@
             }
         },
         methods: {
+          getText(value) {     //电话验证
+              let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
+              let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
+              if(!result) return this.$message.error('请输入正确联系号码格式')
+            },
           addTeacher(){        //添加老师
             if (this.wordData.teacherS.length>=3) return this.$message.error('指导老师最多三人')
             this.wordData.teacherS.push({name:"",collage:"",work:""});