班级管理 添加 培训场地 课表中添加 日间助教

src/views/location/detail.vue

@@ -52,6 +52,10 @@ export default {
         value: '3',
         label: '用餐地点',
       },
+      {
+        value: '4',
+        label: '培训场地',
+      },
     ],
   }),
   created() {},

src/views/new-plan/arrange/director-arrange.vue

@@ -12,6 +12,7 @@
       <el-row>
         <el-table :data="list" border :span-method="objectSpanMethod" @row-click="rowBtn">
           <el-table-column label="期数" prop="term" align="center"> </el-table-column>
+          <el-table-column label="场地设置" prop="address" align="center"> </el-table-column>
           <el-table-column label="班级名称" prop="name" align="center"> </el-table-column>
           <el-table-column label="时间" prop="date" align="center">
             <template slot-scope="scope"> {{ ptc(scope.row.startdate) }}-{{ ptc(scope.row.enddate) }} </template>

src/views/train-plan/parts/excel-term-lesson.vue

@@ -27,7 +27,7 @@
                 课程
                 <tr>
                   <template v-for="(d, dindex) in getBatchDayList(b, type.code)">
-                    <td :key="`date-${dindex}`" class="out" style="display: grid;width:75px;" :style="{ background: getColor(d, dindex, b) }">
+                    <td :key="`date-${dindex}`" class="out" style="display: grid;width:210px;" :style="{ background: getColor(d, dindex, b) }">
                       {{ getLesson(d, b) }}
                     </td>
                   </template>
@@ -81,6 +81,20 @@
               </template>
             </template>
           </tr>
+          <tr>
+            <template v-for="(b, bindex) in getBatchData(type.code)">
+              <td :key="`headteacher${bindex}`" colspan="3" :style="{ borderLeft: `${bindex !== '0' ? '1px solid' : '0'}`, height: '60px' }">日间助教</td>
+              <template v-for="(c, cindex) in b.class">
+                <td :key="`classheadteacher${bindex}-${cindex}`" style="border-left:1px solid" :style="computedTeacherTdWidth(null, c)" @click="clickClass(c)">
+                  {{ c.rjteacher }} <br />
+                  <span style="font-size:14px">{{ getDirTeaTel(c.rjteacherid, 'both') }}</span> <br />
+                  <el-link v-if="checkMsgDirTea(c, 'rjteacher')" :type="checkMsgDirTea(c, 'rjteacher')" :underline="false" style="font-weight: 600;">
+                    {{ getMsgWord(checkMsgDirTea(c, 'rjteacher')) }}
+                  </el-link>
+                </td>
+              </template>
+            </template>
+          </tr>
           <tr>
             <template v-for="(b, bindex) in getBatchData(type.code)">
               <td :key="`headteacher${bindex}`" colspan="3" :style="{ borderLeft: `${bindex !== '0' ? '1px solid' : '0'}`, height: '40px' }">教室地点</td>
@@ -298,11 +312,21 @@ export default {
       // 班主任,礼仪课教师,教室名称,开班地点,拓展训练地点,用餐地点
       let headteacher = _.get(cla, 'headteacher', '');
       let lyteacher = _.get(cla, 'lyteacher', '');
+      let rjteacher = _.get(cla, 'rjteacher', '');
       let jslocation = _.get(cla, 'jslocation', '');
       let kbyslocation = _.get(cla, 'kbyslocation', '');
       let kzjhlocation = _.get(cla, 'kzjhlocation', '');
       let yclocation = _.get(cla, 'yclocation', '');
-      let claArr = [cname.lenth, headteacher.lenth, lyteacher.length, jslocation.length, kbyslocation.length, kzjhlocation.length, yclocation.length];
+      let claArr = [
+        cname.lenth,
+        headteacher.lenth,
+        lyteacher.length,
+        rjteacher.length,
+        jslocation.length,
+        kbyslocation.length,
+        kzjhlocation.length,
+        yclocation.length,
+      ];
       claArr = claArr.sort((a, b) => b - a);
       let unit = 5;
       const { lesson } = cla;

src/views/train-plan/parts/term-class-from.vue

@@ -8,6 +8,9 @@
         <template v-if="item.model == 'lyteacherid'">
           <el-option v-for="(tea, index) in getLyList()" :key="`${item.model}${index}`" :label="tea.name" :value="tea.id"></el-option>
         </template>
+        <template v-if="item.model == 'rjteacherid'">
+          <el-option v-for="(tea, index) in getLyList()" :key="`${item.model}${index}`" :label="tea.name" :value="tea.id"></el-option>
+        </template>
         <template v-if="item.model == 'jslocationid'">
           <el-option v-for="(place, index) in locationList" :key="`${item.model}${index}`" :label="place.name" :value="place.id"></el-option>
         </template>
@@ -45,6 +48,7 @@ export default {
       fields: [
         { label: '班主任', model: 'headteacherid', type: 'select' },
         { label: '礼仪课教师', model: 'lyteacherid', type: 'select' },
+        { label: '日间助教', model: 'rjteacherid', type: 'select' },
         { label: '教室地点', model: 'jslocationid', type: 'select' },
         { label: '开班地点', model: 'kbyslocationid', type: 'select' },
         { label: '拓展训练地点', model: 'kzjhlocationid', type: 'select' },
@@ -67,6 +71,10 @@ export default {
           value: '3',
           label: '用餐地点',
         },
+        {
+          value: '4',
+          label: '培训场地',
+        },
       ],
     };
   },