提交 bc3d7682 编写于 作者: qian.jie's avatar qian.jie

Merge branch 'feature/jqtcm' into 'release'

Feature/jqtcm

See merge request !269
Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into feature/jq
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
...@@ -28,7 +28,14 @@ export const switchOpen = async (data) => { ...@@ -28,7 +28,14 @@ export const switchOpen = async (data) => {
}; };
export const readingReportOpen = async (data) => { export const readingReportOpen = async (data) => {
return request({ return request({
url: 'diagnose/doctor/work/readingReportOpen', url: '/diagnose/doctor/work/readingReportOpen',
data: data,
method: 'post',
});
};
export const reminderSwitchOpen = async (data) => {
return request({
url: '/diagnose/doctor/work/reminderSwitchOpen',
data: data, data: data,
method: 'post', method: 'post',
}); });
......
...@@ -137,6 +137,20 @@ ...@@ -137,6 +137,20 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="isReminderSwitch"
align="center"
label="接诊电话提醒开关"
width="170"
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.isReminderSwitch"
active-color="#0D9078"
@change="changeReminderSwitch(scope.$index, scope.row)"
/>
</template>
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
fixed="right" fixed="right"
...@@ -263,6 +277,9 @@ ...@@ -263,6 +277,9 @@
changeSwitchReport(value, val) { changeSwitchReport(value, val) {
this.$emit('changeSwitchReport', value, val); this.$emit('changeSwitchReport', value, val);
}, },
changeReminderSwitch(value, val) {
this.$emit('changeReminderSwitch', value, val);
},
getServiceOpen(value, row) { getServiceOpen(value, row) {
return row.serviceOpen === String(value); return row.serviceOpen === String(value);
}, },
......
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
@getWorkStatus="getWorkStatus" @getWorkStatus="getWorkStatus"
@changeSwitch="changeSwitch" @changeSwitch="changeSwitch"
@changeSwitchReport="changeSwitchReport" @changeSwitchReport="changeSwitchReport"
@changeReminderSwitch="changeReminderSwitch"
@handleSizeChange="handleSizeChange" @handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange" @handleCurrentChange="handleCurrentChange"
@addSchedule="addSchedule" @addSchedule="addSchedule"
...@@ -197,7 +198,8 @@ ...@@ -197,7 +198,8 @@
switchOpen, switchOpen,
workInStep, workInStep,
getLevel, getLevel,
readingReportOpen readingReportOpen,
reminderSwitchOpen,
} from '@/api/serviceSchedule'; } from '@/api/serviceSchedule';
import { departmentAll, savePCDayCount } from '@/api/diagnosis'; import { departmentAll, savePCDayCount } from '@/api/diagnosis';
import TableServiceSchedule from '@/components/list/table-serviceSchedule'; import TableServiceSchedule from '@/components/list/table-serviceSchedule';
...@@ -368,8 +370,9 @@ ...@@ -368,8 +370,9 @@
this.tableData = (res.data.list || []).map((item) => { this.tableData = (res.data.list || []).map((item) => {
return { return {
...item, ...item,
isReadingReport:item.isReadingReport == 1 ? true : false, isReadingReport: item.isReadingReport == 1 ? true : false,
switchStatus:item.switchStatus == 1 ? true : false isReminderSwitch: item.isReminderSwitch == 1 ? true : false,
switchStatus: item.switchStatus == 1 ? true : false,
}; };
}); });
this.searchParam.totalRows = res.data.count; this.searchParam.totalRows = res.data.count;
...@@ -383,6 +386,7 @@ ...@@ -383,6 +386,7 @@
this.searchParam.ScheduleStatus = value; this.searchParam.ScheduleStatus = value;
}, },
changeSwitch(value, val) { changeSwitch(value, val) {
console.log(value);
switchOpen({ switchOpen({
id: val.id, id: val.id,
switchOpen: val.switchStatus ? '1' : '2', switchOpen: val.switchStatus ? '1' : '2',
...@@ -393,6 +397,7 @@ ...@@ -393,6 +397,7 @@
}); });
}, },
changeSwitchReport(value, val) { changeSwitchReport(value, val) {
console.log(value);
readingReportOpen({ readingReportOpen({
id: val.id, id: val.id,
readingReportOpen: val.isReadingReport ? '1' : '2', readingReportOpen: val.isReadingReport ? '1' : '2',
...@@ -402,6 +407,18 @@ ...@@ -402,6 +407,18 @@
} }
}); });
}, },
// 接诊电话提醒开关
changeReminderSwitch(value, val) {
console.log(value);
reminderSwitchOpen({
id: val.id,
reminderSwitchOpen: val.isReminderSwitch ? '1' : '2',
}).then((res) => {
if (res.code === '000000') {
// this.search();
}
});
},
searchInStep() { searchInStep() {
this.loading = true; this.loading = true;
workInStep().then((res) => { workInStep().then((res) => {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册