提交 978521e7 编写于 作者: haochangdi's avatar haochangdi

解决暂存,模板详情样式,完成按钮提示问题

上级 9e4f6fd3
...@@ -50,40 +50,42 @@ ...@@ -50,40 +50,42 @@
</div> </div>
<el-dialog title="项目详情" :visible.sync="dialogTableVisible" class="dialog-list-wrap"> <el-dialog title="项目详情" :visible.sync="dialogTableVisible" class="dialog-list-wrap">
<div class="dialog-line"></div> <div class="dialog-line"></div>
<div class="dialog-title">{{detailObj.openTemplateName}}</div> <div class="dialog-main">
<div class="dialog-message"> <div class="dialog-title">{{detailObj.openTemplateName}}</div>
<div class="dm-title"> <div class="dialog-message">
<div class="dm-line"></div> <div class="dm-title">
<div class="dm-msg">基本信息</div> <div class="dm-line"></div>
</div> <div class="dm-msg">基本信息</div>
<div class="dm-main">
<div class="mian-list" v-if="detailObj.openTemplateIntro">
<div class="dm-name">内容有效期:</div>
<div class="dm-nr">{{detailObj.openTemplateIntro}}</div>
</div>
<div class="mian-list" v-if="detailObj.subjectName">
<div class="dm-name">项目学科:</div>
<div class="dm-nr">{{detailObj.subjectName}}</div>
</div> </div>
<div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length"> <div class="dm-main">
<div class="dm-name">已参加的机构:</div> <div class="mian-list" v-if="detailObj.openTemplateIntro">
<div class="dm-nr">{{detailObj.organizationNameList.join(', ')}}</div> <div class="dm-name">内容有效期:</div>
<div class="dm-nr">{{detailObj.openTemplateIntro}}</div>
</div>
<div class="mian-list" v-if="detailObj.subjectName">
<div class="dm-name">项目学科:</div>
<div class="dm-nr">{{detailObj.subjectName}}</div>
</div>
<div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length">
<div class="dm-name">已参加的机构:</div>
<div class="dm-nr">{{detailObj.organizationNameList.join(', ')}}</div>
</div>
</div> </div>
</div> </div>
</div> <div class="dialog-jj">
<div class="dialog-jj"> <div class="dm-title">
<div class="dm-title"> <div class="dm-line"></div>
<div class="dm-line"></div> <div class="dm-msg">项目简介</div>
<div class="dm-msg">项目简介</div> </div>
<div class="jjs-main">{{detailObj.openTemplateIntro}}</div>
</div> </div>
<div class="jjs-main">{{detailObj.openTemplateIntro}}</div> <div class="dialog-xq">
</div> <div class="dm-title">
<div class="dialog-xq"> <div class="dm-line"></div>
<div class="dm-title"> <div class="dm-msg">项目详情</div>
<div class="dm-line"></div> </div>
<div class="dm-msg">项目详情</div> <div class="xq-main" v-html="detailObj.openTemplateDetail"></div>
</div> </div>
<div class="xq-main" v-html="detailObj.openTemplateDetail"></div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -334,7 +336,7 @@ export default { ...@@ -334,7 +336,7 @@ export default {
.el-dialog { .el-dialog {
width: 800px; width: 800px;
max-height: 80%; max-height: 80%;
overflow: scroll; overflow: hidden;
} }
.dialog-line { .dialog-line {
width:750px; width:750px;
...@@ -342,6 +344,11 @@ export default { ...@@ -342,6 +344,11 @@ export default {
background:rgba(228,231,237,1); background:rgba(228,231,237,1);
margin: 0 auto 12px; margin: 0 auto 12px;
} }
.dialog-main {
overflow: scroll;
background: #fff;
height: 60vh;
}
.dialog-title { .dialog-title {
margin: 0 auto; margin: 0 auto;
width:752px; width:752px;
......
...@@ -616,6 +616,10 @@ export default { ...@@ -616,6 +616,10 @@ export default {
vm.$message.warning('项目结束时间应在有效期内'); vm.$message.warning('项目结束时间应在有效期内');
return; return;
} }
if(new Date(vm.formData.projectEndtime).getTime() <= new Date(vm.formData.projectBegintime).getTime()) {
vm.$message.warning('项目结束时间应大于开始时间');
return;
}
if (status) { if (status) {
vm.formData.projectStatus = status; vm.formData.projectStatus = status;
...@@ -639,6 +643,11 @@ export default { ...@@ -639,6 +643,11 @@ export default {
.then(res => { .then(res => {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
// 暂存不会跳到下一页
if (status == 1) {
vm.$message.info('成功');
return;
}
// 下一步,并将项目id传递给父组件 // 下一步,并将项目id传递给父组件
vm.$emit('next',res.data.id); vm.$emit('next',res.data.id);
} else if (res.code == "213061") { } else if (res.code == "213061") {
......
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
}, },
// 完成触发的接口 // 完成触发的接口
hidefn() { hidefn() {
vm.regionComplete(vm.changeStatus()); vm.regionComplete(vm.changeStatus);
}, },
// 选择学元范围暂存 // 选择学元范围暂存
regionComplete(fishFn) { regionComplete(fishFn) {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册