|
@@ -2,23 +2,32 @@
|
|
|
<div>
|
|
|
<el-row class="handle-box" style="margin-bottom: 10px">
|
|
|
<el-col :span="24">
|
|
|
- <el-input v-model="seachFrom.keywords" class="ch-input ch-input-size" placeholder="主题/发布人/更改人/版本号" size="small" @keyup.enter.native="handleSearch()" />
|
|
|
+ <el-input v-model="seachFrom.keywords" placeholder="主题/发布人/更改人/版本号" size="small" class="ch-input ch-input-size" @keyup.enter.native="handleSearch()" />
|
|
|
<el-select v-model="seachFrom.state" placeholder="状态" size="small">
|
|
|
<el-option label="全部" value="" />
|
|
|
<el-option label="待发布" value="1" />
|
|
|
<el-option label="已发布" value="0" />
|
|
|
<el-option label="已撤回" value="2" />
|
|
|
</el-select>
|
|
|
- <el-date-picker v-model="seachFrom.times" end-placeholder="结束日期" range-separator="至" size="small" start-placeholder="开始日期" type="daterange" value-format="yyyy-MM-dd" @change="clickTimeFun" />
|
|
|
+ <el-date-picker
|
|
|
+ v-model="seachFrom.times"
|
|
|
+ type="daterange"
|
|
|
+ size="small"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ @change="clickTimeFun"
|
|
|
+ />
|
|
|
|
|
|
<el-button class="ch-button-warning" size="small" @click="handleReset()"><i class="el-icon-refresh" /> 重置</el-button>
|
|
|
<el-button class="ch-button" size="small" @click="handleSearch()"><i class="el-icon-search" /> 搜索</el-button>
|
|
|
- <el-button class="ch-button" size="small" style="float: right;margin-top: 4px" @click="handleAdd()"><i class="el-icon-document-add" /> 新增</el-button>
|
|
|
+ <el-button size="small" class="ch-button-add" style="float: right;margin-top: 4px" @click="handleAdd()"><i class="el-icon-document-add" /> 新增</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row class="handle-box">
|
|
|
<el-col :span="24">
|
|
|
- <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
|
|
|
+ <el-table v-loading="loading" :data="AllData" stripe row-class-name="g_table_row">
|
|
|
<el-table-column type="index" width="60" />
|
|
|
<el-table-column label="主题" prop="title" />
|
|
|
<el-table-column label="版本号" prop="versionNo" />
|
|
@@ -32,12 +41,12 @@
|
|
|
{{ scope.row.state==0?"已发布":scope.row.state==1?"待发布":scope.row.state==2?"已撤回":"" }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" header-align="center" label="操作" width="220">
|
|
|
+ <el-table-column label="操作" header-align="center" align="center" width="260">
|
|
|
<template scope="scope">
|
|
|
- <el-button v-if="scope.row.state == 0" class="ch-button-warning" size="mini" @click="pushMsg(scope.row, '2')">撤回</el-button>
|
|
|
- <el-button v-if="scope.row.state != 0" class="ch-button-warning" size="mini" @click="pushMsg(scope.row, '0')">发布</el-button>
|
|
|
- <el-button size="mini" type="primary" @click="handleEdit(scope.row)">编辑</el-button>
|
|
|
- <el-button size="mini" type="danger" @click="handleDel(scope.row)">删除</el-button>
|
|
|
+ <el-button v-if="scope.row.state == 0" size="mini" class="ch-button-warning" @click="pushMsg(scope.row, '2')">撤回</el-button>
|
|
|
+ <el-button v-if="scope.row.state != 0" size="mini" class="ch-button-warning" @click="pushMsg(scope.row, '0')">发布</el-button>
|
|
|
+ <el-button size="mini" type="primary" class="editButton" @click="handleEdit(scope.row)">编辑</el-button>
|
|
|
+ <el-button size="mini" type="danger" class="deleButton" @click="handleDel(scope.row)">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -45,16 +54,16 @@
|
|
|
<el-pagination
|
|
|
:current-page.sync="currentPage"
|
|
|
:page-size="pageSize"
|
|
|
- :total="allpage"
|
|
|
background
|
|
|
layout="total, prev, pager, next"
|
|
|
+ :total="allpage"
|
|
|
@current-change="handleCurrentChange"
|
|
|
/>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" top="50px" width="70%" @open="dlgOpen">
|
|
|
- <el-form ref="form" :model="form" :rules="rules" style="width: 100%;padding: 5px">
|
|
|
+ <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="70%" top="50px" append-to-body @open="dlgOpen">
|
|
|
+ <el-form ref="form" :model="form" style="width: 100%;padding: 5px" :rules="rules">
|
|
|
<el-row>
|
|
|
<el-col style="padding-bottom: 10px">
|
|
|
<span class="card_title">基本信息</span>
|
|
@@ -87,11 +96,11 @@
|
|
|
<el-form-item>
|
|
|
<!-- <el-input v-model="form.annex" /> -->
|
|
|
<el-upload
|
|
|
+ class="upload-demo"
|
|
|
+ action="#"
|
|
|
+ :http-request="upload"
|
|
|
:before-remove="uploadRemove"
|
|
|
:file-list="fileList"
|
|
|
- :http-request="upload"
|
|
|
- action="#"
|
|
|
- class="upload-demo"
|
|
|
>
|
|
|
<el-button size="small" type="primary">点击上传</el-button>
|
|
|
<div slot="tip" class="el-upload__tip">请上传50MB以内的文件</div>
|
|
@@ -124,12 +133,13 @@ import BaseData from '@/views/base/baseData'
|
|
|
import axios from 'axios'
|
|
|
import channel from '../../static/utils/channel'
|
|
|
import Constant from '../../static/utils/constant'
|
|
|
-// import QuillEditor from '@/components/QuillEditor'
|
|
|
+import QuillEditor from '@/components/QuillEditor'
|
|
|
+import common from '@/static/utils/common'
|
|
|
|
|
|
export default {
|
|
|
name: 'PendingAudit',
|
|
|
components: {
|
|
|
- // QuillEditor
|
|
|
+ QuillEditor
|
|
|
},
|
|
|
mixins: [Base, BaseData],
|
|
|
data() {
|
|
@@ -216,12 +226,15 @@ export default {
|
|
|
this.fileList = []
|
|
|
},
|
|
|
getContent(content) {
|
|
|
+ console.log('content', content)
|
|
|
+
|
|
|
// this.content = content
|
|
|
this.form.content = content
|
|
|
+ console.log('this.form.content', this.form.content)
|
|
|
},
|
|
|
confirmSubmit: function() {
|
|
|
- //console.log('fileList_:', this.fileList)
|
|
|
- //console.log('fileList_:', JSON.stringify(this.fileList))
|
|
|
+ console.log('fileList_:', this.fileList)
|
|
|
+ console.log('fileList_:', JSON.stringify(this.fileList))
|
|
|
const _this = this
|
|
|
this.$refs.form.validate(valid => {
|
|
|
if (valid) {
|
|
@@ -236,7 +249,7 @@ export default {
|
|
|
postData.annex = JSON.stringify(_this.fileList)
|
|
|
this.opRecord(postData, soaUrl)
|
|
|
} else {
|
|
|
- //console.log('error submit!!')
|
|
|
+ console.log('error submit!!')
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
@@ -248,7 +261,7 @@ export default {
|
|
|
id: this.form.id
|
|
|
}
|
|
|
this.baseRequest('getById', postData).then((res) => {
|
|
|
- //console.log('dlgOpen_:', res)
|
|
|
+ console.log('dlgOpen_:', res)
|
|
|
if (res.data) {
|
|
|
const { data } = res
|
|
|
_this.form = Object.assign({}, _this.form, res.data)
|
|
@@ -357,7 +370,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
baseRequest(opUrl, postData) {
|
|
|
- return channel.globeRequest('SysMessageController', opUrl, postData, 'project')
|
|
|
+ return channel.globleRequest('sysMessageController', opUrl, postData, 'project')
|
|
|
},
|
|
|
uploadRemove(file, fileList) {
|
|
|
this.fileList = fileList
|
|
@@ -367,24 +380,24 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style scoped>
|
|
|
- .ch-input .el-input__inner {
|
|
|
- border-radius: 0px;
|
|
|
- border-color: #32323A;
|
|
|
- }
|
|
|
- .ch-input-size {
|
|
|
- width: 150px;
|
|
|
- }
|
|
|
- .ch-button {
|
|
|
- border-radius: 0px;
|
|
|
- border-color: #32323A;
|
|
|
- background-color: #32323A;
|
|
|
- color: #fff;
|
|
|
- }
|
|
|
- .ch-button-warning {
|
|
|
- margin-left: 10px;
|
|
|
- border-radius: 0px;
|
|
|
- border-color: #E6A23C;
|
|
|
- background-color: #E6A23C;
|
|
|
- color: #fff;
|
|
|
- }
|
|
|
+.ch-input .el-input__inner {
|
|
|
+ border-radius: 0px;
|
|
|
+ border-color: #32323A;
|
|
|
+}
|
|
|
+.ch-input-size {
|
|
|
+ width: 150px;
|
|
|
+}
|
|
|
+.ch-button {
|
|
|
+ border-radius: 0px;
|
|
|
+ border-color: #32323A;
|
|
|
+ background-color: #32323A;
|
|
|
+ color: #fff;
|
|
|
+}
|
|
|
+.ch-button-warning {
|
|
|
+ margin-left: 10px;
|
|
|
+ border-radius: 0px;
|
|
|
+ border-color: #E6A23C;
|
|
|
+ background-color: #E6A23C;
|
|
|
+ color: #fff;
|
|
|
+}
|
|
|
</style>
|