update

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

@@ -23,6 +23,7 @@
           :changeRange="changeRange"
           :proAffix="proAffix"
           :classTypeList="classTypeList"
+          :schStuList="schStuList"
         ></a-table>
       </el-card>
     </detail-frame>
@@ -98,6 +99,7 @@ const { mapActions: util } = createNamespacedHelpers('util');
 const { mapActions: school } = createNamespacedHelpers('school');
 const { mapActions: schPlan } = createNamespacedHelpers('schPlan');
 const { mapActions: classtype } = createNamespacedHelpers('classtype');
+const { mapActions: student } = createNamespacedHelpers('student');
 // 表中变量:
 // batch-${batchid}:${batch}
 // batch_type-${batchid}:${type} 这期是什么类型的班级
@@ -126,6 +128,8 @@ export default {
       already: false,
       options: undefined,
       classTypeList: [],
+      // 学校学生
+      schStuList: [],
     };
   },
   async created() {
@@ -137,6 +141,7 @@ export default {
   },
   methods: {
     ...util({ modelFetch: 'fetch' }),
+    ...student({ getSchoolStudent: 'schoolStudent' }),
     ...trainPlan({ getTrainPlan: 'fetch', exportPlan: 'exportSchoolPlan' }),
     ...school(['query']),
     ...schPlan({ schPlanQuery: 'query', createSchPlan: 'create', updateSchPlan: 'update', setSchPlan: 'schArrange' }),
@@ -741,6 +746,13 @@ export default {
     async getOtherList() {
       const res = await this.getClassType();
       if (this.$checkRes(res)) this.$set(this, `classTypeList`, res.data);
+      const { planid } = this.defaultOption;
+      const schoolStudent = await this.getSchoolStudent({ planid });
+      console.log(schoolStudent);
+      if (this.$checkRes(schoolStudent)) {
+        const { data } = schoolStudent;
+        this.$set(this, `schStuList`, data);
+      }
     },
     getProp(data, prop) {
       if (prop.includes('hascar')) {

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

@@ -79,6 +79,7 @@ export default {
     proAffix: { type: Function },
     getDesignate: { type: Function },
     classTypeList: { type: Array, default: () => [] },
+    schStuList: { type: Array, default: () => [] },
   },
   components: {},
   data: function() {
@@ -189,8 +190,16 @@ export default {
     },
     //单元格样式
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (!column.property || column.property == 'name' || column.property.includes('number')) return '';
-      else if (!_.get(row, 'daterange')) return '';
+      if (!column.property || column.property.includes('number')) return '';
+      else if (column.property == 'name') {
+        const { code } = row;
+        const r = this.schStuList.find(f => f.schid === code);
+        if (r) {
+          const { schnum } = r;
+          if (schnum > 0) return { background: '#409EFFA0' };
+        }
+        return '';
+      } else if (!_.get(row, 'daterange')) return '';
       else {
         let r = this.proAffix(column.property);
         let batch = this.tList

src/views/task/index.vue

@@ -8,12 +8,21 @@
           </el-select>
         </el-form-item>
       </el-form>
+      <el-row class="btn_bar" type="flex" justify="end">
+        <el-col :span="2">
+          <el-button type="primary" size="small" @click="eDialog = true">导出</el-button>
+        </el-col>
+      </el-row>
       <data-table :fields="fields" :data="tableData" :opera="opera" @view="toTaskList"></data-table>
     </list-frame>
+    <el-dialog :visible.sync="eDialog" title="导出" width="30%">
+      <export-range :usestudent="false" @toExport="toExport" @close="eDialog = false"></export-range>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import exportRange from '@frame/components/export-range.vue';
 import listFrame from '@frame/layout/admin/list-frame';
 import dataTable from '@frame/components/data-table';
 import _ from 'lodash';
@@ -21,11 +30,13 @@ import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: lesson } = createNamespacedHelpers('lesson');
 const { mapActions: util } = createNamespacedHelpers('util');
 const { mapActions: classes } = createNamespacedHelpers('classes');
+const { mapActions: task } = createNamespacedHelpers('task');
 export default {
   name: 'index',
   props: {},
-  components: { listFrame, dataTable },
+  components: { listFrame, dataTable, exportRange },
   data: () => ({
+    eDialog: false,
     opera: [
       {
         label: '查看学生作业',
@@ -60,6 +71,7 @@ export default {
     return { title: this.$route.meta.title };
   },
   methods: {
+    ...task(['export']),
     ...classes({ getClass: 'query' }),
     ...lesson({ lessionInfo: 'fetch', lessionList: 'query' }),
     ...util({ modelFetch: 'fetch' }),
@@ -103,6 +115,14 @@ export default {
         this.$set(this, `classList`, duplicate);
       }
     },
+    // 导出作业
+    async toExport(range) {
+      let data = { range };
+      const res = await this.export(data);
+      if (this.$checkRes(res, '导出成功', res.errmsg || '导出失败')) {
+        window.open(res.data);
+      }
+    },
   },
   watch: {
     defaultOption: {