Skip to content

P
pica-admin-consultation
提交 d4befb97 编写于 作者: zhongyao.qiao's avatar zhongyao.qiao
浏览文件
操作

Merge branch 'feature/qiao' into 'release' 

Feature/qiao

See merge request !284
上级 07fe0c76 688b8584
隐藏空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 101 行删除
.env.development.local
浏览文件 @ d4befb97
......@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
VUE_APP_APPID=wxf4e66242d31c81c2
#本地token
VUE_APP_TOKEN=B638EE700AD348B8B432E7DF53A48E87
VUE_APP_TOKEN=03C47CD06EA14ADD8C5CB22332E88607
src/components/list/table-set-component.vue
浏览文件 @ d4befb97
......@@ -35,6 +35,7 @@
"
min-width="170"
align="center"
:fixed="item.fixed||false"
>
<template slot-scope="scope">
<div v-if="scope.column.property == 'appointBeginTime'">
......@@ -224,8 +225,7 @@
class="btn"
@click="callAssistant(scope.row,)"
>
{{scope.row.consultRoadType == 2 ? '呼叫居民' : '呼叫助诊医生'}}
{{ scope.row.consultRoadType == 2 ? '呼叫居民' : '呼叫助诊医生' }}
</el-button>
</template>
</el-table-column>
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ d4befb97
export const DIAGNOS_LIST_NEW = [
{
prop: 'diagnoseLogId',
label: 'ID',
label: '问诊ID',
showtooltip: false,
fixed: 'left',
},
{
prop: 'orderNo',
label: '订单ID',
prop: 'userName',
label: '助诊医生',
showtooltip: false,
fixed: 'left',
},
{
prop: 'price',
label: '订单金额',
prop: 'doctorName',
label: '接诊医生',
showtooltip: false,
fixed: 'left',
},
{
prop: 'orderPlacer',
label: '下单人',
prop: 'triageDepartment',
label: '分诊科室',
showtooltip: false,
},
{
prop: 'patientName',
label: '患者姓名',
showtooltip: false,
},
{
prop: 'statusStr',
label: '状态',
showtooltip: false,
},
{
prop: 'price',
label: '订单金额',
showtooltip: false,
},
{
......@@ -37,13 +55,43 @@ export const DIAGNOS_LIST_NEW = [
with: '200',
},
{
prop: 'refundRemark',
label: '外呼状态',
prop: 'diagnoseChannelStr',
label: '问诊方式',
showtooltip: false,
},
{
prop: 'statusStr',
label: '状态',
prop: 'appointBeginTime',
label: '预约时间',
showtooltip: false,
},
{
prop: 'doneTime',
label: '完成时间',
showtooltip: false,
},
{
prop: 'createdTime',
label: '创建时间',
showtooltip: false,
},
{
prop: 'assistantBeginTime',
label: '助诊医生意向时间',
showtooltip: false,
},
{
prop: 'orderNo',
label: '订单ID',
showtooltip: false,
},
{
prop: 'orderPlacer',
label: '下单人',
showtooltip: false,
},
{
prop: 'refundRemark',
label: '外呼状态',
showtooltip: false,
},
{
......@@ -61,12 +109,6 @@ export const DIAGNOS_LIST_NEW = [
label: '稍后跟进状态',
showtooltip: false,
},
{
prop: 'appointBeginTime',
label: '预约时间',
showtooltip: false,
},
// appointBeginTime appointEndTime 预约时间
{
prop: 'operateUserId',
label: '运营人员ID',
......@@ -77,21 +119,11 @@ export const DIAGNOS_LIST_NEW = [
label: '运营人员',
showtooltip: false,
},
{
prop: 'userName',
label: '助诊医生',
showtooltip: false,
},
{
prop: 'userMobile',
label: '助诊电话',
showtooltip: false,
},
{
prop: 'assistantBeginTime',
label: '助诊医生意向时间',
showtooltip: false,
},
// assistantBeginTime assistantEndTime 助诊医生意向时间
{
prop: 'assistantRemark',
......@@ -103,21 +135,11 @@ export const DIAGNOS_LIST_NEW = [
label: '预约科室',
showtooltip: false,
},
{
prop: 'triageDepartment',
label: '分诊科室',
showtooltip: false,
},
{
prop: 'triageRemark',
label: '分诊备注',
showtooltip: true,
},
{
prop: 'doctorName',
label: '接诊医生',
showtooltip: false,
},
{
prop: 'outsideDoctor',
label: '站外医生姓名',
......@@ -134,11 +156,7 @@ export const DIAGNOS_LIST_NEW = [
showtooltip: false,
},
// receptionBeginTime receptionEndTime 接诊医生意向时间
{
prop: 'patientName',
label: '患者姓名',
showtooltip: false,
},
{
prop: 'age',
label: '患者年龄',
......@@ -199,26 +217,11 @@ export const DIAGNOS_LIST_NEW = [
label: '招募人',
showtooltip: false,
},
{
prop: 'diagnoseChannelStr',
label: '问诊方式',
showtooltip: false,
},
{
prop: 'doneTime',
label: '完成时间',
showtooltip: false,
},
{
prop: 'cancelTime',
label: '退款时间',
showtooltip: false,
},
{
prop: 'createdTime',
label: '创建时间',
showtooltip: false,
},
{
prop: 'followFlagStr',
label: '是否跟进',
......
src/utils/constants.js
浏览文件 @ d4befb97
......@@ -5,10 +5,6 @@
// 预约类型list
export const TYPE_LIST = [
{
label: '全部',
value: '',
},
{
label: '语音问诊',
value: 1,
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ d4befb97
......@@ -37,9 +37,10 @@
class="t-b"
>
<el-select
v-model="searchParam.type"
v-model="searchParam.typeList"
placeholder="请选择问诊类型"
style="width: 220px"
multiple
>
<el-option
v-for="item of consultationTypeList"
......@@ -55,19 +56,6 @@
label="分诊科室"
class="t-b"
>
<!-- <el-select
v-model="searchParam.triageDepartmentId"
placeholder="请选择科室"
style="width: 220px"
filterable
>
<el-option
v-for="item of depList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> -->
<el-cascader
ref="cascader"
v-model="searchParam.triageDepartmentId"
......@@ -152,9 +140,10 @@
class="t-b"
>
<el-select
v-model="searchParam.diagnoseType"
v-model="searchParam.diagnoseTypeList"
placeholder="请选择预约类型"
style="width: 220px"
multiple
>
<el-option
v-for="item of tyleList"
......@@ -300,7 +289,7 @@
<el-input
v-model.trim="searchParam.patientName"
clearable
placeholder="仅可查询报告解读患者"
placeholder="请输入"
style="width: 220px"
@change="patientNameChange"
/>
......@@ -343,16 +332,6 @@
label="基层意向时间"
class="t-b"
>
<!-- <el-date-picker
v-model="assistantTime"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 220px"
:picker-options="pickerOptions1"
/> -->
<el-date-picker
v-model="assistantTime"
type="daterange"
......@@ -370,10 +349,11 @@
class="t-b"
>
<el-select
v-model="searchParam.consultRoad"
v-model="searchParam.consultRoadList"
placeholder="请选择业务类型"
clearable
style="width: 220px"
multiple
>
<el-option
v-for="item of orderBusinessList"
......@@ -675,13 +655,13 @@ export default {
tabrefresh: true,
searchParam: {
id: '',
type: '',
typeList: [],
operateName: '',
assistantVal: '',
receptionVal: '',
sort: null,
triageDepartmentId: '',
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
diagnoseTypeList: [], // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '',
createdTimeEnd: '',
operateTimeBegin: '',
......@@ -700,7 +680,7 @@ export default {
refundRemark: '',
orderPlacer: '',
matchingWay: null,
consultRoad: null,
consultRoadList: [],
patientName: null,
},
noteList: [],
......@@ -786,10 +766,6 @@ export default {
allTilst: [],
allList: {},
consultationTypeList: [
{
label: '全部',
value: '',
},
{
label: '名医问诊',
value: 2,
......@@ -1177,7 +1153,7 @@ export default {
this.assistantTime = '';
this.searchParam = Object.assign(this.searchParam, {
id: '',
type: '',
typeList: [],
operateName: '',
assistantVal: '',
receptionVal: '',
......@@ -1186,7 +1162,7 @@ export default {
refundRemark: '',
orderPlacer: '',
matchingWay: null,
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
diagnoseTypeList: [], // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '',
createdTimeEnd: '',
operateTimeBegin: '',
......@@ -1199,7 +1175,7 @@ export default {
assistantBeginTime: '',
assistantEndTime: '',
inNewTimeObj: {},
consultRoad: null,
consultRoadList: [],
patientName: null,
});
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或