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

Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request !199
......@@ -92,7 +92,7 @@
sortable
/>
<el-table-column
prop="createdId"
prop="modifiedId"
label="修改人ID"
width="170"
align="center"
......
......@@ -314,7 +314,7 @@
this.calendarOptions.editable = true;
} else {
// 查看
this.calendarOptions.slotDuration = '00:05:00';
this.calendarOptions.slotDuration = '01:0:00';
this.calendarOptions.selectable = false;
this.calendarOptions.editable = false;
}
......
......@@ -182,6 +182,10 @@
};
setPlatformUpper(params).then((res) => {
if (res.code === '000000') {
this.$message({
message: '保存成功',
type: 'success',
});
this.getPlatformUpper();
}
});
......@@ -253,7 +257,7 @@
};
}
);
const dutyRosterPreList = res.data.dutyRosterPreList.map(
const dutyRosterPreList = (res.data.dutyRosterPreList || []).map(
(item, index) => {
return {
id: index,
......@@ -264,7 +268,7 @@
};
}
);
const dutyWorkList = res.data.dutyWorkList.map((item, index) => {
const dutyWorkList = (res.data.dutyWorkList || []).map((item, index) => {
return {
id: index,
resourceId: item.doctorId,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册