Skip to content

P
pica-admin-consultation
提交 7dcc25ad 编写于 作者: xiaoping.di's avatar xiaoping.di
浏览文件
操作

Merge branch 'release' into 'master' 

Release

See merge request !257
上级 e9778afc 5863f54b
显示空白字符变更
内嵌 并排
正在显示 包含 704 行增加 和 53 行删除
src/api/diagnosis.js
浏览文件 @ 7dcc25ad
...@@ -62,6 +62,13 @@ export const messageHistory = async (data) => { ...@@ -62,6 +62,13 @@ export const messageHistory = async (data) => {
}); });
}; };
export const getOnlineStatus = async (roomId) => {
return request({
url: `/coupler/trtc/room/online/userList?roomId=${roomId}`,
method: 'get',
});
};
export const messageSend = async (data) => { export const messageSend = async (data) => {
return request({ return request({
url: '/im/team/op/message/send', url: '/im/team/op/message/send',
...@@ -295,3 +302,18 @@ export const departmentAll = async () => { ...@@ -295,3 +302,18 @@ export const departmentAll = async () => {
method: 'get', method: 'get',
}); });
}; };
//
export const updateDepartmentId = async (data) => {
return request({
url: '/diagnose/admin/diagnose/diagnoseId/fresh/departmentId',
data: data,
method: 'post',
});
};
export const savePCDayCount = async (data) => {
return request({
url: '/diagnose/doctor/work/savePCDayCount',
data: data,
method: 'post',
});
};
\ No newline at end of file
src/api/serviceSchedule.js
浏览文件 @ 7dcc25ad
...@@ -92,3 +92,10 @@ export const getLevelAndDayCount = async (data) => { ...@@ -92,3 +92,10 @@ export const getLevelAndDayCount = async (data) => {
method: 'post', method: 'post',
}); });
}; };
// 暂时添加刷新问诊接口
export const getOrderNoFresh = async (diagnoseLogId) => {
return request({
url: `/diagnose/admin/diagnose/diagnoseOrderNo/fresh/${diagnoseLogId}`,
method: 'get',
});
};
src/components/IM/diagnosis-live.vue
浏览文件 @ 7dcc25ad
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
callDirect, callDirect,
usersigTrtc, usersigTrtc,
diagnoseEndCall, diagnoseEndCall,
getOnlineStatus,
} from '@/api/diagnosis'; } from '@/api/diagnosis';
export default { export default {
...@@ -159,16 +160,13 @@ ...@@ -159,16 +160,13 @@
answerTime: 0, // 接诊医生接入时长 answerTime: 0, // 接诊医生接入时长
useTime: 0, // 问诊时长 useTime: 0, // 问诊时长
loseTime: 0, // 问诊剩余时长 loseTime: 0, // 问诊剩余时长
askTimeFn: null,
answerTimeFn: null,
useTimeFn: null,
loseTimeFn: null, loseTimeFn: null,
timerOfStatus: null,
type: 1, // 1: 语音 2: 视频 type: 1, // 1: 语音 2: 视频
startTime: 0, startTime: 0,
endTime: 0, endTime: 0,
time: 30, // 总时长 time: 30, // 总时长
memberList: [], memberList: [],
tid: '', // 群id
diagnoseLogId: '', // 问诊id diagnoseLogId: '', // 问诊id
isMuted: true, isMuted: true,
liveInfoSave: {}, liveInfoSave: {},
...@@ -196,10 +194,11 @@ ...@@ -196,10 +194,11 @@
watch: { watch: {
currentChat(newVal, oldVal) { currentChat(newVal, oldVal) {
if (newVal !== oldVal && newVal.imTeamId) { if (newVal !== oldVal && newVal.imTeamId) {
const { imTeamId, diagnoseLogId } = this.currentChat; const { diagnoseLogId } = this.currentChat;
this.tid = imTeamId;
this.diagnoseLogId = diagnoseLogId; this.diagnoseLogId = diagnoseLogId;
this.init(); this.init();
} else {
clearInterval(this.timerOfStatus);
} }
}, },
}, },
...@@ -222,6 +221,7 @@ ...@@ -222,6 +221,7 @@
// 获取视频参数 // 获取视频参数
this.getViedoParams(); this.getViedoParams();
this.getInfo(); // 获取用户信息列表 this.getInfo(); // 获取用户信息列表
this.getOnlineStatus(); // 实时获取用户状态
}, },
toggleVol() { toggleVol() {
if (this.isMuted) { if (this.isMuted) {
...@@ -239,7 +239,6 @@ ...@@ -239,7 +239,6 @@
if (data.role == 2 && this.userTrtcEntryStatus != 2) { if (data.role == 2 && this.userTrtcEntryStatus != 2) {
return false; return false;
} }
console.log('--this.roomId', this.currentChat, data, this.roomId);
const params = { const params = {
imAccId: data.accId, imAccId: data.accId,
imTeamId: this.currentChat.imTeamId, imTeamId: this.currentChat.imTeamId,
...@@ -304,7 +303,6 @@ ...@@ -304,7 +303,6 @@
.catch(() => { .catch(() => {
this.$message.error('未获取到相关信息'); this.$message.error('未获取到相关信息');
this.memberList = []; this.memberList = [];
// this.getErr();
}); });
}, },
// 获取AppId // 获取AppId
...@@ -548,21 +546,6 @@ ...@@ -548,21 +546,6 @@
this.muteLocalAudio(); this.muteLocalAudio();
this.rtc.leave(); this.rtc.leave();
this.clearSession(); this.clearSession();
// window.location.href = 'about:blank';
// window.close();
},
// 结束会话
overFn() {
this.$refs.alert
.init({
cancleTxt: '取消',
confirmTxt: '我知道了',
title: '确定要结束会话么？',
})
.then(() => {
this.out();
})
.catch(() => {});
}, },
out() { out() {
diagnoseEndCall({ diagnoseEndCall({
...@@ -611,9 +594,6 @@ ...@@ -611,9 +594,6 @@
}); });
}, },
clearTime() { clearTime() {
clearInterval(this.askTimeFn);
clearInterval(this.answerTimeFn);
clearInterval(this.useTimeFn);
clearInterval(this.loseTimeFn); clearInterval(this.loseTimeFn);
this.isMuted = true; this.isMuted = true;
}, },
...@@ -629,6 +609,75 @@ ...@@ -629,6 +609,75 @@
checkChrome() { checkChrome() {
return getBroswer().broswer == 'Chrome'; return getBroswer().broswer == 'Chrome';
}, },
getOnlineStatus() {
const { roomId } = this.currentChat;
const that = this;
this.timerOfStatus = setInterval(function () {
getOnlineStatus(roomId).then((res) => {
if (!res.data) {
return false;
}
const l = res.data.map((i) => {
return i.userId;
});
// l = [1089725294, 1089728785];
// that.memberList = [
// {
// accId: 'd_3651506947_uat',
// avatarImageUrl: 'https://test-file.yunqueyi.com/File/doctor_default.png',
// id: 1089725294,
// liveUserId: 'd_3651506947_uat_1089725294',
// name: '顾超',
// role: 2,
// status: 3,
// type: 1
// },
// {
// accId: 'd_1909506947_uat',
// avatarImageUrl: 'https://test-file.yunqueyi.com/File/doctor_default.png',
// id: 1089728785,
// liveUserId: 'd_1909506947_uat_1089728785',
// name: '陈影',
// role: 1,
// status: 3,
// type: 1,
// }
// ];
if (
l &&
l.length > 0 &&
that.memberList &&
that.memberList.length > 0
) {
that.memberList.map((i) => {
console.log('res==---', l, i.id, l.includes(i.id));
if (l.includes(i.id)) {
// 在线 更新状态
that.addNewMember(i.liveUserId);
} else {
// 不在线 更新状态
if (i.role == 1 && that.doctorTrtcEntryStatus != 3) {
that.removeMember(i.liveUserId);
}
if (i.role == 2 && that.userTrtcEntryStatus != 3) {
that.removeMember(i.liveUserId);
}
}
});
}else {
if( that.memberList &&
that.memberList.length > 0) {
that.memberList.map( i => {
that.removeMember(i.liveUserId);
});
}
}
});
}, 2000);
},
}, },
}; };
</script> </script>
......
src/components/common/diagnosis-time.vue
浏览文件 @ 7dcc25ad
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
</div> </div>
<div class="doctor-info"> <div class="doctor-info">
<div class="name-floor"> <div class="name-floor">
<span class="name-info-detail">{{ userName }}</span>
<span class="doctor-info-name">基层医生</span> <span class="doctor-info-name">基层医生</span>
<p class="info-phone"> <span class="name-info-detail">{{ userName }}</span>
<span class="info-phone">
{{ userNamePhone }} {{ userNamePhone }}
</p> </span>
</div> </div>
<div class="daignose-info"> <div class="daignose-info">
<span>分诊科室：{{ triageDepartment }}</span> <span>分诊科室：{{ triageDepartment }}</span>
...@@ -276,15 +276,17 @@ ...@@ -276,15 +276,17 @@
border-radius: 8px; border-radius: 8px;
height: 68px; height: 68px;
display: flex; display: flex;
padding: 20px 30px 20px 0;
.name-floor { .name-floor {
width: 50%; width: 50%;
padding: 10px 26px; padding: 10px 26px;
display: flex;
align-items: center;
.name-info-detail { .name-info-detail {
font-size: 18px; font-size: 18px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #02120f; color: #02120f;
margin-bottom: 8px;
margin-right: 5px; margin-right: 5px;
} }
.doctor-info-name { .doctor-info-name {
...@@ -292,7 +294,9 @@ ...@@ -292,7 +294,9 @@
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
margin-bottom: 8px; border-radius: 9px;
border: 1px solid #D9D9D9;
margin-right: 8px;
} }
.info-phone { .info-phone {
font-size: 18px; font-size: 18px;
...@@ -306,7 +310,10 @@ ...@@ -306,7 +310,10 @@
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
padding-top: 40px; display: flex;
align-items: center;
width: 50%;
justify-content: flex-end;
} }
} }
.work-info-Num { .work-info-Num {
......
src/components/common/updateDepartId.vue 0 → 100644
浏览文件 @ 7dcc25ad
<template>
<div class="update-departId">
<el-dialog
:title="title"
:visible.sync="diaUpdateDeIdVisible"
@close="cancel"
>
<div class="update-shownamephone">
<div class="update-namephone">
<div class="update-name">
<span class="doctor-name">基层医生</span>
<span class="namephone-show">{{ userName }}</span>
<span class="namephone-show">{{ userNamePhone }}</span>
</div>
<div class="depart-show">
原分诊科室：{{ triageDepartment }}
</div>
</div>
<div class="deparment-show">
<p class="update-dename">
修改新分诊科室
</p>
<el-cascader
ref="cascader"
v-model="triageDepartmentId"
filterable
clearable
class="serviceSchedule-cascader"
:options="allTilst"
placeholder="选择科室"
:show-all-levels="false"
@change="changeDepartment"
>
<template slot-scope="{ data }">
<span :style="{ fontSize: '15px', color: '#606266' }">{{
data.label
}}</span>
<span
:style="{
fontSize: '10px',
color: '#606266',
marginLeft: '10px',
opacity: '0.7',
}"
>{{ data.text }}</span>
</template>
</el-cascader>
</div>
<div class="work-info-botton">
<span
slot="footer"
class="dialog-footer"
style="text-align: center"
>
<el-button
class="contest"
type="primary"
:disabled="isClick"
@click="confirm"
>确定</el-button>
<el-button
class="cancel-submit"
@click="cancel"
>取 消</el-button>
</span>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { updateDepartmentId, departmentAll } from '@/api/diagnosis';
let vm = null;
export default {
props: {
diaUpdateDeIdVisible: {
type: Boolean,
default: false,
},
diagnoseLogId: {
type: Number,
default: 0,
},
triageDepartment: {
type: String,
default: '',
},
userName: {
type: String,
default: '',
},
userNamePhone: {
type: String,
default: '',
},
},
data() {
return {
show: false,
title: '',
confirmTxt: '确定',
cancleTxt: '',
triageDepartmentId: '',
newTriageDepartment: '',
allTilst: [],
allList: {},
};
},
created() {
vm = this;
this.departmentAll();
},
methods: {
departmentAll() {
departmentAll().then((res) => {
if (res.code == '000000') {
this.allList = res.data || {};
this.showListALL();
}
});
},
showListALL() {
const arr = [];
const { departmentMapList, parentDepartmentList } = this.allList;
parentDepartmentList.map((item) => {
const obj = {
label: item.departmentName,
value: item.departmentId,
children: [],
};
departmentMapList.map((info) => {
if (info.parentDepartmentId === obj.value) {
const children = [];
info.diagnoseDepartmentRespList.map((detail) => {
const secondObj = {
label: detail.departmentName,
value: detail.departmentId,
text: '',
};
let secondChildren = '';
(detail.departmentDeseaseRespList || []).map((res) => {
secondChildren += res.deseaseName + ' ';
});
secondObj.text = secondChildren ? `（${secondChildren}）` : '';
children.push(secondObj);
});
obj.children = children;
}
});
arr.push(obj);
});
console.log(arr);
this.allTilst = arr;
},
confirm() {
if (this.newTriageDepartment == '') {
this.$message({
message: '请选择修改科室',
type: 'warning',
duration: 1000,
});
return false;
}
const params = {
diagnoseLogId: this.diagnoseLogId,
triageDepartmentId: this.triageDepartmentId,
triageDepartment: this.newTriageDepartment,
};
vm.isClick = true;
updateDepartmentId(params)
.then((res) => {
vm.isClick = false;
if (res.code == '000000') {
vm.cancel();
vm.$emit('search');
} else {
vm.$message.error(res.message);
}
})
.catch(function () {
vm.isClick = false;
// vm.$message.error(err.message);
});
},
cancel() {
this.$emit('update:diaUpdateDeIdVisible', false);
},
// 获取选择的值
changeDepartment() {
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
console.log(checkedNodes);
if (checkedNodes.length > 0) {
this.triageDepartmentId = checkedNodes[0].value;
this.newTriageDepartment = checkedNodes[0].label;
} else {
this.triageDepartmentId = '';
this.newTriageDepartment = '';
}
},
},
};
</script>
<style lang="scss" scoped>
.update-departId {
.update-shownamephone {
padding: 20px 30px;
.update-namephone {
padding: 20px 30px;
background: rgba(240, 242, 245, 0.6);
border-radius: 8px;
display: flex;
width: 100%;
.update-name {
width: 50%;
display: flex;
justify-content: flex-start;
align-items: center;
.doctor-name {
padding: 2px 3px;
border-radius: 10px;
border: 1px solid #d9d9d9;
margin-right: 8px;
}
.namephone-show {
font-size: 18px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #02120f;
margin-right: 8px;
}
}
.depart-show {
width: 50%;
display: flex;
justify-content: flex-end;
}
}
.deparment-show {
margin-top: 28px;
.update-dename {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #02120f;
margin-bottom: 9px;
}
/deep/.serviceSchedule-cascader {
.el-input {
.el-input__inner {
width: 180px;
height: 32px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
}
.el-input__suffix {
display: flex;
align-items: center;
}
}
input::-webkit-input-placeholder {
color: #89888b;
}
}
}
.work-info-botton {
padding: 35px 0;
.dialog-footer {
.contest {
width: 180px;
height: 40px;
background: #0d9078;
border-radius: 20px;
}
.cancel-submit {
width: 180px;
height: 40px;
border-radius: 20px;
border: 1px solid #0d9078;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
}
}
}
}
}
</style>
src/components/list/table-serviceSchedule.vue
浏览文件 @ 7dcc25ad
...@@ -68,6 +68,12 @@ ...@@ -68,6 +68,12 @@
:filters="createList" :filters="createList"
:filter-method="getLevel" :filter-method="getLevel"
/> />
<el-table-column
prop="preNum"
label="接诊上限/小时"
width="150"
align="center"
/>
<el-table-column <el-table-column
prop="workStatus" prop="workStatus"
label="排班状态" label="排班状态"
...@@ -121,7 +127,7 @@ ...@@ -121,7 +127,7 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
min-width="200" min-width="270"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -148,6 +154,12 @@ ...@@ -148,6 +154,12 @@
> >
查看 查看
</div> </div>
<div
class="download-btn"
@click="setMaxNumValue(scope.row)"
>
接诊上限
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -225,6 +237,7 @@ ...@@ -225,6 +237,7 @@
text: '未开通', text: '未开通',
}, },
], ],
// maxNumValue: '',
}; };
}, },
computed: {}, computed: {},
...@@ -254,6 +267,10 @@ ...@@ -254,6 +267,10 @@
addSchedule(value, val) { addSchedule(value, val) {
this.$emit('addSchedule', value, val); this.$emit('addSchedule', value, val);
}, },
// 点击接诊上限按钮弹框打开
setMaxNumValue(value) {
this.$emit('setMaxNumValue', value);
},
// 分页 // 分页
handleSizeChange(value) { handleSizeChange(value) {
this.$emit('handleSizeChange', value); this.$emit('handleSizeChange', value);
......
src/components/list/table-set-component.vue
浏览文件 @ 7dcc25ad
...@@ -118,6 +118,15 @@ ...@@ -118,6 +118,15 @@
> >
设为待匹配医生 设为待匹配医生
</el-button> </el-button>
<el-button
v-if="showBtn(scope.row, 22, 21)"
type="primary"
size="small"
class="btn"
@click="updateDepartId(scope.row)"
>
修改科室
</el-button>
<el-button <el-button
v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)" v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
type="primary" type="primary"
...@@ -356,6 +365,10 @@ ...@@ -356,6 +365,10 @@
waitMatchDot(row) { waitMatchDot(row) {
this.$emit('waitMatchDot', row); this.$emit('waitMatchDot', row);
}, },
// 修改科室
updateDepartId(row) {
this.$emit('updateDepartId', row);
},
// 发送消息 // 发送消息
sendMessage(row) { sendMessage(row) {
this.$emit('sendMessage', row); this.$emit('sendMessage', row);
......
src/router/index.js
浏览文件 @ 7dcc25ad
...@@ -86,6 +86,13 @@ const administrators = (r) => ...@@ -86,6 +86,13 @@ const administrators = (r) =>
() => r(require('@/views/IM/diagnosis-admin/administrators.vue')), () => r(require('@/views/IM/diagnosis-admin/administrators.vue')),
'administrators' 'administrators'
); );
const orderStatusUpdate = (r) =>
require.ensure(
[],
() => r(require('@/views/IM/diagnosis-admin/orderStatusUpdate.vue')),
'orderStatusUpdate'
);
const Layout = (r) => const Layout = (r) =>
require.ensure([], () => r(require('@/views/layout/Layout.vue')), 'Layout'); require.ensure([], () => r(require('@/views/layout/Layout.vue')), 'Layout');
...@@ -158,6 +165,10 @@ const routerConfig = [ ...@@ -158,6 +165,10 @@ const routerConfig = [
path: '/administrators', path: '/administrators',
component: administrators, component: administrators,
}, },
{
path: '/orderStatusUpdate',
component: orderStatusUpdate,
},
], ],
}, },
]; ];
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 7dcc25ad
...@@ -402,6 +402,7 @@ ...@@ -402,6 +402,7 @@
@cancelRefund="cancelRefund" @cancelRefund="cancelRefund"
@witeGo="witeGo" @witeGo="witeGo"
@waitMatchDot="waitMatchDot" @waitMatchDot="waitMatchDot"
@updateDepartId="updateDepartId"
@applyCancel="applyCancel" @applyCancel="applyCancel"
@sendMessage="sendMessage" @sendMessage="sendMessage"
@joinDiagnose="joinDiagnose" @joinDiagnose="joinDiagnose"
...@@ -486,6 +487,16 @@ ...@@ -486,6 +487,16 @@
:department-id="departmentId" :department-id="departmentId"
@search="search" @search="search"
/> />
<!-- 修改科室 -->
<updateDeparId
v-if="diaUpdateDeIdVisible"
:dia-update-de-id-visible.sync="diaUpdateDeIdVisible"
:user-name="userName"
:user-name-phone="userNamePhone"
:diagnose-log-id="diagnoseLogId"
:triage-department="triageDepartment"
@search="search"
/>
<rematching-doctor <rematching-doctor
:rematching-options="rematchingOptions" :rematching-options="rematchingOptions"
:rematching-visible.sync="rematchingVisible" :rematching-visible.sync="rematchingVisible"
...@@ -547,6 +558,7 @@ ...@@ -547,6 +558,7 @@
import RematchingDoctor from '../../../components/common/rematching-doctor'; import RematchingDoctor from '../../../components/common/rematching-doctor';
import TableSetComponent from '@/components/list/table-set-component'; import TableSetComponent from '@/components/list/table-set-component';
import applyCancelComponent from '../../../components/common/applyCancel'; import applyCancelComponent from '../../../components/common/applyCancel';
import updateDeparId from '../../../components/common/updateDepartId';
export default { export default {
components: { components: {
TableSetComponent, TableSetComponent,
...@@ -561,6 +573,7 @@ ...@@ -561,6 +573,7 @@
DiagnosisTime, DiagnosisTime,
RematchingDoctor, RematchingDoctor,
applyCancelComponent, applyCancelComponent,
updateDeparId,
}, },
data() { data() {
return { return {
...@@ -624,6 +637,7 @@ ...@@ -624,6 +637,7 @@
followupVisible: false, followupVisible: false,
doctorVisible: false, doctorVisible: false,
diagnosisVisible: false, diagnosisVisible: false,
diaUpdateDeIdVisible: false,
coordinatingVisible: false, coordinatingVisible: false,
diagnosisDoctorVisible: false, diagnosisDoctorVisible: false,
diagnoseFlag: false, diagnoseFlag: false,
...@@ -690,7 +704,6 @@ ...@@ -690,7 +704,6 @@
departmentAll() { departmentAll() {
departmentAll().then((res) => { departmentAll().then((res) => {
if (res.code == '000000') { if (res.code == '000000') {
console.log(res, 'res111');
this.allList = res.data || {}; this.allList = res.data || {};
this.showListALL(); this.showListALL();
} }
...@@ -727,7 +740,6 @@ ...@@ -727,7 +740,6 @@
arr.push(obj); arr.push(obj);
}); });
console.log(arr);
this.allTilst = arr; this.allTilst = arr;
}, },
changeDepart() { changeDepart() {
...@@ -737,10 +749,6 @@ ...@@ -737,10 +749,6 @@
} else { } else {
this.searchParam.triageDepartmentId = ''; this.searchParam.triageDepartmentId = '';
} }
console.log(
this.searchParam.triageDepartmentId,
'this.searchParam.triageDepartmentId'
);
}, },
changeStartTime(time) { changeStartTime(time) {
this.rangeTimeData = time this.rangeTimeData = time
...@@ -748,7 +756,6 @@ ...@@ -748,7 +756,6 @@
? new Date(time.time).format('yyyy-MM-dd hh:mm:ss') ? new Date(time.time).format('yyyy-MM-dd hh:mm:ss')
: '' : ''
: ''; : '';
console.log(this.rangeTimeData, 'this.rangeTimeData');
}, },
getTableData(val) { getTableData(val) {
this.saveTableData = val || []; this.saveTableData = val || [];
...@@ -1118,21 +1125,28 @@ ...@@ -1118,21 +1125,28 @@
applyCancel(row) { applyCancel(row) {
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
this.dialogFormVisible = true; this.dialogFormVisible = true;
console.log(row);
}, },
// 设为待匹配医生 // 设为待匹配医生
waitMatchDot(row) { waitMatchDot(row) {
console.log(row, 'doctorData111');
this.doctorData = row; this.doctorData = row;
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
this.userName = row.userName; this.userName = row.userName;
this.userNamePhone = row.userMobile; this.userNamePhone = row.userMobile;
this.triageDepartment = row.triageDepartment; this.triageDepartment = row.triageDepartment;
this.departmentId = row.departmentId; this.departmentId = row.triageDepartmentId;
this.diagnosisTimeVisible = true; this.diagnosisTimeVisible = true;
this.bizType = 5; this.bizType = 5;
// } // }
}, },
// 修改科室
updateDepartId(row) {
console.log(row);
this.diagnoseLogId = row.diagnoseLogId;
this.userName = row.userName;
this.userNamePhone = row.userMobile;
this.triageDepartment = row.triageDepartment;
this.diaUpdateDeIdVisible = true;
},
// 发送消息 // 发送消息
sendMessage(row) { sendMessage(row) {
this.$router.push({ this.$router.push({
...@@ -1199,7 +1213,6 @@ ...@@ -1199,7 +1213,6 @@
}, },
// 设为待确认时间 // 设为待确认时间
waitMatchTime(row) { waitMatchTime(row) {
console.log(row, 'row');
this.doctorInfo = row; this.doctorInfo = row;
this.rangeTimeData = row.assistantBeginTime; this.rangeTimeData = row.assistantBeginTime;
this.diagnoseFlag = true; this.diagnoseFlag = true;
......
src/views/IM/diagnosis-admin/modal/index.scss
浏览文件 @ 7dcc25ad
...@@ -124,6 +124,12 @@ ...@@ -124,6 +124,12 @@
.show-work-set { .show-work-set {
margin-top: 100px; margin-top: 100px;
} }
.maxNum-first-show{
margin-top: 20px;
.show-sep-num{
color: red;
}
}
.agment-left-con { .agment-left-con {
padding: 15px; padding: 15px;
text-align: center; text-align: center;
......
src/views/IM/diagnosis-admin/orderStatusUpdate.vue 0 → 100644
浏览文件 @ 7dcc25ad
<template>
<div class="diagnosis-list-content">
<div class="select-content screenSet">
<div class="title">
咨询订单管理后台
</div>
</div>
<div class="component-content screenSet">
<el-form
ref="form"
:inline="true"
:model="form"
label-width="180px"
>
<el-form-item label="订单变化(待问诊>问诊中)">
<el-input v-model="form.orderName" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="submitConfirm"
>
刷新
</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
// 这个页面只是暂时的，等自动排班版本修改
import { getOrderNoFresh } from '@/api/serviceSchedule';
export default {
name: 'OrderStatusUpdate',
data() {
return {
form: {
orderName: '',
},
submitFlag: true,
};
},
mounted() {},
methods: {
submitConfirm() {
this.$confirm('是否要跟新订单状态?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
this.onSubmit();
});
},
onSubmit() {
if (this.form.orderName && this.submitFlag) {
this.submitFlag = false;
getOrderNoFresh(this.form.orderName).then((res) => {
let tipText = '';
if (res.code === '000000') {
tipText = '更新订单成功';
} else {
tipText = res.message;
}
this.form.orderName = '';
this.submitFlag = true;
this.$message({
message: tipText,
type: 'warning',
duration: 1000,
});
});
} else {
this.$message({
message: '请先输入订单id',
type: 'warning',
duration: 1000,
});
}
console.log(this.form);
},
init() {
console.log(11);
},
},
};
</script>
<style lang="scss" scoped>
.diagnosis-list-content {
.select-content {
margin-bottom: 10px;
padding: 10px;
background: #fff;
overflow: hidden !important;
.title {
height: 50px;
display: flex;
justify-content: flex-start;
align-items: center;
}
.form-container {
display: flex;
justify-content: space-between;
.form-li {
display: flex;
flex-direction: column;
// justify-content: space-between;
}
.form-btn {
display: flex;
flex-direction: column;
justify-content: flex-start;
.form-btn-li {
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
}
}
}
.select-bottom {
height: 50px;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
color: #0d9078;
}
.btn-wrap {
text-align: right;
}
.t-b {
margin-bottom: 10px;
}
}
.component-content {
height: 400px;
padding: 10px;
background: #fff;
overflow: hidden !important;
}
}
</style>
src/views/IM/diagnosis-admin/serviceSchedule.vue
浏览文件 @ 7dcc25ad
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
:total-rows="searchParam.totalRows" :total-rows="searchParam.totalRows"
:loading="loading" :loading="loading"
:create-list="newCreateList" :create-list="newCreateList"
:center-dialog-visible="centerDialogVisible"
@sortfunc="sortfunc" @sortfunc="sortfunc"
@getServiceOpen="getServiceOpen" @getServiceOpen="getServiceOpen"
@getWorkStatus="getWorkStatus" @getWorkStatus="getWorkStatus"
...@@ -145,6 +146,7 @@ ...@@ -145,6 +146,7 @@
@handleSizeChange="handleSizeChange" @handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange" @handleCurrentChange="handleCurrentChange"
@addSchedule="addSchedule" @addSchedule="addSchedule"
@setMaxNumValue="setMaxNumValue"
/> />
</div> </div>
</div> </div>
...@@ -155,6 +157,36 @@ ...@@ -155,6 +157,36 @@
href="" href=""
target="_blank" target="_blank"
/> />
<el-dialog
:visible.sync="centerDialogVisible"
width="30%"
center
class="el-dialog-show"
>
<div class="set-agment-maxNum">
<div class="num-max">
<span class="hour-num-title">每小时接诊上限人数</span>
<div class="num-input-show">
<el-input-number
v-model="maxNumValue"
:min="0"
:max="20"
@change="getMaxNumValue"
/>
</div>
</div>
</div>
<span
slot="footer"
class="dialog-footer"
>
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button
type="primary"
@click="submitSetData"
>确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -165,7 +197,7 @@ ...@@ -165,7 +197,7 @@
workInStep, workInStep,
getLevel, getLevel,
} from '@/api/serviceSchedule'; } from '@/api/serviceSchedule';
import { departmentAll } from '@/api/diagnosis'; import { departmentAll, savePCDayCount} from '@/api/diagnosis';
import TableServiceSchedule from '@/components/list/table-serviceSchedule'; import TableServiceSchedule from '@/components/list/table-serviceSchedule';
export default { export default {
components: { components: {
...@@ -227,6 +259,9 @@ ...@@ -227,6 +259,9 @@
newCreateList: [], newCreateList: [],
allTilst: [], allTilst: [],
allList: {}, allList: {},
centerDialogVisible:false,
doctorInfo:{},
maxNumValue:''
}; };
}, },
watch: {}, watch: {},
...@@ -403,20 +438,33 @@ ...@@ -403,20 +438,33 @@
this.search(); this.search();
}, },
addSchedule(value, val) { addSchedule(value, val) {
// this.ScheduleListShow = false;
// this.schedulingType = val;
const target = this.$refs.target; const target = this.$refs.target;
const { origin } = window.location; const { origin } = window.location;
const u = `${origin}/consultation/pica-admin-consultation/addEditSchedule?type=${val}&doctorId=${value.doctorId}&id=${value.id}`; const u = `${origin}/consultation/pica-admin-consultation/addEditSchedule?type=${val}&doctorId=${value.doctorId}&id=${value.id}`;
target.setAttribute('href', u); target.setAttribute('href', u);
target.click(); target.click();
}, },
// goBack(flag) { setMaxNumValue(value) {
// this.ScheduleListShow = true; this.doctorInfo = value;
// if (flag) { this.maxNumValue = value.preNum;
// this.search(); this.centerDialogVisible = true;
// } },
// }, // 每小时接诊上限人数
getMaxNumValue(value) {
this.maxNumValue = value;
},
submitSetData() {
const params = {
doctorId:this.doctorInfo.doctorId,
preNum:this.maxNumValue
};
savePCDayCount(params).then(res => {
if (res.code == '000000') {
this.centerDialogVisible = false;
this.search();
}
});
}
}, },
}; };
</script> </script>
...@@ -541,6 +589,29 @@ ...@@ -541,6 +589,29 @@
} }
} }
} }
.el-dialog-show {
.set-agment-maxNum {
.num-max {
text-align: center;
.hour-num-title {
font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #02120f;
}
.num-input-show {
padding-top: 10px;
.el-input {
width: 50%;
/deep/.el-input__inner {
border-radius: 20px;
text-align: center;
}
}
}
}
}
}
} }
</style> </style>
<style lang="scss"> <style lang="scss">
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或