Skip to content

P
pica.cloud.web-education-admin
提交 6ff6a192 编写于 作者: vino's avatar vino
浏览文件
操作

Merge remote-tracking branch 'origin/dev-circle-nine-20201231' into dev-circle-nine-20201231

上级 694152e0 920970e6
显示空白字符变更
内嵌 并排
正在显示 包含 79 行增加 和 318 行删除
src/utils/yqrange/yqrangeApi.js
浏览文件 @ 6ff6a192
......@@ -294,3 +294,23 @@ export const postCircleTree = (params) => {
description: '保存区域',
})
};
export const auditList = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/sso/activity/doctor/audit/list?doctorName=${params.doctorName}&titleManager=${params.titleManager}&auditStatus=${params.auditStatus}&pageNo=${params.pageNo}&pageSize=${params.pageSize}`),
method: 'get',
data: params,
description: '医生审核列表',
})
};
export const auditOperation = (params) => {
return fetch({
headers,
url: getBaseUrl('circle/sso/activity/doctor/audit'),
method: 'post',
data: params,
description: '医生审核',
})
};
\ No newline at end of file
src/views/activitymanagement/activity-management.vue
浏览文件 @ 6ff6a192
......@@ -3,30 +3,31 @@
<bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
<div class="yqrange-index-content screenSet">
<el-tabs v-model="activeName" @tab-click="tabChangeHandler">
<el-tab-pane label="活动管理" name="first">
<el-form ref="searchForm" :model="searchForm" label-width="75px" label-suffix=":" :inline="true">
<el-row :gutter="1" type="flex" style="margin-top: 10px">
<el-tab-pane label="活动管理" name="first" v-if="showAllFlag">
<el-form ref="searchForm" :model="searchForm" label-suffix=":" :inline="true">
<el-row type="flex" style="margin-top: 10px">
<el-col :span="5">
<el-form-item label="活动ID">
<el-input v-model="searchForm.activityId" size="small" placeholder="请输入活动ID"></el-input>
<el-input v-model="searchForm.activityId" size="mini" placeholder="请输入活动ID"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="后台标题">
<el-input v-model="searchForm.titleManager" size="small" placeholder="请输入后台标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="前台主标题">
<el-input v-model="searchForm.titleViewMain" size="small" placeholder="请输入前台主标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-col :span="4">
<el-form-item label="状态">
<el-select
v-model="searchForm.status"
placeholder="请选择"
size="small">
size="mini"
style="width: 100px;">
<el-option
v-for="item in statusList"
:key="item.value"
......@@ -36,18 +37,6 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="9">
<el-form-item label="创建时间">
<el-date-picker
v-model="searchForm.createdTime"
size="small"
type="date"
placeholder="请选择创建时间"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col> -->
<el-col :span="4" style="text-align: right">
<el-button type="primary" size="small" @click="search">搜索</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">取消搜索</el-button>
......@@ -55,7 +44,7 @@
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<el-button type="primary" size="small" @click="createActivity" v-if="showNewFlag">新建活动</el-button>
<el-button type="primary" size="small" @click="createActivity" >新建活动</el-button>
</el-col>
</el-row>
</el-form>
......@@ -76,19 +65,15 @@
</template>
</el-table-column>
<el-table-column prop="doctorCount" label="活动成员数" min-width="100" align="center"></el-table-column>
<el-table-column label="操作" min-width="370" align="center">
<template slot-scope="scope">
<el-button @click="editRange(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="deleteActivity(scope.row)" type="text" size="small">删除</el-button>
<el-button @click="publishRange(scope.row)" v-if="scope.row.status == 2" type="text" size="small">发布</el-button>
<el-button @click="unPublishRange(scope.row)" v-if="scope.row.status == 1" type="text" size="small">下线</el-button>
<el-button @click="activityManage(scope.row)" type="text" size="small">活动成员管理</el-button>
<!--<el-button @click="setting(scope.row)" type="text" size="small" v-if="scope.row.status != 0 && showNewFlag">应用配置</el-button>-->
</template>
</el-table-column>
</el-table>
......@@ -104,60 +89,17 @@
:total="totalRows"
></el-pagination>
</div>
<el-dialog
title="应用配置"
:visible.sync="dialogSettingVisible"
width="500px"
:close-on-click-modal="false"
@close="handleSettingClose"
center>
<el-form ref="settingForm" :model="settingForm"
label-width="150px"
label-suffix="："
class="basic-form">
<div v-for="(item, index) in settingForm.settingData" :key="index">
<el-form-item :label="item.appTagName">
<el-radio-group size="small" v-model="item.showOff">
<el-radio :label="1">开启</el-radio>
<el-radio :label="0">关闭</el-radio>
</el-radio-group>
</el-form-item>
</div>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: right;">
<el-button type="primary" @click="save" center>保存</el-button>
</div>
</el-dialog>
</el-tab-pane>
<el-tab-pane label="报名审核列表" name="second" v-if="showApplyFlag">
<el-tab-pane label="报名审核列表" name="second" v-if="showAllFlag">
<range-apply></range-apply>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { updateRangeStatus, getCircleSettingList, saveCircleSetting} from "../../utils/yqrange/yqrangeApi";
import { getActivityList,removeActivity,updateActivityStatus} from '@/utils/activitymanagement/activitymanagementApi';
import ElTabPane from "element-ui/packages/tabs/src/tab-pane";
import RangeApply from "./range-apply";
......@@ -172,8 +114,6 @@ export default {
curmbFirst: '活动管理',
activeName: 'first',
showAllFlag: false,
showNewFlag: false,
showApplyFlag: false,
searchForm: {
activityId:"",//活动id
titleManager: '',//后台标题方便管理
......@@ -188,11 +128,6 @@ export default {
},
totalRows: 0,
tableData: [],
dialogSettingVisible: false,
settingForm:{
circleId: null,
settingData: []
},
statusList: [
{
value: 1,
......@@ -216,60 +151,13 @@ export default {
initPrivilege(){
this.idType = localStorage.getItem('storageIdType');
// if(idType == null || idType == ""){
// idType = 2;
// localStorage.setItem('storageIdType', idType);
// }
this.searchForm.userType = this.idType;
// 内部用户:运营人员
if(this.idType == "1"){
this.showAllFlag = true;
this.showNewFlag = true;
this.showApplyFlag = true;
}
// 外部用户
else if(this.idType == "2"){
this.showAllFlag = false;
setTimeout(() => {
this.getUserAuth();
},800)
}
},
// 外部用户权限
getUserAuth(){
let highMainManager = localStorage.getItem('highMainManager');
let mainManager = localStorage.getItem('mainManager');
let manager = localStorage.getItem('manager');
let ordinary = localStorage.getItem('ordinary');
let createCircle = localStorage.getItem('createCircle');
// 新建小圈权限
if(createCircle == "1"){
this.showNewFlag = true;
}
else {
this.showNewFlag = false;
}
// 是否显示审核列表
if(highMainManager == "1" || mainManager == "1"){
// this.showNewFlag = true;
this.showApplyFlag = true;
}
else if(manager == "1"){
// this.showNewFlag = false;
this.showApplyFlag = true;
}
else if(ordinary == "1"){
this.showApplyFlag = false;
}
// localStorage.setItem('ordinary', vm.setStoreData(ordinary))
},
// 搜索
search(){
......@@ -280,8 +168,6 @@ export default {
searchList() {
openLoading(this);
let params = this.searchForm;
console.log('查询活动列表')
getActivityList(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
......@@ -291,17 +177,13 @@ export default {
this.tableData = [];
}
}).catch((error) => {
// this.$message({
// message: error,
// type: 'error'
// });
this.$message.error("请重试");
})
},
//删除活动
removeActivity(activityId){
let params = {
activityId: activityId,
"activityId": activityId
}
openLoading(this);
removeActivity(params).then((res) => {
......@@ -317,12 +199,13 @@ export default {
)
},
resetForm() {
this.searchForm.name = "";
this.searchForm.createdTime = "";
console.log('重置')
this.searchForm.activityId = "";
this.searchForm.titleManager = "";
this.searchForm.titleViewMain = "";
this.searchForm.status = "";
this.search();
},
//新建小圈
//新建活动
createActivity() {
let enterType = 1;//1:add 2 edit
this.$router.push({
......@@ -372,14 +255,8 @@ export default {
} else if(status == 1) {
this.$message.error("发布失败，请重试");
}
}
}).catch((error) => {
// this.$message({
// message: error,
// type: 'error'
// });
if(status == 2){
this.$message.error("下线失败，请重试");
} else if(status == 1) {
......@@ -403,26 +280,13 @@ export default {
type: 'warning',
customClass: 'range-make-box',
}).then(() => {
removeActivity(row.activityId);
this.removeActivity(row.activityId);
// confirm
}).catch(() => {
// cancel
});
},
//直播管理
liveManage(row) {
this.$router.push({
path: '/live-manage?id=' + row.id,
})
},
//成员管理
roleManage(row) {
this.$router.push({
path: '/role-manage?id=' + row.id,
})
},
//编辑
editRange(row) {
let enterType = 2;//1:add 2 edit
......@@ -435,23 +299,6 @@ export default {
}
})
},
//解散圈子
deleteRange(row) {
this.$confirm(`解散后圈子内的动态/直播等内容将不会保存`, `确定解散“${row.name}”吗？`, {
confirmButtonText: '解散',
cancelButtonText: '取消',
type: 'warning',
customClass: 'range-make-box',
}).then(() => {
this.updateStatus(row.id, "50");
// confirm
}).catch(() => {
// cancel
});
},
activityManage(row){
this.$router.push({
path: '/activity-member',
......@@ -463,70 +310,6 @@ export default {
})
},
// 应用配置
setting(row){
this.dialogSettingVisible = true;
this.settingForm.circleId = row.id;
let params = {
circleId: this.settingForm.circleId
// circleId: 22
}
getCircleSettingList(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
this.settingForm.settingData = res.data;
} else {
this.settingForm.settingData = [];
}
if(this.settingForm.settingData == [] || this.settingForm.settingData.length == 0){
this.settingForm.settingData = [{
appTag: 1,
showOff: 1
},
{
appTag: 2,
showOff: 1
},
{
appTag: 3,
showOff: 1
},
{
appTag: 4,
showOff: 1
}];
}
for(let i = 0; i < this.settingForm.settingData.length; i++){
if(this.settingForm.settingData[i].appTag == 1){
this.settingForm.settingData[i].appTagName = "教培"
}
else if(this.settingForm.settingData[i].appTag == 2){
this.settingForm.settingData[i].appTagName = "直播"
}
else if(this.settingForm.settingData[i].appTag == 3){
this.settingForm.settingData[i].appTagName = "继教课程"
}
else if(this.settingForm.settingData[i].appTag == 4){
this.settingForm.settingData[i].appTagName = "职称培训"
}
}
}).catch((error) => {
this.$message.error("请重试");
})
},
// 关闭
handleSettingClose(){
this.dialogSettingVisible = false;
},
handleSizeChange(val) {
this.searchForm.pageSize = val;
......@@ -536,32 +319,6 @@ export default {
this.searchForm.pageNo = val;
this.searchList();
},
// 保存
save(){
let params = {
apps: this.settingForm.settingData,
circleId: this.settingForm.circleId
}
saveCircleSetting(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
this.$message.success("保存成功！");
this.dialogSettingVisible = false;
}
}).catch((error) => {
this.$message.error("请重试");
})
},
getRangeNotice(){
this.$router.push({
path: '/range-notice'
})
}
},
}
......
src/views/activitymanagement/range-apply.vue
浏览文件 @ 6ff6a192
......@@ -5,14 +5,14 @@
<el-form ref="searchForm" :model="searchForm" label-width="75px" label-suffix=":" :inline="true">
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="8">
<el-input v-model="searchForm.name" size="small" placeholder="请输入申请人姓名"></el-input>
<el-input v-model="searchForm.doctorName" size="small" placeholder="请输入报名人姓名"></el-input>
</el-col>
<el-col :span="9">
<el-input v-model="searchForm.circleName" size="small" placeholder="请输入圈子名称"></el-input>
<el-input v-model="searchForm.titleManager" size="small" placeholder="请输入活动后台标题"></el-input>
</el-col>
<el-col :span="9">
<el-select
v-model="searchForm.status"
v-model="searchForm.auditStatus"
placeholder="全部审核状态"
size="small">
<el-option
......@@ -32,24 +32,24 @@
</el-row>
</el-form>
<el-table :data="tableData" class="item-table" style="width: 100%;margin-top: 10px;">
<el-table-column prop="name" label="申请人" min-width="100" align="center"></el-table-column>
<el-table-column prop="circleName" label="申请加入圈子" min-width="100" align="center"></el-table-column>
<el-table-column prop="department" label="所属科室" min-width="100" align="center"></el-table-column>
<el-table-column prop="hospital" label="所属医院" min-width="100" align="center"></el-table-column>
<el-table-column prop="doctorName" label="报名人" min-width="100" align="center"></el-table-column>
<el-table-column prop="activityName" label="报名参加活动" min-width="150" align="center"></el-table-column>
<el-table-column prop="departmentName" label="所属科室" min-width="100" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="所属医院" min-width="100" align="center"></el-table-column>
<el-table-column prop="provinceName" label="所属省份" min-width="100" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" min-width="100" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" min-width="100" align="center"></el-table-column>
<el-table-column prop="townName" label="所属街道" min-width="100" align="center"></el-table-column>
<el-table-column prop="status" label="审核状态" min-width="100" align="center">
<el-table-column prop="auditStatus" label="审核状态" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.status | circleApplyStatus }}</span>
<span>{{ scope.row.auditStatus | circleApplyStatus }}</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="370" align="center">
<template slot-scope="scope">
<div v-if="scope.row.status != 50">
<el-button @click="approve(scope.row)" type="text" size="small" v-if="scope.row.status != 0 && scope.row.status != 2">通过</el-button>
<el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.status != 0 && scope.row.status != 2">拒绝</el-button>
<el-table-column label="操作" min-width="200" align="center">
<template slot-scope="scope"> <!-- 1待审核 2已通过 3已拒绝 -->
<div>
<el-button @click="approve(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">通过</el-button>
<el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">拒绝</el-button>
</div>
</template>
</el-table-column>
......@@ -74,7 +74,7 @@
<script>
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { applyList, applyUpdate} from "../../utils/yqrange/yqrangeApi";
import { auditList, auditOperation, applyList, applyUpdate} from "../../utils/yqrange/yqrangeApi";
export default {
components: {
BreadCrumb
......@@ -85,10 +85,10 @@
showAllFlag: false,
showNewFlag: false,
searchForm: {
name: '',
circleName: '',
doctorName: '',
titleManager: '',
// endTime: '',
status: -1,
auditStatus: 1,
pageNo: 1,
pageSize: 10,
},
......@@ -100,14 +100,6 @@
settingData: []
},
statusList: [
{
value: -1,
label: "全部状态"
},
{
value: 0,
label: "已拒绝"
},
{
value: 1,
label: "待审核"
......@@ -116,12 +108,16 @@
value: 2,
label: "已通过"
},
{
value: 3,
label: "已拒绝"
},
],
dialogVisible: false
}
},
created() {
this.initPrivilege();
// this.initPrivilege();
this.search(1);
},
methods: {
......@@ -178,10 +174,11 @@
openLoading(this);
}
let params = this.searchForm;
applyList(params).then((res) => {
console.log("searchList() : params = " + JSON.stringify(params))
auditList(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
this.tableData = res.data.list;
this.tableData = res.data.activityDoctorAuditModelList;
this.totalRows = res.data.total;
} else {
this.tableData = [];
......@@ -196,9 +193,9 @@
},
resetForm() {
this.searchForm.name = "";
this.searchForm.circleName = "";
this.searchForm.status = -1;
this.searchForm.doctorName = "";
this.searchForm.titleManager = "";
this.searchForm.auditStatus = 1;
console.log('重置')
this.search();
},
......@@ -206,7 +203,8 @@
// 更新圈子状态（上线，下线）
updateStatus(params){
applyUpdate(params).then((res) => {
console.log("updateStatus() : params = " + JSON.stringify(params));
auditOperation(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
this.$message.success("成功");
......@@ -220,21 +218,14 @@
// type: 'error'
// });
this.$message.error("请重试");
})
},
// 0:拒绝，1:待审核；2.通过
// 1:待审核，2.通过，3:拒绝
approve(row){
let params = {
applyList: [{
"circleId": row.circleId,
"doctorId": row.doctorId,
"status": 2
}]
"accept": true,
"auditRecordId": row.auditRecordId,
};
this.updateStatus(params);
......@@ -242,23 +233,18 @@
//拒绝
reject(row) {
let params = {
applyList: [{
"circleId": row.circleId,
"doctorId": row.doctorId,
"status": 0
}]
"accept": true,
"auditRecordId": row.auditRecordId,
};
this.$confirm(`拒绝后"${row.name}"将无法访问"${row.circleName}"`, `确认拒绝`, {
this.$confirm(`拒绝后"${row.doctorName}"将无法访问"${row.activityName}"`, `确认拒绝`, {
confirmButtonText: '拒绝',
cancelButtonText: '取消',
type: 'warning',
customClass: 'range-make-box',
}).then(() => {
this.updateStatus(params);
// confirm
this.updateStatus(params);
}).catch(() => {
// cancel
});
......@@ -279,8 +265,6 @@
this.searchForm.pageNo = val;
this.searchList();
},
},
}
</script>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或