Skip to content

G
gs1-admin
Commit ba733026 by Lyan
Options

bug测试

parent da863326
Showing with 555 additions and 190 deletions
config/index.js
...@@ -15,7 +15,7 @@ module.exports = { ...@@ -15,7 +15,7 @@ module.exports = {
proxyTable: devEnv.OPEN_PROXY === false ? {} : { proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': { '/proxyApi': {
// target: 'http://81.68.189.225:9091/', // target: 'http://81.68.189.225:9091/',
target: 'http://192.168.0.77/', target: ' http://dynamic.gs1cn.org/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/proxyApi': '/' '^/proxyApi': '/'
......
package-lock.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/scss/_base.scss
...@@ -364,11 +364,11 @@ img { ...@@ -364,11 +364,11 @@ img {
margin-right: 5px; margin-right: 5px;
} }
.el-dialog{ .el-dialog{
width: 90%!important; min-width: 80%;
margin-top: 10vh!important; // margin-top: 10vh!important;
.el-dialog__body{ // .el-dialog__body{
height: 63vh!important; // height: 63vh!important;
} // }
.el-select,.el-date-editor{ .el-select,.el-date-editor{
width: 100%; width: 100%;
} }
...@@ -430,3 +430,51 @@ img { ...@@ -430,3 +430,51 @@ img {
.seach-btn{ .seach-btn{
margin-bottom: 22px; margin-bottom: 22px;
} }
//这里注意：我当前将css样式加载全局上，如果单页添加样式需要每个样式前添加 ‘/deep/' 修饰符
/* dialog*/
.el-dialog__header {
padding: 15px 20px 15px;
}
.el-dialog__headerbtn{
top: 15px;
}
/*dialog header*/
.el-dialog__header{
background: #e3eaed;
}
.avue-crud__dialog__header {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
}
.el-dialog__title {
color: rgba(0,0,0,.85);
font-weight: 500;
word-wrap: break-word;
}
.avue-crud__dialog__menu {
padding-right: 20px;
float: left;
margin-top: -5px;
}
.avue-crud__dialog__menu i {
color: #909399;
font-size: 17px;
}
.el-icon-full-screen{
cursor: pointer;
}
.el-icon-full-screen:before {
content: "\e719";
}
.el-icon-full-screen {
background: url('../img/full.png') center center no-repeat;
background-size: 15px;
}
src/views/main.vue
...@@ -110,7 +110,7 @@ export default { ...@@ -110,7 +110,7 @@ export default {
<style lang="scss"> <style lang="scss">
.el-dialog__body { .el-dialog__body {
height: 60vh; // height: 60vh;
overflow-y: auto; // overflow-y: auto;
} }
</style> </style>
\ No newline at end of file
src/views/modules/application/news-add-or-update.vue
...@@ -209,6 +209,14 @@ export default { ...@@ -209,6 +209,14 @@ export default {
cclassName: '' cclassName: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
mounted () { mounted () {
console.log(this.classidList) console.log(this.classidList)
}, },
......
src/views/modules/application/news.vue
...@@ -89,7 +89,8 @@ ...@@ -89,7 +89,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="文章标题"> label="文章标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -100,22 +101,28 @@ ...@@ -100,22 +101,28 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="showtime" prop="showtime"
width="120px"
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="releasedate" prop="startdate"
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="添加时间"> label="添加时间">
<template slot-scope="scope">
<div>{{ scope.row.startdate && scope.row.startdate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/info/announce-add-or-update.vue
...@@ -161,6 +161,14 @@ export default { ...@@ -161,6 +161,14 @@ export default {
}, },
mounted () { mounted () {
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
methods: { methods: {
getSelectName (list, id) { getSelectName (list, id) {
let arr = list.filter((item) => { let arr = list.filter((item) => {
......
src/views/modules/info/announce.vue
...@@ -75,7 +75,8 @@ ...@@ -75,7 +75,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -99,6 +100,7 @@ ...@@ -99,6 +100,7 @@
prop="author" prop="author"
header-align="center" header-align="center"
align="center" align="center"
width="120px"
label="作者"> label="作者">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -106,6 +108,7 @@ ...@@ -106,6 +108,7 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -113,7 +116,11 @@ ...@@ -113,7 +116,11 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
prop="keyword" prop="keyword"
......
src/views/modules/info/indexcarouselmanage-add-or-update.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</el-form-item> </el-form-item>
<el-form-item label="背景颜色：" prop="colorBackground" class=" setdes setdes1"> <el-form-item label="背景颜色：" prop="colorBackground" class=" setdes setdes1">
<el-row v-show="!showInfo"> <el-row v-show="!showInfo">
<el-col :span="22"> <el-col :span="10">
<el-select v-model="dataForm.colorBackground" placeholder="请选择背景颜色" v-show="!showInfo" :disabled='disabled'> <el-select v-model="dataForm.colorBackground" placeholder="请选择背景颜色" v-show="!showInfo" :disabled='disabled'>
<el-option <el-option
v-for="item in colorBackgroundList" v-for="item in colorBackgroundList"
...@@ -20,11 +20,8 @@ ...@@ -20,11 +20,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="2" class="iconStyle"> <el-col :span="12" class="iconStyle">
<el-tooltip placement="top" effect="light"> <p style="color:red;font-size:12px;text-align:left;margin-left:20px"> 注：大轮播图需编辑背景颜色，移动端适配页面展示</p>
<div slot="content">大轮播图需要编辑该项</div>
<i class="el-icon-warning"></i>
</el-tooltip>
</el-col> </el-col>
</el-row> </el-row>
<p v-show="showInfo">{{dataForm.colorBackground}}</p> <p v-show="showInfo">{{dataForm.colorBackground}}</p>
...@@ -114,7 +111,7 @@ ...@@ -114,7 +111,7 @@
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
<!-- <el-input v-model="dataForm.picIndexPath" placeholder=""></el-input> --> <!-- <el-input v-model="dataForm.picIndexPath" placeholder=""></el-input> -->
<span v-show="!showInfo" style="font-size:12px;color:red">注：大轮播图片建议尺寸1920*420或同等比例图片，小轮播图片建议尺寸为360*160或同等比例图片</span> <span v-show="!showInfo" style="font-size:12px;color:red">注：大轮播图片建议尺寸1920*360或同等比例图片，小轮播图片建议尺寸为387*130或同等比例图片</span>
<p><img :src="imgUrlStr" class="avatar2" v-show="showInfo"></p> <p><img :src="imgUrlStr" class="avatar2" v-show="showInfo"></p>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -177,25 +174,25 @@ export default { ...@@ -177,25 +174,25 @@ export default {
levelList: piclevelList, levelList: piclevelList,
colorBackgroundList: [ colorBackgroundList: [
{ {
label: '桔色', label: '医疗蓝',
value: '#f26334' value: '#00B6DE'
}, },
{ {
label: '黄色', label: '零售',
value: '#fbb033' value: '#F05587'
}, },
{ {
label: '粉色', label: '物流',
value: '#f05587' value: '#22BCB9'
}, },
{ {
label: '紫色', label: '电子商务',
value: '#BF83B9' value: '#C1D82F'
}, },
{ {
label: '蓝色', label: '食品安全追溯',
value: '#002c6c!important' value: '#7AC143!important'
} }
], ],
colorMoreList: [ colorMoreList: [
......
src/views/modules/info/indexcarouselmanage.vue
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
:show-overflow-tooltip="true" width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -87,17 +87,21 @@ ...@@ -87,17 +87,21 @@
prop="starttimeIndex" prop="starttimeIndex"
header-align="center" header-align="center"
align="center" align="center"
:show-overflow-tooltip="true"
sortable='custom' sortable='custom'
label="首页添加时间"> label="首页添加时间">
<template slot-scope="scope">
<div>{{ scope.row.starttimeIndex && scope.row.starttimeIndex.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatetimeIndex" prop="updatetimeIndex"
header-align="center" header-align="center"
:show-overflow-tooltip="true"
align="center" align="center"
sortable='custom' sortable='custom'
label="首页修改时间"> label="首页修改时间">
<template slot-scope="scope">
<div>{{ scope.row.updatetimeIndex && scope.row.updatetimeIndex.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="editorIndex" prop="editorIndex"
......
src/views/modules/info/news-add-or-update.vue
...@@ -2,7 +2,19 @@ ...@@ -2,7 +2,19 @@
<el-dialog <el-dialog
:title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'" :title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:fullscreen="dialogFull"
:visible.sync="visible"> :visible.sync="visible">
<template slot="title">
<div class="avue-crud__dialog__header">
<span class="el-dialog__title">
<span ></span>
{{!dataForm.id ? '新增' : this.showInfo?'详情':'修改'}}
</span>
<div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
<i class="el-icon-full-screen"></i>
</div>
</div>
</template>
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" > <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" >
<el-form-item label="原始标题：" prop="titleOld"> <el-form-item label="原始标题：" prop="titleOld">
<el-input v-model="dataForm.titleOld" placeholder="请输入原始标题" v-show="!showInfo"></el-input> <el-input v-model="dataForm.titleOld" placeholder="请输入原始标题" v-show="!showInfo"></el-input>
...@@ -127,6 +139,7 @@ export default { ...@@ -127,6 +139,7 @@ export default {
}, },
data () { data () {
return { return {
dialogFull: false,
loading: false, loading: false,
showInfo: false, showInfo: false,
visible: false, visible: false,
...@@ -208,7 +221,14 @@ export default { ...@@ -208,7 +221,14 @@ export default {
cclassName: '' cclassName: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
created () { created () {
// this.getClassList([5, 9]) // this.getClassList([5, 9])
this.getCclassList(5) this.getCclassList(5)
...@@ -469,6 +489,7 @@ export default { ...@@ -469,6 +489,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
/* .form-list{ /* .form-list{
padding-left: 4%!important; padding-left: 4%!important;
} }
...@@ -481,4 +502,13 @@ export default { ...@@ -481,4 +502,13 @@ export default {
.edui-editor{ .edui-editor{
width: 100%; width: 100%;
} */ } */
</style>
\ No newline at end of file </style>
<style scoped>
.icon-list__tips {
font-size: 18px;
text-align: center;
color: #e6a23c;
cursor: pointer;
}
</style>
src/views/modules/info/news.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" width="360px"
label="新闻标题"> label="新闻标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
prop="showtime" prop="showtime"
header-align="center" header-align="center"
align="center" align="center"
width="120px"
sortable='custom' sortable='custom'
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
...@@ -102,12 +103,16 @@ ...@@ -102,12 +103,16 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="添加时间"> label="添加时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
width="260px"
header-align="center" header-align="center"
align="center"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/info/newsmovie.vue
...@@ -92,13 +92,14 @@ ...@@ -92,13 +92,14 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="显示标题"> label="显示标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left" width="260px"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -107,12 +108,7 @@ ...@@ -107,12 +108,7 @@
align="center" align="center"
label="演讲人"> label="演讲人">
</el-table-column> </el-table-column>
<el-table-column
prop="keyword"
header-align="center"
align="center"
label="关键字">
</el-table-column>
<el-table-column <el-table-column
prop="longStr" prop="longStr"
header-align="center" header-align="center"
...@@ -158,6 +154,9 @@ ...@@ -158,6 +154,9 @@
align="center" align="center"
sortable='custom' sortable='custom'
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatedate" prop="updatedate"
...@@ -165,6 +164,9 @@ ...@@ -165,6 +164,9 @@
align="center" align="center"
sortable='custom' sortable='custom'
label="更新时间"> label="更新时间">
<template slot-scope="scope">
<div>{{ scope.row.updatedate && scope.row.updatedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditor" prop="auditor"
......
src/views/modules/info/newtopic-add-or-update.vue
<template> <template>
<el-dialog <el-dialog
:title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'" :title="!dataForm.classid ? '新增' : this.showInfo?'详情':'修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" > <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" >
...@@ -68,7 +68,7 @@ ...@@ -68,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" class="pic"> <el-form-item label="专题图片：" prop="pic" >
<el-upload <el-upload
v-show="!showInfo" v-show="!showInfo"
class="avatar-uploader avatar2" class="avatar-uploader avatar2"
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
label: 'label' label: 'label'
}, },
dataForm: { dataForm: {
id: 0, classid: 0,
title: '', title: '',
directpath: '', directpath: '',
categoryid: '', categoryid: '',
...@@ -203,7 +203,12 @@ export default { ...@@ -203,7 +203,12 @@ export default {
} }
}, },
watch: { watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
}, },
created () { created () {
...@@ -213,15 +218,15 @@ export default { ...@@ -213,15 +218,15 @@ export default {
}, },
methods: { methods: {
init (id, showInfo) { init (id, showInfo) {
this.dataForm.id = id || 0 this.dataForm.classid = id || 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.classid) {
this.loading = true this.loading = true
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/newtopic/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/office/newtopic/info/${this.dataForm.classid}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
...@@ -244,15 +249,15 @@ export default { ...@@ -244,15 +249,15 @@ 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.ppath === '' || this.dataForm.ppath === null) { // if (this.dataForm.ppath === '' || this.dataForm.ppath === null) {
this.$message.error('图片未上传，请上传图片！') // this.$message.error('图片未上传，请上传图片！')
return // return
} // }
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/newtopic/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/office/newtopic/${!this.dataForm.classid ? 'save' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'classid': this.dataForm.classid || undefined,
'title': this.dataForm.title, 'title': this.dataForm.title,
'directpath': this.dataForm.directpath, 'directpath': this.dataForm.directpath,
'categoryid': this.dataForm.categoryid, 'categoryid': this.dataForm.categoryid,
......
src/views/modules/info/newtopic.vue
...@@ -54,12 +54,14 @@ ...@@ -54,12 +54,14 @@
prop="levels" prop="levels"
header-align="center" header-align="center"
align="center" align="center"
width="70px"
label="级别"> label="级别">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="专题标题"> label="专题标题">
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
...@@ -81,6 +83,9 @@ ...@@ -81,6 +83,9 @@
align="center" align="center"
sortable='custom' sortable='custom'
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.time && scope.row.time.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="editor" prop="editor"
...@@ -243,6 +248,7 @@ export default { ...@@ -243,6 +248,7 @@ export default {
addOrUpdateHandle (id, showInfo) { addOrUpdateHandle (id, showInfo) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
console.log(id)
this.$refs.addOrUpdate.init(id, showInfo) this.$refs.addOrUpdate.init(id, showInfo)
}) })
}, },
......
src/views/modules/info/picture-add-or-update.vue
...@@ -2,7 +2,20 @@ ...@@ -2,7 +2,20 @@
<el-dialog <el-dialog
:title="!dataForm.pictureid ? '新增' : this.showInfo?'详情':'修改'" :title="!dataForm.pictureid ? '新增' : this.showInfo?'详情':'修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:fullscreen="dialogFull"
@open="dialogFull=false"
:visible.sync="visible"> :visible.sync="visible">
<template slot="title">
<div class="avue-crud__dialog__header">
<span class="el-dialog__title">
<span ></span>
{{!dataForm.pictureid ? '新增' : this.showInfo?'详情':'修改'}}
</span>
<div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
<i class="el-icon-full-screen"></i>
</div>
</div>
</template>
<el-form <el-form
:model='dataForm' :model='dataForm'
:rules='dataRule' :rules='dataRule'
...@@ -77,7 +90,7 @@ ...@@ -77,7 +90,7 @@
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
<p><img :src="imgUrlStr" class="avatar2" v-show="showInfo"></p> <p><img :src="imgUrlStr" class="avatar2" v-show="showInfo"></p>
<span v-show="!showInfo" style="font-size:12px;color:red">注：图片资讯图片建议最小尺寸400*300或同等比例图片</span> <span v-show="!showInfo" style="font-size:12px;color:red">注：图片资讯图片建议最小尺寸800*600或同等比例图片</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo"> <span slot="footer" class="dialog-footer" v-show="!showInfo">
...@@ -92,6 +105,7 @@ import { piclevelList } from '@/utils' ...@@ -92,6 +105,7 @@ import { piclevelList } from '@/utils'
export default { export default {
data () { data () {
return { return {
dialogFull: false,
loading: false, loading: false,
visible: false, visible: false,
showInfo: false, showInfo: false,
...@@ -193,10 +207,12 @@ export default { ...@@ -193,10 +207,12 @@ export default {
dialogVisible: false dialogVisible: false
} }
}, },
created () { created () {
}, },
destroyed () {
this.fullscreen = false
},
methods: { methods: {
init (pictureid, showInfo) { init (pictureid, showInfo) {
this.dataForm.pictureid = pictureid || 0 this.dataForm.pictureid = pictureid || 0
......
src/views/modules/info/picture.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
> >
<el-table-column prop="piclevel" header-align="center" align="center" label="级别"> </el-table-column> <el-table-column prop="piclevel" header-align="center" align="center" label="级别"> </el-table-column>
<el-table-column prop="title" header-align="center" align="center" label="标题"> <el-table-column prop="title" header-align="center" align="left" label="标题" width="360px">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{scope.row.title}} {{scope.row.title}}
...@@ -77,9 +77,13 @@ ...@@ -77,9 +77,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="pictureType" header-align="center" align="center" label="分类"> </el-table-column> <el-table-column prop="pictureType" header-align="center" align="center" label="分类"> </el-table-column>
<el-table-column prop="showtime" header-align="center" align="center" sortable='custom' label="显示时间"> </el-table-column> <el-table-column prop="showtime" header-align="center" align="center" sortable='custom' label="显示时间" width="120px"> </el-table-column>
<el-table-column prop="inputdate" header-align="center" align="center" sortable='custom' label="发布时间"> </el-table-column> <el-table-column prop="inputdate" header-align="center" align="center" sortable='custom' label="发布时间" width="120px">
<el-table-column prop="keyword" header-align="center" align="center" label="关键字"> </el-table-column> <template slot-scope="scope">
<div>{{ scope.row.inputdate && scope.row.inputdate.substring(0,10) }}</div>
</template>
</el-table-column>
<el-table-column prop="keyword" header-align="center" align="left" label="关键字" width="260px"> </el-table-column>
<el-table-column prop="editor" header-align="center" align="center" label="编辑"> </el-table-column> <el-table-column prop="editor" header-align="center" align="center" label="编辑"> </el-table-column>
<el-table-column prop="lasteditor" header-align="center" align="center" label="最后编辑"> </el-table-column> <el-table-column prop="lasteditor" header-align="center" align="center" label="最后编辑"> </el-table-column>
<el-table-column prop="auditor" header-align="center" align="center" label="审核人"> </el-table-column> <el-table-column prop="auditor" header-align="center" align="center" label="审核人"> </el-table-column>
......
src/views/modules/logistics/logistics-add-or-update.vue
...@@ -185,6 +185,14 @@ ...@@ -185,6 +185,14 @@
created () { created () {
this.getMedicalTypeList() this.getMedicalTypeList()
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
methods: { methods: {
init (id, showInfo) { init (id, showInfo) {
this.dataForm.id = id || 0 this.dataForm.id = id || 0
......
src/views/modules/logistics/logistics.vue
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -61,6 +62,9 @@ ...@@ -61,6 +62,9 @@
align="center" align="center"
sortable='custom' sortable='custom'
label="创建日期"> label="创建日期">
<template slot-scope="scope">
<div>{{ scope.row.releasetime && scope.row.releasetime.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="checkname" prop="checkname"
......
src/views/modules/medical/medical-add-or-update.vue
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<el-dialog <el-dialog
:title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'" :title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible"
>
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" > <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" >
<el-form-item label="标题：" prop="title"> <el-form-item label="标题：" prop="title">
<el-input v-model="dataForm.title" placeholder="请输入显示标题" v-show="!showInfo"></el-input> <el-input v-model="dataForm.title" placeholder="请输入显示标题" v-show="!showInfo"></el-input>
...@@ -126,16 +127,16 @@ ...@@ -126,16 +127,16 @@
], ],
keyword: [ keyword: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ]
// jumpath: [ // jumpath: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
// ], // ],
author: [ // author: [
{ required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
], // ],
source: [ // source: [
{ required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
] // ]
// releasetime: [ // releasetime: [
// { required: true, message: '不能为空', trigger: 'blur' } // { required: true, message: '不能为空', trigger: 'blur' }
...@@ -160,7 +161,14 @@ ...@@ -160,7 +161,14 @@
title: '' title: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
created () { created () {
this.getMedicalTypeList() this.getMedicalTypeList()
}, },
...@@ -171,8 +179,10 @@ ...@@ -171,8 +179,10 @@
this.dataForm.id = id || 0 this.dataForm.id = id || 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.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/office/medical/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/office/medical/info/${this.dataForm.id}`),
...@@ -187,6 +197,9 @@ ...@@ -187,6 +197,9 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
} else {
this.dataForm = {}
this.ueditor.value = ''
} }
}) })
}, },
...@@ -256,7 +269,6 @@ ...@@ -256,7 +269,6 @@
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.imgUrlStr = '' this.imgUrlStr = ''
this.dialogVisible = false this.dialogVisible = false
this.ueditor.value = ''
} }
} }
} }
......
src/views/modules/medical/medical.vue
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="author" prop="editor"
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
...@@ -71,6 +72,9 @@ ...@@ -71,6 +72,9 @@
align="center" align="center"
sortable='custom' sortable='custom'
label="创建日期"> label="创建日期">
<template slot-scope="scope">
<div>{{ scope.row.releasetime && scope.row.releasetime.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="checkname" prop="checkname"
......
src/views/modules/party/center-add-or-update.vue
...@@ -162,7 +162,14 @@ export default { ...@@ -162,7 +162,14 @@ export default {
title: '' title: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
created () { created () {
}, },
methods: { methods: {
......
src/views/modules/party/center.vue
...@@ -79,7 +79,8 @@ ...@@ -79,7 +79,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="新闻标题"> label="新闻标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -92,6 +93,7 @@ ...@@ -92,6 +93,7 @@
prop="showtime" prop="showtime"
header-align="center" header-align="center"
align="center" align="center"
width="120px"
sortable='custom' sortable='custom'
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
...@@ -100,12 +102,17 @@ ...@@ -100,12 +102,17 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/party/hotFlow-add-or-update.vue
...@@ -159,7 +159,14 @@ export default { ...@@ -159,7 +159,14 @@ export default {
title: '' title: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
created () { created () {
}, },
methods: { methods: {
......
src/views/modules/party/hotFlow.vue
...@@ -76,7 +76,8 @@ ...@@ -76,7 +76,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="新闻标题"> label="新闻标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -97,12 +99,17 @@ ...@@ -97,12 +99,17 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/party/rules-add-or-update.vue
...@@ -162,6 +162,14 @@ export default { ...@@ -162,6 +162,14 @@ export default {
title: '' title: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
methods: { methods: {
init (id, showInfo) { init (id, showInfo) {
this.dataForm.id = id || 0 this.dataForm.id = id || 0
......
src/views/modules/party/rules.vue
...@@ -79,7 +79,8 @@ ...@@ -79,7 +79,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="新闻标题"> label="新闻标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -93,19 +94,25 @@ ...@@ -93,19 +94,25 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="releasedate" prop="releasedate"
header-align="center" header-align="center"
align="center" align="center"
width="120px"
sortable='custom' sortable='custom'
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/party/topicnews-add-or-update.vue
...@@ -162,7 +162,14 @@ export default { ...@@ -162,7 +162,14 @@ export default {
title: '' title: ''
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
created () { created () {
}, },
methods: { methods: {
......
src/views/modules/party/topicnews.vue
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="新闻标题"> label="新闻标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -91,6 +92,7 @@ ...@@ -91,6 +92,7 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="显示时间"> label="显示时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -98,12 +100,17 @@ ...@@ -98,12 +100,17 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate && scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="关键字"> label="关键字">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/planbranch/annual.vue
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<el-button class="seach-btn" @click="getDataList2()" 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 type="primary" @click="allUpload('',-1)">批量上报</el-button> <!-- <el-button type="primary" @click="allUpload('',-1)">批量上报</el-button> -->
<el-button type="primary" @click="allUpload('',0)">批量上传</el-button> <el-button type="primary" @click="allUpload('',1)">批量上传</el-button>
</div> </div>
<div class="table-list"> <div class="table-list">
<el-table <el-table
...@@ -36,11 +36,16 @@ ...@@ -36,11 +36,16 @@
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="index"
header-align="center" header-align="center"
type="index"
align="center" align="center"
width="50px" width="50px"
label="序号"> label="序号">
<template slot-scope="scope">
<span>{{
(pageIndex - 1) * pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -79,9 +84,9 @@ ...@@ -79,9 +84,9 @@
label="状态"> label="状态">
<!-- -1为“未上报”，0为“未上传”1为“已上传” --> <!-- -1为“未上报”，0为“未上传”1为“已上传” -->
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.checkflag===-1" type="text" size="small">未上报</p> <p v-if="scope.row.checkflag==-1" type="text" size="small">未上报</p>
<p v-if="scope.row.checkflag===0" type="text" size="small">未上传</p> <p v-if="scope.row.checkflag==0" type="text" size="small">未上传</p>
<p v-if="scope.row.checkflag===1" type="text" size="small">已上传</p> <p v-if="scope.row.checkflag==1" type="text" size="small">已上传</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -208,7 +213,15 @@ ...@@ -208,7 +213,15 @@
this.$message.error('请选择需要更改的分支机构') this.$message.error('请选择需要更改的分支机构')
return false return false
} }
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflag === -1 ? '未上报' : '未上传' : '批量' + checkflag === -1 ? '未上报' : '未上传'}]操作?`, '提示', { let checkflagStr = '' ;
if ( checkflag === 1 ) {
checkflagStr = '已上传'
} else if (checkflag === 0) {
checkflagStr = '未上传'
} else if (checkflag === -1) {
checkflagStr = '未上报'
}
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflagStr : '批量' + checkflagStr}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
src/views/modules/planbranch/fistplan.vue
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<el-button class="seach-btn" @click="getDataList2()" 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 type="primary" @click="allUpload('',-1)">批量上报</el-button> <!-- <el-button type="primary" @click="allUpload('',-1)">批量上报</el-button> -->
<el-button type="primary" @click="allUpload('',0)">批量上传</el-button> <el-button type="primary" @click="allUpload('',1)">批量上传</el-button>
</div> </div>
<div class="table-list"> <div class="table-list">
<el-table <el-table
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
align="center" align="center"
width="50px" width="50px"
label="序号"> label="序号">
<template slot-scope="scope">
<span>{{
(pageIndex - 1) * pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -79,9 +84,9 @@ ...@@ -79,9 +84,9 @@
label="状态"> label="状态">
<!-- -1为“未上报”，0为“未上传”1为“已上传” --> <!-- -1为“未上报”，0为“未上传”1为“已上传” -->
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.checkflag===-1" type="text" size="small">未上报</p> <p v-if="scope.row.checkflag==-1" type="text" size="small">未上报</p>
<p v-if="scope.row.checkflag===0" type="text" size="small">未上传</p> <p v-if="scope.row.checkflag==0" type="text" size="small">未上传</p>
<p v-if="scope.row.checkflag===1" type="text" size="small">已上传</p> <p v-if="scope.row.checkflag==1" type="text" size="small">已上传</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -208,7 +213,15 @@ ...@@ -208,7 +213,15 @@
this.$message.error('请选择需要更改的分支机构') this.$message.error('请选择需要更改的分支机构')
return false return false
} }
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflag === -1 ? '未上报' : '未上传' : '批量' + checkflag === -1 ? '未上报' : '未上传'}]操作?`, '提示', { let checkflagStr = '' ;
if ( checkflag === 1 ) {
checkflagStr = '已上传'
} else if (checkflag === 0) {
checkflagStr = '未上传'
} else if (checkflag === -1) {
checkflagStr = '未上报'
}
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflagStr : '批量' + checkflagStr}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
src/views/modules/planbranch/fourplan.vue
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<el-button class="seach-btn" @click="getDataList2()" 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 type="primary" @click="allUpload('',-1)">批量上报</el-button> <!-- <el-button type="primary" @click="allUpload('',-1)">批量上报</el-button> -->
<el-button type="primary" @click="allUpload('',0)">批量上传</el-button> <el-button type="primary" @click="allUpload('',1)">批量上传</el-button>
</div> </div>
<div class="table-list"> <div class="table-list">
<el-table <el-table
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
align="center" align="center"
width="50px" width="50px"
label="序号"> label="序号">
<template slot-scope="scope">
<span>{{
(pageIndex - 1) * pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -79,9 +84,9 @@ ...@@ -79,9 +84,9 @@
label="状态"> label="状态">
<!-- -1为“未上报”，0为“未上传”1为“已上传” --> <!-- -1为“未上报”，0为“未上传”1为“已上传” -->
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.checkflag===-1" type="text" size="small">未上报</p> <p v-if="scope.row.checkflag==-1" type="text" size="small">未上报</p>
<p v-if="scope.row.checkflag===0" type="text" size="small">未上传</p> <p v-if="scope.row.checkflag==0" type="text" size="small">未上传</p>
<p v-if="scope.row.checkflag===1" type="text" size="small">已上传</p> <p v-if="scope.row.checkflag==1" type="text" size="small">已上传</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -208,7 +213,15 @@ ...@@ -208,7 +213,15 @@
this.$message.error('请选择需要更改的分支机构') this.$message.error('请选择需要更改的分支机构')
return false return false
} }
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflag === -1 ? '未上报' : '未上传' : '批量' + checkflag === -1 ? '未上报' : '未上传'}]操作?`, '提示', { let checkflagStr = '' ;
if ( checkflag === 1 ) {
checkflagStr = '已上传'
} else if (checkflag === 0) {
checkflagStr = '未上传'
} else if (checkflag === -1) {
checkflagStr = '未上报'
}
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflagStr : '批量' + checkflagStr}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
src/views/modules/planbranch/secondplan.vue
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<el-button class="seach-btn" @click="getDataList2()" 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 type="primary" @click="allUpload('',-1)">批量上报</el-button> <!-- <el-button type="primary" @click="allUpload('',-1)">批量上报</el-button> -->
<el-button type="primary" @click="allUpload('',0)">批量上传</el-button> <el-button type="primary" @click="allUpload('',1)">批量上传</el-button>
</div> </div>
<div class="table-list"> <div class="table-list">
<el-table <el-table
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
align="center" align="center"
width="50px" width="50px"
label="序号"> label="序号">
<template slot-scope="scope">
<span>{{
(pageIndex - 1) * pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -79,9 +84,9 @@ ...@@ -79,9 +84,9 @@
label="状态"> label="状态">
<!-- -1为“未上报”，0为“未上传”1为“已上传” --> <!-- -1为“未上报”，0为“未上传”1为“已上传” -->
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.checkflag===-1" type="text" size="small">未上报</p> <p v-if="scope.row.checkflag==-1" type="text" size="small">未上报</p>
<p v-if="scope.row.checkflag===0" type="text" size="small">未上传</p> <p v-if="scope.row.checkflag==0" type="text" size="small">未上传</p>
<p v-if="scope.row.checkflag===1" type="text" size="small">已上传</p> <p v-if="scope.row.checkflag==1" type="text" size="small">已上传</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -208,7 +213,15 @@ ...@@ -208,7 +213,15 @@
this.$message.error('请选择需要更改的分支机构') this.$message.error('请选择需要更改的分支机构')
return false return false
} }
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflag === -1 ? '未上报' : '未上传' : '批量' + checkflag === -1 ? '未上报' : '未上传'}]操作?`, '提示', { let checkflagStr = '' ;
if ( checkflag === 1 ) {
checkflagStr = '已上传'
} else if (checkflag === 0) {
checkflagStr = '未上传'
} else if (checkflag === -1) {
checkflagStr = '未上报'
}
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflagStr : '批量' + checkflagStr}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
src/views/modules/planbranch/thirdplan.vue
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<el-button class="seach-btn" @click="getDataList2()" 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 type="primary" @click="allUpload('',-1)">批量上报</el-button> <!-- <el-button type="primary" @click="allUpload('',-1)">批量上报</el-button> -->
<el-button type="primary" @click="allUpload('',0)">批量上传</el-button> <el-button type="primary" @click="allUpload('',1)">批量上传</el-button>
</div> </div>
<div class="table-list"> <div class="table-list">
<el-table <el-table
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
align="center" align="center"
width="50px" width="50px"
label="序号"> label="序号">
<template slot-scope="scope">
<span>{{
(pageIndex - 1) * pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -79,9 +84,9 @@ ...@@ -79,9 +84,9 @@
label="状态"> label="状态">
<!-- -1为“未上报”，0为“未上传”1为“已上传” --> <!-- -1为“未上报”，0为“未上传”1为“已上传” -->
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.checkflag===-1" type="text" size="small">未上报</p> <p v-if="scope.row.checkflag==-1" type="text" size="small">未上报</p>
<p v-if="scope.row.checkflag===0" type="text" size="small">未上传</p> <p v-if="scope.row.checkflag==0" type="text" size="small">未上传</p>
<p v-if="scope.row.checkflag===1" type="text" size="small">已上传</p> <p v-if="scope.row.checkflag==1" type="text" size="small">已上传</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -208,7 +213,15 @@ ...@@ -208,7 +213,15 @@
this.$message.error('请选择需要更改的分支机构') this.$message.error('请选择需要更改的分支机构')
return false return false
} }
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflag === -1 ? '未上报' : '未上传' : '批量' + checkflag === -1 ? '未上报' : '未上传'}]操作?`, '提示', { let checkflagStr = '' ;
if ( checkflag === 1 ) {
checkflagStr = '已上传'
} else if (checkflag === 0) {
checkflagStr = '未上传'
} else if (checkflag === -1) {
checkflagStr = '未上报'
}
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? checkflagStr : '批量' + checkflagStr}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
src/views/modules/plate/glossary.vue
...@@ -48,28 +48,32 @@ ...@@ -48,28 +48,32 @@
<el-table-column <el-table-column
prop="titleEn" prop="titleEn"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="英文标题" label="英文标题"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="titleCn" prop="titleCn"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="中文标题" label="中文标题"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="keyword" prop="keyword"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="关键字" label="关键字"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="brief" prop="brief"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="解释" label="解释"
> >
</el-table-column> </el-table-column>
...@@ -85,8 +89,12 @@ ...@@ -85,8 +89,12 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="创建时间" label="创建时间"
> >
<template slot-scope="scope">
<div>{{ scope.row.updatedate && scope.row.updatedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -108,7 +116,7 @@ ...@@ -108,7 +116,7 @@
v-if="isAuth('plate:glossary:delete')" v-if="isAuth('plate:glossary:delete')"
type="text" type="text"
size="small" size="small"
@click="deleteHandle(scope.row.id,scope.row.title)" @click="deleteHandle(scope.row.id,scope.row.titleEn)"
>删除</el-button >删除</el-button
> >
</template> </template>
......
src/views/modules/plate/knowledgeinfo-add-or-update.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='二级分类' prop='class2' > <el-form-item label='二级分类' prop='class2id' >
<el-select v-model="dataForm.class2id" placeholder="请选择" clearable> <el-select v-model="dataForm.class2id" placeholder="请选择" clearable>
<el-option <el-option
v-for="item in class2List" v-for="item in class2List"
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
class1id: [ class1id: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ],
class2: [ class2id: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
], ],
title: [ title: [
...@@ -114,6 +114,14 @@ ...@@ -114,6 +114,14 @@
created () { created () {
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
mounted () { mounted () {
}, },
methods: { methods: {
......
src/views/modules/plate/knowledgeinfo.vue
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -104,7 +105,11 @@ ...@@ -104,7 +105,11 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="发布时间"> label="发布时间">
<template slot-scope="scope">
<div>{{ scope.row.inputdate && scope.row.inputdate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
...@@ -264,12 +269,12 @@ export default { ...@@ -264,12 +269,12 @@ export default {
}) })
}, },
showMsg (data) { showMsg (data) {
if (!data.jumppath || data.jumppath === null) { if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/Knowledge/article?id=' + data.knowledgeinfoid, '_blank') window.open(this.$store.state.config.urls + '/Knowledge/article?id=' + data.knowledgeinfoid, '_blank')
} else if (/^\//.test(data.jumppath)) { } else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.jumppath, '_blank') window.open(this.$store.state.config.urls + data.directpath, '_blank')
} else { } else {
window.open(data.jumppath, '_blank') window.open(data.directpath, '_blank')
} }
}, },
// 删除 // 删除
......
src/views/modules/plate/pcategory.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
v-if="isAuth('plate:pcategory:delete')" v-if="isAuth('plate:pcategory:delete')"
type="text" type="text"
size="small" size="small"
@click="deleteHandle(scope.row.categoryid,scope.row.title)" @click="deleteHandle(scope.row.categoryid,scope.row.category)"
>删除</el-button >删除</el-button
> >
</template> </template>
......
src/views/modules/plate/product.vue
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
<el-table-column <el-table-column
prop="prename" prop="prename"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="商品名称" label="商品名称"
> >
</el-table-column> </el-table-column>
...@@ -72,8 +73,12 @@ ...@@ -72,8 +73,12 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="添加时间" label="添加时间"
> >
<template slot-scope="scope">
<div>{{ scope.row.adddate && scope.row.adddate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -133,7 +138,7 @@ ...@@ -133,7 +138,7 @@
v-if="isAuth('plate:product:delete')" v-if="isAuth('plate:product:delete')"
type="text" type="text"
size="small" size="small"
@click="deleteHandle(scope.row.id,scope.row.title)" @click="deleteHandle(scope.row.id,scope.row.prename)"
>删除</el-button >删除</el-button
> >
</template> </template>
......
src/views/modules/policy/policy-add-or-update.vue
...@@ -179,6 +179,14 @@ export default { ...@@ -179,6 +179,14 @@ export default {
created () { created () {
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
methods: { methods: {
init (id, showInfo) { init (id, showInfo) {
this.dataForm.id = id || 0 this.dataForm.id = id || 0
......
src/views/modules/policy/policy.vue
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -102,14 +103,22 @@ ...@@ -102,14 +103,22 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="创建时间"> label="创建时间">
<template slot-scope="scope">
<div>{{ scope.row.releasedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatedate" prop="updatedate"
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="更新时间"> label="更新时间">
<template slot-scope="scope">
<div>{{ scope.row.updatedate && scope.row.updatedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditor" prop="auditor"
......
src/views/modules/retail/picture.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
> >
<el-table-column prop="piclevel" header-align="center" align="center" label="级别"> </el-table-column> <el-table-column prop="piclevel" header-align="center" align="center" label="级别"> </el-table-column>
<el-table-column prop="title" header-align="center" align="center" label="标题"> <el-table-column prop="title" header-align="center" align="left" label="标题" width="360px">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{scope.row.title}} {{scope.row.title}}
...@@ -77,8 +77,12 @@ ...@@ -77,8 +77,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="pictureType" header-align="center" align="center" label="分类"> </el-table-column> <el-table-column prop="pictureType" header-align="center" align="center" label="分类"> </el-table-column>
<el-table-column prop="showtime" header-align="center" align="center" sortable='custom' label="显示时间"> </el-table-column> <el-table-column prop="showtime" header-align="center" align="center" sortable='custom' label="显示时间" width="120px"> </el-table-column>
<el-table-column prop="inputdate" header-align="center" align="center" sortable='custom' label="发布时间"> </el-table-column> <el-table-column prop="inputdate" header-align="center" align="center" sortable='custom' label="发布时间" width="120px">
<template slot-scope="scope">
<div>{{ scope.row.inputdate && scope.row.inputdate.substring(0,10) }}</div>
</template>
</el-table-column>
<el-table-column prop="keyword" header-align="center" align="center" label="关键字"> </el-table-column> <el-table-column prop="keyword" header-align="center" align="center" label="关键字"> </el-table-column>
<el-table-column prop="editor" header-align="center" align="center" label="编辑"> </el-table-column> <el-table-column prop="editor" header-align="center" align="center" label="编辑"> </el-table-column>
<el-table-column prop="lasteditor" header-align="center" align="center" label="最后编辑"> </el-table-column> <el-table-column prop="lasteditor" header-align="center" align="center" label="最后编辑"> </el-table-column>
......
src/views/modules/service/doc.vue
...@@ -41,12 +41,14 @@ ...@@ -41,12 +41,14 @@
prop="levels" prop="levels"
header-align="center" header-align="center"
align="center" align="center"
width="70px"
label="级别"> label="级别">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题"> label="标题">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/modules/standard/cases-add-or-update.vue
<template> <template>
<el-dialog <el-dialog
:title="!dataForm.id ? '新增' : '修改'" :title="!dataForm.id ? '新增' : this.showInfo?'详情':'修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible" :visible.sync="visible"
> >
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-input <el-input
v-model="dataForm.title" v-model="dataForm.title"
placeholder="请输入标题" placeholder="请输入标题"
:disabled='!showInfo'
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-select <el-select
v-model="dataForm.service" v-model="dataForm.service"
placeholder="请选择服务行业" placeholder="请选择服务行业"
:disabled='!showInfo'
> >
<el-option <el-option
v-for="item in serviceList" v-for="item in serviceList"
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
</el-form-item> </el-form-item>
<el-form-item label="显示时间：" prop="showtime"> <el-form-item label="显示时间：" prop="showtime">
<el-date-picker <el-date-picker
:disabled='!showInfo'
v-model="dataForm.showtime" v-model="dataForm.showtime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
...@@ -83,7 +82,6 @@ ...@@ -83,7 +82,6 @@
:value="ueditor.value" :value="ueditor.value"
:config="ueditor.config" :config="ueditor.config"
ref="ue" ref="ue"
:disabled='!showInfo'
></Ueditor> ></Ueditor>
<!-- <el-input v-model="dataForm.content" placeholder="请输入内容"></el-input> --> <!-- <el-input v-model="dataForm.content" placeholder="请输入内容"></el-input> -->
...@@ -186,6 +184,14 @@ export default { ...@@ -186,6 +184,14 @@ export default {
piclevelList piclevelList
} }
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
methods: { methods: {
init (id, showInfo) { init (id, showInfo) {
console.log(id, 'id') console.log(id, 'id')
...@@ -307,11 +313,6 @@ export default { ...@@ -307,11 +313,6 @@ export default {
// 更新父子组件内容 // 更新父子组件内容
editorReady (instance) { editorReady (instance) {
instance.setContent(this.dataForm.brief) instance.setContent(this.dataForm.brief)
if (!this.showInfo) {
instance.setDisabled()
} else {
instance.setEnabled()
}
instance.addListener('contentChange', () => { instance.addListener('contentChange', () => {
this.dataForm.brief = instance.getContent() this.dataForm.brief = instance.getContent()
}) })
......
src/views/modules/standard/cases.vue
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<el-button <el-button
v-if="isAuth('standard:cases:save')" v-if="isAuth('standard:cases:save')"
type="primary" type="primary"
@click="addOrUpdateHandle('',true)" @click="addOrUpdateHandle()"
> >
+ 添加案例</el-button + 添加案例</el-button
> >
...@@ -112,7 +112,8 @@ ...@@ -112,7 +112,8 @@
<el-table-column <el-table-column
prop="title" prop="title"
header-align="center" header-align="center"
align="center" align="left"
width="360px"
label="标题" label="标题"
> >
</el-table-column> </el-table-column>
...@@ -128,16 +129,24 @@ ...@@ -128,16 +129,24 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="添加时间" label="添加时间"
> >
<template slot-scope="scope">
<div>{{ scope.row.registerdate && scope.row.registerdate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatedate" prop="updatedate"
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="修改时间" label="修改时间"
> >
<template slot-scope="scope">
<div>{{ scope.row.updatedate && scope.row.updatedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -159,6 +168,7 @@ ...@@ -159,6 +168,7 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="审核时间" label="审核时间"
> >
</el-table-column> </el-table-column>
...@@ -217,7 +227,7 @@ ...@@ -217,7 +227,7 @@
v-if="isAuth('standard:cases:update')" v-if="isAuth('standard:cases:update')"
type="text" type="text"
size="small" size="small"
@click="addOrUpdateHandle(scope.row.id,false)" @click="addOrUpdateHandle(scope.row.id)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
......
src/views/modules/standard/partners-add-or-update.vue
...@@ -16,16 +16,12 @@ ...@@ -16,16 +16,12 @@
<el-input <el-input
v-model="dataForm.firmname" v-model="dataForm.firmname"
placeholder="请输入企业名称" placeholder="请输入企业名称"
:disabled='!showInfo'
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="技术领域：" prop="technology"> <el-form-item label="技术领域：" prop="technology">
<el-select <el-select
v-model="dataForm.technology" v-model="dataForm.technology"
placeholder="请选择技术领域" placeholder="请选择技术领域"
:disabled='!showInfo'
> >
<el-option <el-option
v-for="item in technologyList" v-for="item in technologyList"
...@@ -40,8 +36,6 @@ ...@@ -40,8 +36,6 @@
<el-select <el-select
v-model="dataForm.service" v-model="dataForm.service"
placeholder="请选择服务行业" placeholder="请选择服务行业"
:disabled='!showInfo'
> >
<el-option <el-option
v-for="item in serviceList" v-for="item in serviceList"
...@@ -56,32 +50,24 @@ ...@@ -56,32 +50,24 @@
<el-input <el-input
v-model="dataForm.site" v-model="dataForm.site"
placeholder="请输入网址" placeholder="请输入网址"
:disabled='!showInfo'
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系人姓名：" prop="name"> <el-form-item label="联系人姓名：" prop="name">
<el-input <el-input
v-model="dataForm.name" v-model="dataForm.name"
placeholder="请输入联系人姓名" placeholder="请输入联系人姓名"
:disabled='!showInfo'
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话：" prop="phone"> <el-form-item label="联系电话：" prop="phone">
<el-input <el-input
v-model="dataForm.phone" v-model="dataForm.phone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
:disabled='!showInfo'
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮箱：" prop="email"> <el-form-item label="邮箱：" prop="email">
<el-input <el-input
v-model="dataForm.email" v-model="dataForm.email"
placeholder="请输入邮箱" placeholder="请输入邮箱"
:disabled='!showInfo'
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="级别：" prop="levels"> <el-form-item label="级别：" prop="levels">
...@@ -108,7 +94,6 @@ ...@@ -108,7 +94,6 @@
:show-file-list="false" :show-file-list="false"
:http-request="Upload" :http-request="Upload"
:before-upload="beforeAvatarUpload" :before-upload="beforeAvatarUpload"
:disabled='!showInfo'
> >
<img v-if="dialogVisible" :src="imgUrlStr" class="" /> <img v-if="dialogVisible" :src="imgUrlStr" class="" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
...@@ -255,6 +240,14 @@ export default { ...@@ -255,6 +240,14 @@ export default {
}, },
created () { created () {
}, },
watch: {
visible: function (val, oldVal) {
if (val === false) {
this.ueditor.value = ' '
this.dataForm.content = ''
}
}
},
methods: { methods: {
getSelectName (list, id) { getSelectName (list, id) {
let arr = list.filter((item) => { let arr = list.filter((item) => {
......
src/views/modules/standard/partners.vue
...@@ -128,14 +128,16 @@ ...@@ -128,14 +128,16 @@
<el-table-column <el-table-column
prop="firmname" prop="firmname"
header-align="center" header-align="center"
align="center" align="left"
width="260px"
label="企业名称" label="企业名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="technology" prop="technology"
header-align="center" header-align="center"
align="center" align="left"
width="200px"
label="技术领域" label="技术领域"
> >
</el-table-column> </el-table-column>
...@@ -151,16 +153,24 @@ ...@@ -151,16 +153,24 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="添加时间" label="添加时间"
> >
<template slot-scope="scope">
<div>{{ scope.row.registerdate && scope.row.registerdate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatedate" prop="updatedate"
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="修改时间" label="修改时间"
> >
<template slot-scope="scope">
<div>{{ scope.row.updatedate && scope.row.updatedate.substring(0,10) }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -189,6 +199,7 @@ ...@@ -189,6 +199,7 @@
header-align="center" header-align="center"
align="center" align="center"
sortable='custom' sortable='custom'
width="120px"
label="审核时间" label="审核时间"
> >
</el-table-column> </el-table-column>
...@@ -247,7 +258,7 @@ ...@@ -247,7 +258,7 @@
v-if="isAuth('standard:partners:delete')" v-if="isAuth('standard:partners:delete')"
type="text" type="text"
size="small" size="small"
@click="deleteHandle(scope.row.id,scope.row.title)" @click="deleteHandle(scope.row.id,scope.row.firmname)"
>删除</el-button >删除</el-button
> >
</template> </template>
...@@ -479,7 +490,7 @@ export default { ...@@ -479,7 +490,7 @@ export default {
return item.id return item.id
}) })
this.$confirm( this.$confirm(
`确定对[title=${title}]进行[${id ? '删除' : '批量删除'}]操作?`, `确定对[${title}]进行[${id ? '删除' : '批量删除'}]操作?`,
'提示', '提示',
{ {
confirmButtonText: '确定', confirmButtonText: '确定',
......
src/views/modules/temps/ueditor.vue
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
if (val != null && this.ready) { if (val != null && this.ready) {
this.instance = ueditor.getEditor(this.editor, this.config) this.instance = ueditor.getEditor(this.editor, this.config)
this.instance.setContent(val) this.instance.setContent(val)
} else {
this.instance = ueditor.getEditor(this.editor, this.config)
this.instance.setContent('')
} }
} }
}, },
...@@ -32,10 +35,10 @@ ...@@ -32,10 +35,10 @@
}, },
destroyed () { destroyed () {
// // 组件销毁的时候，要销毁 UEditor 实例 // // 组件销毁的时候，要销毁 UEditor 实例
// if (this.instance !== null && this.instance.destroy) { if (this.instance !== null && this.instance.destroy) {
// this.instance.destroy() this.instance.destroy()
// } }
this.instance.destroy() // this.instance.destroy()
}, },
methods: { methods: {
initEditor () { initEditor () {
...@@ -53,10 +56,8 @@ ...@@ -53,10 +56,8 @@
this.instance = ueditor.getEditor(this.editor, this.config) this.instance = ueditor.getEditor(this.editor, this.config)
this.instance.setContent(con) this.instance.setContent(con)
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
</style> </style>
static/config/index-prod.js
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://demo.open.renren.io/renren-fast-server'; // window.SITE_CONFIG['baseUrl'] = 'http://demo.open.renren.io/renren-fast-server';
window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.77:9091' // window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.81:9091'
// window.SITE_CONFIG['baseUrl'] = ' http://81.68.189.225:9091' // window.SITE_CONFIG['baseUrl'] = ' http://81.68.189.225:9091'
window.SITE_CONFIG['baseUrl'] = ' http://dynamic.gs1cn.org'
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['domain'] = './' // 域名
......
static/config/index-qa.js
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = ' http://81.68.189.225:9091' // window.SITE_CONFIG['baseUrl'] = ' http://81.68.189.225:9091'
window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.77:9091' // window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.81:9091'
window.SITE_CONFIG['baseUrl'] = 'http://dynamic.gs1cn.org'
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['domain'] = './' // 域名
window.SITE_CONFIG['version'] = '' // 版本号(年月日时分) window.SITE_CONFIG['version'] = '' // 版本号(年月日时分)
......
static/config/index-uat.js
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast'; // window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
window.SITE_CONFIG['baseUrl'] = ' http://192.168.0.77:9091' // window.SITE_CONFIG['baseUrl'] = ' http://192.168.0.81:9091'
// window.SITE_CONFIG['baseUrl'] = ' http://81.68.189.225:9091' // window.SITE_CONFIG['baseUrl'] = ' http://81.68.189.225:9091'
window.SITE_CONFIG['baseUrl'] = ' http://dynamic.gs1cn.org'
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['domain'] = './' // 域名
......
static/config/index.js
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
window.SITE_CONFIG = {} window.SITE_CONFIG = {}
// api接口请求地址 // api接口请求地址
window.SITE_CONFIG['baseUrl'] = 'http://wudi.natapp1.cc' // window.SITE_CONFIG['baseUrl'] = 'http://116.204.118.109:9091'
// window.SITE_CONFIG['baseUrl'] = ' http://192.168.0.77:9091' // window.SITE_CONFIG['baseUrl'] = ' http://192.168.0.81:9091'
window.SITE_CONFIG['baseUrl'] = ' http://dynamic.gs1cn.org'
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['domain'] = './' // 域名
window.SITE_CONFIG['version'] = '' // 版本号(年月日时分) window.SITE_CONFIG['version'] = '' // 版本号(年月日时分)
......
static/plugins/ueditor-1.4.3.3/themes/default/css/ueditor.css
...@@ -133,6 +133,7 @@ div.edui-box { ...@@ -133,6 +133,7 @@ div.edui-box {
} }
/*UI工具栏、编辑区域、底部*/ /*UI工具栏、编辑区域、底部*/
.edui-default .edui-editor { .edui-default .edui-editor {
width: 100%!important;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
background-color: white; background-color: white;
position: relative; position: relative;
...@@ -142,7 +143,7 @@ div.edui-box { ...@@ -142,7 +143,7 @@ div.edui-box {
border-radius: 4px; border-radius: 4px;
} }
.edui-editor div{ .edui-editor div{
width:auto; width:auto!important;
height:auto; height:auto;
} }
.edui-default .edui-editor-toolbarbox { .edui-default .edui-editor-toolbarbox {
......
static/plugins/ueditor-1.4.3.3/ueditor.config.js
...@@ -185,10 +185,9 @@ ...@@ -185,10 +185,9 @@
//, autoClearEmptyNode : true //getContent时，是否删除空的inlineElement节点（包括嵌套的情况） //, autoClearEmptyNode : true //getContent时，是否删除空的inlineElement节点（包括嵌套的情况）
// 启用自动保存 enableAutoSave: false, // 启用自动保存
//, enableAutoSave: true
// 自动保存间隔时间， 单位ms saveInterval: 0, // 自动保存间隔时间， 单位ms
//, saveInterval: 500
// fullscreen : false //是否开启初始化时即全屏，默认关闭 // fullscreen : false //是否开启初始化时即全屏，默认关闭
......
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