Merge remote-tracking branch 'origin/dev'

src/api/system/playRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询学习培训项目播放日志记录列表
+export function listPlayRecord(query) {
+    return request({
+        url: '/system/playRecord/trainingItemPlayRecordList',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询学习培训项目播放日志记录详细
+export function getPlayRecord(id) {
+    return request({
+        url: '/system/playRecord/' + id,
+        method: 'get'
+    })
+}
+
+// 新增学习培训项目播放日志记录
+export function addPlayRecord(data) {
+    return request({
+        url: '/system/playRecord',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改学习培训项目播放日志记录
+export function updatePlayRecord(data) {
+    return request({
+        url: '/system/playRecord',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除学习培训项目播放日志记录
+export function delPlayRecord(id) {
+    return request({
+        url: '/system/playRecord/' + id,
+        method: 'delete'
+    })
+}

src/api/system/trainingItem.js

@@ -58,6 +58,12 @@ export function updateTrainingItem(data) {
         data: data
     })
 }
+export function selectSubordinateItem(trainingParentId) {
+    return request({
+        url: `/system/trainingItem/selectSubordinateItem?trainingParentId=${trainingParentId}`,
+        method: 'get',
+    })
+}
 
 // 删除学习培训项目信息
 export function delTrainingItem(id) {

src/views/system/InformationCategory/index.vue

@@ -25,6 +25,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="资讯分类类型" prop="informationCategoryType">
+        <el-select
+          v-model="queryParams.informationCategoryType"
+          placeholder="请选择"
+          style="width: 250px"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <!-- <el-form-item label="资讯分类排序" prop="sort">
         <el-input
           v-model="queryParams.sort"
@@ -125,7 +140,11 @@
           {{
             scope.row.informationCategoryType == "HEALTH_NOUS" ? "健康常识" : ""
           }}
-          <!-- {{ scope.row.informationCategoryType == "OTHER" ? "其他" : "" }} -->
+          {{
+            scope.row.informationCategoryType == "NURSING_NEWS"
+              ? "护理新闻"
+              : ""
+          }}
         </template>
       </el-table-column>
 
@@ -203,6 +222,7 @@
             <el-input
               v-model.number="item.sort"
               maxlength="5"
+              oninput="value=value.replace(/[^\d]/g,'')"
               style="width: 200px"
               placeholder="请输入资讯分类排序"
             />
@@ -263,6 +283,7 @@
 
         <el-form-item label="资讯分类排序" prop="sort">
           <el-input
+            oninput="value=value.replace(/[^\d]/g,'')"
             v-model.number="form.sort"
             placeholder="请输入分类排序"
             style="width: 250px"
@@ -317,6 +338,10 @@ export default {
           value: "HEALTH_NOUS",
           label: "健康常识",
         },
+        {
+          value: "NURSING_NEWS",
+          label: "护理新闻",
+        },
       ],
       value: "",
       // 遮罩层

src/views/system/playRecordStatistics/index.vue

@@ -0,0 +1,467 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="130px"
+    >
+      <!-- <el-form-item label="学习培训订单id" prop="trainingOrderId">
+        <el-input
+          v-model="queryParams.trainingOrderId"
+          placeholder="请输入学习培训订单id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="培训项目表id，此处id是学习培训订单明细表中的项目id" prop="trainingItemId">
+        <el-input
+          v-model="queryParams.trainingItemId"
+          placeholder="请输入培训项目表id，此处id是学习培训订单明细表中的项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="培训项目标题" prop="trainingItemTitle">
+        <el-input
+          v-model="queryParams.trainingItemTitle"
+          placeholder="请输入培训项目标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="培训项目章节表id，此处id是学习培训订单章节信息表中的id" prop="trainingItemDirectoryId">
+        <el-input
+          v-model="queryParams.trainingItemDirectoryId"
+          placeholder="请输入培训项目章节表id，此处id是学习培训订单章节信息表中的id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="培训项目章节名称" prop="trainingItemDirectoryName">
+        <el-input
+          v-model="queryParams.trainingItemDirectoryName"
+          placeholder="请输入培训项目章节名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="护理员信息表id" prop="nurseStationPersonId">
+        <el-input
+          v-model="queryParams.nurseStationPersonId"
+          placeholder="请输入护理员信息表id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="护理站人员名称" prop="nursePersonName">
+        <el-input
+          v-model="queryParams.nursePersonName"
+          placeholder="请输入护理站人员名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="播放时间，格式：yyyy-MM-dd HH:mm:ss" prop="playTime">
+        <el-date-picker clearable
+          v-model="queryParams.playTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择播放时间，格式：yyyy-MM-dd HH:mm:ss">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="播放日期，格式：yyyy-MM-dd" prop="playDate">
+        <el-date-picker clearable
+          v-model="queryParams.playDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择播放日期，格式：yyyy-MM-dd">
+        </el-date-picker>
+      </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"
+          v-hasPermi="['system:playRecord:add']"
+        >新增</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:playRecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:playRecord:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:playRecord:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="playRecordList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column  width="55" align="center" />
+      <el-table-column
+        label="护理站人员名称"
+        align="center"
+        prop="nursePersonName"
+      />
+      <el-table-column
+        label="培训项目标题"
+        align="center"
+        prop="trainingItemTitle"
+      />
+      <!-- <el-table-column label="培训项目章节表id，此处id是学习培训订单章节信息表中的id" align="center" prop="trainingItemDirectoryId" /> -->
+      <el-table-column
+        label="培训项目章节名称"
+        align="center"
+        prop="trainingItemDirectoryName"
+      />
+      <!-- <el-table-column label="护理员信息表id" align="center" prop="nurseStationPersonId" /> -->
+
+      <el-table-column label="播放次数" align="center" prop="playCount" />
+
+      <el-table-column
+        label="播放时间"
+        align="center"
+        prop="playTime"
+        width="180"
+      >
+        <!-- <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.playTime, '{y}-{m}-{d}') }}</span>
+        </template> -->
+      </el-table-column>
+      <!-- <el-table-column label="播放日期" align="center" prop="playDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.playDate, '{y}-{m}-{d}') }}</span>
+        </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)"
+            v-hasPermi="['system:playRecord:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:playRecord:remove']"
+          >删除</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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="学习培训订单id" prop="trainingOrderId">
+          <el-input
+            v-model="form.trainingOrderId"
+            placeholder="请输入学习培训订单id"
+          />
+        </el-form-item>
+        <el-form-item
+          label="培训项目表id，此处id是学习培训订单明细表中的项目id"
+          prop="trainingItemId"
+        >
+          <el-input
+            v-model="form.trainingItemId"
+            placeholder="请输入培训项目表id，此处id是学习培训订单明细表中的项目id"
+          />
+        </el-form-item>
+        <el-form-item label="培训项目标题" prop="trainingItemTitle">
+          <el-input
+            v-model="form.trainingItemTitle"
+            placeholder="请输入培训项目标题"
+          />
+        </el-form-item>
+        <el-form-item
+          label="培训项目章节表id，此处id是学习培训订单章节信息表中的id"
+          prop="trainingItemDirectoryId"
+        >
+          <el-input
+            v-model="form.trainingItemDirectoryId"
+            placeholder="请输入培训项目章节表id，此处id是学习培训订单章节信息表中的id"
+          />
+        </el-form-item>
+        <el-form-item label="培训项目章节名称" prop="trainingItemDirectoryName">
+          <el-input
+            v-model="form.trainingItemDirectoryName"
+            placeholder="请输入培训项目章节名称"
+          />
+        </el-form-item>
+        <el-form-item label="护理员信息表id" prop="nurseStationPersonId">
+          <el-input
+            v-model="form.nurseStationPersonId"
+            placeholder="请输入护理员信息表id"
+          />
+        </el-form-item>
+        <el-form-item label="护理站人员名称" prop="nursePersonName">
+          <el-input
+            v-model="form.nursePersonName"
+            placeholder="请输入护理站人员名称"
+          />
+        </el-form-item>
+        <el-form-item
+          label="播放时间，格式：yyyy-MM-dd HH:mm:ss"
+          prop="playTime"
+        >
+          <el-date-picker
+            clearable
+            v-model="form.playTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择播放时间，格式：yyyy-MM-dd HH:mm:ss"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="播放日期，格式：yyyy-MM-dd" prop="playDate">
+          <el-date-picker
+            clearable
+            v-model="form.playDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择播放日期，格式：yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </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>
+  </div>
+</template>
+
+<script>
+import {
+  listPlayRecord,
+  getPlayRecord,
+  delPlayRecord,
+  addPlayRecord,
+  updatePlayRecord,
+} from "@/api/system/playRecord";
+
+export default {
+  name: "PlayRecord",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 学习培训项目播放日志记录表格数据
+      playRecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        trainingOrderId: null,
+        trainingItemId: null,
+        trainingItemTitle: null,
+        trainingItemDirectoryId: null,
+        trainingItemDirectoryName: null,
+        nurseStationPersonId: null,
+        nursePersonName: null,
+        playTime: null,
+        playDate: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询学习培训项目播放日志记录列表 */
+    getList() {
+      this.loading = true;
+      listPlayRecord(this.queryParams).then((response) => {
+        this.playRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        trainingOrderId: null,
+        trainingItemId: null,
+        trainingItemTitle: null,
+        trainingItemDirectoryId: null,
+        trainingItemDirectoryName: null,
+        nurseStationPersonId: null,
+        nursePersonName: null,
+        playTime: null,
+        playDate: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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;
+      getPlayRecord(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) {
+            updatePlayRecord(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPlayRecord(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 delPlayRecord(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/playRecord/export",
+        {
+          ...this.queryParams,
+        },
+        `playRecord_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/system/trainingAvatar/index.vue

@@ -1,65 +1,32 @@
 <template>
   <div>
     <div class="user-info-head" :class="video.VideoPath ? 'wihi' : ''" @click="editCropper()">
-      <video
+      <video style="width: 208px; height: 208px" v-bind:src="video.VideoPath" v-if="video.VideoPath"
-        style="width: 208px; height: 208px"
+        class="avatar video-avatar" controls="controls">您的浏览器不支持视频播放</video>
-        v-bind:src="video.VideoPath"
+      <i class="el-icon-plus avatar-uploader-icon" style="
-        v-if="video.VideoPath"
-        class="avatar video-avatar"
-        controls="controls"
-      >您的浏览器不支持视频播放</video>
-      <i
-        class="el-icon-plus avatar-uploader-icon"
-        style="
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
-        "
+          "></i>
-      ></i>
     </div>
-    <el-dialog
+    <el-dialog :title="title" :visible.sync="openimg" width="950px" append-to-body @opened="modalOpened"
-      :title="title"
+      @close="closeDialog">
-      :visible.sync="openimg"
-      width="950px"
-      append-to-body
-      @opened="modalOpened"
-      @close="closeDialog"
-    >
       <el-row>
         <el-col :xs="24" :md="24" :style="{ height: '350px' }">
           <div class="avatar-upload-preview">
-            <video
+            <video v-if="openimg" style="width: 100%; height: 100%" v-bind:src="videoForm.showVideoPath"
-              v-if="openimg"
+              class="avatar video-avatar" controls="controls">您的浏览器不支持视频播放</video>
-              style="width: 100%; height: 100%"
-              v-bind:src="videoForm.showVideoPath"
-              class="avatar video-avatar"
-              controls="controls"
-            >您的浏览器不支持视频播放</video>
           </div>
         </el-col>
       </el-row>
       <br />
-      <el-progress
+      <el-progress v-if="progressFlag" :percentage="loadProgress" style="height:30px;padding-bottom:20px"></el-progress>
-        v-if="progressFlag"
-        :percentage="loadProgress"
-        style="height:30px;padding-bottom:20px"
-      ></el-progress>
       <el-row style="padding-bottom:0px">
         <el-col :lg="3" :md="2">
-          <el-upload
+          <el-upload :show-file-list="false" class="upload-demo" ref="upload" :action="uploadurl"
-            :show-file-list="false"
+            :on-preview="handlePreview" :auto-upload="false" :on-change="loadJsonFromFile" :data="filedata"
-            class="upload-demo"
+            :headers="headers" :on-progress="uploadVideoProcess" :on-success="handleAvatarSuccess">
-            ref="upload"
-            :action="uploadurl"
-            :on-preview="handlePreview"
-            :auto-upload="false"
-            :on-change="loadJsonFromFile"
-            :data="filedata"
-            :headers="headers"
-            :on-progress="uploadVideoProcess"
-            :on-success="handleAvatarSuccess"
-          >
             <el-button slot="trigger" size="small" type="primary" style="float:left">选取文件</el-button>
           </el-upload>
         </el-col>
@@ -140,8 +107,10 @@ export default {
         this.uploadbtn = true;
         if (newimg == null) {
           this.video.VideoPath = null;
+          this.videoForm.showVideoPath = null
         } else if (newimg == "") {
           this.video.VideoPath = null;
+          this.videoForm.showVideoPath = null
         } else {
           this.videoForm.showVideoPath = process.env.VUE_APP_BASE_API + newimg;
           this.video.VideoPath = process.env.VUE_APP_BASE_API + newimg;
@@ -219,11 +188,15 @@ export default {
       };
     },
     handleAvatarSuccess(res, file) {
+      if (res.code == 200) {
         this.video.VideoPath = process.env.VUE_APP_BASE_API + res.imgUrl;
         this.items.itemDirectoryUrl = res.imgUrl;
         this.$emit("item", JSON.stringify(this.items));
         this.$modal.msgSuccess("上传视频成功");
         this.openimg = false;
+      } else {
+        this.$message.error(res.msg);
+      }
       this.uploadbtn = true;
     },
     // 上传图片
@@ -273,6 +246,7 @@ export default {
   left: 50%;
   transform: translate(-50%, 0%);
 }
+
 .avatar-upload-preview {
   position: absolute;
   top: 0%;
@@ -284,6 +258,7 @@ export default {
   box-shadow: 0 0 4px #ccc;
   overflow: hidden;
 }
+
 .user-info-head {
   position: relative;
   display: inline-block;
@@ -309,11 +284,13 @@ export default {
   line-height: 110px;
   border-radius: 50%;
 }
+
 .wihi {
   background-color: #fff;
   width: 100px;
   height: 100px;
 }
+
 .wihi:hover:after {
   transform: translate(50%, 50%);
 }

src/views/system/trainingCategory/index.vue

@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训分类排序" prop="trainingCategorySort">
+      <!-- <el-form-item label="培训分类排序" prop="trainingCategorySort">
         <el-input
           oninput="value=value.replace(/[^\d]/g,'')"
           maxlength="5"
@@ -42,7 +42,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"

src/views/system/trainingItem/index.vue

@@ -40,8 +40,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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>
 
@@ -54,7 +62,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:trainingItem:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -65,7 +74,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:trainingItem:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -76,7 +86,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:trainingItem:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -89,20 +100,144 @@
           >导出</el-button
         >
       </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
-
     <el-table
       v-loading="loading"
       :data="trainingItemList"
+      highlight-current-row
       @selection-change="handleSelectionChange"
+      @expand-change="info"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学习培训课程组名称" align="center" prop="trainingParentName" />
+      <el-table-column type="expand">
-      <el-table-column label="培训课程编号" align="center" prop="trainingItemCode" />
+        <template slot-scope="props">
-      <el-table-column property="trainingItemTitle" label="培训课程名称" align="center" />
+          <el-table
-      <el-table-column label="培训课程价格" align="center" prop="trainingItemPrice" />
+            :data="props.row.selectSubordinateItemlist"
-      <el-table-column label="培训课程类型" align="center" prop="trainingItemType">
+            style="width: 100%"
+            :header-cell-style="{ background: '#fff', color: '#606266' }"
+          >
+            <el-table-column
+              prop="trainingItemCode"
+              label="培训课程编号"
+              width="180"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="trainingItemTitle"
+              label="培训课程名称"
+              width="180"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="trainingItemPrice"
+              label="培训课程价格"
+              width="180"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="trainingItemType"
+              label="培训课程类型"
+              width="180"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.trainingItemType == "VIDEO_LEARNING"
+                    ? "视频学习"
+                    : ""
+                }}
+                {{
+                  scope.row.trainingItemType == "GRAPHIC_LEARNING"
+                    ? "图文学习"
+                    : ""
+                }}
+                {{
+                  scope.row.trainingItemType == "LIVE_COURSES" ? "直播课程" : ""
+                }}
+                {{
+                  scope.row.trainingItemType == "OFFLINE_TRAINING"
+                    ? "线下培训"
+                    : ""
+                }}
+                {{
+                  scope.row.trainingItemType == "LEARNING_ITEM_GROUP"
+                    ? "学习培训课程组"
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="trainingShelfFlag"
+              label="上架状态"
+            
+            >
+              <template slot-scope="scope">
+                {{ scope.row.trainingShelfFlag == 1 ? "已下架" : "" }}
+                {{ scope.row.trainingShelfFlag == 0 ? "已上架" : "" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="trainingItemSort"
+              label="培训课程排序"
+            
+            >
+            </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)"
+                  v-hasPermi="['system:trainingItem:edit']"
+                  >修改</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:trainingItem:remove']"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        label="学习培训课程组名称"
+        align="center"
+        prop="trainingParentName"
+      /> -->
+      <el-table-column
+        label="培训课程编号"
+        align="center"
+        prop="trainingItemCode"
+      />
+      <el-table-column
+        property="trainingItemTitle"
+        label="培训课程名称"
+        align="center"
+      />
+      <el-table-column
+        label="培训课程价格"
+        align="center"
+        prop="trainingItemPrice"
+      />
+      <el-table-column
+        label="培训课程类型"
+        align="center"
+        prop="trainingItemType"
+      >
         <template slot-scope="scope">
           {{ scope.row.trainingItemType == "VIDEO_LEARNING" ? "视频学习" : "" }}
           {{
@@ -122,7 +257,6 @@
       <el-table-column label="上架状态" align="center" prop="trainingShelfFlag">
         <template slot-scope="scope">
           <el-switch
-            v-if="scope.row.trainingItemType == 'LEARNING_ITEM_GROUP'"
             v-model="scope.row.trainingShelfFlag"
             active-color="#13ce66"
             inactive-color="#ff4949"
@@ -156,8 +290,16 @@
         width="180"
       >
       </el-table-column>-->
-      <el-table-column label="培训课程排序" align="center" prop="trainingItemSort" />
+      <el-table-column
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        label="培训课程排序"
+        align="center"
+        prop="trainingItemSort"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -165,14 +307,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:trainingItem:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:trainingItem:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -199,14 +343,22 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="分类编码" prop="trainingItemCode" label-width="120">
+        <el-form-item
+          label="分类编码"
+          prop="trainingItemCode"
+          label-width="120"
+        >
           <el-input
             v-model="trainingParentqueryParams.trainingItemCode"
             placeholder="请输入分类编码"
             clearable
           />
         </el-form-item>
-        <el-form-item label="培训课程组名称" prop="trainingParentName" label-width="120">
+        <el-form-item
+          label="培训课程组名称"
+          prop="trainingParentName"
+          label-width="120"
+        >
           <el-input
             v-model="trainingParentqueryParams.trainingParentName"
             placeholder="请输入培训课程组名称"
@@ -214,8 +366,16 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="trainingParentinfo">搜索</el-button>
+          <el-button
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerylist">重置</el-button>
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="trainingParentinfo"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerylist"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
 
@@ -247,8 +407,16 @@
           align="center"
           :show-overflow-tooltip="true"
         ></el-table-column>
-        <el-table-column property="trainingItemCode" label="培训分类编码" align="center"></el-table-column>
+        <el-table-column
-        <el-table-column property="trainingItemPrice" label="价格" align="center"></el-table-column>
+          property="trainingItemCode"
+          label="培训分类编码"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          property="trainingItemPrice"
+          label="价格"
+          align="center"
+        ></el-table-column>
 
         <!-- <el-table-column
           property="trainingItemType"
@@ -388,7 +556,13 @@
       width="1300px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px" :inline="true">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="140px"
+        :inline="true"
+      >
         <el-form-item label="培训课程名称" prop="trainingItemTitle">
           <el-input
             style="width: 250px"
@@ -432,7 +606,8 @@
               color: #c0c4cc;
               overflow: hidden;
             "
-          >{{ form.trainingParentName }}</el-button>
+            >{{ form.trainingParentName }}</el-button
+          >
           <el-button
             @click="trainingParentitem()"
             type
@@ -444,7 +619,8 @@
               padding-left: -10px;
               overflow: hidden;
             "
-          >{{ form.trainingParentName }}</el-button>
+            >{{ form.trainingParentName }}</el-button
+          >
         </el-form-item>
         <!-- <el-form-item
           label="所属培训课程分类"
@@ -496,7 +672,12 @@
         </el-form-item>
 
         <el-form-item label="是否可以购买" prop="buyFlag">
-          <el-select v-model="form.buyFlag" placeholder="请选择" clearable style="width: 250px">
+          <el-select
+            v-model="form.buyFlag"
+            placeholder="请选择"
+            clearable
+            style="width: 250px"
+          >
             <el-option
               v-for="item in option"
               :key="item.value"
@@ -644,14 +825,21 @@
           prop="trainingItemAddress"
           v-if="form.trainingItemType == 'OFFLINE_TRAINING'"
         >
-          <el-input v-model="form.trainingItemAddress" placeholder="请输入培训课程地址" />
+          <el-input
+            v-model="form.trainingItemAddress"
+            placeholder="请输入培训课程地址"
+          />
         </el-form-item>
         <el-form-item
           label="报名须知"
           prop="trainingItemNotes"
           v-if="form.trainingItemType == 'OFFLINE_TRAINING'"
         >
-          <el-input style="width: 250px" v-model="form.trainingItemNotes" placeholder="请输入报名须知" />
+          <el-input
+            style="width: 250px"
+            v-model="form.trainingItemNotes"
+            placeholder="请输入报名须知"
+          />
         </el-form-item>
         <el-table
           v-if="form.trainingItemType == 'VIDEO_LEARNING'"
@@ -771,8 +959,15 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" @click="addPictureUrl">新增</el-button>
+              <el-button size="mini" type="text" @click="addPictureUrl"
-              <el-button size="mini" type="text" @click="delPictureUrl(scope.row)">删除</el-button>
+                >新增</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="delPictureUrl(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -789,12 +984,13 @@
 import {
   listTrainingItem,
   listTrainingCategory,
+  selectSubordinateItem,
   selectTrainingParent,
   getTrainingItem,
   delTrainingItem,
   addTrainingItem,
   updateTrainingItem,
-  updateTrainingShelfFlag
+  updateTrainingShelfFlag,
 } from "@/api/system/trainingItem";
 import trainingAvatar from "../trainingAvatar/index.vue";
 import stationAcatar from "../stationAvatar/index.vue";
@@ -815,38 +1011,38 @@ export default {
         pageNum: 1,
         pageSize: 10,
         trainingItemCode: "",
-        trainingParentName: ""
+        trainingParentName: "",
       },
       trainingCategoryqueryParams: {
         pageNum: 1,
         pageSize: 10,
         trainingCategoryCode: "",
-        trainingCategoryName: ""
+        trainingCategoryName: "",
       },
       option: [
         {
           value: 0,
-          label: "是"
+          label: "是",
         },
         {
           value: 1,
-          label: "否"
+          label: "否",
-        }
+        },
       ],
       value: "",
       options: [
         {
           value: "GRAPHIC_LEARNING",
-          label: "图文学习"
+          label: "图文学习",
         },
         {
           value: "LEARNING_ITEM_GROUP",
-          label: "学习培训课程组"
+          label: "学习培训课程组",
         },
         {
           value: "VIDEO_LEARNING",
-          label: "视频学习"
+          label: "视频学习",
-        }
+        },
         // {
         //   value: "LIVE_COURSES",
         //   label: "直播课程",
@@ -892,7 +1088,7 @@ export default {
         trainingItemEndTime: null,
         trainingItemAddress: null,
         trainingItemNotes: null,
-        trainingItemSort: null
+        trainingItemSort: null,
       },
       // 表单参数
       form: {
@@ -902,9 +1098,9 @@ export default {
             itemDirectoryTitle: null,
             itemDirectoryUrl: null,
             itemDirectoryIntroduce: null,
-            itemDirectorySort: null
+            itemDirectorySort: null,
-          }
+          },
-        ]
+        ],
       },
       imgtwo: "",
       imgone: "",
@@ -921,7 +1117,7 @@ export default {
         //   { required: true, message: "请选择培训分类", trigger: "blur" },
         // ],
         trainingItemTitle: [
-          { required: true, message: "请输入培训课程名称", trigger: "blur" }
+          { required: true, message: "请输入培训课程名称", trigger: "blur" },
         ],
         // trainingItemPrice: [
         //   { required: true, message: "请输入培训课程价格", trigger: "blur" },
@@ -941,44 +1137,55 @@ export default {
         //   },
         // ],
         trainingItemType: [
-          { required: true, message: "请选择培训课程类型", trigger: "blur" }
+          { required: true, message: "请选择培训课程类型", trigger: "blur" },
         ],
         trainingItemDetails: [
-          { required: true, message: "请输入培训课程详情", trigger: "blur" }
+          { required: true, message: "请输入培训课程详情", trigger: "blur" },
         ],
         trainingItemContent: [
-          { required: true, message: "请输入培训课程内容", trigger: "blur" }
+          { required: true, message: "请输入培训课程内容", trigger: "blur" },
         ],
         trainingItemDate: [
-          { required: true, message: "请输入培训课程日期", trigger: "blur" }
+          { required: true, message: "请输入培训课程日期", trigger: "blur" },
         ],
         trainingItemStartTime: [
           {
             required: true,
             message: "请输入培训课程开始时间",
-            trigger: "blur"
+            trigger: "blur",
-          }
+          },
         ],
         trainingItemEndTime: [
           {
             required: true,
             message: "请输入培训课程结束时间",
-            trigger: "blur"
+            trigger: "blur",
-          }
+          },
         ],
         trainingItemAddress: [
-          { required: true, message: "请输入培训课程地址", trigger: "blur" }
+          { required: true, message: "请输入培训课程地址", trigger: "blur" },
-        ]
+        ],
         // trainingItemSort: [
         //   { required: true, message: "请输入培训课程排序", trigger: "blur" },
         // ],
-      }
+      },
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    info(row) {
+      if (!row.expand) {
+        // 先判断该行是否已经展开了
+        var trainingParentId = row.id;
+        selectSubordinateItem(trainingParentId).then((response) => {
+          row.selectSubordinateItemlist = response.data;
+          this.loading = false;
+          row.expand = true; // 设置展开行是打开的
+        });
+      }
+    },
     /**只能输入数字且有小数点最多保留两位*/
     checkPrice() {
       let checkPlan = "" + this.form.trainingItemPrice;
@@ -1006,7 +1213,7 @@ export default {
         itemDirectoryUrl: null,
         itemDirectoryIntroduce: null,
         itemDirectorySort: null,
-        idd: this.idd
+        idd: this.idd,
       };
       if (this.form.trainingItemDirectoryList.length >= 5) {
         this.$message.error("最多新增5条");
@@ -1021,16 +1228,18 @@ export default {
         if (this.form.trainingItemDirectoryList.length == 1) {
           this.$message.error("最后一条不可删除");
         } else {
-          this.form.trainingItemDirectoryList = this.form.trainingItemDirectoryList.filter(
+          this.form.trainingItemDirectoryList =
-            e => e.idd != item.idd
+            this.form.trainingItemDirectoryList.filter(
+              (e) => e.idd != item.idd
             );
         }
       } else if (!item.idd && item.trainingItemDirectoryId) {
         if (this.form.trainingItemDirectoryList.length == 1) {
           this.$message.error("最后一条不可删除");
         } else {
-          this.form.trainingItemDirectoryList = this.form.trainingItemDirectoryList.filter(
+          this.form.trainingItemDirectoryList =
-            e => e.trainingItemDirectoryId != item.trainingItemDirectoryId
+            this.form.trainingItemDirectoryList.filter(
+              (e) => e.trainingItemDirectoryId != item.trainingItemDirectoryId
             );
         }
       }
@@ -1040,13 +1249,13 @@ export default {
     itemDirectoryUrl(item) {
       let items = JSON.parse(item);
       if (items.idd && !items.trainingItemDirectoryId) {
-        this.form.trainingItemDirectoryList.forEach(e => {
+        this.form.trainingItemDirectoryList.forEach((e) => {
           if (e.idd == items.idd) {
             e.itemDirectoryUrl = items.itemDirectoryUrl;
           }
         });
       } else if (!items.idd && items.attributeDetailsId) {
-        this.form.trainingItemDirectoryList.forEach(e => {
+        this.form.trainingItemDirectoryList.forEach((e) => {
           if (e.attributeDetailsId == items.attributeDetailsId) {
             e.itemDirectoryUrl = items.itemDirectoryUrl;
           }
@@ -1054,7 +1263,6 @@ export default {
       }
     },
     imgs(item) {
-      console.log(item);
       this.imgsurl.pictureUrlList.push(item);
     },
     // 重置
@@ -1073,7 +1281,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         trainingCategoryCode: "",
-        trainingParentName: ""
+        trainingParentName: "",
       };
       this.trainingParentinfo();
     },
@@ -1117,7 +1325,7 @@ export default {
     // 父级课程组
     trainingParentinfo() {
       this.loading = true;
-      selectTrainingParent(this.trainingParentqueryParams).then(response => {
+      selectTrainingParent(this.trainingParentqueryParams).then((response) => {
         console.log(response);
         this.trainingParentlist = response.rows;
         this.total3 = response.total;
@@ -1132,7 +1340,6 @@ export default {
       this.form.trainingItemCoverUrl = imgUrl;
     },
     imgUrl3(imgUrl) {
-      console.log(imgUrl);
       this.form.trainingItemPosterUrl = imgUrl;
     },
     //上架
@@ -1141,15 +1348,17 @@ export default {
       if (row.trainingShelfFlag == false) {
         var obj = {
           id: row.id,
-          trainingShelfFlag: 1
+          trainingShelfFlag: 1,
+          trainingItemType: row.trainingItemType,
         };
       } else if (row.trainingShelfFlag == true) {
         var obj = {
           id: row.id,
-          trainingShelfFlag: 0
+          trainingShelfFlag: 0,
+          trainingItemType: row.trainingItemType,
         };
       }
-      updateTrainingShelfFlag(obj).then(res => {
+      updateTrainingShelfFlag(obj).then((res) => {
         if (obj.trainingShelfFlag == 0) {
           this.$modal.msgSuccess("已修改上架状态为上架");
         } else {
@@ -1161,15 +1370,18 @@ export default {
     /** 查询学习培训课程信息列表 */
     getList() {
       this.loading = true;
-      listTrainingItem(this.queryParams).then(response => {
+      listTrainingItem(this.queryParams).then((response) => {
-        this.trainingItemList = response.rows;
+        console.log(response);
-        response.rows.forEach(e => {
+        response.rows.forEach((e) => {
+          e.selectSubordinateItemlist = []; // 先给一个空值
+          e.expand = false; // 表示当前行是闭合的，不设置这个等下展开后就没法闭合了
           if (e.trainingShelfFlag == 0) {
             e.trainingShelfFlag = true;
           } else if (e.trainingShelfFlag == 1) {
             e.trainingShelfFlag = false;
           }
         });
+        this.trainingItemList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -1184,10 +1396,10 @@ export default {
         obj.pictureUrlList.push(this.form.trainingItemPosterUrl);
       }
       if (obj.pictureUrlList.length > 0) {
-        updatePicture(obj).then(res => {});
+        updatePicture(obj).then((res) => {});
       }
       if (this.imgsurl.pictureUrlList.length > 0) {
-        updatePicture(this.imgsurl).then(res => {});
+        updatePicture(this.imgsurl).then((res) => {});
       }
       this.imgsurl = { pictureUrlList: [] };
 
@@ -1204,8 +1416,8 @@ export default {
             itemDirectoryUrl: null,
             itemDirectoryIntroduce: null,
             itemDirectorySort: null,
-            idd: this.idd
+            idd: this.idd,
-          }
+          },
         ],
         trainingParentId: "",
         id: null,
@@ -1231,7 +1443,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -1248,7 +1460,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1262,9 +1474,9 @@ export default {
             itemDirectoryTitle: null,
             itemDirectoryUrl: null,
             itemDirectoryIntroduce: null,
-            itemDirectorySort: null
+            itemDirectorySort: null,
-          }
+          },
-        ]
+        ],
       };
       this.reset();
       this.open = true;
@@ -1275,13 +1487,13 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getTrainingItem(id).then(response => {
+      getTrainingItem(id).then((response) => {
         var obj = {
           itemDirectoryName: null,
           itemDirectoryTitle: null,
           itemDirectoryUrl: null,
           itemDirectoryIntroduce: null,
-          itemDirectorySort: null
+          itemDirectorySort: null,
         };
         if (response.data.trainingItemDirectoryList.length == 0) {
           response.data.trainingItemDirectoryList.push(obj);
@@ -1307,10 +1519,11 @@ export default {
       if (this.form.buyFlag === "") {
         this.form.buyFlag = null;
       }
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.trainingItemStartTime) {
-            this.form.trainingItemStartTimeStr = this.form.trainingItemStartTime;
+            this.form.trainingItemStartTimeStr =
+              this.form.trainingItemStartTime;
           } else {
             this.form.trainingItemStartTimeStr = "00:00:00";
           }
@@ -1321,7 +1534,7 @@ export default {
             this.form.trainingItemDirectoryList = [];
           }
           if (this.form.trainingItemId != null) {
-            updateTrainingItem(this.form).then(response => {
+            updateTrainingItem(this.form).then((response) => {
               var obj = { pictureUrlList: [] };
               if (this.imgone != this.form.trainingItemCoverUrl) {
                 obj.pictureUrlList.push(this.imgone);
@@ -1331,7 +1544,7 @@ export default {
               }
               this.imgsurl = { pictureUrlList: [] };
               if (obj.pictureUrlList.length > 0) {
-                updatePicture(obj).then(res => {});
+                updatePicture(obj).then((res) => {});
               }
               if (response.code == 200) {
                 this.$modal.msgSuccess("修改成功");
@@ -1340,7 +1553,7 @@ export default {
               }
             });
           } else {
-            addTrainingItem(this.form).then(response => {
+            addTrainingItem(this.form).then((response) => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -1374,12 +1587,12 @@ export default {
       this.download(
         "system/trainingItem/export",
         {
-          ...this.queryParams
+          ...this.queryParams,
         },
         `trainingItem_${new Date().getTime()}.xlsx`
       );
-    }
+    },
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/system/trainingOrder/index.vue

@@ -9,9 +9,11 @@
       label-width="100px"
     >
       <el-form-item label="所属护理站" prop="nurseStationName">
-        <el-button type class="stationbtn" @click="ParamsStation(true)">
+        <el-button
-          {{ queryParams.nurseStationName }}
+          type
-        </el-button>
+          class="stationbtn"
+          @click="ParamsStation(true)"
+        >{{ queryParams.nurseStationName }}</el-button>
       </el-form-item>
       <el-form-item label="护理员姓名" prop="nursePersonName">
         <el-input
@@ -38,11 +40,7 @@
         />
       </el-form-item>-->
       <el-form-item label="订单状态" prop="trainingOrderStatus">
-        <el-select
+        <el-select v-model="queryParams.trainingOrderStatus" placeholder="请选择订单状态" clearable>
-          v-model="queryParams.trainingOrderStatus"
-          placeholder="请选择订单状态"
-          clearable
-        >
           <el-option
             v-for="item in trainingOrderStatusoptions"
             :key="item.value"
@@ -52,89 +50,32 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          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">
-      <right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
     <el-table
       v-loading="loading"
       :data="trainingOrderList"
       @selection-change="handleSelectionChange"
     >
-      ]
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
-      <el-table-column
+      <el-table-column label="护理员姓名" align="center" prop="nursePersonName" />
-        label="所属护理站"
-        align="center"
-        prop="nurseStationName"
-      />
-      <el-table-column
-        label="护理员姓名"
-        align="center"
-        prop="nursePersonName"
-      />
       <el-table-column label="订单编号" align="center" prop="trainingOrderNo" />
-      <el-table-column
+      <el-table-column property="trainingItemTitle" label="培训课程名称" align="center" />
-        property="trainingItemTitle"
+      <el-table-column label="订单状态" align="center" prop="trainingOrderStatus">
-        label="培训课程名称"
-        align="center"
-      />
-      <el-table-column
-        label="订单状态"
-        align="center"
-        prop="trainingOrderStatus"
-      >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.trainingOrderStatus == 'WAIT_PAY'"
+          <el-button v-if="scope.row.trainingOrderStatus == 'WAIT_PAY'">待付款</el-button>
-            >待付款</el-button
+          <el-button type="primary" v-if="scope.row.trainingOrderStatus == 'PAY'">已付款</el-button>
-          >
+          <el-button type="danger" v-if="scope.row.trainingOrderStatus == 'CANCEL'">已取消</el-button>
-          <el-button
+          <el-button type="success" v-if="scope.row.trainingOrderStatus == 'REFUNDED'">已退款</el-button>
-            type="primary"
-            v-if="scope.row.trainingOrderStatus == 'PAY'"
-            >已付款</el-button
-          >
-          <el-button
-            type="warning"
-            v-if="scope.row.trainingOrderStatus == 'WAIT_REFUND'"
-            >退款中</el-button
-          >
-
-          <el-button
-            type="danger"
-            v-if="scope.row.trainingOrderStatus == 'CANCEL'"
-            >已取消</el-button
-          >
-          <el-button
-            type="success"
-            v-if="scope.row.trainingOrderStatus == 'REFUNDED'"
-            >已退款</el-button
-          >
         </template>
       </el-table-column>
-
+      <el-table-column label="订单金额" align="center" prop="trainingOrderAmount" />
-      <el-table-column
+      <el-table-column label="下单方式" align="center" prop="trainingOrderChannel">
-        label="订单金额"
-        align="center"
-        prop="trainingOrderAmount"
-      />
-      <el-table-column
-        label="下单方式"
-        align="center"
-        prop="trainingOrderChannel"
-      >
         <template slot-scope="scope">
           {{ scope.row.trainingOrderChannel == "MOBILE_APP" ? "手机App" : "" }}
           {{
@@ -149,27 +90,16 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="下单时间" align="center" prop="trainingOrderTime" width="180"></el-table-column>
-        label="下单时间"
-        align="center"
-        prop="trainingOrderTime"
-        width="180"
-      >
-      </el-table-column>
       <!-- <el-table-column label="备注信息" align="center" prop="remark" /> -->
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-zoom-in"
             @click="handleUpdate(scope.row)"
-            >查看</el-button
+          >查看</el-button>
-          >
 
           <el-button
             size="mini"
@@ -177,8 +107,7 @@
             icon="el-icon-error"
             @click="cencel(scope.row)"
             v-if="scope.row.trainingOrderStatus == 'PAY'"
-            >退款</el-button
+          >退款</el-button>
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -190,12 +119,7 @@
       @pagination="getList"
     />
     <!-- 退款弹框 -->
-    <el-dialog
+    <el-dialog title="退款" :visible.sync="innerrefund" append-to-body width="500px">
-      title="退款"
-      :visible.sync="innerrefund"
-      append-to-body
-      width="500px"
-    >
       <el-form :inline="true" :rules="rules" label-width="120px">
         <el-form-item label="订单编号" prop="trainingOrderNo">
           <el-input
@@ -255,19 +179,8 @@
       </div>
     </el-dialog>
     <!-- 查看学习培训订单主对话框 -->
-    <el-dialog
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
-      :title="title"
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
-      :visible.sync="open"
-      width="1200px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
         <el-form-item label="护理员姓名" prop="nursePersonName">
           <div class="text">{{ form.nursePersonName }}</div>
         </el-form-item>
@@ -289,16 +202,8 @@
           v-loading="loading"
           style="margin: 10px 0 20px 0; padding-bottom: 20px"
         >
-          <el-table-column
+          <el-table-column prop="trainingItemTitle" label="培训课程名称" align="center"></el-table-column>
-            prop="trainingItemTitle"
+          <el-table-column prop="trainingItemType" label="课程类型" align="center">
-            label="培训课程名称"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="trainingItemType"
-            label="课程类型"
-            align="center"
-          >
             <template slot-scope="scope">
               {{
               scope.row.trainingItemType == "VIDEO_LEARNING" ? "视频学习" : ""
@@ -323,37 +228,22 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-zoom-in"
                 @click="handlelook(scope.row)"
-                >查看</el-button
+              >查看</el-button>
-              >
             </template>
           </el-table-column>
         </el-table>
       </el-form>
     </el-dialog>
     <!-- 查看图文 -->
-    <el-dialog
+    <el-dialog title="查看图文" :visible.sync="innerrefundvideo" append-to-body width="1000px">
-      title="查看图文"
+      <el-form :inline="true" :rules="rules" label-width="130px" :model="formlist">
-      :visible.sync="innerrefundvideo"
-      append-to-body
-      width="1000px"
-    >
-      <el-form
-        :inline="true"
-        :rules="rules"
-        label-width="130px"
-        :model="formlist"
-      >
         <el-form-item
           label="培训课程详情"
           prop="trainingItemDetails"
@@ -364,7 +254,8 @@
         >
           <div class="textdetails">{{ formlist.trainingItemDetails }}</div>
         </el-form-item>
-        <el-form-item  :label="
+        <el-form-item
+          :label="
           formlist.trainingItemType == 'GRAPHIC_LEARNING'
             ? '培训课程内容'
             : formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
@@ -389,11 +280,7 @@
           <img class="img" :src="baseurl + formlist.trainingItemCoverUrl" alt />
         </el-form-item>
         <el-form-item label="培训课程海报图片" prop="trainingItemPosterUrl">
-          <img
+          <img class="img" :src="baseurl + formlist.trainingItemPosterUrl" alt />
-            class="img"
-            :src="baseurl + formlist.trainingItemPosterUrl"
-            alt
-          />
         </el-form-item>
         <el-table
           ref="list"
@@ -404,27 +291,17 @@
         >
           <el-table-column label="章节视频" align="center" width="300">
             <template slot-scope="scope">
-              <video
+              <video class="img" :src="baseurl + scope.row.itemDirectoryUrl" controls="controls"></video>
-                class="img"
-                :src="baseurl + scope.row.itemDirectoryUrl"
-                controls="controls"
-              ></video>
             </template>
           </el-table-column>
           <el-table-column label="章节名称" align="center">
             <template slot-scope="scope">
-              <el-input
+              <el-input v-model="scope.row.itemDirectoryName" placeholder="请输入章节名称"></el-input>
-                v-model="scope.row.itemDirectoryName"
-                placeholder="请输入章节名称"
-              ></el-input>
             </template>
           </el-table-column>
           <el-table-column label="章节标题" align="center">
             <template slot-scope="scope">
-              <el-input
+              <el-input v-model="scope.row.itemDirectoryTitle" placeholder="请输入章节标题"></el-input>
-                v-model="scope.row.itemDirectoryTitle"
-                placeholder="请输入章节标题"
-              ></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -438,42 +315,19 @@
       append-to-body
       :before-close="clicknurseStationshow"
     >
-      <el-form
+      <el-form ref="form" :model="getListByUserquery" label-width="110px" :inline="true">
-        ref="form"
-        :model="getListByUserquery"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="护理站编码" prop="nurseStationCode">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationCode" placeholder="请输入护理站编码" />
-            v-model="getListByUserquery.nurseStationCode"
-            placeholder="请输入护理站编码"
-          />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationName" placeholder="请输入护理站名称" />
-            v-model="getListByUserquery.nurseStationName"
-            placeholder="请输入护理站名称"
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="info"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="loading" :data="nurseStationlist" @cell-dblclick="choicestationid">
-        v-loading="loading"
-        :data="nurseStationlist"
-        @cell-dblclick="choicestationid"
-      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -492,21 +346,9 @@
             ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="nurseStationCode" label="护理站编码" align="center"></el-table-column>
-          property="nurseStationCode"
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></el-table-column>
-          label="护理站编码"
+        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          property="nurseStationName"
-          label="护理站名称"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          align="center"
-        ></el-table-column>
         <el-table-column
           property="address"
           label="护理站地址"
@@ -534,7 +376,7 @@ import {
   delTrainingOrder,
   xylWeChatRefundNotify,
   addTrainingOrder,
-  updateTrainingOrder,
+  updateTrainingOrder
 } from "@/api/system/trainingOrder";
 import stationAcatar from "../stationAvatar/index.vue";
 import editor from "@/components/Editor";
@@ -548,24 +390,20 @@ export default {
       trainingOrderStatusoptions: [
         {
           value: "WAIT_PAY",
-          label: "待付款",
+          label: "待付款"
         },
         {
           value: "PAY",
-          label: "已付款",
+          label: "已付款"
-        },
-        {
-          value: "WAIT_REFUND",
-          label: "退款中",
         },
         {
           value: "REFUNDED",
-          label: "已退款",
+          label: "已退款"
         },
         {
           value: "CANCEL",
-          label: "已取消",
+          label: "已取消"
-        },
+        }
       ],
       nurseStationshow: false,
       // 遮罩层
@@ -577,46 +415,46 @@ export default {
       trainingItemTypeoptions: [
         {
           value: "GRAPHIC_LEARNING",
-          label: "图文学习",
+          label: "图文学习"
         },
         {
           value: "LEARNING_ITEM_GROUP",
-          label: "学习培训项目组",
+          label: "学习培训项目组"
         },
         {
           value: "VIDEO_LEARNING",
-          label: "视频学习",
+          label: "视频学习"
-        },
+        }
       ],
       // 选中数组
       ids: [],
       optiondeflag: [
         {
           value: 0,
-          label: "否",
+          label: "否"
         },
         {
           value: 1,
-          label: "是",
+          label: "是"
-        },
+        }
       ],
       options: [
         {
           value: "MOBILE_APP",
-          label: "手机App",
+          label: "手机App"
         },
         {
           value: "WECHAT_APPLET",
-          label: "微信小程序",
+          label: "微信小程序"
         },
         {
           value: "ALI_PAY_APPLET",
-          label: "支付宝小程序",
+          label: "支付宝小程序"
-        },
+        }
       ],
       getListByUserquery: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       // 非单个禁用
       single: true,
@@ -652,7 +490,7 @@ export default {
       nurseStationlist: [],
       trainingOrderDetailsList: [],
       // 表单校验
-      rules: {},
+      rules: {}
     };
   },
   created() {
@@ -666,7 +504,7 @@ export default {
     },
     //护理站list
     info() {
-      getListByUser(this.getListByUserquery).then((res) => {
+      getListByUser(this.getListByUserquery).then(res => {
         this.nurseStationlist = res.rows;
         this.stationtotal = res.total;
       });
@@ -678,7 +516,7 @@ export default {
     stationcancel() {
       this.getListByUserquery = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       };
       this.info();
     },
@@ -693,13 +531,13 @@ export default {
       let items = JSON.parse(item);
       console.log(items);
       if (items.idd && !items.trainingItemDirectoryId) {
-        this.form.trainingItemDirectoryList.forEach((e) => {
+        this.form.trainingItemDirectoryList.forEach(e => {
           if (e.idd == items.idd) {
             e.itemDirectoryUrl = items.itemDirectoryUrl;
           }
         });
       } else if (!items.idd && items.attributeDetailsId) {
-        this.form.trainingItemDirectoryList.forEach((e) => {
+        this.form.trainingItemDirectoryList.forEach(e => {
           if (e.attributeDetailsId == items.attributeDetailsId) {
             e.itemDirectoryUrl = items.itemDirectoryUrl;
           }
@@ -714,7 +552,7 @@ export default {
     // // 确认退款
     cencel(row) {
       console.log(row);
-      refundInformation(row.id).then((response) => {
+      refundInformation(row.id).then(response => {
         this.query = response.data;
         this.innerrefund = true;
       });
@@ -728,9 +566,9 @@ export default {
       var obj = {
         orderNo: this.query.trainingOrderNo,
         refundPrice: this.query.trainingOrderAmount,
-        trainingOrderFlag: "TRAINING",
+        trainingOrderFlag: "TRAINING"
       };
-      xylWeChatRefundNotify(obj).then((res) => {
+      xylWeChatRefundNotify(obj).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("退款有延迟，请耐心等待");
         }
@@ -741,7 +579,7 @@ export default {
     /** 查询学习培训订单主列表 */
     getList() {
       this.loading = true;
-      listTrainingOrder(this.queryParams).then((response) => {
+      listTrainingOrder(this.queryParams).then(response => {
         this.trainingOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -762,7 +600,7 @@ export default {
       this.formlist.trainingItemDetails = row.trainingItemDetails;
       this.formlist.trainingItemContent = row.trainingItemContent;
       this.formlist.trainingItemType = row.trainingItemType;
-      orderItemDirectory(row.trainingOrderDetailsId).then((response) => {
+      orderItemDirectory(row.trainingOrderDetailsId).then(response => {
         this.formlist.list = response.rows;
         this.loading = false;
       });
@@ -785,7 +623,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
+        updateTime: null
       };
       this.resetForm("form");
     },
@@ -799,13 +637,13 @@ export default {
       this.resetForm("queryForm");
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       };
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -819,7 +657,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getTrainingOrder(id).then((response) => {
+      getTrainingOrder(id).then(response => {
         this.form = response.data;
         this.form.trainingOrderDetailsList =
           response.data.trainingOrderDetailsList;
@@ -839,10 +677,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateTrainingOrder(this.form).then((response) => {
+            updateTrainingOrder(this.form).then(response => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
@@ -850,7 +688,7 @@ export default {
               }
             });
           } else {
-            addTrainingOrder(this.form).then((response) => {
+            addTrainingOrder(this.form).then(response => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -880,12 +718,12 @@ export default {
       this.download(
         "system/trainingOrder/export",
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `trainingOrder_${new Date().getTime()}.xlsx`
       );
-    },
+    }
-  },
+  }
 };
 </script>
 <style lang="scss">
@@ -894,6 +732,7 @@ export default {
   height: 150px;
   margin-left: 10px;
 }
+
 .text {
   width: 250px;
   height: 36px;
@@ -904,6 +743,7 @@ export default {
   padding: 0 15px;
   border: 1px solid #e6ebf5;
 }
+
 .textdetail {
   width: 550px;
   // height: 600px;
@@ -914,6 +754,7 @@ export default {
   padding: 0 15px;
   border: 1px solid #e6ebf5;
 }
+
 .stationbtn {
   width: 208px;
   text-align: left;
@@ -921,6 +762,7 @@ export default {
   overflow: hidden;
   font-size: 14px;
 }
+
 .textdetails {
   width: 600px;
   // height: 300px;
@@ -931,12 +773,14 @@ export default {
   padding: 0 15px;
   border: 1px solid #e6ebf5;
 }
+
 ::v-deep .wihi {
   text-align: left !important;
   // width: 208px !important;
   // height: 208px !important;
   background: none;
 }
+
 ::v-deep .video-avatar {
   transform: translateX(-25%);
 }