Skip to content

P
pica-admin-consultation
提交 9c6b5777 编写于 作者: haochangdi's avatar haochangdi
浏览文件
操作

Merge branch 'dev-diagnosis-20210323' of... 

Merge branch 'dev-diagnosis-20210323' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-diagnosis-20210323
上级 8ef5074d 9c470b18
隐藏空白字符变更
内嵌 并排
正在显示 包含 89 行增加 和 203 行删除
src/views/IM/diagnosis-admin/diagnosis-im.vue
浏览文件 @ 9c6b5777
...@@ -503,40 +503,40 @@ export default { ...@@ -503,40 +503,40 @@ export default {
} }
} }
if (msg.type.toLowerCase() == "custom") { if (msg.type.toLowerCase() == "custom") {
content = JSON.parse(msg.content); content = JSON.parse(msg.content)
text = content.content; text = content.content
if (content.bizType == -1) { // 系统消息：消息由于违规未发送成功（可以不处理） if (content.bizType == -1) { // 系统消息：消息由于违规未发送成功（可以不处理）
showType = -1; showType = -1
text = content.content; text = content.content
} else if (content.bizType == 18) { // PDF } else if (content.bizType == 18) { // PDF
showType = 3; showType = 3
text = content.name; text = content.name
size = content.size; size = content.size
url = content.url; url = content.url
} else if (content.bizType == 19) { // 链接 } else if (content.bizType == 19) { // 链接
showType = 4; showType = 4
text = content.content; text = content.content
suffix = content.suffix; suffix = content.suffix
} else if(content.bizType == 22){ // 病例 } else if(content.bizType == 22){ // 病例
showType = 7; showType = 7
title = content.title; title = content.title
text = JSON.parse(content.content); text = JSON.parse(content.content)
} else if(content.bizType == 23) { // 预约时间 } else if(content.bizType == 23) { // 预约时间
showType = 8; showType = 8
title = content.title; title = content.title
text = JSON.parse(content.content); text = JSON.parse(content.content)
} else if(content.bizType == 24){ // 音视频与IM交互 } else if(content.bizType == 24){ // 音视频与IM交互
showType = 9; showType = 9
text = content.content; text = content.content
} else if(content.bizType == 25){ // 本次问诊结束 } else if(content.bizType == 25){ // 本次问诊结束
showType = 10; showType = 10
text = content.content; text = content.content
} else if(content.bizType == 26){ // 医生建议 } else if(content.bizType == 26){ // 医生建议
showType = 11; showType = 11
title = content.title; title = content.title
text = content.content; text = content.content
}else { }else {
showType = 5; showType = 5
} }
} else if( msg.type.toLowerCase() == "image" || msg.type.toLowerCase() == "picture") { // 图片 } else if( msg.type.toLowerCase() == "image" || msg.type.toLowerCase() == "picture") { // 图片
content = JSON.parse(msg.content); content = JSON.parse(msg.content);
...@@ -545,21 +545,21 @@ export default { ...@@ -545,21 +545,21 @@ export default {
showType = 2; showType = 2;
this.imgSizeHandleNew(msg, content.w, content.h); this.imgSizeHandleNew(msg, content.w, content.h);
}else if(msg.type.toLowerCase() == "audio") { // 语音 }else if(msg.type.toLowerCase() == "audio") { // 语音
content = JSON.parse(msg.content); content = JSON.parse(msg.content)
url = content.url; url = content.url
showType = 6 showType = 6
} else { } else {
showType = 1; // 文本 showType = 1 // 文本
text = msg.content; text = msg.content
} }
msg.title = title; msg.title = title
msg.text = text; msg.text = text
msg.showType = showType; msg.showType = showType
msg.suffix = suffix; msg.suffix = suffix
msg.size = size; msg.size = size
msg.url = url; msg.url = url
msg.sessionFlag = false; msg.sessionFlag = false
cMessageList.push(msg); cMessageList.push(msg)
}); });
if (directFlag === 1) { if (directFlag === 1) {
......
src/views/IM/diagnosis-admin/diagnosis-list.vue
浏览文件 @ 9c6b5777
...@@ -48,23 +48,23 @@ ...@@ -48,23 +48,23 @@
style="width: 100%" style="width: 100%"
v-loading="loading"> v-loading="loading">
<el-table-column prop="orderNo" label="订单ID" min-width="80" align="left"></el-table-column> <el-table-column prop="orderNo" label="订单ID" min-width="80" align="left"></el-table-column>
<el-table-column prop="operateUserName" label="运营人员" min-width="100" align="left"></el-table-column> <el-table-column prop="operateUserName" label="运营人员" min-width="80" align="left"></el-table-column>
<el-table-column prop="specialName" label="专区名称" min-width="120" align="left"></el-table-column> <el-table-column prop="specialName" label="专区名称" min-width="80" align="left"></el-table-column>
<el-table-column prop="diagnoseType" label="问诊类型" min-width="80" align="left"> <el-table-column prop="diagnoseType" label="问诊类型" min-width="80" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.diagnoseType | diagnosisTypeFilter}}</span> <span>{{scope.row.diagnoseType | diagnosisTypeFilter}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="doctorName" label="接诊医生" min-width="100" align="left"></el-table-column> <el-table-column prop="doctorName" label="接诊医生" min-width="80" align="left"></el-table-column>
<el-table-column prop="doctorMobile" label="接诊电话" min-width="100" align="left"></el-table-column> <el-table-column prop="doctorMobile" label="接诊电话" min-width="80" align="left"></el-table-column>
<el-table-column prop="userName" label="问诊患者" min-width="80" align="left"></el-table-column> <el-table-column prop="userName" label="问诊患者" min-width="80" align="left"></el-table-column>
<el-table-column prop="userMobile" label="问诊电话" min-width="100" align="left"></el-table-column> <el-table-column prop="userMobile" label="问诊电话" min-width="80" align="left"></el-table-column>
<el-table-column prop="price" label="价格" min-width="80" align="left"> <el-table-column prop="price" label="价格" min-width="60" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.price | priceFilter}}</span> <span>{{scope.row.price | priceFilter}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="appointBeginTime" label="预约时间" min-width="120" align="left"> <el-table-column prop="appointBeginTime" label="预约时间" min-width="100" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.appointBeginTime}}</p> <p>{{scope.row.appointBeginTime}}</p>
<p>{{scope.row.appointEndTime}}</p> <p>{{scope.row.appointEndTime}}</p>
...@@ -75,13 +75,13 @@ ...@@ -75,13 +75,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 1 初始状态 2待咨询 3 咨询中 4已结束 --> <!-- 1 初始状态 2待咨询 3 咨询中 4已结束 -->
<div> <div>
<el-button v-if="scope.row.status != 4" type="primary" size="small" @click="timeHandle(scope.row)">修改时间</el-button> <el-button v-if="scope.row.status != 4" type="primary" size="small" @click="timeHandle(scope.row)" style="margin-top: 10px;">修改时间</el-button>
<el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)">结束</el-button> <el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)" style="margin-top: 10px;">结束</el-button>
</div> </div>
<div style="margin-top: 10px;"> <div>
<el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1" type="primary" size="small" @click="callAll(scope.row)">呼叫双方</el-button> <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1" type="primary" size="small" @click="callAll(scope.row)" style="margin-top: 10px;">呼叫双方</el-button>
<el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2" type="primary" size="small" @click="jionCommunicate(scope.row)">加入问诊</el-button> <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2" type="primary" size="small" @click="jionCommunicate(scope.row)" style="margin-top: 10px;">加入问诊</el-button>
<el-button type="primary" size="small" @click="sendMessage(scope.row)">发送消息</el-button> <el-button type="primary" size="small" @click="sendMessage(scope.row)" style="margin-top: 10px;">发送消息</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -229,66 +229,66 @@ export default { ...@@ -229,66 +229,66 @@ export default {
} }
}, },
mounted() { mounted() {
this.getDiagnoseTypeList(); this.getDiagnoseTypeList()
this.getDiagnoseList(); this.getDiagnoseList()
this.search(); this.search()
}, },
methods: { methods: {
// 问诊类型 // 问诊类型
getDiagnoseTypeList() { getDiagnoseTypeList() {
let url = `/basic-data/constants?typeCode=P253`; let url = `/basic-data/constants?typeCode=P253`
this.GET(url).then(res => { this.GET(url).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
this.diagnosisTypeSelect = res.data; this.diagnosisTypeSelect = res.data
} }
}); })
}, },
// 问诊状态 // 问诊状态
getDiagnoseList() { getDiagnoseList() {
let url = `/basic-data/constants?typeCode=P254`; let url = `/basic-data/constants?typeCode=P254`
this.GET(url).then(res => { this.GET(url).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
this.diagnosisSelect = res.data; this.diagnosisSelect = res.data
} }
}); });
}, },
// tab切换 // tab切换
handleClick(val) { handleClick(val) {
this.searchParam.tab = val.name == 'second' ? 2: 1; this.searchParam.tab = val.name == 'second' ? 2: 1
this.search(); this.search()
}, },
search(a) { search(a) {
if(a) this.searchParam.pageNo = 1; if(a) this.searchParam.pageNo = 1
this.loading = true; this.loading = true
let url = `/diagnose/admin/diagnose/`; let url = `/diagnose/admin/diagnose/`
let params = this.searchParam; let params = this.searchParam
this.POST(url, params).then(res => { this.POST(url, params).then(res => {
this.loading = false; this.loading = false
if (res.code == "000000") { if (res.code == "000000") {
this.tableData = res.data.list; this.tableData = res.data.list
this.totalRows = res.data.allSize; this.totalRows = res.data.allSize
} }
}); });
}, },
// 预约时间 // 预约时间
timeHandle(row) { timeHandle(row) {
this.timeVisible = true; this.timeVisible = true
this.timeForm.diagnoseLogId = row.diagnoseLogId; this.timeForm.diagnoseLogId = row.diagnoseLogId
}, },
confirmTime() { confirmTime() {
this.$refs.timeForm.validate((valid) => { this.$refs.timeForm.validate((valid) => {
if(valid) { if(valid) {
this.loading = true; this.loading = true
this.POST('/diagnose/admin/diagnose/appointTime', this.timeForm).then(res => { this.POST('/diagnose/admin/diagnose/appointTime', this.timeForm).then(res => {
this.loading = false; this.loading = false
if (res.code == "000000") { if (res.code == "000000") {
this.$message({ this.$message({
message: '修改预约时间成功', message: '修改预约时间成功',
type: "success" type: "success"
}); });
this.searchParam.tab = 1; this.searchParam.tab = 1
this.timeVisible = false; this.timeVisible = false
this.search(); this.search()
}else { }else {
this.$message({ this.$message({
message: res.message, message: res.message,
...@@ -311,9 +311,9 @@ export default { ...@@ -311,9 +311,9 @@ export default {
this.$message({ this.$message({
message: '成功结束问诊', message: '成功结束问诊',
type: "success" type: "success"
}); })
this.searchParam.tab = 1; this.searchParam.tab = 1
this.search(); this.search()
}else { }else {
this.$message({ this.$message({
message: res.message, message: res.message,
...@@ -347,8 +347,8 @@ export default { ...@@ -347,8 +347,8 @@ export default {
message: '选择成功', message: '选择成功',
type: "success" type: "success"
}); });
this.searchParam.tab = 1; this.searchParam.tab = 1
this.search(); this.search()
}else { }else {
this.$message({ this.$message({
message: res.message, message: res.message,
...@@ -356,17 +356,17 @@ export default { ...@@ -356,17 +356,17 @@ export default {
}) })
} }
}); });
this.activeName = 'first'; this.activeName = 'first'
this.searchParam.tab = 1; this.searchParam.tab = 1
this.search(); this.search()
}, },
handleSizeChange(value) { handleSizeChange(value) {
this.searchParam.pageSize = value; this.searchParam.pageSize = value
this.search(); this.search()
}, },
handleCurrentChange(value) { handleCurrentChange(value) {
this.searchParam.pageNo = value; this.searchParam.pageNo = value
this.search(); this.search()
} }
} }
} }
......
src/views/IM/diagnosis-admin/im.scss
浏览文件 @ 9c6b5777
...@@ -3,119 +3,11 @@ ...@@ -3,119 +3,11 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
// min-width: 1200px; // min-width: 1200px;
background: none !important; background: none !important;
font-size: 14px; font-size: 14px;
.left {
display: none;
width: 270px;
// padding: 0 25px 15px;
border-right: 2px solid #f5f5f5;
.l-header {
display: flex;
flex-direction: row;
height: 52px;
justify-content: space-between;
align-items: center;
padding: 0 12px 0 25px;
p {
display: flex;
flex-direction: row;
align-items: center;
color: #0d9078;
cursor: pointer;
img {
width: 16px;
height: 16px;
margin-right: 4px;
}
span {
font-size: 14px;
color: #0d9078;
}
}
// & > span:first-child {
// font-size: 14px;
// }
// & > span:last-child {
// color: #0d9078;
// cursor: pointer;
// }
}
.c-num {
padding: 0 25px;
height: 40px;
line-height: 40px;
font-size: 12px;
background: #fffbe6;
}
.session-list {
width: 100%;
height: 100%;
overflow: scroll;
& > .item {
width: 100%;
display: flex;
height: 72px;
flex-direction: row;
align-items: center;
padding: 0 12px 0 25px;
cursor: pointer;
.img-wrapper {
// position: relative;
// top: 0;
// left: 0;
width: 24px;
height: 24px;
margin-right: 10px;
img {
width: 100%;
height: 100%;
border-radius: 20px;
}
}
& > .desc {
flex: 1;
.top {
display: flex;
flex-direction: row;
justify-content: space-between;
.name {
}
}
.bottom {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
font-size: 12px;
color: #999999;
.num {
display: inline-block;
min-width: 16px;
padding: 2px 4px;
border-radius: 8px;
text-align: center;
color: #ffffff;
background: #ff4d4f;
}
& > img {
display: block;
width: 15px;
height: 15px;
padding: 2px 0 2px 4px;
}
}
}
&.current {
background: #f8f9fa;
}
}
}
}
.center { .center {
margin-left: 240px; margin-left: 10%;
margin-right: 240px; margin-right: 10%;
flex: 1; flex: 1;
background: #fff; background: #fff;
.c-header { .c-header {
...@@ -504,12 +396,6 @@ ...@@ -504,12 +396,6 @@
} }
} }
} }
.right {
display: none;
width: 240px;
border-left: 2px solid #f5f5f5;
overflow: scroll;
}
background: #fff; background: #fff;
.time { .time {
color: #999999; color: #999999;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或