Skip to content

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

预约单列表优化,添加字段

上级 9ad369b1
隐藏空白字符变更
内嵌 并排
正在显示 包含 221 行增加 和 52 行删除
package-lock.json
浏览文件 @ 9e047b4f
......@@ -2734,7 +2734,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -3151,7 +3152,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -3207,6 +3209,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -3250,12 +3253,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......
src/components/common/followup.vue
浏览文件 @ 9e047b4f
......@@ -41,7 +41,11 @@ export default {
diagnoseLogId: {
type: Number,
default: 0
}
},
toFollowReason:{
type: String,
default:''
},
},
data() {
return {
......@@ -60,8 +64,18 @@ export default {
}
}
},
watch:{
toFollowReason(newdata,olddata){
this.model.toFollowReason=newdata
}
},
created() {
vm = this;
},
mounted(){
},
methods: {
......
src/components/list/table-c.vue
浏览文件 @ 9e047b4f
......@@ -9,11 +9,7 @@
border
@selection-change="handleSelectionChange"
>
<el-table-column
fixed
type="selection"
width="55">
</el-table-column>
<el-table-column fixed type="selection" width="55"> </el-table-column>
<el-table-column
v-for="item in tableColumn"
:key="item.prop"
......@@ -21,21 +17,24 @@
:label="item.label"
:show-overflow-tooltip="item.showtooltip"
min-width="170"
align="center">
align="center"
>
<template slot-scope="scope">
<div v-if="scope.column.property == 'appointBeginTime'">
<p>{{scope.row.appointBeginTime}}</p>
<p>{{scope.row.appointEndTime}}</p>
<p>{{ scope.row.appointBeginTime }}</p>
<p>{{ scope.row.appointEndTime }}</p>
</div>
<div v-else-if="scope.column.property == 'assistantBeginTime'">
<p>{{scope.row.assistantBeginTime}}</p>
<p>{{scope.row.assistantEndTime}}</p>
<p>{{ scope.row.assistantBeginTime }}</p>
<p>{{ scope.row.assistantEndTime }}</p>
</div>
<div v-else-if="scope.column.property == 'receptionBeginTime'">
<p>{{scope.row.receptionBeginTime}}</p>
<p>{{scope.row.receptionEndTime}}</p>
<p>{{ scope.row.receptionBeginTime }}</p>
<p>{{ scope.row.receptionEndTime }}</p>
</div>
<div v-else>
<p>{{ scope.row[scope.column.property] }}</p>
</div>
<div v-else><p>{{scope.row[scope.column.property]}}</p></div>
</template>
</el-table-column>
<el-table-column
......@@ -45,24 +44,132 @@
min-width="400"
>
<template slot-scope="scope">
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,25)" @click="witeDiagnose(scope.row)">设为待问诊</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3,2) && menuType ==1 " @click="changeRun(scope.row)">更换运营</el-button>
<el-button type="primary" size="small" class="btn" @click="goDetail(scope.row,false)">查看详情</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3) && menuType ==1 " @click="cancelRefund(scope.row)">取消/退款</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,22,21)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,5,6,21,22,23,24,25,26)" @click="sendMessage(scope.row)">发送消息</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,26)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button>-->
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,3,4,6,21,22,23,24,25,26,5,6)" @click="goDetail(scope.row,true)" >编辑</el-button>
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button>-->
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23)" @click="waitHzeDot(scope.row)">设为待协调医生</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23,24)" @click="waitMatchTime(scope.row)">设为待确认时间</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,25,26)" @click="reMatchDot(scope.row)">重新匹配医生</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,26)" @click="changeTime(scope.row)">修改时间</el-button>
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,26)" @click="call(scope.row)">发起问诊</el-button>-->
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="doneHandle(scope.row)">设为已完成</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="setOffice(scope.row)">设置科室</el-button>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 25)"
@click="witeDiagnose(scope.row)"
>设为待问诊</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="
showBtn(scope.row, 21, 22, 23, 24, 25, 26, 3, 2) && menuType == 1
"
@click="changeRun(scope.row)"
>更换运营</el-button
>
<el-button
type="primary"
size="small"
class="btn"
@click="goDetail(scope.row, false)"
>查看详情</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="
showBtn(scope.row, 2, 21, 22, 23, 24, 25, 26, 3) && menuType == 1
"
@click="cancelRefund(scope.row)"
>取消/退款</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 21)"
@click="witeGo(scope.row)"
>设为稍后跟进</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 22, 21)"
@click="waitMatchDot(scope.row)"
>设为待匹配医生</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
@click="sendMessage(scope.row)"
>发送消息</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 3, 26)"
@click="joinDiagnose(scope.row)"
>加入问诊</el-button
>
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button>-->
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 2, 3, 4, 6, 21, 22, 23, 24, 25, 26, 5, 6)"
@click="goDetail(scope.row, true)"
>编辑</el-button
>
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button>-->
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 23)"
@click="waitHzeDot(scope.row)"
>设为待协调医生</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 23, 24)"
@click="waitMatchTime(scope.row)"
>设为待确认时间</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 3, 25, 26)"
@click="reMatchDot(scope.row)"
>重新匹配医生</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 3, 26)"
@click="changeTime(scope.row)"
>修改时间</el-button
>
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,26)" @click="call(scope.row)">发起问诊</el-button>-->
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 3)"
@click="doneHandle(scope.row)"
>设为已完成</el-button
>
<el-button
type="primary"
size="small"
class="btn"
v-if="showBtn(scope.row, 2)"
@click="setOffice(scope.row)"
>设置科室</el-button
>
</template>
</el-table-column>
</el-table>
......@@ -86,7 +193,7 @@
<script>
import { TABLE_COLUMN } from "@/utils/constants";
//0 只填写了患者信息（急速问诊才会有的状态），1 初始状态（未支付），2待问诊（待匹配运营）（支付成功待完善）3 问诊中（已完善），4、已问诊 5、取消， 6 已结算
//21 已匹配， 22 待分诊， 23 待匹配接诊医生， 24 待协调医生 25 待设置问诊时间， 26 待问诊
//21 已匹配， 22 待分诊， 23 待匹配接诊医生， 24 待协调医生 25 待设置问诊时间， 26 待问诊
export default {
props: {
menuType: {
......@@ -124,15 +231,13 @@ export default {
},
data() {
return {
tableColumn: TABLE_COLUMN
tableColumn: TABLE_COLUMN,
};
},
mounted() {
},
mounted() {},
methods: {
showBtn(row,...arr) {
return arr.includes(row.status)
showBtn(row, ...arr) {
return arr.includes(row.status);
// return true;
},
// 选择
......@@ -216,7 +321,7 @@ export default {
setOffice(value) {
this.$emit("setOffice", value);
},
},
},
};
</script>
......
src/utils/constants.js
浏览文件 @ 9e047b4f
......@@ -88,11 +88,11 @@ export const STATUS_LIST = [
{
label: '已取消',
value: 5
},
},
{
label: '已结算',
value: 6
},
},
{
label: '已匹配',
value: 21
......@@ -100,19 +100,19 @@ export const STATUS_LIST = [
{
label: '待分诊',
value: 22
},
},
{
label: '待匹配医生',
value: 23
},
},
{
label: '待协调医生',
value: 24
},
},
{
label: '待确认时间',
value: 25
},
},
{
label: '待问诊',
value: 26
......@@ -388,6 +388,10 @@ export const MATCH_TAB_LIST = [
{
label: '已匹配',
active: '21'
},
{
label: '稍后跟进',
active: '27'
}
]
export const TABLE_COLUMN = [
......@@ -411,6 +415,13 @@ export const TABLE_COLUMN = [
label: "状态",
showtooltip: false,
},
{
prop: "toFollowReason",
label: "稍后跟进备注",
showtooltip: false,
},
{
prop: "appointBeginTime",
label: "预约时间",
......@@ -441,11 +452,17 @@ export const TABLE_COLUMN = [
label: "助诊医生意向时间",
showtooltip: false,
},
{
prop: "assistantRemark",
label: "助诊备注",
showtooltip: true,
},
{
prop: "department",
label: "预约科室",
showtooltip: false,
},
{
prop: "triageDepartment",
label: "分诊科室",
......@@ -481,6 +498,13 @@ export const TABLE_COLUMN = [
label: "患者姓名",
showtooltip: false,
},
{
prop: "age",
label: "患者年龄",
showtooltip: false,
},
{
prop: "patientMobilePhone",
label: "患者电话",
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 9e047b4f
......@@ -222,7 +222,8 @@
</el-tabs>
<match-component @search="search" :matchVisible.sync="matchVisible" :diagnoseLogId="diagnoseLogId" :batchFlag="batchFlag" :multipleSelection="multipleSelection" :operateUserID="operateUserID"></match-component>
<refund-component @search="search" :refundVisible.sync="refundVisible" :diagnoseLogId="diagnoseLogId"></refund-component>
<followup-component @search="search" :followupVisible.sync="followupVisible" :diagnoseLogId="diagnoseLogId"></followup-component>
<!-- 跟进原因弹出窗 -->
<followup-component @search="search" :followupVisible.sync="followupVisible" :toFollowReason="toFollowReason" :diagnoseLogId="diagnoseLogId"></followup-component>
<matching-doctor @search="search" :doctorVisible.sync="doctorVisible" :diagnoseLogId="diagnoseLogId" :triageDepartmentId="triageDepartmentId" :bizType="bizType"></matching-doctor>
<diagnosis-component @search="search" :diagnosisVisible.sync="diagnosisVisible" :diagnoseLogId="diagnoseLogId"></diagnosis-component>
<coordinating-doctor @search="search" :coordinatingVisible.sync="coordinatingVisible" :diagnoseLogId="diagnoseLogId" :bizType="bizType"></coordinating-doctor>
......@@ -315,6 +316,7 @@ export default {
timeClickFlag: true,
tableHeight: 500,
diagnoseLogId: 0,
toFollowReason:'',
matchVisible:false,
refundVisible:false,
followupVisible:false,
......@@ -430,7 +432,24 @@ export default {
},
// tab切换
handleClick(val) {
this.searchParam.status = val.paneName == 99 ? '' : val.paneName;
console.log(val.paneName)
this.searchParam.status = val.paneName == 99 ? '' :val.paneName == 27 ? '21': val.paneName;
if(this.fromType==5&&this.searchParam.status){
if(val.paneName==27){
this.searchParam.swagger=1
}
else{
this.searchParam.swagger=2
}
}
else{
if(this.searchParam.hasOwnProperty("swagger")){
delete this.searchParam.swagger
}
}
this.getsearch();
},
// 初始化时间
......@@ -558,7 +577,9 @@ export default {
//设为稍后跟进
witeGo(row) {
this.followupVisible = true;
this.toFollowReason=row.toFollowReason;
this.diagnoseLogId = row.diagnoseLogId;
},
//设为待匹配医生
waitMatchDot(row) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或