Skip to content

P
pica-admin-consultation
提交 a58e40c7 编写于 作者: 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!184
上级 c88a4f0c 5a63daa5
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 847 行增加 和 163 行删除
package.json
浏览文件 @ a58e40c7
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"clipboard": "^2.0.6", "clipboard": "^2.0.6",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"dayjs": "^1.8.30", "dayjs": "^1.10.7",
"dsbridge": "^3.1.4", "dsbridge": "^3.1.4",
"element-ui": "^2.6.1", "element-ui": "^2.6.1",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
......
src/api/diagnosis.js
浏览文件 @ a58e40c7
...@@ -265,3 +265,18 @@ export const opAck = async (data) => { ...@@ -265,3 +265,18 @@ export const opAck = async (data) => {
method: 'post', method: 'post',
}); });
}; };
export const acceptsCeiling = async (data) => {
return request({
url: '/diagnose/admin/diagnose/accepts/ceiling',
params: data,
method: 'get',
});
};
export const getLeisureTime = async (data) => {
return request({
url: '/diagnose/doctor/work/getLeisureTime',
data: data,
method: 'post',
});
};
src/api/serviceSchedule.js
浏览文件 @ a58e40c7
...@@ -65,3 +65,16 @@ export const previewWork = async (data) => { ...@@ -65,3 +65,16 @@ export const previewWork = async (data) => {
data: data, data: data,
}); });
}; };
export const setPlatformUpper = async (data) => {
return request({
url: `/diagnose/doctor/work/setPlatformUpper/${data.num}`,
data: data,
method: 'post',
});
};
export const getPlatformUpper = async () => {
return request({
url: '/diagnose/doctor/work/getPlatformUpper',
method: 'post',
});
};
src/components/list/table-serviceSchedule.vue
浏览文件 @ a58e40c7
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
> >
<template slot="empty"> <template slot="empty">
<div class="nothing-data"> <div class="nothing-data">
<img src="../../assets/image/nothingData.png" alt="" > <img
src="../../assets/image/nothingData.png"
alt=""
>
<span class="nothing-data-title">暂未找到符合条件的医生</span> <span class="nothing-data-title">暂未找到符合条件的医生</span>
</div> </div>
</template> </template>
...@@ -88,6 +91,13 @@ ...@@ -88,6 +91,13 @@
align="center" align="center"
sortable sortable
/> />
<el-table-column
prop="createdId"
label="修改人ID"
width="170"
align="center"
sortable
/>
<el-table-column <el-table-column
prop="mobilePhone" prop="mobilePhone"
label="联系电话" label="联系电话"
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ a58e40c7
...@@ -441,6 +441,7 @@ ...@@ -441,6 +441,7 @@
:diagnose-type="diagnoseType" :diagnose-type="diagnoseType"
:doctor-id="doctorId" :doctor-id="doctorId"
:range-time-data="rangeTimeData" :range-time-data="rangeTimeData"
:doctor-info="doctorInfo"
@search="search" @search="search"
@changeStartTime="changeStartTime" @changeStartTime="changeStartTime"
/> />
...@@ -621,6 +622,7 @@ ...@@ -621,6 +622,7 @@
}, },
timer: null, timer: null,
fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台 fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台
doctorInfo: {},
}; };
}, },
watch: { watch: {
...@@ -1106,11 +1108,13 @@ ...@@ -1106,11 +1108,13 @@
}, },
// 设为待确认时间 // 设为待确认时间
waitMatchTime(row) { waitMatchTime(row) {
// debugger;
console.log(row, 'row'); console.log(row, '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
浏览文件 @ a58e40c7
...@@ -6,21 +6,53 @@ ...@@ -6,21 +6,53 @@
border-radius: 6px; border-radius: 6px;
flex: 3.8; flex: 3.8;
} }
.w2{ .setMaxNum {
/deep/.fc-prev-button{ display: flex;
background:#f4f4f5; justify-content: space-around;
}
.input-value {
width: 100px;
/deep/.el-input-number__decrease {
width: 20px;
}
/deep/.el-input-number__increase {
width: 20px;
}
/deep/.el-input__inner {
padding: 0;
}
}
.list-item {
width: 86px;
height: 25px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
text-align: center;
}
.list-item-noth {
width: 86px;
height: 25px;
background: red;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
text-align: center;
}
.w2 {
/deep/.fc-prev-button {
background: #f4f4f5;
cursor: not-allowed; cursor: not-allowed;
border:1px solid #d9d9d9; border: 1px solid #d9d9d9;
} }
} }
.w3{ .w3 {
/deep/.fc-next-button{ /deep/.fc-next-button {
background:#f4f4f5; background: #f4f4f5;
border:1px solid #d9d9d9; border: 1px solid #d9d9d9;
cursor: not-allowed; cursor: not-allowed;
} }
} }
/deep/.fc-timegrid-event-harness{ /deep/.fc-timegrid-event-harness {
// position: absolute !important; // position: absolute !important;
left: 0 !important; left: 0 !important;
} }
...@@ -62,6 +94,10 @@ ...@@ -62,6 +94,10 @@
overflow: hidden; overflow: hidden;
border-radius: 8px; border-radius: 8px;
} }
.agment-left-copy {
margin-top: 34px;
text-align: center;
}
.agment-head { .agment-head {
border-radius: 5px; border-radius: 5px;
display: flex; display: flex;
...@@ -91,19 +127,19 @@ ...@@ -91,19 +127,19 @@
color: #02120f; color: #02120f;
margin-top: 19px; margin-top: 19px;
} }
.agment-head-none{ .agment-head-none {
background: #fff; background: #fff;
pointer-events: none; pointer-events: none;
} }
.agment-head-priority { .agment-head-priority {
padding-top: 20px; padding-top: 20px;
display: flex; display: flex;
justify-content:center; justify-content: center;
align-items: center; align-items: center;
.item { .item {
width: 42px; width: 42px;
height: 32px; height: 32px;
margin-right:10px; margin-right: 10px;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-radius: 8px; border-radius: 8px;
text-align: center; text-align: center;
...@@ -121,12 +157,19 @@ ...@@ -121,12 +157,19 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.reset-submit{ .copy-submit {
background: #fff; background: #fff;
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: #0d9078;
}
.reset-submit {
background: #fff;
border: 1px solid #0d9078;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
} }
/deep/.fc-timegrid-event { /deep/.fc-timegrid-event {
border-radius: 1px !important; border-radius: 1px !important;
...@@ -144,15 +187,15 @@ ...@@ -144,15 +187,15 @@
} }
/deep/.fc-header-toolbar { /deep/.fc-header-toolbar {
position: absolute; position: absolute;
right:1%; right: 1%;
top: 25px; top: 25px;
width: 20%; width: 20%;
} }
/deep/.fc-toolbar-title { /deep/.fc-toolbar-title {
font-size: 6px; font-size: 6px;
} }
/deep/.fc-toolbar-chunk{ /deep/.fc-toolbar-chunk {
display:flex; display: flex;
} }
/deep/.fc-button-primary { /deep/.fc-button-primary {
background: #fff; background: #fff;
...@@ -162,17 +205,17 @@ ...@@ -162,17 +205,17 @@
padding: 6px 16px; padding: 6px 16px;
flex-shrink: 0; flex-shrink: 0;
} }
@media screen and (min-width: 1000px) and (max-width: 1300px){ @media screen and (min-width: 1000px) and (max-width: 1300px) {
/deep/.fc-header-toolbar { /deep/.fc-header-toolbar {
right: 6%; right: 6%;
} }
.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;
right: 1% !important; right: 1% !important;
} }
} }
...@@ -190,4 +233,3 @@ ...@@ -190,4 +233,3 @@
word-wrap: break-word; word-wrap: break-word;
white-space: normal; white-space: normal;
} }
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ a58e40c7
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
ref="agmentSelect" ref="agmentSelect"
class="serviceSchedule_select" class="serviceSchedule_select"
> >
<div class="agmentSelect-select-left">
<el-cascader <el-cascader
v-model="innerform" v-model="innerform"
class="serviceSchedule-cascader" class="serviceSchedule-cascader"
...@@ -42,13 +43,32 @@ ...@@ -42,13 +43,32 @@
查询 查询
</el-button> </el-button>
</div> </div>
<div class="agmentSelect-select-right">
设置系统单日接诊总上限
<el-input-number
v-model="maxDiaNum"
:step="1"
:min="10"
:max="1000000"
step-strictly
@change="getInputNumber"
/>
<el-button
type="primary"
class="submit-btn"
@click="setPlatformUpper"
>
保存
</el-button>
</div>
</div>
<div <div
class="fullCalendar-show" class="fullCalendar-show"
style="width:100%" style="width: 100%"
> >
<div <div
class="fullCalendar-show-out" class="fullCalendar-show-out"
:style="{width:getWidth}" :style="{ minWidth: getWidth, maxWidth: getMaxWidth }"
> >
<FullCalendar <FullCalendar
ref="fullCalendar" ref="fullCalendar"
...@@ -70,6 +90,8 @@ ...@@ -70,6 +90,8 @@
getFirstLevelLable, getFirstLevelLable,
childLabelList, childLabelList,
previewWork, previewWork,
setPlatformUpper,
getPlatformUpper,
} from '@/api/serviceSchedule'; } from '@/api/serviceSchedule';
export default { export default {
name: 'Index', name: 'Index',
...@@ -78,6 +100,7 @@ ...@@ -78,6 +100,7 @@
}, },
data() { data() {
return { return {
maxDiaNum: 100,
dateTime: '', dateTime: '',
interfaceOptions: [], interfaceOptions: [],
innerform: [], innerform: [],
...@@ -113,8 +136,8 @@ ...@@ -113,8 +136,8 @@
eventColor: '#fff', eventColor: '#fff',
eventBackgroundColor: '#fff', eventBackgroundColor: '#fff',
events: [], events: [],
slotMinWidth:50, slotMinWidth: 50,
resourceAreaWidth:'5%', resourceAreaWidth: '5%',
allDaySlot: false, // 周，日视图时，all-day 不显示 allDaySlot: false, // 周，日视图时，all-day 不显示
slotDuration: '00:05:00', slotDuration: '00:05:00',
slotMinTime: '09:00', slotMinTime: '09:00',
...@@ -134,16 +157,38 @@ ...@@ -134,16 +157,38 @@
loading: false, loading: false,
doctorList: [], doctorList: [],
index: 0, index: 0,
getWidth:'100%' getWidth: '100%',
getMaxWidth: '100%',
}; };
}, },
watch: {}, watch: {},
created() { created() {
this.getFirstLevelLable(); this.getFirstLevelLable();
this.getPlatformUpper();
}, },
mounted() { mounted() {},
},
methods: { methods: {
getPlatformUpper() {
getPlatformUpper().then((res) => {
if (res.code === '000000') {
console.log(res);
this.maxDiaNum = res.data;
}
});
},
setPlatformUpper() {
const params = {
num: this.maxDiaNum,
};
setPlatformUpper(params).then((res) => {
if (res.code === '000000') {
this.getPlatformUpper();
}
});
},
getInputNumber(value) {
console.log(value, 'getInputNumbergetInputNumber');
},
// 通过监听expand-change事件（当展开节点发生变化时触发）获取第二层数据，组装interfaceOptions数据 // 通过监听expand-change事件（当展开节点发生变化时触发）获取第二层数据，组装interfaceOptions数据
handleItemChange(val) { handleItemChange(val) {
const value = val[0]; const value = val[0];
...@@ -188,10 +233,10 @@ ...@@ -188,10 +233,10 @@
this.dateTime = value; this.dateTime = value;
}, },
search() { search() {
if(!this.dateTime || !this.departmentId) { if (!this.dateTime || !this.departmentId) {
return this.$message({ return this.$message({
message: '科室和时间都需要选择哦！', message: '科室和时间都需要选择哦！',
type: 'warning' type: 'warning',
}); });
} }
const params = { const params = {
...@@ -219,8 +264,7 @@ ...@@ -219,8 +264,7 @@
}; };
} }
); );
const dutyWorkList = res.data.dutyWorkList.map( const dutyWorkList = res.data.dutyWorkList.map((item, index) => {
(item, index) => {
return { return {
id: index, id: index,
resourceId: item.doctorId, resourceId: item.doctorId,
...@@ -228,12 +272,49 @@ ...@@ -228,12 +272,49 @@
start: item.startTime, start: item.startTime,
color: '#E7F4F5', color: '#E7F4F5',
}; };
} });
);
// 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(dutyRosterPreList, dutyWorkList); 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(); const calendarApi = this.$refs.fullCalendar.getApi();
this.getWidth = `${this.calendarOptions.resources.length * 150}px`;
this.getMaxWidth = `${
this.calendarOptions.resources.length * 150 + 100
}px`;
calendarApi.gotoDate(this.dateTime); calendarApi.gotoDate(this.dateTime);
console.log(this.calendarOptions.resources); console.log(this.calendarOptions.resources);
...@@ -256,15 +337,19 @@ ...@@ -256,15 +337,19 @@
border-radius: 6px; border-radius: 6px;
flex: 3.8; flex: 3.8;
width: 100%; width: 100%;
overflow:hidden; overflow: hidden;
.serviceSchedule_select { .serviceSchedule_select {
width: 100%; width: 100%;
background: #fff; background: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 20px 0 0px 20px; padding: 20px 0 10px 20px;
justify-content: space-between;
.agmentSelect-select-left {
display: flex;
align-items: center;
justify-content: flex-start;
.serviceSchedule-cascader { .serviceSchedule-cascader {
// height: 100%;
background: #fff; background: #fff;
margin-right: 15px; margin-right: 15px;
} }
...@@ -279,7 +364,24 @@ ...@@ -279,7 +364,24 @@
align-items: center; align-items: center;
} }
} }
.fullCalendar-show{ .agmentSelect-select-right {
display: flex;
align-items: center;
justify-content: flex-end;
padding-right: 30px;
.el-input-number {
margin: 0 10px;
}
.submit-btn {
height: 32px;
background: #0d9078;
border-radius: 16px;
display: flex;
align-items: center;
}
}
}
.fullCalendar-show {
width: 100%; width: 100%;
overflow: scroll; overflow: scroll;
// /deep/ .fc-resource{ // /deep/ .fc-resource{
...@@ -290,12 +392,12 @@ ...@@ -290,12 +392,12 @@
background: #fff; background: #fff;
padding: 20px; padding: 20px;
} }
.fullCalendar-nothing{ .fullCalendar-nothing {
background: #fff; background: #fff;
padding: 20px; padding: 20px;
display: flex; display: flex;
justify-content: center; justify-content: center;
img{ img {
display: flex; display: flex;
} }
} }
...@@ -317,10 +419,10 @@ ...@@ -317,10 +419,10 @@
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
} }
} }
/deep/ .fc-timegrid-col-frame{ /deep/ .fc-timegrid-col-frame {
// width: 100px !important; // width: 100px !important;
background: #fff !important; background: #fff !important;
} }
.w3 { .w3 {
/deep/.fc-next-button { /deep/.fc-next-button {
background: #f4f4f5; background: #f4f4f5;
...@@ -332,6 +434,9 @@ ...@@ -332,6 +434,9 @@
// position: absolute !important; // position: absolute !important;
left: 0 !important; left: 0 !important;
} }
/deep/.fc-resource {
width: 150px;
}
.agment-box-left { .agment-box-left {
flex: 1; flex: 1;
height: 100%; height: 100%;
......
yarn.lock
浏览文件 @ a58e40c7
...@@ -4663,7 +4663,7 @@ dateformat@^2.0.0: ...@@ -4663,7 +4663,7 @@ dateformat@^2.0.0:
resolved "http://192.168.110.93:4873/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" resolved "http://192.168.110.93:4873/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
dayjs@^1.8.30, dayjs@^1.8.31: dayjs@^1.10.7, dayjs@^1.8.31:
version "1.10.7" version "1.10.7"
resolved "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" resolved "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
integrity sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg= integrity sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或