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 () => {
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
......@@ -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) => {
return fetch({
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ a533ac31
......@@ -435,7 +435,7 @@
@search="search"
/>
<diagnosis-doctor
v-if="diagnoseFlag"
v-if="diagnosisDoctorVisible"
:diagnosis-doctor-visible.sync="diagnosisDoctorVisible"
:diagnose-log-id="diagnoseLogId"
:diagnose-type="diagnoseType"
......@@ -452,9 +452,14 @@
@search="search"
/>
<diagnosis-time
v-if="diagnosisTimeVisible"
:diagnosis-time-visible.sync="diagnosisTimeVisible"
:diagnose-log-id="diagnoseLogId"
:biz-type="bizType"
:user-name="userName"
:user-name-phone="userNamePhone"
:triage-department="triageDepartment"
:department-id="departmentId"
@search="search"
/>
<rematching-doctor
......@@ -623,6 +628,10 @@
timer: null,
fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台
doctorInfo: {},
userName: '',
userNamePhone: '',
triageDepartment: '',
departmentId: '',
};
},
watch: {
......@@ -1030,14 +1039,13 @@
},
// 设为待匹配医生
waitMatchDot(row) {
console.log(row, 'doctorData111');
this.doctorData = row;
this.diagnoseLogId = row.diagnoseLogId;
// 待分诊
// if(row.status == 22){
// this.doctorVisible = true;
// this.bizType = 7;
// this.triageDepartmentId = row.triageDepartmentId;
// }
// else {
this.userName = row.userName;
this.userNamePhone = row.userMobile;
this.triageDepartment = row.triageDepartment;
this.departmentId = row.departmentId;
this.diagnosisTimeVisible = true;
this.bizType = 5;
// }
......@@ -1108,13 +1116,11 @@
},
// 设为待确认时间
waitMatchTime(row) {
// debugger;
console.log(row, 'row');
this.doctorInfo = row;
this.rangeTimeData = row.assistantBeginTime;
this.diagnoseFlag = true;
this.diagnosisDoctorVisible = true;
// this.acceptsCeilings(row.doctorId);
this.diagnoseLogId = row.diagnoseLogId;
this.diagnoseType = row.diagnoseType;
if (row.doctorId == 0) {
......
src/views/IM/diagnosis-admin/modal/index.scss
浏览文件 @ a533ac31
......@@ -59,10 +59,39 @@
.agment-box-left {
flex: 1;
height: 100%;
padding: 20px;
margin-left: 12px;
background: #fff;
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 {
// position: relative;
......@@ -86,28 +115,86 @@
top: 18px;
}
}
.show-work-set {
margin-top: 100px;
}
.agment-left-con {
margin-top: 70px;
background: #f0f2f5;
height: auto;
padding: 20px;
overflow: hidden;
border-radius: 8px;
padding: 15px;
text-align: center;
background: #f2f2f2;
border-radius: 12px;
}
.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 {
margin-top: 34px;
padding: 5px;
margin: 0 auto;
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 {
border-radius: 5px;
display: flex;
justify-content: flex-start;
align-items: flex-end;
text-align: center;
}
.agment-head-name {
font-size: 20px;
color: #02120f;
font-weight: 600;
padding: 3px;
}
.agment-head-phone {
font-size: 18px;
......@@ -116,8 +203,10 @@
.agment-hospital {
color: #89888b;
font-size: 16px;
margin-top: 14px;
line-height: 24px;
margin-top: 10px;
}
.agment-hospital-show {
margin-right: 10px;
}
.agment-hospital-ks {
margin-top: 8px;
......@@ -131,6 +220,15 @@
background: #fff;
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 {
padding-top: 20px;
display: flex;
......@@ -158,11 +256,11 @@
justify-content: center;
}
.copy-submit {
background: #fff;
background: #0d9078;
border: 1px solid #0d9078;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
color: #ffffff;
}
.reset-submit {
background: #fff;
......@@ -187,8 +285,9 @@
}
/deep/.fc-header-toolbar {
position: absolute;
right: 1%;
top: 25px;
right: 0;
top: 15px;
padding: 20px;
width: 20%;
}
/deep/.fc-toolbar-title {
......@@ -212,7 +311,7 @@
.ag-left1 {
width: 12% !important;
right: 18% !important;
border: 1px solid red !important;
// border: 1px solid red !important;
}
.ag-left2 {
width: 12% !important;
......
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ a533ac31
......@@ -44,7 +44,7 @@
</el-button>
</div>
<div class="agmentSelect-select-right">
设置系统单日接诊总上限
设置系统每小时接诊上限
<el-input-number
v-model="maxDiaNum"
:step="1"
......@@ -129,7 +129,7 @@
],
// timeZone: 'UTC',
locale: 'zh-cn',
aspectRatio: 2.5, // 设置日历单元格宽度与高度的比例。
aspectRatio: 4.5, // 设置日历单元格宽度与高度的比例。
schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
initialView: 'resourceTimeGridDay',
resources: [],
......@@ -139,7 +139,7 @@
slotMinWidth: 50,
resourceAreaWidth: '5%',
allDaySlot: false, // 周，日视图时，all-day 不显示
slotDuration: '00:05:00',
slotDuration: '01:00:00',
slotMinTime: '09:00',
slotMaxTime: '21:00',
slotLabelInterval: '',
......@@ -274,44 +274,15 @@
};
});
// this.getWidth = this.$refs.agmentSelect.scrollWidth + 'px';
this.getWidth = 3000 + 'px';
// this.getWidth = 3000 + 'px';
this.calendarOptions.events = [].concat(
dutyRosterPreList,
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();
this.getWidth = `${this.calendarOptions.resources.length * 150}px`;
this.getWidth = `${
(this.calendarOptions.resources.length + 1) * 150
}px`;
this.getMaxWidth = `${
this.calendarOptions.resources.length * 150 + 100
}px`;
......@@ -332,7 +303,7 @@
width: 100%;
}
.agment-box {
height: 100%;
// height: 100%;
padding: 0 25px 25px 25px;
border-radius: 6px;
flex: 3.8;
......@@ -401,15 +372,6 @@
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 {
......@@ -446,12 +408,6 @@
border-radius: 6px;
}
.ag-left-change {
// position: relative;
// border:1px solid #ccc;
// height:40px;
// width:100%;
// display:flex;
// z-index:1;
div {
width: 9%;
height: 55px;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或