Skip to content

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

Merge branch 'dev-mvp-20200331' of... 

Merge branch 'dev-mvp-20200331' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331
上级 0b2d20b9 82e9bf06
隐藏空白字符变更
内嵌 并排
正在显示 包含 119 行增加 和 131 行删除
src/views/education/edu-role.vue
浏览文件 @ ef273ce6
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb> <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="component-content screenSet" id="screenSet"> <div class="component-content screenSet" id="screenSet">
<div class="header-title">模板管理</div> <div class="header-title">发起教培项目赋权</div>
<el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;"> <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
<el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;"> <el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="手机号："> <el-form-item label="手机号：">
<el-input v-model="formInline.phoneNumber" size="small" placeholder="请输入"></el-input> <el-input v-model="formInline.mobilePhone" size="small" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="padding:0;text-align:right;padding-right:15px;"> <el-col :span="12" style="padding:0;text-align:right;padding-right:15px;">
...@@ -21,26 +21,30 @@ ...@@ -21,26 +21,30 @@
</el-row> </el-row>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="name" label="模板名称" align="center"></el-table-column> <el-table-column prop="name" label="用户名" align="center"></el-table-column>
<el-table-column prop="phoneNumner" label="手机号" align="center"></el-table-column> <el-table-column prop="mobilePhone" label="手机号" align="center"></el-table-column>
<el-table-column prop="jigou" label="所属机构" align="center"></el-table-column> <el-table-column prop="hospitalName" label="所属机构" align="center"></el-table-column>
<el-table-column prop="diqu" label="所属地区" align="center"></el-table-column> <el-table-column prop="provinceName" label="所属地区" align="center">
<el-table-column prop="projectStatus" label="状态" align="center"> <template slot-scope="scope">
<span>{{ scope.row.provinceName }}{{ scope.row.cityName }}{{ scope.row.countyName }}{{ scope.row.townName }}</span>
</template>
</el-table-column>
<el-table-column prop="projectStatus" label="权限状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.status | roleStatus }}</span> <span>{{ scope.row.roleFlag ? '已开通' : '未开通' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" align="center"> <el-table-column fixed="right" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click="changeStatus(scope.row,0)" @click="changeStatus(scope.row,0)"
v-show="scope.row.status == 0" v-if="scope.row.roleFlag == false"
type="primary" type="primary"
size="small" size="small"
>开通权限</el-button> >开通权限</el-button>
<el-button <el-button
@click="changeStatus(scope.row,1)" @click="changeStatus(scope.row,1)"
v-show="scope.row.status == 1" v-if="scope.row.roleFlag == true"
type="primary" type="primary"
size="small" size="small"
>关闭权限</el-button> >关闭权限</el-button>
...@@ -49,7 +53,7 @@ ...@@ -49,7 +53,7 @@
<div slot="empty"> <div slot="empty">
<div class="table-empty"> <div class="table-empty">
<img src="../../assets/image/no-content1.png"> <img src="../../assets/image/no-content1.png">
<p>没有搜索到该手机号,请重新搜索</p> <p class="text">没有搜索到该手机号,请重新搜索</p>
</div> </div>
</div> </div>
</el-table > </el-table >
...@@ -67,142 +71,128 @@ ...@@ -67,142 +71,128 @@
></el-pagination> ></el-pagination>
</div> </div>
<dialog-compont :dialogObj="downObj" @confirm="downConfirm" @hide="downHide"></dialog-compont> <!-- 修改状态 -->
<dialog-compont :dialogObj="passObj" @confirm="passConfirm" @hide="passHide"></dialog-compont> <el-dialog
:title="changeStatusConfig.title"
:show-close=false
:visible.sync="changeStatusVisible"
:close-on-click-modal="false"
width="600px"
center>
<p style="text-align: center;">{{changeStatusConfig.message}}</p>
<span slot="footer" class="dialog-footer">
<el-button @click="changeStatusVisible=false">取 消</el-button>
<el-button type="primary" @click="changeStatusConfirm">确 认</el-button>
</span>
</el-dialog>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import BreadCrumb from "../../components/breadcrumb.vue"; import BreadCrumb from "../../components/breadcrumb.vue";
import dialog from "../../components/education/template/dialog";
import { openLoading, closeLoading } from "../../utils/utils"; import { openLoading, closeLoading } from "../../utils/utils";
import * as commonUtil from "../../utils/utils"; import * as commonUtil from "../../utils/utils";
let vm = null; let vm = null;
export default { export default {
data() { data() {
return { return {
curmbFirst: "教培项目", curmbFirst: "角色权限",
curmbSecond: "模板管理", curmbSecond: "发起教培项目赋权",
formInline: { formInline: {
phoneNumber: '', mobilePhone: '',
pageSize: 15, pageSize: 10,
pageNo: 1 pageNo: 1
}, },
tableData: [ tableData: [],
{
name: '王小二',
phoneNumner: '136638902819',
jigou: '尼山中心医院',
diqu: '山东省曲阜市角力中你山乡',
status: 0
},
{
name: '王小二',
phoneNumner: '136638902819',
jigou: '尼山中心医院',
diqu: '山东省曲阜市角力中你山乡',
status: 1
}
],
totalRows: 10, totalRows: 10,
deleteVisible: false, // 删除弹框显示与否 changeStatusVisible: false,
downObj: { doctorId: 0,
title: '确认要下架该项目模板吗？', needChangeStatus: true,
message: '下架后,用户则无法查看项目', changeStatusConfig: {
visible: false title: '确认要开通权限操作吗？',
}, message: '一旦开通，该用户可查看并创建外部教培项目',
passObj: {
title: '确认要通过该项目模板审核吗？',
message: '审核通过后,用户可在工作站查看或购买该项目模板',
visible: false
},
rejectObj: {
title: '确认要拒绝该项目模板吗？',
message: '拒绝后该项目模板将从列表中消失',
visible: false
}, },
idType: 1 //idType 1为内部项目，其他为外部项目 idType: 1 //idType 1为内部项目，其他为外部项目
} }
}, },
components: { components: {
BreadCrumb, BreadCrumb,
dialogCompont: dialog
}, },
created() { created() {
vm = this; vm = this;
vm.idType = localStorage.getItem('storageIdType'); vm.idType = localStorage.getItem('storageIdType');
// vm.searchList(); this.searchList();
}, },
mounte() { mounte() {
commonUtil.resizeHeight(); commonUtil.resizeHeight();
}, },
methods: { methods: {
// 查询列表 // 查询列表
searchList() { searchList() {
let req = {}; let req = {};
req = vm.formInline; req = vm.formInline;
openLoading(vm); openLoading(vm);
vm.GET("openTemplate/getOpenTemplateList", req).then(res => { vm.GET("portal/portalProjectOrRole/doctor/list", req).then(res => {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
// vm.tableData = res.data.data; vm.tableData = res.data.doctorList;
// vm.totalRows = res.data.totalRows; vm.totalRows = res.data.totalCnt;
// }
console.log('====================================');
console.log( res.data.data);
console.log('====================================');
} }
}); });
}, },
// 重置搜索 // 重置搜索
resetForm() {}, resetForm() {
// 改变状态 vm.formInline.mobilePhone = '';
changeStatus(row,type) {
if (type == 1) {
vm.passObj.visible = true;
}
},
//删除
deleteRow() {
vm.deleteVisible = true;
}, },
// 删除项目
confirmDelete() { // 已开通: true; 未开通: false;
alert('delete') changeStatus(row) {
}, vm.doctorId = row.doctorId;
hideDeleteFrom() { vm.needChangeStatus = row.roleFlag ? false : true;
vm.deleteVisible = false; let title = '', message = '';
}, if(!row.roleFlag) {
// 显示操作按钮 title = '确认要开通权限操作吗？';
showButton(row,type) { message = '一旦开通，该用户可查看并创建外部教培项目';
// （1.草稿 2.未上架 3.审核中/待审核 4.已上架 5.已下架 6.已拒绝/未上架） } else { // 拒绝
// 内部用户 title = '确认要关闭权限操作吗？';
let projectStatus = row.projectStatus; message = '一旦关闭，该用户则无法查看外部教培项目';
let idType = row.idType; }
let level = row.level; vm.changeStatusConfig.title = title;
let flag = false; vm.changeStatusConfig.message = message;
let typeStr = parseInt(type); vm.changeStatusVisible = true;
return true;
}, },
handleSizeChange() {},
handleCurrentChange() {}, // 改变状态
// 跳转到模板详情 changeStatusConfirm() {
go() { let req = {
vm.$router.push("template-editor"); doctorId: vm.doctorId,
roleFlag: vm.needChangeStatus
};
openLoading(vm);
vm.POST("portal/portalProjectOrRole/doctor/role", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.changeStatusVisible = false;
vm.searchList();
}
});
}, },
downConfirm() {},
downHide() {}, handleSizeChange(val) {
// 通过按钮 this.formInline.pageSize = val;
passConfirm() { vm.searchList();
alert('通过');
}, },
passHide() {
alert('quxiao') handleCurrentChange(val) {
this.formInline.pageNo = val;
vm.searchList();
}, },
rejectConfirm() {},
rejectHide() {}
} }
} }
</script> </script>
...@@ -218,6 +208,13 @@ export default { ...@@ -218,6 +208,13 @@ export default {
color: #449284; color: #449284;
border-bottom: 1px solid #efefef; border-bottom: 1px solid #efefef;
} }
.table-empty {
.text {
position: relative;
top: -100px;
left: 6px;
}
}
} }
} }
</style> </style>
src/views/education/item-manager.vue
浏览文件 @ ef273ce6
...@@ -224,6 +224,7 @@ ...@@ -224,6 +224,7 @@
<el-radio-group v-model="newProjectType"> <el-radio-group v-model="newProjectType">
<el-radio :label="1">普通项目</el-radio> <el-radio :label="1">普通项目</el-radio>
<el-radio :label="2">CME项目</el-radio> <el-radio :label="2">CME项目</el-radio>
<el-radio :label="3">开放模板</el-radio>
</el-radio-group> </el-radio-group>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button> <el-button @click="centerDialogVisible = false">取 消</el-button>
...@@ -418,8 +419,10 @@ export default { ...@@ -418,8 +419,10 @@ export default {
this.$router.push("edit-manager?projectType=1"); this.$router.push("edit-manager?projectType=1");
}, },
toCmePage() { toCmePage() {
console.log('跳转至 cme 新建项目');
this.$router.push("edit-cme?projectType=2"); this.$router.push("edit-cme?projectType=2");
},
toTemplatePage() {
this.$router.push("template-open?projectType=3");
}, },
toShield(row) { toShield(row) {
this.$router.push("item-shield?projectId="+row.id); this.$router.push("item-shield?projectId="+row.id);
...@@ -433,6 +436,8 @@ export default { ...@@ -433,6 +436,8 @@ export default {
this.toPage(); this.toPage();
} else if (this.newProjectType == 2) { } else if (this.newProjectType == 2) {
this.toCmePage(); this.toCmePage();
} else if(this.newProjectType == 3) {
this.toTemplatePage();
} }
}, },
......
src/views/education/template-manager.vue
浏览文件 @ ef273ce6
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-form class="demo-form-inline"> <el-form class="demo-form-inline">
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="addOrEditTemplate()">+ 新建模板</el-button> <el-button size="small" type="primary" @click="addOrEditTemplate">+ 新建模板</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -143,10 +143,6 @@ ...@@ -143,10 +143,6 @@
<el-button type="primary" @click="changeStatusConfirm">确 认</el-button> <el-button type="primary" @click="changeStatusConfirm">确 认</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- <dialog-compont :dialogObj="downObj" @confirm="downConfirm" @hide="downHide"></dialog-compont>
<dialog-compont :dialogObj="passObj" @confirm="passConfirm" @hide="passHide"></dialog-compont>
<dialog-compont :dialogObj="rejectObj" @confirm="rejectConfirm" @hide="rejectHide"></dialog-compont> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -201,10 +197,6 @@ export default { ...@@ -201,10 +197,6 @@ export default {
value: 6, value: 6,
label: '已拒绝' label: '已拒绝'
}, },
// {
// value: 6,
// label: '未上架'
// }
], ],
tableData: [{ tableData: [{
id: 1, id: 1,
...@@ -257,11 +249,13 @@ export default { ...@@ -257,11 +249,13 @@ export default {
} }
}); });
}, },
// 重置搜索 // 重置搜索
resetForm() { resetForm() {
vm.formInline.openTemplateName = ''; vm.formInline.openTemplateName = '';
vm.formInline.openTemplateStatus = ''; vm.formInline.openTemplateStatus = '';
}, },
// 新建模板 // 新建模板
openProject() {}, openProject() {},
...@@ -302,26 +296,30 @@ export default { ...@@ -302,26 +296,30 @@ export default {
if (res.code == "000000") { if (res.code == "000000") {
vm.changeStatusVisible = false; vm.changeStatusVisible = false;
vm.searchList(); vm.searchList();
// vm.tableData = res.data.data;
// vm.totalRows = res.data.totalRows;
} }
}); });
}, },
//删除 //删除
deleteRow(id) { deleteRow(row) {
vm.deleteTemplateId = id; console.log('row.id', row.id);
vm.deleteTemplateId = row.id;
vm.deleteVisible = true; vm.deleteVisible = true;
}, },
// 删除项目 // 删除项目
confirmDelete() { confirmDelete() {
openLoading(vm);
alert('delete') vm.DELETE(`portal/openTemplate/delete/${vm.deleteTemplateId}`, {}).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.deleteVisible = false;
vm.searchList();
}
});
}, },
hideDeleteFrom() {
vm.deleteVisible = false;
},
// 显示操作按钮 // 显示操作按钮
showButton(row, optionType) { showButton(row, optionType) {
// showButton(scope.row, 4) // showButton(scope.row, 4)
...@@ -372,18 +370,6 @@ export default { ...@@ -372,18 +370,6 @@ export default {
addOrEditTemplate(row, isEdit = 0) { addOrEditTemplate(row, isEdit = 0) {
vm.$router.push(`template-editor?id=${row && row.id || ''}&isEdit=${isEdit}`); vm.$router.push(`template-editor?id=${row && row.id || ''}&isEdit=${isEdit}`);
}, },
downConfirm() {},
downHide() {},
// 通过按钮
passConfirm() {
alert('通过');
},
passHide() {
alert('quxiao')
},
rejectConfirm() {},
rejectHide() {}
} }
} }
</script> </script>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或