Merge branch 'master' of http://git.cc-lotus.info/new_train/frame

parts/print/print-sign.vue

@@ -27,14 +27,29 @@
         </tr>
       </table> -->
 
-      <el-col :span="24" style="width:1060px;border: solid #cecece;">
+      <el-col :span="24" style="width:1055px;" ref="print">
-        <el-table border stripe :data="list" ref="print" size="small" style="border: solid #cecece;">
+        <el-table border :data="list" size="small" style="border: solid #cecece;">
-          <el-table-column align="center" label="姓名" prop="name" width="170"></el-table-column>
+          <!-- <el-table-column align="center" label="姓名" prop="name" width="120px"></el-table-column>
-          <el-table-column align="center" label="学校" prop="school_name" width="200"></el-table-column>
+          <el-table-column align="center" label="性别" prop="gender" width="70px"></el-table-column>
-          <el-table-column align="center" label="性别" prop="gender" width="80"></el-table-column>
+          <el-table-column align="center" label="民族" prop="nation" width="80px"></el-table-column>
-          <el-table-column align="center" label="民族" prop="nation" width="150"></el-table-column>
+          <el-table-column align="center" label="身份证号" prop="id_number" width="150px"></el-table-column>
-          <el-table-column align="center" label="班级" prop="classname" width="80"></el-table-column>
+          <el-table-column align="center" label="学校" prop="school_name" width="130px"></el-table-column>
-          <el-table-column align="center" label="手机号" prop="phone" width="150"></el-table-column>
+          <el-table-column align="center" label="专业" prop="major" width="100px"></el-table-column>
+          <el-table-column align="center" label="入学年份" prop="entry_year" width="70px"></el-table-column>
+          <el-table-column align="center" label="手机号" prop="phone" width="100px"></el-table-column>
+          <el-table-column align="center" label="班级" prop="classname" width="80px"></el-table-column>
+          <el-table-column align="center" label="寝室" prop="bedroom" width="70px"></el-table-column>
+          <el-table-column align="center" label="签名" width="78x"></el-table-column> -->
+          <el-table-column align="center" label="姓名" prop="name"></el-table-column>
+          <el-table-column align="center" label="性别" prop="gender"></el-table-column>
+          <el-table-column align="center" label="民族" prop="nation"></el-table-column>
+          <el-table-column align="center" label="身份证号" prop="id_number"></el-table-column>
+          <el-table-column align="center" label="学校" prop="school_name"></el-table-column>
+          <el-table-column align="center" label="专业" prop="major"></el-table-column>
+          <el-table-column align="center" label="入学年份" prop="entry_year"></el-table-column>
+          <el-table-column align="center" label="手机号" prop="phone"></el-table-column>
+          <el-table-column align="center" label="班级" prop="classname"></el-table-column>
+          <el-table-column align="center" label="寝室" prop="bedroom"></el-table-column>
           <el-table-column align="center" label="签名"></el-table-column>
         </el-table>
       </el-col>
@@ -85,4 +100,8 @@ export default {
     border: 0.25px solid #ccc;
   }
 }
+/deep/.el-table--small td {
+  height: 76px;
+  padding: 0;
+}
 </style>

parts/time-table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="index" style="padding-left:10rem">
+  <div id="index" style="padding-left:0rem">
     <el-row type="flex" align="middle" justify="end" class="btn_bar">
       <el-col :span="4" class="printingBtn">
         <el-button type="primary" size="mini" @click="toPrint()">打印课程表</el-button>
@@ -19,11 +19,11 @@
                 <p style="text-align:center;padding:0 10px;color:#000;">课程</p>
                 <p style="text-align:left;padding:0 10px;color:#000;">时间</p>
               </th>
-              <th class="th" v-for="(date, index) in th" :key="index">
+              <th class="ths" v-for="(date, index) in th" :key="index">
                 <p>{{ date | getWeekDay }}</p>
                 <p>（{{ date | getDay }}）</p>
               </th>
-              <th class="th beizhu">备注</th>
+              <th class="ths beizhu">备注</th>
             </tr>
             <!-- 第一行需要合并2行单元格显示上午 -->
             <!-- 第三行需要合并3行单元格显示下午 -->
@@ -34,17 +34,33 @@
               <td>{{ time }}</td>
               <td v-for="(date, di) in th" :key="di" v-html="getLesson(date, time)"></td>
               <td rowspan="5" v-if="ti == 0">
-                <p>
+                <div class="classInfo">
-                  上课地点：<span>{{ data.jslocation || '' }}</span>
+                  <p>上课地点</p>
-                </p>
+                  <p>{{ data.jslocation || '' }}</p>
-                <p>
+                </div>
-                  班主任：<span class="teacherName">{{ data.headteacher || '' }}</span>
+                <div class="classInfo">
-                </p>
+                  <p>班主任</p>
-                <p>
+                  <p>{{ data.headteacher || '' }}</p>
-                  礼仪课：<span class="teacherName">{{ data.lyteacher || '' }}</span>
+                </div>
-                </p>
+                <div class="classInfo">
+                  <p>礼仪课</p>
+                  <p>{{ data.lyteacher || '暂无' }}</p>
+                </div>
+                <div class="classInfo">
+                  <p>督导值班</p>
+                  <p>{{ data.reteacher || '' }}</p>
+                </div>
               </td>
             </tr>
+            <tr>
+              <td colspan="2">教师签字</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td colspan="2"></td>
+            </tr>
           </table>
         </el-col>
       </el-col>
@@ -95,4 +111,13 @@ export default {
 
 <style lang="less" scoped>
 @import '~@frame/style/timeTable.less';
+.classInfo {
+  margin: 10px 0;
+  p:first-child {
+    padding: 5px 0;
+  }
+  p:last-child {
+    color: #ff0000;
+  }
+}
 </style>

style/timeTable.less

@@ -10,7 +10,11 @@
   padding: 10px 0 10px 26%;
 }
 .th {
-  width: 120px !important;
+  width: 200px !important;
+  height: 40px !important;
+}
+.ths{
+  width: 200px !important;
   height: 40px !important;
 }
 .th p {
@@ -21,7 +25,7 @@
 }
 .table tr td {
   text-align: center;
-  padding: 15px 5px;
+  padding: 15px;
   font-size: 15px;
   color: #000;
 }
@@ -34,3 +38,6 @@
 // .rowLesson{
 //   padding: 0 115px;
 // }
+.timeTable{
+  width: 1000px;
+}