Skip to content

P
pica.cloud.web-education-admin
提交 37c87458 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-saas-phrase2.1-0522' into 'release' 

修复时间控件的问题   code reviewer 张平

修复时间控件的问题   code reviewer 张平

See merge request !158
上级 1979fbbe c09b28eb
隐藏空白字符变更
内嵌 并排
正在显示 包含 107 行增加 和 46 行删除
src/components/education/custom/custom-baseinfo.vue
浏览文件 @ 37c87458
......@@ -144,7 +144,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="封面文件：" style="margin-bottom: 10px">
<el-form-item label="封面图片：" style="margin-bottom: 10px">
<el-col :span="13" style="height: 95px">
<div class="url2-selected">
<img :src="formData.attachmentUrl2" alt />
......@@ -609,14 +609,14 @@ export default {
}
}
vm.formData.projectBegintime = convertTime(
vm.formData.projectBegintime,
false
);
vm.formData.projectEndtime = convertTime(
vm.formData.projectEndtime,
false
);
// vm.formData.projectBegintime = convertTime(
// vm.formData.projectBegintime,
// false
// );
// vm.formData.projectEndtime = convertTime(
// vm.formData.projectEndtime,
// false
// );
if (status) {
vm.formData.projectStatus = status;
}
......@@ -636,7 +636,16 @@ export default {
vm.formData.attachmentMore2
);
let baseobj = {};
baseobj.projectModel = JSON.stringify(vm.formData);
let formData2 = JSON.parse(JSON.stringify(vm.formData));
formData2.projectBegintime = convertTime(
vm.formData.projectBegintime,
false
);
formData2.projectEndtime = convertTime(
vm.formData.projectEndtime,
false
);
baseobj.projectModel = JSON.stringify(formData2);
baseobj.attachmentModel = JSON.stringify(vm.attachmentModel);
baseobj.attachmentPDFModel = null;
baseobj.notifyData = null;
......
src/components/education/template/templateMessage.vue
浏览文件 @ 37c87458
......@@ -633,8 +633,9 @@ export default {
}
vm.formData.projectBegintime = convertTime(vm.formData.projectBegintime, false);
vm.formData.projectEndtime = convertTime(vm.formData.projectEndtime, false);
// vm.formData.projectBegintime = convertTime(vm.formData.projectBegintime, false);
// vm.formData.projectEndtime = convertTime(vm.formData.projectEndtime, false);
if (status) {
vm.formData.projectStatus = status;
}
......@@ -647,8 +648,17 @@ export default {
//整合图片视频
vm.attachmentModel[0] = Object.assign(vm.attachmentModel[0],vm.formData.attachmentMore1);
vm.attachmentModel[1] = Object.assign(vm.attachmentModel[1],vm.formData.attachmentMore2);
let formData2 = JSON.parse(JSON.stringify(vm.formData));
formData2.projectBegintime = convertTime(
vm.formData.projectBegintime,
false
);
formData2.projectEndtime = convertTime(
vm.formData.projectEndtime,
false
);
let baseobj = {};
baseobj.projectModel = JSON.stringify(vm.formData);
baseobj.projectModel = JSON.stringify(formData2);
baseobj.attachmentModel = JSON.stringify(vm.attachmentModel);
baseobj.attachmentPDFModel= null;
baseobj.notifyData= null;
......@@ -656,6 +666,7 @@ export default {
vm.POST("portal/portalInfo/insertOrUpdate", baseobj)
.then(res => {
closeLoading(vm);
vm.formData.id = res.data.id;
if (res.code == "000000") {
// 暂存不会跳到下一页
if (status == 1) {
......
src/views/layout/slidebar.vue
浏览文件 @ 37c87458
......@@ -109,39 +109,39 @@
}
]
},
{
title: '居民管理',
icon: 'el-icon-patients-manage',
index: 'patients-manage',
subs: [
{
title: '我的居民',
icon: 'el-icon-setting',
index: 'patients-manage/mypatients-manage/patients-list'
},
{
title: '新增居民',
icon: 'el-icon-setting',
index: 'patients-manage/new-manage/new-patient'
},
{
title: '分组管理',
icon: 'el-icon-setting',
index: 'patients-manage/labels-manage/labels-list'
},
{
title: '资料不全居民',
icon: 'el-icon-setting',
index: 'patients-manage/not-complete/uncompleted-list'
}
]
},{
title: '消息推送',
icon: 'el-icon-message',
index: 'msg-push',
isMessageSend: true,
checkAuth: true,
},
// {
// title: '居民管理',
// icon: 'el-icon-patients-manage',
// index: 'patients-manage',
// subs: [
// {
// title: '我的居民',
// icon: 'el-icon-setting',
// index: 'patients-manage/mypatients-manage/patients-list'
// },
// {
// title: '新增居民',
// icon: 'el-icon-setting',
// index: 'patients-manage/new-manage/new-patient'
// },
// {
// title: '分组管理',
// icon: 'el-icon-setting',
// index: 'patients-manage/labels-manage/labels-list'
// },
// {
// title: '资料不全居民',
// icon: 'el-icon-setting',
// index: 'patients-manage/not-complete/uncompleted-list'
// }
// ]
// },{
// title: '消息推送',
// icon: 'el-icon-message',
// index: 'msg-push',
// isMessageSend: true,
// checkAuth: true,
// },
// {
// title: '学情报告',
// icon: 'el-icon-tickets',
......@@ -274,9 +274,49 @@
}
]
}
const patients = {
title: '居民管理',
icon: 'el-icon-patients-manage',
index: 'patients-manage',
subs: [
{
title: '我的居民',
icon: 'el-icon-setting',
index: 'patients-manage/mypatients-manage/patients-list'
},
{
title: '新增居民',
icon: 'el-icon-setting',
index: 'patients-manage/new-manage/new-patient'
},
{
title: '分组管理',
icon: 'el-icon-setting',
index: 'patients-manage/labels-manage/labels-list'
},
{
title: '资料不全居民',
icon: 'el-icon-setting',
index: 'patients-manage/not-complete/uncompleted-list'
}
]
}
const message = {
title: '消息推送',
icon: 'el-icon-message',
index: 'msg-push',
isMessageSend: true,
checkAuth: true,
}
vm.items[1].title = '教育培训';
vm.items.push(followSider);
vm.items.push(patients);
vm.items.push(message);
},
setEntrySide() {
const itemComponent = {
title: '项目组件',
......@@ -334,6 +374,7 @@
vm.items.push(eduRole);
vm.items.push(cme);
},
goToMessageSendPage(checkAuth) {
if(checkAuth){
utils.checkAuthFunc().then(res=>{
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或