Skip to content

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

Merge branch 'release-new' into 'release' 

Release new

See merge request !225
上级 6b982918 eb180bc7
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 2085 行增加 和 1036 行删除
package.json
浏览文件 @ 57fc3217
...@@ -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
浏览文件 @ 57fc3217
...@@ -265,3 +265,33 @@ export const opAck = async (data) => { ...@@ -265,3 +265,33 @@ 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',
});
};
export const outboundIntention = async (data) => {
return request({
url: '/diagnose/admin/diagnose/outbound/intention',
data: data,
method: 'post',
});
};
export const departmentAll = async () => {
return request({
url: '/diagnose/department/all',
method: 'get',
});
};
src/api/serviceSchedule.js
浏览文件 @ 57fc3217
...@@ -65,3 +65,30 @@ export const previewWork = async (data) => { ...@@ -65,3 +65,30 @@ 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',
});
};
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/components/common/matching-doctor.vue
浏览文件 @ 57fc3217
...@@ -21,21 +21,30 @@ ...@@ -21,21 +21,30 @@
class="required-label" class="required-label"
prop="triageDepartmentId" prop="triageDepartmentId"
> >
<el-select <el-cascader
ref="cascader"
v-model="model.triageDepartmentId" v-model="model.triageDepartmentId"
placeholder="请选择分诊科室"
clearable
filterable filterable
style="width: 56%; height: 32px; line-height: 32px" clearable
:options="allTilst"
placeholder="选择科室"
:show-all-levels="false"
@change="change" @change="change"
> >
<el-option <template slot-scope="{ data }">
v-for="item in depList" <span :style="{ fontSize: '15px', color: '#606266' }">{{
:key="item.id" data.label
:label="item.name" }}</span>
:value="item.id" <span
/> :style="{
</el-select> fontSize: '10px',
color: '#606266',
marginLeft: '10px',
opacity: '0.7',
}"
>{{ data.text }}</span>
</template>
</el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
...@@ -70,6 +79,7 @@ ...@@ -70,6 +79,7 @@
<script> <script>
import { updateDiagnosis, getDepList } from '../../utils/diagnosis'; import { updateDiagnosis, getDepList } from '../../utils/diagnosis';
import { departmentAll } from '@/api/diagnosis';
let vm = null; let vm = null;
export default { export default {
props: { props: {
...@@ -92,6 +102,12 @@ ...@@ -92,6 +102,12 @@
}, },
data() { data() {
return { return {
// props: {
// // props定义的值根据接口返回的数据定的
// label: 'departmentId',
// value: 'departmentName',
// children: [],
// },
show: false, show: false,
title: '设置分诊科室', title: '设置分诊科室',
confirmTxt: '确定', confirmTxt: '确定',
...@@ -107,6 +123,8 @@ ...@@ -107,6 +123,8 @@
{ required: true, message: '请选择分诊科室', trigger: 'change' }, { required: true, message: '请选择分诊科室', trigger: 'change' },
], ],
}, },
allTilst: [],
allList: {},
}; };
}, },
watch: { watch: {
...@@ -125,8 +143,63 @@ ...@@ -125,8 +143,63 @@
created() { created() {
vm = this; vm = this;
this.getDepList(); this.getDepList();
this.departmentAll();
}, },
methods: { methods: {
departmentAll() {
departmentAll().then((res) => {
if (res.code == '000000') {
console.log(res, 'res111');
this.allList = res.data || {};
this.showListALL();
}
});
},
getCascaderObj(val, opt) {
return val.map(function (value) {
for (var itm of opt) {
if (itm.value == value) {
opt = itm.children;
return itm;
}
}
return null;
});
},
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;
},
getDepList() { getDepList() {
getDepList() getDepList()
.then(function (res) { .then(function (res) {
...@@ -171,15 +244,18 @@ ...@@ -171,15 +244,18 @@
this.model.triageDepartmentId = ''; this.model.triageDepartmentId = '';
this.model.triageRemark = ''; this.model.triageRemark = '';
this.$emit('update:doctorVisible', false); this.$emit('update:doctorVisible', false);
// this.doctorVisible = false;
}, },
change(data) { change() {
for (let i = 0; i < this.depList.length; i++) { const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (data == this.depList[i].id) { if (checkedNodes.length > 0) {
this.model.triageDepartment = this.depList[i].name; this.model.triageDepartmentId = checkedNodes[0].value;
break; this.model.triageDepartment = checkedNodes[0].label;
} } else {
this.model.triageDepartmentId = '';
this.model.triageDepartment = '';
} }
console.log(this.model.triageDepartmentId, 'model.triageDepartmentId');
console.log(this.model.triageDepartment, 'model.triageDepartment');
}, },
}, },
}; };
......
src/components/list/table-serviceSchedule.vue
浏览文件 @ 57fc3217
...@@ -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="modifiedId"
label="修改人ID"
width="170"
align="center"
sortable
/>
<el-table-column <el-table-column
prop="mobilePhone" prop="mobilePhone"
label="联系电话" label="联系电话"
...@@ -261,20 +271,20 @@ ...@@ -261,20 +271,20 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.table-serviceSchedule { .table-serviceSchedule {
.el-table { .el-table {
.nothing-data{ .nothing-data {
display: inline-grid; display: inline-grid;
padding-top: 100px; padding-top: 100px;
img{ img {
width: 338px; width: 338px;
height: 159px; height: 159px;
} }
.nothing-data-title{ .nothing-data-title {
padding-top: 40px; padding-top: 40px;
padding-bottom: 150px; padding-bottom: 150px;
font-size: 16px; font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #89888B; color: #89888b;
line-height: 22px; line-height: 22px;
} }
} }
......
src/router/index.js
浏览文件 @ 57fc3217
...@@ -68,13 +68,13 @@ const serviceSchedule = (r) => ...@@ -68,13 +68,13 @@ const serviceSchedule = (r) =>
() => r(require('@/views/IM/diagnosis-admin/serviceSchedule.vue')), () => r(require('@/views/IM/diagnosis-admin/serviceSchedule.vue')),
'serviceSchedule' 'serviceSchedule'
); );
const addEditSchedule = (r) => const addEditSchedule = (r) =>
require.ensure( require.ensure(
[], [],
() => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')), () => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')),
'addEditSchedule' 'addEditSchedule'
); );
const overviewScheduling = (r) => const overviewScheduling = (r) =>
require.ensure( require.ensure(
[], [],
() => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')), () => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')),
......
src/utils/diagnosis/index.js
浏览文件 @ 57fc3217
...@@ -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
浏览文件 @ 57fc3217
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
label="分诊科室" label="分诊科室"
class="t-b" class="t-b"
> >
<el-select <!-- <el-select
v-model="searchParam.triageDepartmentId" v-model="searchParam.triageDepartmentId"
placeholder="请选择科室" placeholder="请选择科室"
style="width: 220px" style="width: 220px"
...@@ -48,7 +48,31 @@ ...@@ -48,7 +48,31 @@
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select> -->
<el-cascader
ref="cascader"
v-model="searchParam.triageDepartmentId"
filterable
clearable
:options="allTilst"
placeholder="选择科室"
:show-all-levels="false"
@change="changeDepart"
>
<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>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
...@@ -435,12 +459,13 @@ ...@@ -435,12 +459,13 @@
@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"
: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"
/> />
...@@ -451,9 +476,14 @@ ...@@ -451,9 +476,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
...@@ -502,6 +532,7 @@ ...@@ -502,6 +532,7 @@
getDepartments, getDepartments,
diagnoseExport, diagnoseExport,
diagnoseList, diagnoseList,
departmentAll,
} from '@/api/diagnosis'; } from '@/api/diagnosis';
import MatchComponent from '@/components/common/match'; import MatchComponent from '@/components/common/match';
...@@ -621,6 +652,13 @@ ...@@ -621,6 +652,13 @@
}, },
timer: null, timer: null,
fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台 fromType: 0, // 1或不传为为预约单列表 2为运营预约单列表 3为分诊台 4为接诊台
doctorInfo: {},
userName: '',
userNamePhone: '',
triageDepartment: '',
departmentId: '',
allTilst: [],
allList: {},
}; };
}, },
watch: { watch: {
...@@ -638,16 +676,72 @@ ...@@ -638,16 +676,72 @@
}, },
created() { created() {
vm = this; vm = this;
this.getDep(); // this.getDep();
}, },
mounted() { mounted() {
this.setTableHeight(); this.setTableHeight();
this.getOutboundNote(); this.getOutboundNote();
this.departmentAll();
}, },
destroyed() { destroyed() {
clearInterval(this.timer); clearInterval(this.timer);
}, },
methods: { methods: {
departmentAll() {
departmentAll().then((res) => {
if (res.code == '000000') {
console.log(res, 'res111');
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;
},
changeDepart() {
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (checkedNodes.length > 0) {
this.searchParam.triageDepartmentId = checkedNodes[0].value;
} else {
this.searchParam.triageDepartmentId = '';
}
console.log(
this.searchParam.triageDepartmentId,
'this.searchParam.triageDepartmentId'
);
},
changeStartTime(time) { changeStartTime(time) {
this.rangeTimeData = time this.rangeTimeData = time
? time.time ? time.time
...@@ -1028,14 +1122,13 @@ ...@@ -1028,14 +1122,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;
// } // }
...@@ -1107,10 +1200,10 @@ ...@@ -1107,10 +1200,10 @@
// 设为待确认时间 // 设为待确认时间
waitMatchTime(row) { waitMatchTime(row) {
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.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
浏览文件 @ 57fc3217
.agment-box { .schedul-box {
width: 100%;
height: auto;
position: relative;
display: flex;
justify-content: space-between;
.agment-box {
height: 100%; height: 100%;
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
padding: 20px; padding: 20px;
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;
} }
.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;
.ag-left-change { 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; // position: relative;
// border:1px solid #ccc; // border:1px solid #ccc;
// height:40px; // height:40px;
...@@ -53,57 +120,130 @@ ...@@ -53,57 +120,130 @@
right: 1%; right: 1%;
top: 18px; top: 18px;
} }
} }
.agment-left-con { .show-work-set {
margin-top: 70px; margin-top: 100px;
background: #f0f2f5; }
height: auto; .agment-left-con {
padding: 20px; padding: 15px;
overflow: hidden; text-align: center;
border-radius: 8px; background: #f2f2f2;
} border-radius: 12px;
.agment-head { }
.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 {
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; 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;
margin-left: 16px; margin-left: 16px;
} }
.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 {
.agment-hospital-ks { margin-right: 10px;
}
.agment-hospital-ks {
margin-top: 8px; margin-top: 8px;
} }
.agment-head-title { .agment-head-title {
font-size: 14px; font-size: 14px;
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 { .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; 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;
...@@ -115,79 +255,101 @@ ...@@ -115,79 +255,101 @@
background: #0d9078; background: #0d9078;
border: none; border: none;
} }
} }
.agment-left-button { .agment-left-button {
margin-top: 34px; margin-top: 34px;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.reset-submit{ .copy-submit {
background: #0d9078;
border: 1px solid #0d9078;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
}
.reset-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;
} }
/deep/.fc-timegrid-event { /deep/.fc-timegrid-event {
border-radius: 1px !important; border-radius: 1px !important;
} }
/deep/thead .fc-scroller-harness { /deep/thead .fc-scroller-harness {
background: #fcfbff; background: #fcfbff;
} }
/deep/.fc-col-header-cell-cushion { /deep/.fc-col-header-cell-cushion {
color: #333; color: #333;
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
} }
/deep/.fc .fc-highlight { /deep/.fc .fc-highlight {
background: transparent; background: transparent;
} }
/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 {
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;
color: #02120f; color: #02120f;
border-color: #d9d9d9; border-color: #d9d9d9;
border-radius: 20px; border-radius: 20px;
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;
} }
} }
/deep/.fc-myCustomButton-button { /deep/.fc-myCustomButton-button {
padding: 6px 24px; padding: 6px 24px;
} }
/deep/.fc-button-primary:hover { /deep/.fc-button-primary:hover {
background: #fff; background: #fff;
color: #02120f; color: #02120f;
border: 1px solid #0d9078; border: 1px solid #0d9078;
} }
/deep/.fc-event-time { /deep/.fc-event-time {
font-size: 14px; font-size: 14px;
color: #0d9078; color: #0d9078;
word-wrap: break-word; word-wrap: break-word;
white-space: normal; white-space: normal;
}
/deep/.fc-col-header-cell-cushion {
background: #fff;
border: 1px solid #0d9078;
color: #0d9078;
border-radius: 20px;
height: 30px;
line-height: 25px;
font-size: 14px;
margin: 10px 0;
text-decoration: none;
}
/deep/a:hover {
text-decoration: none;
}
} }
src/views/IM/diagnosis-admin/serviceSchedule.vue
浏览文件 @ 57fc3217
...@@ -14,17 +14,30 @@ ...@@ -14,17 +14,30 @@
<div class="serviceSchedule-containerInfo"> <div class="serviceSchedule-containerInfo">
<div class="serviceSchedule-containerInfo-left"> <div class="serviceSchedule-containerInfo-left">
<el-cascader <el-cascader
v-model="innerform" ref="cascader"
class="serviceSchedule-cascader" v-model="searchParam.departmentId"
filterable filterable
clearable clearable
:options="interfaceOptions" class="serviceSchedule-cascader"
:props="props" :options="allTilst"
placeholder="选择科室" placeholder="选择科室"
:show-all-levels="false" :show-all-levels="false"
@expand-change="handleItemChange" @change="changeDepartment"
@change="selectApi($event, innerform)" >
/> <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>
<el-select <el-select
v-model="searchParam.createType" v-model="searchParam.createType"
class="select-first" class="select-first"
...@@ -147,13 +160,12 @@ ...@@ -147,13 +160,12 @@
<script> <script>
import { import {
getFirstLevelLable,
childLabelList,
workQuery, workQuery,
switchOpen, switchOpen,
workInStep, workInStep,
getLevel, getLevel,
} from '@/api/serviceSchedule'; } from '@/api/serviceSchedule';
import { departmentAll } from '@/api/diagnosis';
import TableServiceSchedule from '@/components/list/table-serviceSchedule'; import TableServiceSchedule from '@/components/list/table-serviceSchedule';
export default { export default {
components: { components: {
...@@ -213,55 +225,68 @@ ...@@ -213,55 +225,68 @@
tableData: [], tableData: [],
loading: false, loading: false,
newCreateList: [], newCreateList: [],
allTilst: [],
allList: {},
}; };
}, },
watch: {}, watch: {},
created() { created() {
this.getFirstLevelLable();
this.getLevel(); this.getLevel();
this.departmentAll();
this.search(); this.search();
}, },
methods: { methods: {
// 通过监听expand-change事件（当展开节点发生变化时触发）获取第二层数据，组装interfaceOptions数据 departmentAll() {
handleItemChange(val) { departmentAll().then((res) => {
const value = val[0]; if (res.code == '000000') {
childLabelList(value).then((res) => { console.log(res, 'res111');
if (res.code === '000000') { this.allList = res.data || {};
const interfaceArr = (res.data || []).map((item) => { this.showListALL();
return {
value: item.name,
no: item.id,
};
});
this.interfaceOptions.filter((item) => {
if (item.no === value) {
this.$set(item, 'interface', interfaceArr);
}
return;
});
} }
}); });
}, },
getFirstLevelLable() { showListALL() {
getFirstLevelLable().then((res) => { const arr = [];
if (res.code === '000000') { const { departmentMapList, parentDepartmentList } = this.allList;
this.interfaceOptions = res.data || []; parentDepartmentList.map((item) => {
this.interfaceOptions.forEach((item, index) => { const obj = {
// 添加属性 label: item.departmentName,
this.$set(this.interfaceOptions[index], 'interface', []); 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 + ' ';
}); });
} else { secondObj.text = secondChildren ? `（${secondChildren}）` : '';
this.$message({ children.push(secondObj);
message: res.msg,
type: 'warning',
}); });
obj.children = children;
} }
}); });
arr.push(obj);
});
console.log(arr);
this.allTilst = arr;
}, },
// 获取选择的值 // 获取选择的值
selectApi(e, value) { changeDepartment() {
this.searchParam.departmentId = value[1]; const checkedNodes = this.$refs['cascader'].getCheckedNodes();
this.searchParam.pageNo = 1; if (checkedNodes.length > 0) {
this.searchParam.departmentId = checkedNodes[0].value;
} else {
this.searchParam.departmentId = '';
}
}, },
getCreateType(value) { getCreateType(value) {
this.searchParam.createType = value; this.searchParam.createType = value;
......
yarn.lock
浏览文件 @ 57fc3217
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或