Skip to content

P
pica-admin-consultation
提交 39398fa1 编写于 作者: qian.jie's avatar qian.jie
浏览文件
操作

Merge branch 'develop' into 'release-new' 

Develop

See merge request !217
上级 8bb0116e 229a6cf2
隐藏空白字符变更
内嵌 并排
正在显示 包含 152 行增加 和 99 行删除
src/components/common/matching-doctor.vue
浏览文件 @ 39398fa1
...@@ -21,21 +21,6 @@ ...@@ -21,21 +21,6 @@
class="required-label" class="required-label"
prop="triageDepartmentId" prop="triageDepartmentId"
> >
<!-- <el-select
v-model="model.triageDepartmentId"
placeholder="请选择分诊科室"
clearable
filterable
style="width: 56%; height: 32px; line-height: 32px"
@change="change"
>
<el-option
v-for="item in depList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> -->
<el-cascader <el-cascader
ref="cascader" ref="cascader"
v-model="model.triageDepartmentId" v-model="model.triageDepartmentId"
...@@ -263,8 +248,13 @@ ...@@ -263,8 +248,13 @@
}, },
change() { change() {
const checkedNodes = this.$refs['cascader'].getCheckedNodes(); const checkedNodes = this.$refs['cascader'].getCheckedNodes();
this.model.triageDepartmentId = checkedNodes[0].value; if (checkedNodes.length > 0) {
this.model.triageDepartment = checkedNodes[0].label; this.model.triageDepartmentId = checkedNodes[0].value;
this.model.triageDepartment = checkedNodes[0].label;
}else{
this.model.triageDepartmentId = '';
this.model.triageDepartment = '';
}
console.log(this.model.triageDepartmentId, 'model.triageDepartmentId'); console.log(this.model.triageDepartmentId, 'model.triageDepartmentId');
console.log(this.model.triageDepartment, 'model.triageDepartment'); console.log(this.model.triageDepartment, 'model.triageDepartment');
}, },
......
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ 39398fa1
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
class="serviceSchedule_select" class="serviceSchedule_select"
> >
<div class="agmentSelect-select-left"> <div class="agmentSelect-select-left">
<el-cascader <!-- <el-cascader
v-model="innerform" v-model="innerform"
class="serviceSchedule-cascader" class="serviceSchedule-cascader"
filterable filterable
...@@ -26,7 +26,32 @@ ...@@ -26,7 +26,32 @@
:show-all-levels="false" :show-all-levels="false"
@expand-change="handleItemChange" @expand-change="handleItemChange"
@change="selectApi($event, innerform)" @change="selectApi($event, innerform)"
/> /> -->
<el-cascader
ref="cascader"
v-model="departmentId"
filterable
clearable
class="serviceSchedule-cascader"
:options="allTilst"
placeholder="选择科室"
:show-all-levels="false"
@change="changeDepartment"
>
<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-date-picker <el-date-picker
v-model="dateTime" v-model="dateTime"
class="serviceSchedule_dateTime" class="serviceSchedule_dateTime"
...@@ -81,14 +106,13 @@ ...@@ -81,14 +106,13 @@
</div> </div>
</template> </template>
<script> <script>
import { departmentAll } from '@/api/diagnosis';
import FullCalendar from '@fullcalendar/vue'; import FullCalendar from '@fullcalendar/vue';
import dayGridPlugin from '@fullcalendar/daygrid'; import dayGridPlugin from '@fullcalendar/daygrid';
import timeGridPlugin from '@fullcalendar/timegrid'; import timeGridPlugin from '@fullcalendar/timegrid';
import interactionPlugin from '@fullcalendar/interaction'; import interactionPlugin from '@fullcalendar/interaction';
import resourceTimeGridPlugin from '@fullcalendar/resource-timegrid'; import resourceTimeGridPlugin from '@fullcalendar/resource-timegrid';
import { import {
getFirstLevelLable,
childLabelList,
previewWork, previewWork,
setPlatformUpper, setPlatformUpper,
getPlatformUpper, getPlatformUpper,
...@@ -160,11 +184,13 @@ ...@@ -160,11 +184,13 @@
index: 0, index: 0,
getWidth: '100%', getWidth: '100%',
getMaxWidth: '100%', getMaxWidth: '100%',
allTilst: [],
allList: {},
}; };
}, },
watch: {}, watch: {},
created() { created() {
this.getFirstLevelLable(); this.departmentAll();
this.getPlatformUpper(); this.getPlatformUpper();
}, },
mounted() {}, mounted() {},
...@@ -194,45 +220,57 @@ ...@@ -194,45 +220,57 @@
getInputNumber(value) { getInputNumber(value) {
console.log(value, 'getInputNumbergetInputNumber'); console.log(value, 'getInputNumbergetInputNumber');
}, },
// 通过监听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: [],
} else { };
this.$message({ departmentMapList.map((info) => {
message: res.msg, if (info.parentDepartmentId === obj.value) {
type: 'warning', 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}）`;
children.push(secondObj);
});
obj.children = children;
}
});
arr.push(obj);
}); });
console.log(arr);
this.allTilst = arr;
}, },
// 获取选择的值 // 获取选择的值
selectApi(e, value) { changeDepartment() {
this.departmentId = value[1]; const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (checkedNodes.length > 0) {
this.departmentId = checkedNodes[0].value;
}else{
this.departmentId = '';
}
}, },
getNowDate(value) { getNowDate(value) {
this.dateTime = value; this.dateTime = value;
......
src/views/IM/diagnosis-admin/serviceSchedule.vue
浏览文件 @ 39398fa1
...@@ -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: [],
} else { };
this.$message({ departmentMapList.map((info) => {
message: res.msg, if (info.parentDepartmentId === obj.value) {
type: 'warning', 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}）`;
children.push(secondObj);
});
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;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或