|
@@ -102,8 +102,10 @@
|
|
|
<el-input v-model="ruleForm.noticeTitle" placeholder="请输入公告标题" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="公告内容" prop="noticeContent">
|
|
|
- <el-input v-model="ruleForm.noticeContent"
|
|
|
- type="textarea" :rows="10" placeholder="请输入公告内容"></el-input>
|
|
|
+ <!-- <pre v-if="isSave">{{ruleForm.noticeContent}}</pre> -->
|
|
|
+ <el-input v-model="ruleForm.noticeContent" :disabled="isSave"
|
|
|
+ type="textarea" :rows="10" placeholder="请输入公告内容"></el-input>
|
|
|
+
|
|
|
</el-form-item>
|
|
|
<el-form-item label="发布对象" prop="sendTo">
|
|
|
<el-select v-model="ruleForm.sendTo" placeholder="请选择发布对象">
|
|
@@ -449,10 +451,10 @@ export default {
|
|
|
sendTo: that.ruleForm.sendTo,
|
|
|
sendToContent: that.ruleForm.sendToContent.join(','),
|
|
|
releaseState: type === '草稿'? '草稿': type === '发布'?'已发布':'未发布',
|
|
|
- releaseDept: that.userMes.deptId,
|
|
|
- releaseDeptName: that.userMes.deptName,
|
|
|
- releasePeople: that.userMes.id,
|
|
|
- releasePeopleName: that.userMes.name
|
|
|
+ // releaseDept: that.userMes.deptId,
|
|
|
+ // releaseDeptName: that.userMes.deptName,
|
|
|
+ // releasePeople: that.userMes.id,
|
|
|
+ // releasePeopleName: that.userMes.name
|
|
|
}
|
|
|
const formData = new FormData()
|
|
|
if (that.filesList.length>0) {
|
|
@@ -537,10 +539,19 @@ export default {
|
|
|
} else {
|
|
|
this.evalradio = this.changeDateSelect[0]
|
|
|
}
|
|
|
+
|
|
|
+ let conStr = ''
|
|
|
+ for(let i in this.evalradio.noticeContent) {
|
|
|
+ let it = this.evalradio.noticeContent[i]
|
|
|
+ if (it === ' ' && i !== 0 && this.evalradio.noticeContent[i-1] !== ' ') {
|
|
|
+ it = it+'\n'
|
|
|
+ }
|
|
|
+ conStr += it
|
|
|
+ }
|
|
|
this.ruleForm = {
|
|
|
serialNumber: this.evalradio.serialNumber*1,
|
|
|
noticeTitle: this.evalradio.noticeTitle,
|
|
|
- noticeContent: this.evalradio.noticeContent,
|
|
|
+ noticeContent: conStr,
|
|
|
sendTo: this.evalradio.sendTo,
|
|
|
sendToContent: this.evalradio.sendToContent.split(','),
|
|
|
releaseDept: this.evalradio.releaseDept,
|