Merge remote-tracking branch 'origin/driver' into driver

src/views/drivingSchool/DriveSchoolGuide/index.vue

@@ -25,7 +25,7 @@
             size="mini"
             :disabled="single"
             @click="handleUpdate"
-            v-hasPermi="['system/driveSchool:test:edit']"
+            v-hasPermi="['system/driveSchool:guide:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -36,7 +36,7 @@
             size="mini"
             :disabled="multiple"
             @click="handleDelete"
-            v-hasPermi="['system/driveSchool:test:remove']"
+            v-hasPermi="['system/driveSchool:guide:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -46,7 +46,7 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['system/driveSchool:test:export']"
+            v-hasPermi="['system/driveSchool:guide:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -135,7 +135,7 @@ import editor from '@/components/Editor/index.vue'
 import { addGuide, delGuide, getGuide, listGuide, updateGuide } from '@/views/drivingSchool/DriveSchoolGuide/api/guide'
 
 export default {
-  name: "Test",
+  name: "Guide",
   components: {editor},
   data() {
     return {
@@ -155,7 +155,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 合同模板表格数据
+      // 业务办理指南表格数据
       testList: [],
       // 弹出层标题
       title: "",

src/views/drivingSchool/student/form/DlDriveSchoolStudentForm.vue

@@ -3,6 +3,9 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
       <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+        <el-form-item label="头像" prop="avatar">
+          <ImageUpload v-model="formData.avatar" :limit="1"/>
+        </el-form-item>
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="name">

src/views/drivingSchool/student/index.vue

@@ -31,6 +31,7 @@
       <el-table-column label="家庭住址" align="center" prop="address"/>
       <el-table-column label="人员类型" align="center" prop="type"/>
       <el-table-column label="学员编号" align="center" prop="drivingStudentCode"/>
+      <el-table-column label="教练" align="center" prop="coachName"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">