Merge remote-tracking branch 'origin/master'

src/views/drivingSchool/DriveSchoolTeachingJournal/api/journal.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询教学日志列表
+export function listJournal(query) {
+  return request({
+    url: '/drivingSchool/system/journal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询教学日志详细
+export function getJournal(id) {
+  return request({
+    url: '/drivingSchool/system/journal/' + id,
+    method: 'get'
+  })
+}
+
+// 新增教学日志
+export function addJournal(data) {
+  return request({
+    url: '/drivingSchool/system/journal',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改教学日志
+export function updateJournal(data) {
+  return request({
+    url: '/drivingSchool/system/journal',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除教学日志
+export function delJournal(id) {
+  return request({
+    url: '/drivingSchool/system/journal/' + id,
+    method: 'delete'
+  })
+}

src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue

@@ -0,0 +1,247 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="教练姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入教练姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="journalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="教练姓名" align="center" prop="userName" />
+      <el-table-column label="日志内容" align="center" prop="content">
+      <template slot-scope="scope">
+        <el-button @click="viewContentFun(scope.row.content)" type="text" slot="reference">查看</el-button>
+      </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改教学日志对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="教练姓名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入教练姓名" />
+        </el-form-item>
+        <el-form-item label="日志内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog  title="查看" :visible.sync="viewFlag" width="65%" append-to-body>
+      <div style="box-sizing: border-box;padding: 15px;overflow: hidden" v-html="viewContent"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listJournal, getJournal, delJournal, addJournal, updateJournal } from "./api/journal";
+
+export default {
+  name: "Journal",
+  data() {
+    return {
+      viewContent:"",
+      viewFlag:false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 教学日志表格数据
+      journalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: null,
+        userId: null,
+        userName: null,
+        content: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    viewContentFun(data){
+      this.viewContent =data;
+      this.viewFlag = true;
+    },
+    /** 查询教学日志列表 */
+    getList() {
+      this.loading = true;
+      listJournal(this.queryParams).then(response => {
+        this.journalList = response.data.records;
+        console.log("152:",response)
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        userId: null,
+        userName: null,
+        content: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加教学日志";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getJournal(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改教学日志";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateJournal(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addJournal(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除教学日志编号为"' + ids + '"的数据项？').then(function() {
+        return delJournal(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('drivingSchool/system/journal/export', {
+        ...this.queryParams
+      }, `journal_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>