Skip to content

G
gs1-admin
Commit 3380b42e by Lyan
Options

后台bug

parent edcee82d
Showing with 439 additions and 152 deletions
src/assets/scss/_base.scss
...@@ -367,6 +367,13 @@ img { ...@@ -367,6 +367,13 @@ img {
.el-select,.el-date-editor{ .el-select,.el-date-editor{
width: 100%; width: 100%;
} }
.pic{
.el-form-item__label::before{
content: '*';
color: #f56c6c;
margin-right: 4px;
}
}
.avatar-uploader>.el-upload { .avatar-uploader>.el-upload {
border: 2px dashed #666666; border: 2px dashed #666666;
...@@ -402,6 +409,9 @@ img { ...@@ -402,6 +409,9 @@ img {
img{ img{
width: 100%; width: 100%;
} }
video{
width: 100%;
}
} }
p{ p{
margin: 0; margin: 0;
......
src/views/modules/info/announce-add-or-update.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<p v-show="showInfo">{{dataForm.showtime}}</p> <p v-show="showInfo">{{dataForm.showtime}}</p>
</el-form-item> </el-form-item>
<el-form-item label="附件路径：" prop="fileUrl"> <el-form-item label="附件路径：" prop="fileUrl" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploaderFile" class="avatar-uploaderFile"
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
showtime: [ showtime: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
] ]
}, },
fileUrl: new FormData(), fileUrl: new FormData(),
fileUrlStr: '', fileUrlStr: '',
...@@ -182,6 +183,8 @@ ...@@ -182,6 +183,8 @@
this.fileUrlStr = data.announce.fileUrlStr this.fileUrlStr = data.announce.fileUrlStr
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -192,6 +195,10 @@ ...@@ -192,6 +195,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.fileurl === '' || this.dataForm.fileurl === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/announce/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/announce/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
......
src/views/modules/info/announce.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary" >搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary" >搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:announce:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:announce:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -72,6 +72,12 @@ ...@@ -72,6 +72,12 @@
label="级别"> label="级别">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="title"
header-align="center"
align="center"
label="标题">
</el-table-column>
<el-table-column
prop="announcetype" prop="announcetype"
header-align="center" header-align="center"
align="center" align="center"
...@@ -224,6 +230,10 @@ export default { ...@@ -224,6 +230,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -239,14 +249,15 @@ export default { ...@@ -239,14 +249,15 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'releaseTimeStart': this.releaseDate === null ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate === null ? '' : this.releaseDate[1] 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/info/indexcarouselmanage-add-or-update.vue
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<p v-show="showInfo">{{dataForm.brief}}</p> <p v-show="showInfo">{{dataForm.brief}}</p>
</el-form-item> </el-form-item>
<el-form-item label="图片：" prop="picIndexPath" class="setdes setdes3"> <el-form-item label="图片：" prop="picIndexPath" class="setdes setdes3 pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -151,15 +151,15 @@ ...@@ -151,15 +151,15 @@
title: [ title: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ],
// brief: [ brief: [
// { required: true, message: '不能为空', trigger: 'blur' }
// ],
levels: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ],
directpath: [ levels: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
] ]
// directpath: [
// { required: true, message: '不能为空', trigger: 'blur' }
// ]
// picIndexPath: [ // picIndexPath: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ] // ]
...@@ -234,6 +234,8 @@ ...@@ -234,6 +234,8 @@
this.dataForm.colorMore = data.indexCarouselManage.colorMore this.dataForm.colorMore = data.indexCarouselManage.colorMore
this.imgUrlStr = data.indexCarouselManage.picIndexPath this.imgUrlStr = data.indexCarouselManage.picIndexPath
this.dialogVisible = true this.dialogVisible = true
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -251,6 +253,10 @@ ...@@ -251,6 +253,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.picIndexPath === '' || this.dataForm.picIndexPath === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/indexCarouselManage/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/indexCarouselManage/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
......
src/views/modules/info/indexcarouselmanage.vue
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
<el-select v-model="dataForm.classnum" placeholder="请选择类别" clearable> <el-select v-model="dataForm.classnum" placeholder="请选择类别" clearable>
<el-option <el-option
v-for="item in classnumList" v-for="item in classnumList"
:key="item.value" :key="item.label"
:label="item.name" :label="item.label"
:value="item.name"> :value="item.label">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary" >搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary" >搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:indexcarouselmanage:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:indexcarouselmanage:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -212,6 +212,10 @@ export default { ...@@ -212,6 +212,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -225,8 +229,8 @@ export default { ...@@ -225,8 +229,8 @@ export default {
'status': this.dataForm.status, 'status': this.dataForm.status,
'levels': this.dataForm.levels, 'levels': this.dataForm.levels,
'classnum': this.dataForm.classnum, 'classnum': this.dataForm.classnum,
'inputDataStart': this.releaseDate === null ? '' : this.releaseDate[0], 'startTime': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'inputDataEnd': this.releaseDate === null ? '' : this.releaseDate[1] 'endTime': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
...@@ -234,6 +238,7 @@ export default { ...@@ -234,6 +238,7 @@ export default {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
...@@ -265,7 +270,7 @@ export default { ...@@ -265,7 +270,7 @@ export default {
}, },
showMsg (data) { showMsg (data) {
if (!data.directpath || data.directpath === null) { if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + data.id, '_blank') window.open(this.$store.state.config.urls + '/home?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) { } else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank') window.open(this.$store.state.config.urls + data.directpath, '_blank')
} else { } else {
...@@ -283,7 +288,7 @@ export default { ...@@ -283,7 +288,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/office/indexcarouselmanage/delete'), url: this.$http.adornUrl('/office/indexCarouselManage/delete'),
method: 'post', method: 'post',
data: this.$http.adornData(ids, false) data: this.$http.adornData(ids, false)
}).then(({data}) => { }).then(({data}) => {
......
src/views/modules/info/news-add-or-update.vue
...@@ -24,18 +24,27 @@ ...@@ -24,18 +24,27 @@
<p v-show="showInfo">{{dataForm.directpath}}</p> <p v-show="showInfo">{{dataForm.directpath}}</p>
</el-form-item> </el-form-item>
<el-form-item label="栏目：" prop="classid"> <el-form-item label="栏目：" prop="classid">
<el-select v-model="dataForm.classid" @change="getClassList([dataForm.classid])" style='width:121px!important' v-show="!showInfo"> <el-select v-model="dataForm.classid" @change="getCclassList" style='width:121px!important' v-show="!showInfo">
<el-option <!-- <el-option
ref = 'sel1' ref = 'sel1'
v-for="item in classidList" v-for="item in classidList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option> -->
<el-option value="5" label="综合报道"></el-option>
<el-option value="6" label="中心活动"></el-option>
<el-option value="7" label="地方动态"></el-option>
<el-option value="8" label="国际追踪"></el-option>
<el-option value="29" label="Events"></el-option>
<el-option value="32" label="研究动态"></el-option>
<el-option value="33" label="科研成果"></el-option>
<el-option value="9" label="专题"></el-option>
<el-option value="38" label="质检中心"></el-option>
<el-option value="42" label="条码通"></el-option>
</el-select> </el-select>
<el-select v-model="dataForm.cclassid" style='width:121px!important' v-show="!showInfo"> <el-select v-model="dataForm.cclassid" style='width:121px!important' v-if="!showInfo" v-show="cclassShow" >
<el-option <el-option
ref = 'sel2'
v-for="item in cclassidList" v-for="item in cclassidList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
...@@ -78,10 +87,9 @@ ...@@ -78,10 +87,9 @@
<el-input v-model="dataForm.author" placeholder="请输入作者" v-show="!showInfo"></el-input> <el-input v-model="dataForm.author" placeholder="请输入作者" v-show="!showInfo"></el-input>
<p v-show="showInfo">{{dataForm.author}}</p> <p v-show="showInfo">{{dataForm.author}}</p>
</el-form-item> </el-form-item>
<el-form-item label="上传图片：" prop="pic"> <el-form-item label="上传图片：" prop="pic" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
action="" action=""
:show-file-list="false" :show-file-list="false"
...@@ -165,12 +173,12 @@ ...@@ -165,12 +173,12 @@
levels: [ levels: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ],
directpath: [ // directpath: [
{ required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
], // ],
pic: [ // pic: [
{ required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
], // ],
// content: [ // content: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ], // ],
...@@ -193,8 +201,7 @@ ...@@ -193,8 +201,7 @@
}, },
piclevelList: [1, 2, 3, 4, 5, 6, 7, 8, 9], piclevelList: [1, 2, 3, 4, 5, 6, 7, 8, 9],
id: [], id: [],
classidList: [], // cclassidList: [],
cclassidList: [],
title: '', title: '',
className: '', className: '',
cclassName: '' cclassName: ''
...@@ -202,7 +209,8 @@ ...@@ -202,7 +209,8 @@
}, },
created () { created () {
this.getClassList([5, 9]) // this.getClassList([5, 9])
this.getCclassList(5)
}, },
mounted () { mounted () {
console.log(this.classidList) console.log(this.classidList)
...@@ -230,14 +238,33 @@ ...@@ -230,14 +238,33 @@
this.loading = false this.loading = false
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.news this.dataForm = data.news
this.getClassList([5, 9]) // this.getClassList([5, 9])
this.dataForm.ishead = parseInt(data.news.ishead) this.dataForm.ishead = parseInt(data.news.ishead)
this.dataForm.classid = this.dataForm.classid
this.getClassList([this.dataForm.classid]) // this.getClassList([this.dataForm.classid])
this.dataForm.cclassid = this.dataForm.cclassid this.dataForm.cclassid = this.dataForm.cclassid
this.imgUrlStr = data.news.pic this.imgUrlStr = data.news.pic
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
if ([24, 25, 26, 27, 28, 30].indexOf(this.dataForm.classid) !== -1) {
this.dataForm.cclassid = this.dataForm.classid
this.dataForm.classid = '5'
this.getCclassList(this.dataForm.classid)
} else if ([35, 36, 37].indexOf(this.dataForm.classid) !== -1) {
this.dataForm.cclassid = this.dataForm.classid
this.dataForm.classid = '9'
this.getCclassList(this.dataForm.classid)
} else if ([39, 40, 41].indexOf(this.dataForm.classid) !== -1) {
this.dataForm.cclassid = this.dataForm.classid
this.dataForm.classid = '38'
this.getCclassList(this.dataForm.classid)
} else {
this.dataForm.classid = this.dataForm.classid + ''
this.getCclassList(this.dataForm.classid)
}
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -248,6 +275,10 @@ ...@@ -248,6 +275,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.pic === '' || this.dataForm.pic === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/news/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/news/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
...@@ -305,6 +336,73 @@ ...@@ -305,6 +336,73 @@
} }
}) })
}, },
getCclassList (e) {
if (Number(e) === 5) {
this.cclassShow = true
this.cclassidList = [
{
id: 24,
name: '应用'
},
{
id: 25,
name: '企业'
},
{
id: 26,
name: 'EPC'
},
{
id: 27,
name: 'ECR'
},
{
id: 28,
name: 'GDS'
},
{
id: 30,
name: '其他'
}
]
} else if (Number(e) === 9) {
this.cclassShow = true
this.cclassidList = [
{
id: 35,
name: '深度专题'
},
{
id: 36,
name: '案例推荐'
},
{
id: 37,
name: '应用指南'
}
]
} else if (Number(e) === 38) {
this.cclassShow = true
this.cclassidList = [
{
id: 39,
name: '最新资讯'
},
{
id: 40,
name: '标准法规'
},
{
id: 41,
name: '技术文档'
}
]
} else {
this.dataForm.cclassid = ''
this.cclassShow = false
}
},
// 上传之前校验 // 上传之前校验
beforeAvatarUpload (file) { beforeAvatarUpload (file) {
const isJPG = file.type === 'image/jpeg' const isJPG = file.type === 'image/jpeg'
......
src/views/modules/info/news.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary" >搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary" >搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:news:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:news:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -221,6 +221,10 @@ export default { ...@@ -221,6 +221,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -236,10 +240,10 @@ export default { ...@@ -236,10 +240,10 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'releaseTimeStart': this.releaseDate === null ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate === null ? '' : this.releaseDate[1], 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
'updateTimeStart': this.updateDate === null ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate === null ? '' : this.updateDate[1], 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
'auditor': this.dataForm.auditor 'auditor': this.dataForm.auditor
}) })
}).then(({data}) => { }).then(({data}) => {
...@@ -247,6 +251,7 @@ export default { ...@@ -247,6 +251,7 @@ export default {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/info/newsmovie-add-or-update.vue
...@@ -39,14 +39,15 @@ ...@@ -39,14 +39,15 @@
<p v-show="showInfo">{{dataForm.longStr}}</p> <p v-show="showInfo">{{dataForm.longStr}}</p>
</el-form-item> </el-form-item>
<el-form-item label="时间：" prop="stdate"> <el-form-item label="时间：" prop="stdate">
<el-date-picker <!-- <el-date-picker
v-show="!showInfo" v-show="!showInfo"
v-model="dataForm.stdate" v-model="dataForm.stdate"
value-format='yyyy-MM-dd' value-format='yyyy-MM-dd'
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker> -->
<el-input v-model="dataForm.stdate" placeholder="请输入时间" v-show="!showInfo"></el-input>
<p v-show="showInfo">{{dataForm.stdate}}</p> <p v-show="showInfo">{{dataForm.stdate}}</p>
</el-form-item> </el-form-item>
<el-form-item label='语种：' prop='clanguage'> <el-form-item label='语种：' prop='clanguage'>
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
<el-form-item label="上传图片命名规则" prop="rules"> <el-form-item label="上传图片命名规则" prop="rules">
<span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span> <span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span>
</el-form-item> </el-form-item>
<el-form-item label="描述图片：" prop="pic"> <el-form-item label="描述图片：" prop="pic" class="pic">
<el-upload <el-upload
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
action="" action=""
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
</el-upload> </el-upload>
<p v-show="showInfo"><img :src="imgUrlStr" class="avatar2"></p> <p v-show="showInfo"><img :src="imgUrlStr" class="avatar2"></p>
</el-form-item> </el-form-item>
<el-form-item label="MP4文件：" prop="video"> <el-form-item label="MP4文件：" prop="video" class="pic">
<el-upload <el-upload
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
action="" action=""
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
], ],
keyword: [ keyword: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
] ],
// longStr: [ // longStr: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ], // ],
...@@ -150,9 +151,9 @@ ...@@ -150,9 +151,9 @@
// stdate: [ // stdate: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ], // ],
// levels: [ levels: [
// { required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
// ], ]
// directpath: [ // directpath: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ], // ],
...@@ -199,29 +200,20 @@ ...@@ -199,29 +200,20 @@
if (this.dataForm.id) { if (this.dataForm.id) {
this.loading = true this.loading = true
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/news/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/office/newsmovie/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
this.loading = false this.loading = false
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.newsmovie this.dataForm = data.newsMovie
// this.dataForm.title = data.newsmovie.title this.imgUrlStr = this.dataForm.littlepic
// this.dataForm.titleOld = data.newsmovie.titleOld this.videoUrlStr = this.dataForm.wavname
// this.dataForm.keyword = data.newsmovie.keyword
// this.dataForm.longStr = data.newsmovie.longStr
// this.dataForm.stdate = data.newsmovie.stdate
// this.dataForm.clanguage = data.newsmovie.clanguage
// this.dataForm.author = data.newsmovie.author
// this.dataForm.levels = data.newsmovie.levels
// this.dataForm.directpath = data.newsmovie.directpath
// this.dataForm.pic = data.newsmovie.pic
// this.dataForm.wavname = data.newsmovie.wavname
// this.dataForm.content = data.newsmovie.content
this.imgUrlStr = data.newsmovie.pic
this.dialogVisible = true
this.videoUrlStr = data.newsmovie.wavname
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
this.dialogVisible = true
this.dialogVisible2 = true
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -232,8 +224,15 @@ ...@@ -232,8 +224,15 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.pic === '' || this.dataForm.pic === null) {
this.$message.error('图片未上传，请上传图片！')
return
} else if (this.dataForm.wavname === '' || this.dataForm.wavname === null) {
this.$message.error('视频未上传，请上传视频！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/news/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/newsmovie/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,
......
src/views/modules/info/newsmovie.vue
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:newsmovie:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:newsmovie:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -159,6 +159,13 @@ ...@@ -159,6 +159,13 @@
label="发布时间"> label="发布时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatedate"
header-align="center"
align="center"
sortable
label="更新时间">
</el-table-column>
<el-table-column
prop="auditor" prop="auditor"
header-align="center" header-align="center"
align="center" align="center"
...@@ -258,6 +265,10 @@ export default { ...@@ -258,6 +265,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -268,16 +279,16 @@ export default { ...@@ -268,16 +279,16 @@ export default {
'page': this.pageIndex + '', 'page': this.pageIndex + '',
'limit': this.pageSize + '', 'limit': this.pageSize + '',
'title': this.dataForm.title, 'title': this.dataForm.title,
'levels': this.dataForm.levels + '', 'levels': this.dataForm.levels,
'author': this.dataForm.author, 'author': this.dataForm.author,
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'clanguage': this.dataForm.clanguage, 'clanguage': this.dataForm.clanguage,
'releaseTimeStart': this.releaseDate === null ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate === null ? '' : this.releaseDate[1], 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
'updateTimeStart': this.updateDate === null ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate === null ? '' : this.updateDate[1], 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
'auditor': this.dataForm.auditor 'auditor': this.dataForm.auditor
}) })
}).then(({data}) => { }).then(({data}) => {
...@@ -285,6 +296,7 @@ export default { ...@@ -285,6 +296,7 @@ export default {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/info/newtopic-add-or-update.vue
...@@ -12,16 +12,19 @@ ...@@ -12,16 +12,19 @@
<el-input v-model="dataForm.directpath" placeholder="请输入跳转地址" v-show="!showInfo"></el-input> <el-input v-model="dataForm.directpath" placeholder="请输入跳转地址" v-show="!showInfo"></el-input>
<p v-show="showInfo">{{dataForm.directpath}}</p> <p v-show="showInfo">{{dataForm.directpath}}</p>
</el-form-item> </el-form-item>
<el-form-item label="子类：" prop="classid"> <el-form-item label="子类：" prop="categoryid">
<el-select v-model="dataForm.classid" v-show="!showInfo"> <el-select v-model="dataForm.categoryid" v-show="!showInfo">
<el-option <!-- <el-option
v-for="item in classidList" v-for="item in classidList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option> -->
<el-option label="深度专题" value="1"></el-option>
<el-option label="案例推荐" value="2"></el-option>
<el-option label="应用指南" value="3"></el-option>
</el-select> </el-select>
<p v-show="showInfo">{{dataForm.classid}}</p> <p v-show="showInfo">{{dataForm.categoryName}}</p>
</el-form-item> </el-form-item>
<el-form-item label="专题模板：" prop="newtmpid"> <el-form-item label="专题模板：" prop="newtmpid">
<el-select v-model="dataForm.newtmpid" v-show="!showInfo"> <el-select v-model="dataForm.newtmpid" v-show="!showInfo">
...@@ -29,7 +32,7 @@ ...@@ -29,7 +32,7 @@
v-for="(item, i) in newtmList" v-for="(item, i) in newtmList"
:key="i" :key="i"
:label="item.label" :label="item.label"
:value="item.label"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<p v-show="showInfo">{{dataForm.newtmpid}}</p> <p v-show="showInfo">{{dataForm.newtmpid}}</p>
...@@ -65,7 +68,7 @@ ...@@ -65,7 +68,7 @@
</el-row> </el-row>
<p v-show="showInfo">{{dataForm.showtime}}</p> <p v-show="showInfo">{{dataForm.showtime}}</p>
</el-form-item> </el-form-item>
<el-form-item label="专题图片：" prop="pic"> <el-form-item label="专题图片：" prop="pic" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -118,7 +121,7 @@ ...@@ -118,7 +121,7 @@
id: 0, id: 0,
title: '', title: '',
directpath: '', directpath: '',
classid: '', categoryid: '',
newtmpid: '', newtmpid: '',
levels: '', levels: '',
showtime: '', showtime: '',
...@@ -152,7 +155,7 @@ ...@@ -152,7 +155,7 @@
// content: [ // content: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ], // ],
classid: [ categoryid: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ],
showtime: [ showtime: [
...@@ -173,7 +176,24 @@ ...@@ -173,7 +176,24 @@
id: [], id: [],
newtmList: [ newtmList: [
{ {
value: 6,
label: '蓝色魅力' label: '蓝色魅力'
},
{
value: 7,
label: '成员服务案例'
},
{
value: 8,
label: '绿色'
},
{
value: 14,
label: 'xxxx'
},
{
value: 0,
label: '自定义'
} }
], ],
title: '', title: '',
...@@ -186,7 +206,6 @@ ...@@ -186,7 +206,6 @@
}, },
created () { created () {
this.getClassList([9, 12, 13])
}, },
mounted () { mounted () {
...@@ -209,8 +228,11 @@ ...@@ -209,8 +228,11 @@
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.newtopic this.dataForm = data.newtopic
this.imgUrlStr = data.newtopic.ppath this.imgUrlStr = data.newtopic.ppath
this.dataForm.categoryid = data.newtopic.categoryid + ''
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -221,6 +243,10 @@ ...@@ -221,6 +243,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.ppath === '' || this.dataForm.ppath === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/newtopic/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/newtopic/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
...@@ -228,7 +254,7 @@ ...@@ -228,7 +254,7 @@
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,
'title': this.dataForm.title, 'title': this.dataForm.title,
'directpath': this.dataForm.directpath, 'directpath': this.dataForm.directpath,
'classid': this.dataForm.classid, 'categoryid': this.dataForm.categoryid,
'newtmpid': this.dataForm.newtmpid, 'newtmpid': this.dataForm.newtmpid,
'headad': this.dataForm.headad, 'headad': this.dataForm.headad,
'levels': this.dataForm.levels, 'levels': this.dataForm.levels,
......
src/views/modules/info/newtopic.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:newtopic:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:newtopic:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
align="center" align="center"
label="专题标题"> label="专题标题">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="author" prop="categoryName"
header-align="center" header-align="center"
align="center" align="center"
label="专题分类"> label="专题分类">
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
prop="showtime" prop="showtime"
header-align="center" header-align="center"
...@@ -188,6 +188,10 @@ export default { ...@@ -188,6 +188,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -198,16 +202,17 @@ export default { ...@@ -198,16 +202,17 @@ export default {
'page': this.pageIndex + '', 'page': this.pageIndex + '',
'limit': this.pageSize + '', 'limit': this.pageSize + '',
'title': this.dataForm.title, 'title': this.dataForm.title,
'status': this.dataForm.status, 'status': this.dataForm.status === null ? '' : this.dataForm.status,
'levels': this.dataForm.levels, 'levels': this.dataForm.levels,
'inputDataStart': this.releaseDate === null ? '' : this.releaseDate[0], 'inputDateStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'inputDataEnd': this.releaseDate === null ? '' : this.releaseDate[1] 'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
...@@ -238,7 +243,7 @@ export default { ...@@ -238,7 +243,7 @@ export default {
}, },
showMsg (data) { showMsg (data) {
if (!data.directpath || data.directpath === null) { if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/viewsub?id=' + data.id, '_blank') window.open(this.$store.state.config.urls + '/News/viewsub?id=' + data.classid, '_blank')
} else if (/^\//.test(data.directpath)) { } else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank') window.open(this.$store.state.config.urls + data.directpath, '_blank')
} else { } else {
......
src/views/modules/info/picture-add-or-update.vue
<template> <template>
<el-dialog <el-dialog
:title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'" :title="!dataForm.pictureid ? '新增' : this.showInfo?'详情':'修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form <el-form
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<el-input v-model='dataForm.jumppath' placeholder='请输入跳转' v-show="!showInfo"></el-input> <el-input v-model='dataForm.jumppath' placeholder='请输入跳转' v-show="!showInfo"></el-input>
<p v-show="showInfo">{{dataForm.jumppath}}</p> <p v-show="showInfo">{{dataForm.jumppath}}</p>
</el-form-item> </el-form-item>
<el-form-item label='图片:' prop='picFile'> <el-form-item label='图片:' prop='picFile' class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
showInfo: false, showInfo: false,
title: '', title: '',
dataForm: { dataForm: {
id: 0, pictureid: 0,
title: '', title: '',
pictureType: '', pictureType: '',
picFile: '', picFile: '',
...@@ -109,8 +109,16 @@ export default { ...@@ -109,8 +109,16 @@ export default {
piclevelList: [1, 2, 3, 4, 5, 6, 7, 8, 9], piclevelList: [1, 2, 3, 4, 5, 6, 7, 8, 9],
pictureTypeList: [ pictureTypeList: [
{ {
value: '1', value: '图片信息',
label: '图片信息' label: '图片信息'
},
{
value: '静态页面图片',
label: '静态页面图片'
},
{
value: '不合格样本图片',
label: '不合格样本图片'
} }
], ],
dataRule: { dataRule: {
...@@ -188,17 +196,17 @@ export default { ...@@ -188,17 +196,17 @@ export default {
}, },
methods: { methods: {
init (id, showInfo) { init (pictureid, showInfo) {
this.dataForm.id = id || 0 this.dataForm.pictureid = pictureid || 0
this.visible = true this.visible = true
this.showInfo = showInfo this.showInfo = showInfo
this.$nextTick(() => { this.$nextTick(() => {
this.clearInp() this.clearInp()
if (this.dataForm.id) { if (this.dataForm.pictureid) {
this.loading = true this.loading = true
this.$http({ this.$http({
url: this.$http.adornUrl( url: this.$http.adornUrl(
`/office/picture/info/${this.dataForm.id}` `/office/picture/info/${this.dataForm.pictureid}`
), ),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
...@@ -215,6 +223,8 @@ export default { ...@@ -215,6 +223,8 @@ export default {
this.dataForm.keyword = data.picture.keyword this.dataForm.keyword = data.picture.keyword
this.dataForm.jumppath = data.picture.jumppath this.dataForm.jumppath = data.picture.jumppath
this.dataForm.showtime = data.picture.showtime this.dataForm.showtime = data.picture.showtime
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -225,6 +235,10 @@ export default { ...@@ -225,6 +235,10 @@ export default {
this.loading = true this.loading = true
this.$refs['dataForm'].validate(valid => { this.$refs['dataForm'].validate(valid => {
if (valid) { if (valid) {
if (this.dataForm.picFile === '' || this.dataForm.picFile === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl( url: this.$http.adornUrl(
`/office/picture/${!this.dataForm.pictureid ? 'save' : 'update'}` `/office/picture/${!this.dataForm.pictureid ? 'save' : 'update'}`
......
src/views/modules/info/picture.vue
...@@ -159,8 +159,16 @@ export default { ...@@ -159,8 +159,16 @@ export default {
piclevelList, piclevelList,
pictureTypeList: [ pictureTypeList: [
{ {
value: '1', value: '图片信息',
label: '图片信息' label: '图片信息'
},
{
value: '静态页面图片',
label: '静态页面图片'
},
{
value: '不合格样本图片',
label: '不合格样本图片'
} }
], ],
releaseDate: [] releaseDate: []
...@@ -179,6 +187,7 @@ export default { ...@@ -179,6 +187,7 @@ export default {
}, },
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
console.log(this.releaseDate)
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/office/picture/list'), url: this.$http.adornUrl('/office/picture/list'),
...@@ -192,14 +201,15 @@ export default { ...@@ -192,14 +201,15 @@ export default {
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'pictureType': this.dataForm.pictureType, 'pictureType': this.dataForm.pictureType,
'inputDataStart': this.releaseDate === null ? '' : this.releaseDate[0], 'inputDateStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'inputDataEnd': this.releaseDate === null ? '' : this.releaseDate[1] 'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
...@@ -222,10 +232,10 @@ export default { ...@@ -222,10 +232,10 @@ export default {
this.dataListSelections = val this.dataListSelections = val
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (id, showInfo) { addOrUpdateHandle (pictureid, showInfo) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init(id, showInfo) this.$refs.addOrUpdate.init(pictureid, showInfo)
}) })
}, },
showMsg (data) { showMsg (data) {
......
src/views/modules/logistics/logistics-add-or-update.vue
...@@ -201,6 +201,8 @@ ...@@ -201,6 +201,8 @@
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.logistics this.dataForm = data.logistics
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
......
src/views/modules/logistics/logistics.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- <el-form-item label='关键字' prop='keyword'> <!-- <el-form-item label='关键字' prop='keyword'>
<el-input v-model='dataForm.keyword' placeholder='请输入关键字' clearable></el-input> <el-input v-model='dataForm.keyword' placeholder='请输入关键字' clearable></el-input>
</el-form-item> --> </el-form-item> -->
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:logistics:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:logistics:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -155,6 +155,10 @@ ...@@ -155,6 +155,10 @@
this.getMedicalTypeList() this.getMedicalTypeList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -173,6 +177,7 @@ ...@@ -173,6 +177,7 @@
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/medical/medical-add-or-update.vue
...@@ -182,6 +182,8 @@ ...@@ -182,6 +182,8 @@
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.medical this.dataForm = data.medical
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
......
src/views/modules/medical/medical.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:medical:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:medical:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -137,6 +137,10 @@ ...@@ -137,6 +137,10 @@
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -154,6 +158,7 @@ ...@@ -154,6 +158,7 @@
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/party/center-add-or-update.vue
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<el-form-item label="上传图片命名规则" > <el-form-item label="上传图片命名规则" >
<span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span> <span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span>
</el-form-item> </el-form-item>
<el-form-item label="图片：" prop="pic"> <el-form-item label="图片：" prop="pic" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -183,6 +183,8 @@ ...@@ -183,6 +183,8 @@
this.imgUrlStr = data.news.pic this.imgUrlStr = data.news.pic
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -193,6 +195,10 @@ ...@@ -193,6 +195,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.pic === '' || this.dataForm.pic === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/center/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/center/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
......
src/views/modules/party/center.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:center:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:center:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -217,6 +217,10 @@ export default { ...@@ -217,6 +217,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -232,16 +236,17 @@ export default { ...@@ -232,16 +236,17 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'releaseTimeStart': this.releaseDate[0] === undefined ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate[1] === undefined ? '' : this.releaseDate[1], 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
'updateTimeStart': this.updateDate[0] === undefined ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate[1] === undefined ? '' : this.updateDate[1] 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/party/hotFlow-add-or-update.vue
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<el-form-item label="上传图片命名规则" > <el-form-item label="上传图片命名规则" >
<span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span> <span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span>
</el-form-item> </el-form-item>
<el-form-item label="图片：" prop="pic"> <el-form-item label="图片：" prop="pic" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -180,6 +180,8 @@ ...@@ -180,6 +180,8 @@
this.imgUrlStr = data.news.pic this.imgUrlStr = data.news.pic
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -190,6 +192,10 @@ ...@@ -190,6 +192,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.pic === '' || this.dataForm.pic === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/hotFlow/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/hotFlow/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
......
src/views/modules/party/hotFlow.vue
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:hotFlow:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:hotFlow:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -214,6 +214,10 @@ export default { ...@@ -214,6 +214,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -229,16 +233,17 @@ export default { ...@@ -229,16 +233,17 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'releaseTimeStart': this.releaseDate[0] === undefined ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate[1] === undefined ? '' : this.releaseDate[1], 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
'updateTimeStart': this.updateDate[0] === undefined ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate[1] === undefined ? '' : this.updateDate[1] 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/party/rules-add-or-update.vue
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<el-form-item label="上传图片命名规则" > <el-form-item label="上传图片命名规则" >
<span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span> <span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span>
</el-form-item> </el-form-item>
<el-form-item label="图片：" prop="pic"> <el-form-item label="图片：" prop="pic" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -183,6 +183,8 @@ ...@@ -183,6 +183,8 @@
this.imgUrlStr = data.news.pic this.imgUrlStr = data.news.pic
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -193,6 +195,10 @@ ...@@ -193,6 +195,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.pic === '' || this.dataForm.pic === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/rules/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/rules/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
......
src/views/modules/party/rules.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:rules:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:rules:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -217,6 +217,10 @@ export default { ...@@ -217,6 +217,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -232,16 +236,17 @@ export default { ...@@ -232,16 +236,17 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'releaseTimeStart': this.releaseDate === null ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate === null ? '' : this.releaseDate[1], 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
'updateTimeStart': this.updateDate === null ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate === null ? '' : this.updateDate[1] 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/party/topicnews-add-or-update.vue
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<el-form-item label="上传图片命名规则" > <el-form-item label="上传图片命名规则" >
<span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span> <span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span>
</el-form-item> </el-form-item>
<el-form-item label="图片：" prop="pic"> <el-form-item label="图片：" prop="pic" class="pic">
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -183,6 +183,8 @@ ...@@ -183,6 +183,8 @@
this.imgUrlStr = data.news.pic this.imgUrlStr = data.news.pic
this.dialogVisible = true this.dialogVisible = true
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -193,6 +195,10 @@ ...@@ -193,6 +195,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.pic === '' || this.dataForm.pic === null) {
this.$message.error('图片未上传，请上传图片！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/topicnews/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/topicnews/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
......
src/views/modules/party/topicnews.vue
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:topicnews:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:topicnews:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -215,6 +215,10 @@ export default { ...@@ -215,6 +215,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -230,16 +234,17 @@ export default { ...@@ -230,16 +234,17 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'releaseTimeStart': this.releaseDate === null ? '' : this.releaseDate[0], 'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
'releaseTimeEnd': this.releaseDate === null ? '' : this.releaseDate[1], 'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
'updateTimeStart': this.updateDate === null ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate === null ? '' : this.updateDate[1] 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/policy/policy-add-or-update.vue
...@@ -197,6 +197,8 @@ ...@@ -197,6 +197,8 @@
this.dataForm.publicdate = data.policy.releasedate this.dataForm.publicdate = data.policy.releasedate
this.dataForm.startdate = data.policy.updatedate this.dataForm.startdate = data.policy.updatedate
this.ueditor.value = this.dataForm.content this.ueditor.value = this.dataForm.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
......
src/views/modules/policy/policy.vue
...@@ -234,14 +234,15 @@ export default { ...@@ -234,14 +234,15 @@ export default {
'editor': this.dataForm.editor, 'editor': this.dataForm.editor,
'keyword': this.dataForm.keyword, 'keyword': this.dataForm.keyword,
'status': this.dataForm.status, 'status': this.dataForm.status,
'updateTimeStart': this.updateDate[0] === undefined ? '' : this.updateDate[0], 'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
'updateTimeEnd': this.updateDate[1] === undefined ? '' : this.updateDate[1] 'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
src/views/modules/service/doc-add-or-update.vue
...@@ -21,16 +21,16 @@ ...@@ -21,16 +21,16 @@
</el-form-item> </el-form-item>
<el-form-item label='类型：' prop='category'> <el-form-item label='类型：' prop='category'>
<el-select v-model="dataForm.category" placeholder="请输入类型" v-show="!showInfo" @change="changeType"> <el-select v-model="dataForm.category" placeholder="请输入类型" v-show="!showInfo" @change="changeType">
<el-option label='表格下载' value="1">表格下载</el-option> <el-option label='表格下载' value="1"></el-option>
<el-option label="分支机构培训计划" value="2">分支机构培训计划</el-option> <el-option label="分支机构培训计划" value="2"></el-option>
</el-select> </el-select>
<p v-show="showInfo">{{dataForm.category}}</p> <p v-show="showInfo">{{dataForm.categoryname}}</p>
</el-form-item> </el-form-item>
<el-form-item label="作者：" prop="author"> <el-form-item label="作者：" prop="author">
<el-input v-model="dataForm.author" placeholder="请输入作者" v-show="!showInfo"></el-input> <el-input v-model="dataForm.author" placeholder="请输入作者" v-show="!showInfo"></el-input>
<p v-show="showInfo">{{dataForm.author}}</p> <p v-show="showInfo">{{dataForm.author}}</p>
</el-form-item> </el-form-item>
<el-form-item label="文件：" prop="file"> <el-form-item label="文件：" prop="file" class="pic">
<!-- <el-upload <!-- <el-upload
class="upload-demo" class="upload-demo"
drag drag
...@@ -99,11 +99,11 @@ ...@@ -99,11 +99,11 @@
levelList: [1, 2, 3, 4, 5, 6, 7, 8, 9], levelList: [1, 2, 3, 4, 5, 6, 7, 8, 9],
typeList: [ typeList: [
{ {
value: 1, value: '表格下载',
label: '表格下载' label: '表格下载'
}, },
{ {
value: 2, value: '分支机构培训计划',
label: '分支机构培训计划' label: '分支机构培训计划'
} }
], ],
...@@ -146,6 +146,8 @@ ...@@ -146,6 +146,8 @@
// this.dataForm.pic = data.newsmovie.pic // this.dataForm.pic = data.newsmovie.pic
// this.dataForm.wavname = data.newsmovie.wavname // this.dataForm.wavname = data.newsmovie.wavname
// this.dataForm.content = data.newsmovie.content // this.dataForm.content = data.newsmovie.content
} else {
this.$message.error(data.msg)
} }
}) })
} }
...@@ -156,6 +158,10 @@ ...@@ -156,6 +158,10 @@
this.loading = true this.loading = true
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.dataForm.docfile === '' || this.dataForm.docfile === null) {
this.$message.error('文件未上传，请上传文件！')
return
}
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/doc/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/doc/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
...@@ -164,7 +170,8 @@ ...@@ -164,7 +170,8 @@
'title': this.dataForm.title, 'title': this.dataForm.title,
'levels': this.dataForm.levels, 'levels': this.dataForm.levels,
'author': this.dataForm.author, 'author': this.dataForm.author,
'docfile': this.dataForm.docfile 'docfile': this.dataForm.docfile,
'category': this.dataForm.category
}) })
}).then(({data}) => { }).then(({data}) => {
this.loading = false this.loading = false
...@@ -216,7 +223,7 @@ ...@@ -216,7 +223,7 @@
this.$http({ this.$http({
url: this.$http.adornUrl('/office/file/uploadFile'), url: this.$http.adornUrl('/office/file/uploadFile'),
method: 'post', method: 'post',
data: this.videoUrl, data: this.fileUrl,
headers: { headers: {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data'
} }
......
src/views/modules/service/doc.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button> <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
</el-form> </el-form>
<div class="add-btn"> <div class="add-btn">
<el-button v-if="isAuth('manage:doc:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button> <el-button v-if="isAuth('manage:doc:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
...@@ -56,16 +56,10 @@ ...@@ -56,16 +56,10 @@
label="作者"> label="作者">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="category" prop="categoryname"
header-align="center" header-align="center"
align="center" align="center"
label="类型"> label="类型">
<template slot-scope="scope">
<div>
<span v-if="scope.row.category === 1">表格下载</span>
<span v-if="scope.row.category === 2">分支机构培训计划</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditor" prop="auditor"
...@@ -74,7 +68,19 @@ ...@@ -74,7 +68,19 @@
label="审核人"> label="审核人">
</el-table-column> </el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="状态">
<template slot-scope="scope">
<div>
<span v-if="scope.row.status === 0">待审核</span>
<span v-if="scope.row.status === -1">失败</span>
<span v-if="scope.row.status === 1">成功</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
fixed="right" fixed="right"
header-align="center" header-align="center"
...@@ -144,6 +150,10 @@ export default { ...@@ -144,6 +150,10 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
getDataList2 () {
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
...@@ -155,7 +165,7 @@ export default { ...@@ -155,7 +165,7 @@ export default {
'limit': this.pageSize, 'limit': this.pageSize,
'title': this.dataForm.title, 'title': this.dataForm.title,
'levels': this.dataForm.levels, 'levels': this.dataForm.levels,
'type': this.dataForm.type 'type': this.dataForm.category
}) })
}).then(({data}) => { }).then(({data}) => {
...@@ -163,6 +173,7 @@ export default { ...@@ -163,6 +173,7 @@ export default {
this.dataList = data.page.list this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} else { } else {
this.$message.error(data.msg)
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment