Skip to content

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

Merge branch 'feature/jq_1' into 'develop' 

Feature/jq 1

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!187
上级 3222dd8f e915e012
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 784 行增加 和 646 行删除
src/api/serviceSchedule.js
浏览文件 @ a533ac31
...@@ -78,3 +78,17 @@ export const getPlatformUpper = async () => { ...@@ -78,3 +78,17 @@ export const getPlatformUpper = async () => {
method: 'post', method: 'post',
}); });
}; };
export const saveLevelAndDayCount = async (data) => {
return request({
url: '/diagnose/doctor/work/saveLevelAndDayCount',
data: data,
method: 'post',
});
};
export const getLevelAndDayCount = async (data) => {
return request({
url: `/diagnose/doctor/work/getLevelAndDayCount/${data.workId}`,
data: data,
method: 'post',
});
};
src/utils/diagnosis/index.js
浏览文件 @ a533ac31
...@@ -2,7 +2,7 @@ import fetch from '../fetch'; ...@@ -2,7 +2,7 @@ import fetch from '../fetch';
import { getBaseUrl } from '@/utils/index'; import { getBaseUrl } from '@/utils/index';
const headers = { const headers = {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8',
token: localStorage.getItem('token'), token: localStorage.getItem('token'),
}; };
/* 保存问诊相关信息*/ /* 保存问诊相关信息*/
...@@ -16,6 +16,15 @@ export const updateDiagnosis = (params) => { ...@@ -16,6 +16,15 @@ export const updateDiagnosis = (params) => {
}); });
}; };
export const manualQueue = (params) => {
return fetch({
headers,
url: getBaseUrl('/diagnose/diagnose/manual/queue'),
method: 'post',
data: params,
description: '保存问诊相关信息',
});
};
/* 批量设置运营*/ /* 批量设置运营*/
export const batchSetOperator = (params) => { export const batchSetOperator = (params) => {
return fetch({ return fetch({
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ a533ac31
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
@search="search" @search="search"
/> />
<diagnosis-doctor <diagnosis-doctor
v-if="diagnoseFlag" v-if="diagnosisDoctorVisible"
:diagnosis-doctor-visible.sync="diagnosisDoctorVisible" :diagnosis-doctor-visible.sync="diagnosisDoctorVisible"
:diagnose-log-id="diagnoseLogId" :diagnose-log-id="diagnoseLogId"
:diagnose-type="diagnoseType" :diagnose-type="diagnoseType"
...@@ -452,9 +452,14 @@ ...@@ -452,9 +452,14 @@
@search="search" @search="search"
/> />
<diagnosis-time <diagnosis-time
v-if="diagnosisTimeVisible"
:diagnosis-time-visible.sync="diagnosisTimeVisible" :diagnosis-time-visible.sync="diagnosisTimeVisible"
:diagnose-log-id="diagnoseLogId" :diagnose-log-id="diagnoseLogId"
:biz-type="bizType" :biz-type="bizType"
:user-name="userName"
:user-name-phone="userNamePhone"
:triage-department="triageDepartment"
:department-id="departmentId"
@search="search" @search="search"
/> />
<rematching-doctor <rematching-doctor
...@@ -623,6 +628,10 @@ ...@@ -623,6 +628,10 @@
timer: null, timer: null,
fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台 fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台
doctorInfo: {}, doctorInfo: {},
userName: '',
userNamePhone: '',
triageDepartment: '',
departmentId: '',
}; };
}, },
watch: { watch: {
...@@ -1030,14 +1039,13 @@ ...@@ -1030,14 +1039,13 @@
}, },
// 设为待匹配医生 // 设为待匹配医生
waitMatchDot(row) { waitMatchDot(row) {
console.log(row, 'doctorData111');
this.doctorData = row;
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
// 待分诊 this.userName = row.userName;
// if(row.status == 22){ this.userNamePhone = row.userMobile;
// this.doctorVisible = true; this.triageDepartment = row.triageDepartment;
// this.bizType = 7; this.departmentId = row.departmentId;
// this.triageDepartmentId = row.triageDepartmentId;
// }
// else {
this.diagnosisTimeVisible = true; this.diagnosisTimeVisible = true;
this.bizType = 5; this.bizType = 5;
// } // }
...@@ -1108,13 +1116,11 @@ ...@@ -1108,13 +1116,11 @@
}, },
// 设为待确认时间 // 设为待确认时间
waitMatchTime(row) { waitMatchTime(row) {
// debugger;
console.log(row, '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;
this.diagnosisDoctorVisible = true; this.diagnosisDoctorVisible = true;
// this.acceptsCeilings(row.doctorId);
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
this.diagnoseType = row.diagnoseType; this.diagnoseType = row.diagnoseType;
if (row.doctorId == 0) { if (row.doctorId == 0) {
......
src/views/IM/diagnosis-admin/modal/index.scss
浏览文件 @ a533ac31
...@@ -59,10 +59,39 @@ ...@@ -59,10 +59,39 @@
.agment-box-left { .agment-box-left {
flex: 1; flex: 1;
height: 100%; height: 100%;
padding: 20px;
margin-left: 12px; margin-left: 12px;
background: #fff; background: #fff;
border-radius: 6px; border-radius: 6px;
text-align: center;
display: flex;
justify-content: center;
}
.el-dialog-show {
.set-agment-maxNum {
.first-show-num {
text-align: center;
padding-bottom: 30px;
}
.num-max {
text-align: center;
.hour-num-title {
font-size: 14px;
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;
}
}
}
}
}
} }
.ag-left-change { .ag-left-change {
// position: relative; // position: relative;
...@@ -86,28 +115,86 @@ ...@@ -86,28 +115,86 @@
top: 18px; top: 18px;
} }
} }
.show-work-set {
margin-top: 100px;
}
.agment-left-con { .agment-left-con {
margin-top: 70px; padding: 15px;
background: #f0f2f5; text-align: center;
height: auto; background: #f2f2f2;
padding: 20px; border-radius: 12px;
overflow: hidden; }
border-radius: 8px; .reset-doctor-schedu {
padding: 30px 15px 5px 15px;
text-align: center;
.copy-submit {
background: #fff;
border: 1px solid #9ed4ca;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
}
}
.copy-doctor-schedu {
padding: 5px;
margin: 0 auto;
text-align: center;
.copy-submit {
background: #fff;
border: 1px solid #9ed4ca;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
}
} }
.agment-left-copy { .agment-left-copy {
margin-top: 34px; padding: 5px;
margin: 0 auto;
text-align: center; text-align: center;
.copy-reset-schedu {
padding-top: 14px;
.copy-week-schedu {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
margin-right: 5px;
cursor: pointer;
}
.copy-reaset-line {
color: #d9d9d9;
}
.reset-week-schedu {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
margin-left: 5px;
cursor: pointer;
}
}
}
.first-left-max {
padding: 5px;
margin: 0 auto;
text-align: center;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
cursor: pointer;
} }
.agment-head { .agment-head {
border-radius: 5px; border-radius: 5px;
display: flex; text-align: center;
justify-content: flex-start;
align-items: flex-end;
} }
.agment-head-name { .agment-head-name {
font-size: 20px; font-size: 20px;
color: #02120f; color: #02120f;
font-weight: 600; font-weight: 600;
padding: 3px;
} }
.agment-head-phone { .agment-head-phone {
font-size: 18px; font-size: 18px;
...@@ -116,8 +203,10 @@ ...@@ -116,8 +203,10 @@
.agment-hospital { .agment-hospital {
color: #89888b; color: #89888b;
font-size: 16px; font-size: 16px;
margin-top: 14px; margin-top: 10px;
line-height: 24px; }
.agment-hospital-show {
margin-right: 10px;
} }
.agment-hospital-ks { .agment-hospital-ks {
margin-top: 8px; margin-top: 8px;
...@@ -131,6 +220,15 @@ ...@@ -131,6 +220,15 @@
background: #fff; background: #fff;
pointer-events: none; pointer-events: none;
} }
.new-max {
text-align: center;
margin-top: 20px;
}
.new-max-none {
text-align: center;
margin-top: 20px;
pointer-events: none;
}
.agment-head-priority { .agment-head-priority {
padding-top: 20px; padding-top: 20px;
display: flex; display: flex;
...@@ -158,11 +256,11 @@ ...@@ -158,11 +256,11 @@
justify-content: center; justify-content: center;
} }
.copy-submit { .copy-submit {
background: #fff; background: #0d9078;
border: 1px solid #0d9078; border: 1px solid #0d9078;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #0d9078; color: #ffffff;
} }
.reset-submit { .reset-submit {
background: #fff; background: #fff;
...@@ -187,8 +285,9 @@ ...@@ -187,8 +285,9 @@
} }
/deep/.fc-header-toolbar { /deep/.fc-header-toolbar {
position: absolute; position: absolute;
right: 1%; right: 0;
top: 25px; top: 15px;
padding: 20px;
width: 20%; width: 20%;
} }
/deep/.fc-toolbar-title { /deep/.fc-toolbar-title {
...@@ -212,7 +311,7 @@ ...@@ -212,7 +311,7 @@
.ag-left1 { .ag-left1 {
width: 12% !important; width: 12% !important;
right: 18% !important; right: 18% !important;
border: 1px solid red !important; // border: 1px solid red !important;
} }
.ag-left2 { .ag-left2 {
width: 12% !important; width: 12% !important;
......
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ a533ac31
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-button> </el-button>
</div> </div>
<div class="agmentSelect-select-right"> <div class="agmentSelect-select-right">
设置系统单日接诊总上限 设置系统每小时接诊上限
<el-input-number <el-input-number
v-model="maxDiaNum" v-model="maxDiaNum"
:step="1" :step="1"
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
], ],
// timeZone: 'UTC', // timeZone: 'UTC',
locale: 'zh-cn', locale: 'zh-cn',
aspectRatio: 2.5, // 设置日历单元格宽度与高度的比例。 aspectRatio: 4.5, // 设置日历单元格宽度与高度的比例。
schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives', schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
initialView: 'resourceTimeGridDay', initialView: 'resourceTimeGridDay',
resources: [], resources: [],
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
slotMinWidth: 50, slotMinWidth: 50,
resourceAreaWidth: '5%', resourceAreaWidth: '5%',
allDaySlot: false, // 周，日视图时，all-day 不显示 allDaySlot: false, // 周，日视图时，all-day 不显示
slotDuration: '00:05:00', slotDuration: '01:00:00',
slotMinTime: '09:00', slotMinTime: '09:00',
slotMaxTime: '21:00', slotMaxTime: '21:00',
slotLabelInterval: '', slotLabelInterval: '',
...@@ -274,44 +274,15 @@ ...@@ -274,44 +274,15 @@
}; };
}); });
// this.getWidth = this.$refs.agmentSelect.scrollWidth + 'px'; // this.getWidth = this.$refs.agmentSelect.scrollWidth + 'px';
this.getWidth = 3000 + 'px'; // this.getWidth = 3000 + 'px';
this.calendarOptions.events = [].concat( this.calendarOptions.events = [].concat(
dutyRosterPreList, dutyRosterPreList,
dutyWorkList dutyWorkList
); );
// this.calendarOptions.resources.push(
// {id: 1000105468, title: '吴明豪1'},
// {id: 1000205468, title: '吴明豪2'},
// {id: 1000305468, title: '吴明豪3'},
// {id: 1000405468, title: '吴明豪4'},
// {id: 1000505468, title: '吴明豪5'},
// {id: 1000605468, title: '吴明豪5'},
// {id: 1000705468, title: '吴明豪5'},
// {id: 1000805468, title: '吴明豪5'},
// {id: 1000905468, title: '吴明豪5'},
// {id: 1001505468, title: '吴明豪5'},
// {id: 1002505468, title: '吴明豪5'},
// {id: 1003505468, title: '吴明豪5'},
// {id: 1004505468, title: '吴明豪5'},
// {id: 1005505468, title: '吴明豪5'},
// {id: 1006505468, title: '吴明豪5'},
// {id: 1007505468, title: '吴明豪5'},
// {id: 1008505468, title: '吴明豪5'},
// {id: 1009505468, title: '吴明豪5'},
// {id: 1017505468, title: '吴明豪5'},
// {id: 1027505468, title: '吴明豪5'},
// {id: 1037505468, title: '吴明豪5'},
// {id: 1047505468, title: '吴明豪5'},
// {id: 1057505468, title: '吴明豪5'},
// {id: 1067505468, title: '吴明豪5'},
// {id: 1077505468, title: '吴明豪5'},
// {id: 1087505468, title: '吴明豪5'},
// {id: 1097505468, title: '吴明豪5'},
// {id: 1018505468, title: '吴明豪5'},
// {id: 1009505468, title: '吴明豪5'},);
// this.calendarOptions.resources = [{id: 1000105468, title: '吴明豪1'}, {id: 1000205468, title: '吴明豪2'}, {id: 1008505468, title: '吴明豪5'}, {id: 1008505461, title: '吴明豪5'}];
const calendarApi = this.$refs.fullCalendar.getApi(); const calendarApi = this.$refs.fullCalendar.getApi();
this.getWidth = `${this.calendarOptions.resources.length * 150}px`; this.getWidth = `${
(this.calendarOptions.resources.length + 1) * 150
}px`;
this.getMaxWidth = `${ this.getMaxWidth = `${
this.calendarOptions.resources.length * 150 + 100 this.calendarOptions.resources.length * 150 + 100
}px`; }px`;
...@@ -332,7 +303,7 @@ ...@@ -332,7 +303,7 @@
width: 100%; width: 100%;
} }
.agment-box { .agment-box {
height: 100%; // height: 100%;
padding: 0 25px 25px 25px; padding: 0 25px 25px 25px;
border-radius: 6px; border-radius: 6px;
flex: 3.8; flex: 3.8;
...@@ -401,15 +372,6 @@ ...@@ -401,15 +372,6 @@
display: flex; display: flex;
} }
} }
// /deep/.fc-col-header-cell{
// width: 100px !important;
// }
// /deep/.fc-day-mon{
// width: 100px !important;
// }
// /deep/.fc-timegrid-col-frame{
// width: 100px !important;
// }
} }
.w2 { .w2 {
...@@ -446,12 +408,6 @@ ...@@ -446,12 +408,6 @@
border-radius: 6px; border-radius: 6px;
} }
.ag-left-change { .ag-left-change {
// position: relative;
// border:1px solid #ccc;
// height:40px;
// width:100%;
// display:flex;
// z-index:1;
div { div {
width: 9%; width: 9%;
height: 55px; height: 55px;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或