Skip to content

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

Merge branch 'feature/dxp' into 'release-new' 

Feature/dxp

See merge request !223
上级 d29bac61 b17e635c
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 468 行增加 和 509 行删除
src/components/common/diagnosis-doctor.vue
浏览文件 @ eb180bc7
......@@ -253,7 +253,11 @@
created() {
vm = this;
this.getDoctorList();
if (!(this.doctorList || []).some(item => { item.doctorId == this.formData.receptionId;})) {
if (
!(this.doctorList || []).some((item) => {
item.doctorId == this.formData.receptionId;
})
) {
this.refreshData();
}
},
......
src/components/common/diagnosis-time.vue
浏览文件 @ eb180bc7
......@@ -146,9 +146,10 @@
const now = new Date();
const day = now.getDay();
const oneDayTime = 24 * 60 * 60 * 1000;
const SundayTime = ((7 - day) * oneDayTime) + 21 * 24 * 60 * 60 * 1000;
const SundayTime = (7 - day) * oneDayTime + 21 * 24 * 60 * 60 * 1000;
return (
time.getTime() + 1 * 24 * 60 * 60 * 1000 < new Date() || time.getTime() > new Date().getTime() + SundayTime
time.getTime() + 1 * 24 * 60 * 60 * 1000 < new Date() ||
time.getTime() > new Date().getTime() + SundayTime
);
},
},
......@@ -183,7 +184,9 @@
const day = now.getDay();
const SundayTime = 7 - day;
console.log(SundayTime, 'SundayTime');
const maxDate = dayjs(new Date()).add((SundayTime + 20), 'day').unix();
const maxDate = dayjs(new Date())
.add(SundayTime + 20, 'day')
.unix();
if (dayjs(this.chooseTime).unix() > maxDate) {
this.$message({
message: '时间不能超过28天',
......
src/components/common/matching-doctor.vue
浏览文件 @ eb180bc7
......@@ -124,8 +124,7 @@
],
},
allTilst: [],
allList: {
},
allList: {},
};
},
watch: {
......@@ -251,7 +250,7 @@
if (checkedNodes.length > 0) {
this.model.triageDepartmentId = checkedNodes[0].value;
this.model.triageDepartment = checkedNodes[0].label;
}else{
} else {
this.model.triageDepartmentId = '';
this.model.triageDepartment = '';
}
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ eb180bc7
......@@ -532,7 +532,7 @@
getDepartments,
diagnoseExport,
diagnoseList,
departmentAll
departmentAll,
} from '@/api/diagnosis';
import MatchComponent from '@/components/common/match';
......@@ -658,7 +658,7 @@
triageDepartment: '',
departmentId: '',
allTilst: [],
allList: {}
allList: {},
};
},
watch: {
......@@ -734,10 +734,13 @@
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (checkedNodes.length > 0) {
this.searchParam.triageDepartmentId = checkedNodes[0].value;
}else{
} else {
this.searchParam.triageDepartmentId = '';
}
console.log(this.searchParam.triageDepartmentId, 'this.searchParam.triageDepartmentId');
console.log(
this.searchParam.triageDepartmentId,
'this.searchParam.triageDepartmentId'
);
},
changeStartTime(time) {
this.rangeTimeData = time
......
src/views/IM/diagnosis-admin/modal/index.scss
浏览文件 @ eb180bc7
.agment-box {
.schedul-box {
width: 100%;
height: auto;
position: relative;
display: flex;
justify-content: space-between;
.agment-box {
height: 100%;
background: #fff;
overflow: hidden;
padding: 20px;
border-radius: 6px;
flex: 3.8;
}
.setMaxNum {
}
.setMaxNum {
display: flex;
justify-content: space-around;
}
.input-value {
}
.input-value {
width: 100px;
/deep/.el-input-number__decrease {
width: 20px;
......@@ -21,42 +27,42 @@
/deep/.el-input__inner {
padding: 0;
}
}
.list-item {
}
.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 {
}
.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 {
}
.w2 {
/deep/.fc-prev-button {
background: #f4f4f5;
cursor: not-allowed;
border: 1px solid #d9d9d9;
}
}
.w3 {
}
.w3 {
/deep/.fc-next-button {
background: #f4f4f5;
border: 1px solid #d9d9d9;
cursor: not-allowed;
}
}
/deep/.fc-timegrid-event-harness {
}
/deep/.fc-timegrid-event-harness {
// position: absolute !important;
left: 0 !important;
}
.agment-box-left {
}
.agment-box-left {
flex: 1;
height: 100%;
margin-left: 12px;
......@@ -65,8 +71,8 @@
text-align: center;
display: flex;
justify-content: center;
}
.el-dialog-show {
}
.el-dialog-show {
.set-agment-maxNum {
.first-show-num {
text-align: center;
......@@ -92,8 +98,8 @@
}
}
}
}
.ag-left-change {
}
.ag-left-change {
// position: relative;
// border:1px solid #ccc;
// height:40px;
......@@ -114,25 +120,18 @@
right: 1%;
top: 18px;
}
}
.show-work-set {
}
.show-work-set {
margin-top: 100px;
padding: 10px;
}
.agment-left-con {
}
.agment-left-con {
padding: 15px;
text-align: center;
background: #f2f2f2;
border-radius: 12px;
}
.maxNum-first-show {
padding: 20px 15px 5px 15px;
.show-sep-num {
color: red;
}
}
.reset-doctor-schedu {
padding: 10px 15px 5px 15px;
.reset-doctor-schedu {
padding: 30px 15px 5px 15px;
text-align: center;
.copy-submit {
background: #fff;
......@@ -142,8 +141,8 @@
font-weight: 400;
color: #0d9078;
}
}
.copy-doctor-schedu {
}
.copy-doctor-schedu {
padding: 5px;
margin: 0 auto;
text-align: center;
......@@ -155,8 +154,8 @@
font-weight: 400;
color: #0d9078;
}
}
.agment-left-copy {
}
.agment-left-copy {
padding: 5px;
margin: 0 auto;
text-align: center;
......@@ -182,8 +181,8 @@
cursor: pointer;
}
}
}
.first-left-max {
}
.first-left-max {
padding: 5px;
margin: 0 auto;
text-align: center;
......@@ -192,51 +191,51 @@
font-weight: 400;
color: #0d9078;
cursor: pointer;
}
.agment-head {
}
.agment-head {
border-radius: 5px;
text-align: center;
}
.agment-head-name {
}
.agment-head-name {
font-size: 20px;
color: #02120f;
font-weight: 600;
padding: 3px;
}
.agment-head-phone {
}
.agment-head-phone {
font-size: 18px;
margin-left: 16px;
}
.agment-hospital {
}
.agment-hospital {
color: #89888b;
font-size: 16px;
margin-top: 10px;
}
.agment-hospital-show {
}
.agment-hospital-show {
margin-right: 10px;
}
.agment-hospital-ks {
}
.agment-hospital-ks {
margin-top: 8px;
}
.agment-head-title {
}
.agment-head-title {
font-size: 14px;
color: #02120f;
margin-top: 19px;
}
.agment-head-none {
}
.agment-head-none {
background: #fff;
pointer-events: none;
}
.new-max {
}
.new-max {
text-align: center;
margin-top: 20px;
}
.new-max-none {
}
.new-max-none {
text-align: center;
margin-top: 20px;
pointer-events: none;
}
.agment-head-priority {
}
.agment-head-priority {
padding-top: 20px;
display: flex;
justify-content: center;
......@@ -256,64 +255,64 @@
background: #0d9078;
border: none;
}
}
.agment-left-button {
}
.agment-left-button {
margin-top: 34px;
display: flex;
justify-content: center;
}
.copy-submit {
}
.copy-submit {
background: #0d9078;
border: 1px solid #0d9078;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
}
.reset-submit {
}
.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;
}
/deep/thead .fc-scroller-harness {
}
/deep/thead .fc-scroller-harness {
background: #fcfbff;
}
/deep/.fc-col-header-cell-cushion {
}
/deep/.fc-col-header-cell-cushion {
color: #333;
height: 45px;
line-height: 45px;
}
/deep/.fc .fc-highlight {
}
/deep/.fc .fc-highlight {
background: transparent;
}
/deep/.fc-header-toolbar {
}
/deep/.fc-header-toolbar {
position: absolute;
right: 0;
top: 15px;
padding: 20px;
width: 20%;
}
/deep/.fc-toolbar-title {
}
/deep/.fc-toolbar-title {
font-size: 6px;
}
/deep/.fc-toolbar-chunk {
}
/deep/.fc-toolbar-chunk {
display: flex;
}
/deep/.fc-button-primary {
}
/deep/.fc-button-primary {
background: #fff;
color: #02120f;
border-color: #d9d9d9;
border-radius: 20px;
padding: 6px 16px;
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 {
right: 3%;
right: 6%;
}
.ag-left1 {
width: 12% !important;
......@@ -324,22 +323,22 @@
width: 12% !important;
right: 1% !important;
}
}
/deep/.fc-myCustomButton-button {
}
/deep/.fc-myCustomButton-button {
padding: 6px 24px;
}
/deep/.fc-button-primary:hover {
}
/deep/.fc-button-primary:hover {
background: #fff;
color: #02120f;
border: 1px solid #0d9078;
}
/deep/.fc-event-time {
}
/deep/.fc-event-time {
font-size: 14px;
color: #0d9078;
word-wrap: break-word;
white-space: normal;
}
/deep/.fc-col-header-cell-cushion {
}
/deep/.fc-col-header-cell-cushion {
background: #fff;
border: 1px solid #0d9078;
color: #0d9078;
......@@ -349,7 +348,8 @@
font-size: 14px;
margin: 10px 0;
text-decoration: none;
}
/deep/a:hover {
}
/deep/a:hover {
text-decoration: none;
}
}
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ eb180bc7
......@@ -268,7 +268,7 @@
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (checkedNodes.length > 0) {
this.departmentId = checkedNodes[0].value;
}else{
} else {
this.departmentId = '';
}
},
......
src/views/IM/diagnosis-admin/serviceSchedule.vue
浏览文件 @ eb180bc7
......@@ -284,7 +284,7 @@
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (checkedNodes.length > 0) {
this.searchParam.departmentId = checkedNodes[0].value;
}else{
} else {
this.searchParam.departmentId = '';
}
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或