Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
提交
议题看板
打开侧边栏
jingqi.liu
pica.cloud.web-education-admin
提交
40404e4d
提交
40404e4d
编写于
9月 16, 2020
作者:
bo.dang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
审核列表
上级
0f75a9cb
变更
7
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
382 行增加
和
18 行删除
+382
-18
org.vue
src/components/yqrange/member-management/org.vue
+1
-1
renyuan.vue
src/components/yqrange/member-management/renyuan.vue
+1
-1
router.js
src/router/router.js
+3
-3
filter.js
src/utils-o/filter.js
+21
-9
yqrangeApi.js
src/utils/yqrange/yqrangeApi.js
+22
-1
range-apply.vue
src/views/yqrange/range-apply.vue
+331
-0
yq-range.vue
src/views/yqrange/yq-range.vue
+3
-3
未找到文件。
src/components/yqrange/member-management/org.vue
浏览文件 @
40404e4d
...
...
@@ -455,7 +455,7 @@ export default {
else
{
this
.
$message
({
type
:
'error'
,
message
:
'导入失败,请联系研发团队'
message
:
res
.
message
});
}
// vm.setDialog(res);
...
...
src/components/yqrange/member-management/renyuan.vue
浏览文件 @
40404e4d
...
...
@@ -345,7 +345,7 @@ export default {
else
{
this
.
$message
({
type
:
'error'
,
message
:
'导入失败,请联系研发团队'
message
:
res
.
message
});
}
// vm.setDialog(res);
...
...
src/router/router.js
浏览文件 @
40404e4d
...
...
@@ -63,7 +63,7 @@ const editRange = r => require.ensure([], () => r(require('../views/yqrange/edit
const
createLive
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/yqrange/create-live.vue'
)),
'create-live'
)
const
blackListManage
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/yqrange/blacklist-manage.vue'
)),
'blacklist-manage'
)
const
adminManage
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/yqrange/admin-manage.vue'
)),
'admin-manage'
)
const
range
Notice
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/yqrange/range-notice.vue'
)),
'rangeNotice
'
)
const
range
Apply
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/yqrange/range-apply.vue'
)),
'rangeApply
'
)
const
shopList
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/shop/shop-list.vue'
)),
'shop-list'
)
const
createShop
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/shop/create-shop.vue'
)),
'create-shop'
)
...
...
@@ -251,8 +251,8 @@ export default [{
component
:
rangeManage
},
{
path
:
'/range-
notice
'
,
component
:
range
Notice
path
:
'/range-
apply
'
,
component
:
range
Apply
},
{
path
:
'/create-live'
,
...
...
src/utils-o/filter.js
浏览文件 @
40404e4d
...
...
@@ -14,9 +14,21 @@ const vueFilter = {
return
'已结束(可回看)'
}
},
circleApplyStatus
:
(
value
)
=>
{
if
(
value
.
stauts
=
0
){
return
'拒绝'
}
else
if
(
value
.
stauts
=
1
){
return
'待审核'
}
else
if
(
value
.
stauts
=
2
){
return
'通过'
}
},
liveStatusFilter
:
(
value
)
=>
{
if
(
value
==
1
)
return
"隐藏"
else
return
"发布"
else
return
"发布"
},
liveTeacherType
:
(
value
)
=>
{
let
doctorName
=
[]
...
...
@@ -30,7 +42,7 @@ const vueFilter = {
doctorName
.
push
(
value
[
i
].
doctorName
)
}
return
doctorName
.
join
(
"、"
)
}
}
},
controlType
:
(
value
)
=>
{
if
(
value
==
1
)
{
...
...
@@ -56,11 +68,11 @@ const vueFilter = {
},
refreshType
:
(
value
)
=>
{
if
(
value
==
1
)
return
"支持"
else
return
"不支持"
else
return
"不支持"
},
moudleType
:
(
value
)
=>
{
if
(
value
==
1
)
return
"未激活"
else
return
"激活"
else
return
"激活"
},
dateFilter
:
(
value
)
=>
{
if
(
!
value
)
return
''
;
...
...
@@ -68,12 +80,12 @@ const vueFilter = {
},
appColumnStatusFilter
:
(
value
)
=>
{
if
(
value
==
1
)
return
"未提交"
else
if
(
value
==
4
)
return
"已提交"
else
if
(
value
==
4
)
return
"已提交"
},
statusFilter
:
(
value
)
=>
{
if
(
value
==
1
)
return
"已创建"
else
if
(
value
==
5
)
return
"已发布"
else
return
"已下架"
else
return
"已下架"
},
linkTypeFilter
:
(
value
)
=>
{
// 跳转类型
if
(
value
==
1
)
return
'链接'
...
...
@@ -82,7 +94,7 @@ const vueFilter = {
},
teacherStatusFilter
:
(
value
)
=>
{
if
(
value
==
1
)
return
"已下架"
else
return
"已发布"
else
return
"已发布"
},
moduleTypeFilter
:
(
value
,
data
)
=>
{
// 模块类型
for
(
let
key
in
data
)
{
...
...
@@ -266,9 +278,9 @@ const vueFilter = {
let
list
=
''
;
for
(
let
i
=
0
;
i
<
value
.
length
;
i
++
)
{
list
+=
value
[
i
]
+
'、'
;
}
}
list
=
list
.
substring
(
0
,
list
.
length
-
1
);
return
list
},
}
export
default
vueFilter
\ No newline at end of file
export
default
vueFilter
src/utils/yqrange/yqrangeApi.js
浏览文件 @
40404e4d
...
...
@@ -124,7 +124,7 @@ export const uploadOrg = (params) => {
export
const
uploadDoc
=
(
params
)
=>
{
return
fetch
({
headers
,
url
:
getBaseUrl
(
`circle/
circle/import/
${
params
.
id
}
/doctors`
),
url
:
getBaseUrl
(
`circle/
import
/doctors`
),
method
:
'post'
,
data
:
params
,
description
:
'批量导入人员'
,
...
...
@@ -141,3 +141,24 @@ export const searchDoc = (params) => {
})
};
export
const
applyList
=
(
params
)
=>
{
return
fetch
({
headers
,
url
:
getBaseUrl
(
`circle/circle/apply/list`
),
method
:
'post'
,
data
:
params
,
description
:
'圈子审核列表'
,
})
};
export
const
applyUpdate
=
(
params
)
=>
{
return
fetch
({
headers
,
url
:
getBaseUrl
(
`circle/circle/apply/update`
),
method
:
'post'
,
data
:
params
,
description
:
'圈子审核列表更新'
,
})
};
src/views/yqrange/range-
notice
.vue
→
src/views/yqrange/range-
apply
.vue
浏览文件 @
40404e4d
...
...
@@ -7,34 +7,23 @@
<el-col
:span=
"8"
>
<el-input
v-model=
"searchForm.name"
size=
"small"
placeholder=
"请输入申请人姓名"
></el-input>
</el-col>
<!--
<el-col
:span=
"9"
>
-->
<!--
<el-select-->
<!--v-model=""-->
<!--placeholder="请选择圈子"-->
<!--size="small"-->
<!--clearable>-->
<!--
<el-option-->
<!--v-for="(item,index) in statusList"-->
<!--:key="index"-->
<!--:label="item.label"-->
<!--:value="item.value"-->
<!-->
</el-option>
-->
<!--
</el-select>
-->
<!--
</el-col>
-->
<!--
<el-col
:span=
"9"
>
-->
<!--
<el-select-->
<!--v-model=""-->
<!--placeholder="全部审核状态"-->
<!--size="small"-->
<!--clearable>-->
<!--
<el-option-->
<!--v-for="(item,index) in statusList"-->
<!--:key="index"-->
<!--:label="item.label"-->
<!--:value="item.value"-->
<!-->
</el-option>
-->
<!--
</el-select>
-->
<!--
</el-col>
-->
<el-col
:span=
"9"
>
<el-input
v-model=
"searchForm.circleName"
size=
"small"
placeholder=
"请输入圈子名称"
></el-input>
</el-col>
<el-col
:span=
"9"
>
<el-select
v-model=
"searchForm.status"
placeholder=
"全部审核状态"
size=
"small"
clearable
>
<el-option
v-for=
"item in statusList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-col>
<el-col
:span=
"7"
style=
"text-align: right"
>
...
...
@@ -44,22 +33,24 @@
</el-row>
</el-form>
<el-table
:data=
"tableData"
class=
"item-table"
style=
"width: 100%;margin-top: 10px;"
>
<el-table-column
prop=
"id"
label=
"姓名"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createdTime"
label=
"创建时间"
min-width=
"100"
align=
"center"
>
<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=
"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"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
createdTime
|
liveDateFilter
}}
</span>
<span>
{{
scope
.
row
.
status
|
circleApplyStatus
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"name"
label=
"请求加入圈子名称"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"numberOfPeople"
label=
"机构姓名"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"dynamicFlag"
label=
"职位"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"status"
label=
"地区"
min-width=
"100"
align=
"center"
>
</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=
"
deleteRang
e(scope.row)"
type=
"text"
size=
"small"
v-if=
"showAllFlag && scope.row.status != 0"
>
通过
</el-button>
<el-button
@
click=
"r
angeManage
(scope.row)"
type=
"text"
size=
"small"
v-if=
"scope.row.status != 0"
>
拒绝
</el-button>
<el-button
@
click=
"
approv
e(scope.row)"
type=
"text"
size=
"small"
v-if=
"showAllFlag && scope.row.status != 0"
>
通过
</el-button>
<el-button
@
click=
"r
eject
(scope.row)"
type=
"text"
size=
"small"
v-if=
"scope.row.status != 0"
>
拒绝
</el-button>
</div>
</
template
>
</el-table-column>
...
...
@@ -85,22 +76,21 @@
<
script
>
import
{
openLoading
,
closeLoading
}
from
"../../utils/utils"
;
import
BreadCrumb
from
"@/components/breadcrumb.vue"
;
import
{
getRangeList
,
updateRangeStatus
,
getCircleSettingList
,
saveCircleSetting
}
from
"../../utils/yqrange/yqrangeApi"
;
import
{
getRangeList
,
updateRangeStatus
,
getCircleSettingList
,
saveCircleSetting
,
applyList
,
applyUpdate
}
from
"../../utils/yqrange/yqrangeApi"
;
export
default
{
components
:
{
BreadCrumb
},
data
(){
return
{
curmbFirst
:
'
云鹊小圈
'
,
curmbFirst
:
'
审核列表
'
,
showAllFlag
:
false
,
showNewFlag
:
false
,
searchForm
:
{
name
:
''
,
c
reatedTi
me
:
''
,
c
ircleNa
me
:
''
,
// endTime: '',
userType
:
""
,
// 用户标识 1:内部用户 2:外部用户,
status
:
""
,
status
:
-
1
,
pageNo
:
1
,
pageSize
:
10
,
},
...
...
@@ -113,9 +103,21 @@
},
statusList
:
[
{
label
:
1
,
value
:
"正常"
}
value
:
-
1
,
label
:
"全部状态"
},
{
value
:
0
,
label
:
"拒绝"
},
{
value
:
1
,
label
:
"待审核"
},
{
value
:
2
,
label
:
"通过"
},
]
}
},
...
...
@@ -131,7 +133,7 @@
// idType = 2;
// localStorage.setItem('storageIdType', idType);
// }
this
.
searchForm
.
userType
=
idType
;
//
this.searchForm.userType = idType;
// 内部用户:运营人员
if
(
idType
==
"1"
){
...
...
@@ -176,15 +178,14 @@
let
params
=
this
.
searchForm
;
console
.
log
(
'查询圈子'
)
getRange
List
(
params
).
then
((
res
)
=>
{
apply
List
(
params
).
then
((
res
)
=>
{
closeLoading
(
this
);
// if(res.code == "000000") {
// this.tableData = res.data.circleList;
// this.totalRows = res.data.count;
// } else {
// this.tableData = [];
// }
this
.
tableData
=
[];
if
(
res
.
code
==
"000000"
)
{
this
.
tableData
=
res
.
data
.
list
;
this
.
totalRows
=
res
.
data
.
total
;
}
else
{
this
.
tableData
=
[];
}
}).
catch
((
error
)
=>
{
// this.$message({
// message: error,
...
...
@@ -196,68 +197,30 @@
resetForm
()
{
this
.
searchForm
.
name
=
""
;
this
.
searchForm
.
createdTime
=
""
;
this
.
searchForm
.
circleName
=
""
;
this
.
searchForm
.
status
=
""
;
console
.
log
(
'重置'
)
this
.
search
();
},
//新建小圈
createRange
()
{
let
enterType
=
1
;
//1:add 2 edit
this
.
$router
.
push
({
path
:
`/create-range?enterType=
${
enterType
}
`
})
},
//上线
publishRange
(
row
)
{
this
.
$confirm
(
`上线后圈子成员将收到入圈消息提醒(每天最多提醒一次),确定上线“
${
row
.
name
}
”吗?`
,
''
,
{
confirmButtonText
:
'上线'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
,
customClass
:
'range-make-box'
,
}).
then
(()
=>
{
// confirm
this
.
updateStatus
(
row
.
id
,
"30"
);
}).
catch
(()
=>
{
// cancel
// this.$message.error("上线失败");
});
},
//下线
unPublishRange
(
row
)
{
this
.
$confirm
(
`确定下线“
${
row
.
name
}
”吗?`
,
''
,
{
confirmButtonText
:
'下线'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
,
customClass
:
'range-make-box'
,
}).
then
(()
=>
{
this
.
updateStatus
(
row
.
id
,
"40"
);
// confirm
}).
catch
(()
=>
{
// cancel
});
},
// 更新圈子状态(上线,下线)
updateStatus
(
id
,
status
){
let
params
=
{
"
id"
:
i
d
,
"status"
:
status
};
let
params
=
{
"
doctorId"
:
id
,
circleId
:
this
.
circleI
d
,
"status"
:
status
};
updateRangeStatus
(
params
).
then
((
res
)
=>
{
closeLoading
(
this
);
if
(
res
.
code
==
"000000"
)
{
if
(
status
==
"40"
){
this
.
$message
.
success
(
"下线成功"
);
}
else
if
(
status
==
"30"
)
{
this
.
$message
.
success
(
"上线成功"
);
}
else
if
(
status
==
"50"
)
{
this
.
$message
.
success
(
"解散成功"
);
if
(
status
==
2
){
this
.
$message
.
success
(
"成功通过"
);
}
else
if
(
status
==
0
)
{
this
.
$message
.
success
(
"拒绝成功"
);
}
this
.
searchList
();
}
else
{
if
(
status
==
"40"
){
this
.
$message
.
error
(
"下线失败,请重试"
);
}
else
if
(
status
==
"30"
)
{
this
.
$message
.
error
(
"上线失败,请重试"
);
}
else
if
(
status
==
"50"
)
{
this
.
$message
.
error
(
"解散失败,请重试"
);
if
(
status
==
2
){
this
.
$message
.
success
(
"通过失败"
);
}
else
if
(
status
==
0
)
{
this
.
$message
.
success
(
"拒绝失败"
);
}
...
...
@@ -291,105 +254,22 @@
})
},
//直播管理
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
this
.
$router
.
push
({
path
:
`/create-range?enterType`
,
query
:{
id
:
row
.
id
,
enterType
:
enterType
,
roleType
:
row
.
roleId
}
})
},
//解散圈子
deleteRange
(
row
)
{
this
.
$confirm
(
`解散后圈子内的动态/直播等内容将不会保存`
,
`确定解散“
${
row
.
name
}
”吗?`
,
{
confirmButtonText
:
'解散'
,
//拒绝
reject
(
row
)
{
this
.
$confirm
(
``
,
`确定拒绝“
${
row
.
name
}
”吗?`
,
{
confirmButtonText
:
'拒绝'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
,
customClass
:
'range-make-box'
,
}).
then
(()
=>
{
this
.
updateStatus
(
row
.
id
,
"50"
);
this
.
updateStatus
(
row
.
doctorId
,
0
);
// confirm
}).
catch
(()
=>
{
// cancel
});
},
// 应用配置
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
(){
...
...
@@ -404,27 +284,7 @@
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
(
"请重试"
);
})
}
},
}
...
...
src/views/yqrange/yq-range.vue
浏览文件 @
40404e4d
...
...
@@ -118,7 +118,7 @@
</el-tab-pane>
<el-tab-pane
label=
"审核列表"
name=
"second"
>
<range-
notice></range-notice
>
<range-
apply></range-apply
>
</el-tab-pane>
</el-tabs>
...
...
@@ -135,10 +135,10 @@
import
BreadCrumb
from
"@/components/breadcrumb.vue"
;
import
{
getRangeList
,
updateRangeStatus
,
getCircleSettingList
,
saveCircleSetting
}
from
"../../utils/yqrange/yqrangeApi"
;
import
ElTabPane
from
"element-ui/packages/tabs/src/tab-pane"
;
import
Range
Notice
from
"./range-notice
"
;
import
Range
Apply
from
"./range-apply
"
;
export
default
{
components
:
{
Range
Notice
,
Range
Apply
,
ElTabPane
,
BreadCrumb
},
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录