Skip to content

P
pica-admin-consultation
提交 b0e4bf8c 编写于 作者: xingli.wu's avatar xingli.wu
浏览文件
操作

Merge branch 'feature/wxl' into 'release' 

feat: 新增新诊室跳转 & 敏感信息卡片

See merge request !301
上级 fe25ea60 0bcf9aac
显示空白字符变更
内嵌 并排
正在显示 包含 266 行增加 和 218 行删除
.env.development.local
浏览文件 @ b0e4bf8c
......@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
VUE_APP_APPID=wxf4e66242d31c81c2
#本地token
VUE_APP_TOKEN=94F2E2E006D74C6EB5CCFC15F67DE31A
VUE_APP_TOKEN=E214A2D6B40345F98DE538DA793CF918
src/api/diagnosis.js
浏览文件 @ b0e4bf8c
......@@ -96,7 +96,7 @@ export const getCountQuery = async (params) => {
return request({
url: '/diagnose/admin/diagnose/countQuery',
method: 'post',
data: params
data: params,
});
};
......@@ -337,3 +337,11 @@ export const personnelList = async () => {
method: 'get',
});
};
// 根据订单id获取群ID和群用户名
export const getUserIdByDiagnoseLogId = async (diagnoseLogId) => {
return request({
url: `/diagnose/admin/diagnose/team/${diagnoseLogId}`,
method: 'get',
});
};
src/components/list/table-set-component.vue
浏览文件 @ b0e4bf8c
......@@ -29,14 +29,16 @@
:label="item.label"
:show-overflow-tooltip="item.showtooltip"
:sortable="
item.prop == 'appointBeginTime' || item.prop == 'assistantBeginTime' ||
item.prop == 'assistantTime' || item.prop == 'receptionTime'
item.prop == 'appointBeginTime' ||
item.prop == 'assistantBeginTime' ||
item.prop == 'assistantTime' ||
item.prop == 'receptionTime'
? 'custom'
: false
"
min-width="170"
align="center"
:fixed="item.fixed||false"
:fixed="item.fixed || false"
>
<template slot-scope="scope">
<div v-if="scope.column.property == 'appointBeginTime'">
......@@ -54,17 +56,22 @@
<div v-else-if="scope.column.property == 'assistantTime'">
<div
:style="{
color: scope.row.diagnoseChannel === 3 && scope.row.status === 3 ? 'red' : ''
color:
scope.row.diagnoseChannel === 3 && scope.row.status === 3
? 'red'
: '',
}"
>
<p v-if="scope.row.diagnoseChannel === 3 && scope.row.status === 3">
<p
v-if="scope.row.diagnoseChannel === 3 && scope.row.status === 3"
>
距自动结束还剩
</p>
<p>{{ goTime(scope.row.assistantTime) }}</p>
</div>
</div>
<div v-else-if="scope.column.property == 'receptionTime'">
<div :style="{ color: isReceptionTime(scope) ? 'red' : ''}">
<div :style="{ color: isReceptionTime(scope) ? 'red' : '' }">
<p v-if="isReceptionTime(scope)">
距自动取消还剩
</p>
......@@ -151,7 +158,7 @@
</el-button>
<!-- 问诊方式不能为小程序问诊 scope.row.diagnoseChannel！==3隐藏发送消息 -->
<el-button
v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26) && scope.row.diagnoseChannel !== 3"
v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
type="primary"
size="small"
class="btn"
......@@ -215,7 +222,11 @@
手动打回
</el-button>
<el-button
v-if="scope.row.diagnoseType !== 4 && showBtn(scope.row, 3, 26) && scope.row.diagnoseChannel !== 3"
v-if="
scope.row.diagnoseType !== 4 &&
showBtn(scope.row, 3, 26) &&
scope.row.diagnoseChannel !== 3
"
type="primary"
size="small"
class="btn"
......@@ -245,7 +256,7 @@
type="primary"
size="small"
class="btn"
@click="callAssistant(scope.row,)"
@click="callAssistant(scope.row)"
>
{{ scope.row.consultRoadType == 2 ? '呼叫居民' : '呼叫助诊医生' }}
</el-button>
......@@ -272,12 +283,12 @@
</template>
<script>
import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
import TabSet from '@/components/common/tab-set';
import dayjs from 'dayjs';
import duration from 'dayjs/plugin/duration';
dayjs.extend(duration);
export default {
import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
import TabSet from '@/components/common/tab-set';
import dayjs from 'dayjs';
import duration from 'dayjs/plugin/duration';
dayjs.extend(duration);
export default {
components: {
TabSet,
},
......@@ -453,14 +464,20 @@
return dayjs.duration(time, 'seconds').format('HH:mm:ss');
},
isReceptionTime(scope) {
if (scope.row.diagnoseChannel === 3
&& (scope.row.status === 2 || scope.row.status === 21 || scope.row.status === 22
|| scope.row.status === 23 || scope.row.status === 24 || scope.row.status === 25
|| scope.row.status === 26)
) return true;
},
},
};
if (
scope.row.diagnoseChannel === 3 &&
(scope.row.status === 2 ||
scope.row.status === 21 ||
scope.row.status === 22 ||
scope.row.status === 23 ||
scope.row.status === 24 ||
scope.row.status === 25 ||
scope.row.status === 26)
)
return true;
},
},
};
</script>
<style lang="scss" scoped>
......
src/main.js
浏览文件 @ b0e4bf8c
......@@ -5,6 +5,7 @@ console.log('store ', store);
// 本地调试增加token和systemType
if (process.env.VUE_APP_ENV === 'development') {
console.log(123);
window.localStorage.setItem('token', process.env.VUE_APP_TOKEN);
window.localStorage.setItem('systemType', process.env.VUE_APP_SYSTEM_TYPE);
}
src/views/IM/diagnosis-admin/diagnosis-im.vue
浏览文件 @ b0e4bf8c
......@@ -61,6 +61,15 @@
src="../../../assets/image/IM/loading-icon-new.png"
alt
>
<div
v-if="item.showType == -1"
class="mid-text-wrapper"
style="max-width: 520px;"
>
<div class="mid-text">
{{ item.text }}
</div>
</div>
<div
v-if="item.showType == 1"
class="mid-text-wrapper"
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ b0e4bf8c
......@@ -670,7 +670,8 @@ import {
getCountQuery,
getDepartments,
reMatchDoctor,
personnelList
personnelList,
getUserIdByDiagnoseLogId,
} from '@/api/diagnosis';
import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
import {
......@@ -685,7 +686,7 @@ import {
TRIAGE_TAB_LIST,
TYPE_LIST,
DIAGNOSE_CHANNEL,
FOLLOW_STATUS_LIST
FOLLOW_STATUS_LIST,
} from '@/utils/constants';
import { outbounNote } from '../../../api/diagnosis';
import { callAssistantDoctor, updateDiagnosis } from '../../../utils/diagnosis';
......@@ -734,7 +735,7 @@ export default {
orderRangeTime: '',
completeRangeTime: '',
assistantTime: '',
followDateTime:'',
followDateTime: '',
depList: [],
tabrefresh: true,
searchParam: {
......@@ -756,8 +757,8 @@ export default {
doneTimeEnd: '',
assistantBeginTime: '',
assistantEndTime: '',
followDateBegin:'',
followDateEnd:'',
followDateBegin: '',
followDateEnd: '',
pageSize: 15,
pageNo: 1,
menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊 5、外呼
......@@ -769,8 +770,8 @@ export default {
consultRoadList: [],
diagnoseChannelList: [],
patientName: null,
followOperatorId:'', // 运营id
followStatusList:[], // 跟进状态
followOperatorId: '', // 运营id
followStatusList: [], // 跟进状态
},
noteList: [],
alltabslist: [],
......@@ -856,7 +857,7 @@ export default {
triageDepartment: '',
departmentId: '',
allTilst: [],
allPersonnelList:[],
allPersonnelList: [],
allList: {},
consultationTypeList: [
{
......@@ -1164,7 +1165,7 @@ export default {
orderRangeTime,
completeRangeTime,
assistantTime,
followDateTime
followDateTime,
} = this;
this.setTime('createdTimeBegin', 'createdTimeEnd', createRangeTime);
this.setTime('cancelTimeBegin', 'cancelTimeEnd', cancelRangeTime);
......@@ -1208,7 +1209,7 @@ export default {
data.order == 'descending'
) {
this.searchParam.sort = 4;
} else if(data.prop == 'assistantTime') {
} else if (data.prop == 'assistantTime') {
if (data.order == 'ascending') {
this.searchParam.sort = 5;
} else {
......@@ -1296,14 +1297,14 @@ export default {
doneTimeEnd: '',
assistantBeginTime: '',
assistantEndTime: '',
followDateBegin:'',
followDateEnd:'',
followDateBegin: '',
followDateEnd: '',
inNewTimeObj: {},
consultRoadList: [],
patientName: null,
diagnoseChannelList: [],
followStatusList:[],
followOperatorId:''
followStatusList: [],
followOperatorId: '',
});
this.getsearch();
},
......@@ -1430,16 +1431,28 @@ export default {
},
// 发送消息
sendMessage(row) {
// this.$router.push({
// path: '/diagnosis-im',
// query: { tid: row.imTeamId },
// });
console.log('sendMessage', row);
const target = this.$refs.target;
const { origin } = window.location;
const u = `${origin}/consultation/pica-admin-consultation/diagnosis-im?tid=${row.imTeamId}`;
target.setAttribute('href', u);
let url = `${origin}/consultation/pica-admin-consultation/diagnosis-im?tid=${row.imTeamId}`;
// 小程序问诊跳新的项目，本地跳转会不生效。 需要启动该项目 http://192.168.110.53/com.pica.cloud.education.frontend/pica-turborepo/tree/release/apps/pica-chat
if (row.diagnoseChannel === 3) {
getUserIdByDiagnoseLogId(row.diagnoseLogId)
.then((res) => {
if (res.code === '000000') {
const { userId } = res.data;
url = `${origin}/new-pica-consultation?userId=${userId}`;
target.setAttribute('href', url);
target.click();
}
})
.catch((err) => {
console.log('err', err);
});
} else {
target.setAttribute('href', url);
target.click();
}
},
// 加入问诊
......@@ -1533,7 +1546,7 @@ export default {
'上级医生日程改变，提前取消',
'操作失误，重新匹配医生',
'助诊医生爽约',
'科室不对'
'科室不对',
];
}
// this.rematchingOptions=
......
vue.config.js
浏览文件 @ b0e4bf8c
......@@ -70,7 +70,7 @@ module.exports = {
port: 8080,
proxy: {
'/proxy': {
target: 'https://dev-sc.yunqueyi.com/',
target: 'https://uat-sc.yunqueyi.com/',
ws: false,
changeOrigin: true,
secure: true,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或