Merge remote-tracking branch 'origin/dev'

This commit is contained in:
纪寒 2023-05-10 15:08:29 +08:00
commit 725e00511d
7 changed files with 892 additions and 193 deletions

View File

@ -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'
})
}

View File

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

View File

@ -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>

View File

@ -1,65 +1,32 @@
<template>
<div>
<div class="user-info-head" :class="video.VideoPath ? 'wihi' : ''" @click="editCropper()">
<video
style="width: 208px; height: 208px"
v-bind:src="video.VideoPath"
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>
<video style="width: 208px; height: 208px" v-bind:src="video.VideoPath" 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>
</div>
<el-dialog
:title="title"
:visible.sync="openimg"
width="950px"
append-to-body
@opened="modalOpened"
@close="closeDialog"
>
<el-dialog :title="title" :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
v-if="openimg"
style="width: 100%; height: 100%"
v-bind:src="videoForm.showVideoPath"
class="avatar video-avatar"
controls="controls"
>您的浏览器不支持视频播放</video>
<video v-if="openimg" 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
v-if="progressFlag"
:percentage="loadProgress"
style="height:30px;padding-bottom:20px"
></el-progress>
<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
:show-file-list="false"
class="upload-demo"
ref="upload"
:action="uploadurl"
:on-preview="handlePreview"
:auto-upload="false"
:on-change="loadJsonFromFile"
:data="filedata"
:headers="headers"
:on-progress="uploadVideoProcess"
:on-success="handleAvatarSuccess"
>
<el-upload :show-file-list="false" class="upload-demo" 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;
@ -184,7 +153,7 @@ export default {
this.uploadbtn = false;
this.$refs.upload.submit();
},
handlePreview(file) {},
handlePreview(file) { },
//
editCropper() {
this.openimg = true;
@ -194,7 +163,7 @@ export default {
this.visible = true;
},
//
requestUpload() {},
requestUpload() { },
//
rotateLeft() {
this.$refs.cropper.rotateLeft();
@ -219,11 +188,15 @@ export default {
};
},
handleAvatarSuccess(res, file) {
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;
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%);
}

View File

@ -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"

View File

@ -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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<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,41 +100,163 @@
>导出</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 label="培训课程编号" align="center" prop="trainingItemCode" />
<el-table-column property="trainingItemTitle" label="培训课程名称" align="center" />
<el-table-column type="expand">
<template slot-scope="props">
<el-table
:data="props.row.selectSubordinateItemlist"
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 label="培训课程价格" align="center" prop="trainingItemPrice" />
<el-table-column label="培训课程类型" align="center" prop="trainingItemType">
<el-table-column
prop="trainingShelfFlag"
label="上架状态"
width="180"
>
<template slot-scope="scope">
{{ scope.row.trainingShelfFlag == 1 ? "已下架" : "" }}
{{ scope.row.trainingShelfFlag == 0 ? "已上架" : "" }}
</template>
</el-table-column>
<el-table-column
prop="trainingItemSort"
label="培训课程排序"
width="180"
>
</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" ? "视频学习" : "" }}
{{
scope.row.trainingItemType == "GRAPHIC_LEARNING" ? "图文学习" : ""
scope.row.trainingItemType == "GRAPHIC_LEARNING" ? "图文学习" : ""
}}
{{ scope.row.trainingItemType == "LIVE_COURSES" ? "直播课程" : "" }}
{{
scope.row.trainingItemType == "OFFLINE_TRAINING" ? "线下培训" : ""
scope.row.trainingItemType == "OFFLINE_TRAINING" ? "线下培训" : ""
}}
{{
scope.row.trainingItemType == "LEARNING_ITEM_GROUP"
? "学习培训课程组"
: ""
scope.row.trainingItemType == "LEARNING_ITEM_GROUP"
? "学习培训课程组"
: ""
}}
</template>
</el-table-column>
<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"
@ -157,8 +290,16 @@
width="180"
>
</el-table-column>-->
<el-table-column label="培训课程排序" align="center" prop="trainingItemSort" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
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"
@ -166,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>
@ -200,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="请输入培训课程组名称"
@ -215,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 icon="el-icon-refresh" size="mini" @click="resetQuerylist">重置</el-button>
<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>
@ -248,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 property="trainingItemPrice" label="价格" align="center"></el-table-column>
<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"
@ -389,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"
@ -433,7 +606,8 @@
color: #c0c4cc;
overflow: hidden;
"
>{{ form.trainingParentName }}</el-button>
>{{ form.trainingParentName }}</el-button
>
<el-button
@click="trainingParentitem()"
type
@ -445,7 +619,8 @@
padding-left: -10px;
overflow: hidden;
"
>{{ form.trainingParentName }}</el-button>
>{{ form.trainingParentName }}</el-button
>
</el-form-item>
<!-- <el-form-item
label="所属培训课程分类"
@ -497,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"
@ -645,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'"
@ -772,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="delPictureUrl(scope.row)">删除</el-button>
<el-button size="mini" type="text" @click="addPictureUrl"
>新增</el-button
>
<el-button
size="mini"
type="text"
@click="delPictureUrl(scope.row)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
@ -785,26 +979,26 @@
</el-dialog>
</div>
</template>
<script>
import {
listTrainingItem,
listTrainingCategory,
selectSubordinateItem,
selectTrainingParent,
getTrainingItem,
delTrainingItem,
addTrainingItem,
updateTrainingItem,
updateTrainingShelfFlag
updateTrainingShelfFlag,
} from "@/api/system/trainingItem";
import stationAcatar from "../stationAvatar/index.vue";
import trainingAvatar from "../trainingAvatar/index.vue";
import stationAcatar from "../stationAvatar/index.vue";
import editor from "@/components/Editor";
import { updatePicture } from "@/api/system/station";
export default {
name: "TrainingItem",
components: { stationAcatar, editor, trainingAvatar },
data() {
return {
//
@ -817,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: "",
@ -894,7 +1088,7 @@ export default {
trainingItemEndTime: null,
trainingItemAddress: null,
trainingItemNotes: null,
trainingItemSort: null
trainingItemSort: null,
},
//
form: {
@ -904,9 +1098,9 @@ export default {
itemDirectoryTitle: null,
itemDirectoryUrl: null,
itemDirectoryIntroduce: null,
itemDirectorySort: null
}
]
itemDirectorySort: null,
},
],
},
imgtwo: "",
imgone: "",
@ -923,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" },
@ -943,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;
@ -999,7 +1204,6 @@ export default {
}
this.form.trainingItemPrice = checkPlan;
},
//
addPictureUrl() {
this.idd++;
@ -1009,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条");
@ -1024,32 +1228,34 @@ export default {
if (this.form.trainingItemDirectoryList.length == 1) {
this.$message.error("最后一条不可删除");
} else {
this.form.trainingItemDirectoryList = this.form.trainingItemDirectoryList.filter(
e => e.idd != item.idd
);
this.form.trainingItemDirectoryList =
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(
e => e.trainingItemDirectoryId != item.trainingItemDirectoryId
);
this.form.trainingItemDirectoryList =
this.form.trainingItemDirectoryList.filter(
(e) => e.trainingItemDirectoryId != item.trainingItemDirectoryId
);
}
}
console.log(this.form.trainingItemDirectoryList);
},
//
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;
}
@ -1057,7 +1263,6 @@ export default {
}
},
imgs(item) {
console.log(item);
this.imgsurl.pictureUrlList.push(item);
},
//
@ -1076,7 +1281,7 @@ export default {
pageNum: 1,
pageSize: 10,
trainingCategoryCode: "",
trainingParentName: ""
trainingParentName: "",
};
this.trainingParentinfo();
},
@ -1120,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;
@ -1135,7 +1340,6 @@ export default {
this.form.trainingItemCoverUrl = imgUrl;
},
imgUrl3(imgUrl) {
console.log(imgUrl);
this.form.trainingItemPosterUrl = imgUrl;
},
//
@ -1144,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 {
@ -1164,15 +1370,18 @@ export default {
/** 查询学习培训课程信息列表 */
getList() {
this.loading = true;
listTrainingItem(this.queryParams).then(response => {
this.trainingItemList = response.rows;
response.rows.forEach(e => {
listTrainingItem(this.queryParams).then((response) => {
console.log(response);
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;
});
@ -1187,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: [] };
@ -1207,8 +1416,8 @@ export default {
itemDirectoryUrl: null,
itemDirectoryIntroduce: null,
itemDirectorySort: null,
idd: this.idd
}
idd: this.idd,
},
],
trainingParentId: "",
id: null,
@ -1234,7 +1443,7 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
updateTime: null,
};
this.resetForm("form");
},
@ -1251,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;
},
@ -1265,9 +1474,9 @@ export default {
itemDirectoryTitle: null,
itemDirectoryUrl: null,
itemDirectoryIntroduce: null,
itemDirectorySort: null
}
]
itemDirectorySort: null,
},
],
};
this.reset();
this.open = true;
@ -1278,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);
@ -1299,9 +1508,6 @@ export default {
},
/** 提交按钮 */
submitForm() {
if (this.form.buyFlag === "") {
this.form.buyFlag = null;
}
if (this.form.trainingItemPrice) {
this.form.trainingItemPrice = Number(this.form.trainingItemPrice);
} else {
@ -1310,10 +1516,14 @@ export default {
if (!this.form.trainingItemSort) {
this.form.trainingItemSort = null;
}
this.$refs["form"].validate(valid => {
if (this.form.buyFlag === "") {
this.form.buyFlag = null;
}
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";
}
@ -1324,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);
@ -1334,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("修改成功");
@ -1343,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;
@ -1356,7 +1566,6 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row);
const ids = row.id || this.ids;
const trainingItemTitles =
row.trainingItemTitle || this.trainingItemTitles;
@ -1364,7 +1573,7 @@ export default {
.confirm(
'是否确认删除培训课程名称为"' + trainingItemTitles + '"的数据项?'
)
.then(function() {
.then(function () {
return delTrainingItem(ids);
})
.then(() => {
@ -1378,12 +1587,12 @@ export default {
this.download(
"system/trainingItem/export",
{
...this.queryParams
...this.queryParams,
},
`trainingItem_${new Date().getTime()}.xlsx`
);
}
}
},
},
};
</script>
<style lang="scss" scoped>
@ -1394,9 +1603,9 @@ export default {
background: none;
}
::v-deep .wihi:hover:after {
transform: translate(0%, 30%);
transform: translate(0%, 40%);
}
::v-deep .video-avatar {
transform: translateX(-25%);
}
</style>
</style>

View File

@ -68,7 +68,6 @@
:data="trainingOrderList"
@selection-change="handleSelectionChange"
>
]
<el-table-column label="所属护理站" align="center" prop="nurseStationName" />
<el-table-column label="护理员姓名" align="center" prop="nursePersonName" />
<el-table-column label="订单编号" align="center" prop="trainingOrderNo" />
@ -77,13 +76,10 @@
<template slot-scope="scope">
<el-button v-if="scope.row.trainingOrderStatus == 'WAIT_PAY'">待付款</el-button>
<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 label="下单方式" align="center" prop="trainingOrderChannel">
<template slot-scope="scope">
@ -110,7 +106,6 @@
icon="el-icon-zoom-in"
@click="handleUpdate(scope.row)"
>查看</el-button>
<el-button
size="mini"
type="text"
@ -121,7 +116,6 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
@ -202,7 +196,6 @@
<el-form-item label="订单金额" prop="trainingOrderAmount">
<div class="text">{{ form.trainingOrderAmount }}</div>
</el-form-item>
<el-form-item label="下单方式" prop="trainingOrderChannel">
<div class="text">{{ form.trainingOrderChannel }}</div>
</el-form-item>
@ -261,25 +254,25 @@
label="培训课程详情"
prop="trainingItemDetails"
v-if="
formlist.trainingItemType == 'VIDEO_LEARNING' ||
formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
"
formlist.trainingItemType == 'VIDEO_LEARNING' ||
formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
"
>
<div class="textdetails">{{ formlist.trainingItemDetails }}</div>
</el-form-item>
<el-form-item
:label="
formlist.trainingItemType == 'GRAPHIC_LEARNING'
? '培训课程内容'
: formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
formlist.trainingItemType == 'GRAPHIC_LEARNING'
? '培训课程内容'
: formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
? '培训课程介绍'
: ''
"
"
prop="trainingItemContent"
v-if="
formlist.trainingItemType == 'GRAPHIC_LEARNING' ||
formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
"
formlist.trainingItemType == 'GRAPHIC_LEARNING' ||
formlist.trainingItemType == 'LEARNING_ITEM_GROUP'
"
>
<editor
@imgs="imgs"
@ -323,7 +316,7 @@
</div>
</template>
<script>
<script>
import {
listTrainingOrder,
getTrainingOrder,
@ -352,10 +345,6 @@ export default {
value: "PAY",
label: "已付款"
},
{
value: "WAIT_REFUND",
label: "退款中"
},
{
value: "REFUNDED",
label: "已退款"
@ -691,12 +680,13 @@ export default {
}
};
</script>
<style lang="scss">
<style lang="scss">
.img {
width: 150px;
height: 150px;
margin-left: 10px;
}
.text {
width: 250px;
height: 36px;
@ -707,6 +697,7 @@ export default {
padding: 0 15px;
border: 1px solid #e6ebf5;
}
.textdetail {
width: 550px;
// height: 600px;
@ -717,6 +708,7 @@ export default {
padding: 0 15px;
border: 1px solid #e6ebf5;
}
.stationbtn {
width: 208px;
text-align: left;
@ -724,6 +716,7 @@ export default {
overflow: hidden;
font-size: 14px;
}
.textdetails {
width: 600px;
// height: 300px;
@ -734,12 +727,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%);
}