Skip to content

G
gs1-admin
Commit c6f1209a by Lyan
Options

bug提交

parent 910574d1
Showing with 551 additions and 175 deletions
src/assets/scss/_base.scss
......@@ -5,7 +5,7 @@
}
body {
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
font-size: 14px;
font-size: 12px;
line-height: 1.15;
color: #303133;
background-color: #fff;
......@@ -478,3 +478,9 @@ img {
background: url('../img/full.png') center center no-repeat;
background-size: 15px;
}
.el-form{
font-size: 12px;
.el-form-item__content{
line-height: normal;
}
}
src/utils/httpRequest.js
......@@ -45,7 +45,6 @@ http.adornUrl = (actionName) => {
// 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
}
/**
* get请求参数处理
* @param {*} params 参数对象
......
src/views/common/login.vue
......@@ -215,4 +215,7 @@
}
}
.el-input__prefix i{
line-height: 36px;
}
</style>
src/views/main-navbar-update-password.vue
......@@ -4,9 +4,9 @@
:visible.sync="visible"
:append-to-body="true">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="账号">
<!-- <el-form-item label="账号">
<span>{{ userName }}</span>
</el-form-item>
</el-form-item> -->
<el-form-item label="原密码" prop="password">
<el-input type="password" v-model="dataForm.password"></el-input>
</el-form-item>
......@@ -78,7 +78,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl('/sys/user/password'),
url: this.$http.adornUrl('/office/sys/user/password'),
method: 'post',
data: this.$http.adornData({
'password': this.dataForm.password,
......@@ -109,4 +109,9 @@
}
}
</script>
<style scoped>
.el-input__prefix i{
line-height: 36px;
}
</style>
src/views/main-navbar.vue
......@@ -17,6 +17,7 @@
<el-menu
class="site-navbar__menu"
mode="horizontal">
<a href="http://www.gs1cn.org/" target="_blank"><img style="width: 50px;margin-right: 15px;" src="../assets/img/logo.png"/></a>
<span style="color:red;line-height: 50px;">严禁在本网站上处理涉密文件、信息！</span>
</el-menu>
<el-menu
......@@ -46,7 +47,7 @@
<img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}
</span>
<el-dropdown-menu slot="dropdown">
<!-- <el-dropdown-item @click.native="updatePasswordHandle()">修改密码</el-dropdown-item> -->
<el-dropdown-item @click.native="updatePasswordHandle()">修改密码</el-dropdown-item>
<el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -88,12 +89,12 @@
},
methods: {
// 修改密码
// updatePasswordHandle () {
// this.updatePassowrdVisible = true
// this.$nextTick(() => {
// this.$refs.updatePassowrd.init()
// })
// },
updatePasswordHandle () {
this.updatePassowrdVisible = true
this.$nextTick(() => {
this.$refs.updatePassowrd.init()
})
},
// 退出
logoutHandle () {
clearLoginInfo()
......
src/views/modules/application/news-add-or-update.vue
......@@ -142,7 +142,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -160,6 +160,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -256,6 +257,7 @@ export default {
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.loading = true
this.$http({
url: this.$http.adornUrl(
......@@ -287,6 +289,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/application/news.vue
......@@ -96,7 +96,8 @@
<el-table-column
prop="author"
header-align="center"
align="center"
align="left"
width="200px"
label="作者">
</el-table-column>
<el-table-column
......@@ -169,6 +170,7 @@
<el-button v-if="isAuth('application:news:info')" type="text" size="small" @click="previewHandle(scope.row)">预览</el-button>
<el-button v-if="isAuth('application:news:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button v-if="isAuth('application:news:delete')" type="text" size="small" @click="deleteHandle(scope.row.id,scope.row.title)">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -184,6 +186,7 @@
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :classidList="columnList"></add-or-update>
</div>
</div>
</template>
......@@ -191,6 +194,7 @@
<script>
import { piclevelList } from '@/utils'
import AddOrUpdate from './news-add-or-update'
export default {
components: {
AddOrUpdate
......@@ -314,15 +318,27 @@ export default {
// 预览
previewHandle (info) {
console.log(info, '预览')
let url
let urlstr
if (!info.directpath || info.directpath === null) {
url = `${this.$store.state.config.urls}/News/msg?id=${info.id}`
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
urlstr = `${this.$store.state.config.urls}/News/msg?id=${info.id}&token=${data.data}`
window.open(urlstr, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(info.directpath)) {
url = `${this.$store.state.config.urls}${info.directpath}`
urlstr = `${this.$store.state.config.urls}${info.directpath}`
window.open(urlstr, '_blank')
} else {
url = info.directpath
urlstr = info.directpath
window.open(urlstr, '_blank')
}
window.open(url, '_blank')
},
// 新增 / 修改
addOrUpdateHandle (id, showInfo) {
......
src/views/modules/info/announce-add-or-update.vue
......@@ -71,7 +71,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -88,6 +88,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -211,6 +212,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// }
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/announce/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -234,6 +236,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/info/announce.vue
......@@ -298,13 +298,25 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/NoticeArticle?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(`${this.$store.state.config.urls}/News/NoticeArticle?id=${item.id}&token=${data.data}`, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/info/indexcarouselmanage-add-or-update.vue
......@@ -117,7 +117,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -130,6 +130,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
title: '',
dataForm: {
id: 0,
......@@ -268,6 +269,7 @@ export default {
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
if (this.dataForm.picIndexPath === '' || this.dataForm.picIndexPath === null) {
this.$message.error('图片未上传，请上传图片！')
return
......@@ -296,6 +298,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/info/indexcarouselmanage.vue
......@@ -322,9 +322,19 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
console.log(data, 'datadatadata')
window.open(`${this.$store.state.config.urls}/home?indexCarouselManageId=${data.id}`, '_blank')
showMsg (item) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(`${this.$store.state.config.urls}?indexCarouselManageId=${item.id}&token=${data.data}`, '_blank')
} else {
this.$message.error('获取失败')
}
})
},
// 删除
deleteHandle (id, title) {
......
src/views/modules/info/news-add-or-update.vue
......@@ -125,7 +125,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -143,6 +143,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -159,7 +160,7 @@ export default {
directpath: '',
pic: '',
content: '',
ishead: 1,
ishead: 0,
showtime: '',
classid: '',
cclassid: ''
......@@ -296,6 +297,7 @@ export default {
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
// if (this.dataForm.pic === '' || this.dataForm.pic === null) {
// this.$message.error('图片未上传，请上传图片！')
// return
......@@ -330,6 +332,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......@@ -504,11 +507,24 @@ export default {
} */
</style>
<style scoped>
<style scoped lang="scss">
.icon-list__tips {
font-size: 18px;
text-align: center;
color: #e6a23c;
cursor: pointer;
}
.el-form /deep/.el-form-item__label,.el-table{
font-size: 12px;
}
input::-webkit-input-placeholder {
/* placeholder颜色 */
/* placeholder字体大小 */
font-size: 12px;
}
.el-radio-group{
line-height:40px;
}
</style>
src/views/modules/info/news.vue
......@@ -2,19 +2,19 @@
<div class="mod-config mod-list-form">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="80px">
<el-form-item label='标题' prop='title'>
<el-input v-model='dataForm.title' placeholder='请输入标题' clearable></el-input>
<el-input v-model='dataForm.title' placeholder='请输入标题' clearable size="small" ></el-input>
</el-form-item>
<el-form-item label='作者' prop='title'>
<el-input v-model='dataForm.author' placeholder='请输入作者' clearable></el-input>
<el-input v-model='dataForm.author' placeholder='请输入作者' clearable size="small"></el-input>
</el-form-item>
<el-form-item label='编辑' prop='editor'>
<el-input v-model='dataForm.editor' placeholder='请输入编辑' clearable></el-input>
<el-input v-model='dataForm.editor' placeholder='请输入编辑' clearable size="small"></el-input>
</el-form-item>
<el-form-item label='关键字' prop='keyword'>
<el-input v-model='dataForm.keyword' placeholder='请输入关键字' clearable></el-input>
<el-input v-model='dataForm.keyword' placeholder='请输入关键字' clearable size="small"></el-input>
</el-form-item>
<el-form-item label='状态' prop='status'>
<el-select v-model="dataForm.status" placeholder="请选择状态" clearable>
<el-select v-model="dataForm.status" placeholder="请选择状态" clearable size="small">
<el-option
v-for="item in statusList"
:key="item.value"
......@@ -23,8 +23,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label='级别' prop='levels'>
<el-select v-model="dataForm.levels" placeholder="请输入级别" clearable>
<el-form-item label='级别' prop='levels' >
<el-select v-model="dataForm.levels" placeholder="请输入级别" clearable size="small">
<el-option
v-for="item in piclevelList"
:key="item.value"
......@@ -35,7 +35,7 @@
</el-form-item>
<el-form-item label='发布日期' prop='releaseDate'>
<el-date-picker
clearable
clearable size="small"
v-model="releaseDate"
type="daterange"
......@@ -47,7 +47,7 @@
</el-form-item>
<el-form-item label='更新日期' prop='updateDate'>
<el-date-picker
size="small"
clearable
v-model="updateDate"
type="daterange"
......@@ -57,10 +57,10 @@
>
</el-date-picker>
</el-form-item>
<el-button class="seach-btn" @click="getDataList2()" type="primary" >搜索</el-button>
<el-button class="seach-btn" @click="getDataList2()" type="primary" size="small">搜索</el-button>
</el-form>
<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()" size="small"> + 添加</el-button>
</div>
<div class="table-list">
<el-table
......@@ -159,6 +159,8 @@
<el-button v-if="isAuth('manage:news:info')" type="text" size="small" @click="showMsg(scope.row)">预览</el-button>
<el-button v-if="isAuth('manage:news:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button v-if="isAuth('manage:news:delete')" type="text" size="small" @click="deleteHandle(scope.row.id,scope.row.title)">删除</el-button>
<br v-if="isAuth('application:news:check')" />
<el-button v-if="isAuth('application:news:update')" type="text" size="small" @click="UpdatePicHandle(scope.row)">图片资讯</el-button>
</template>
</el-table-column>
</el-table>
......@@ -174,6 +176,8 @@
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<!-- 图片资讯 -->
<update-pic v-if="updatePicVisible" ref="updatePic" @refreshDataList="getDataList"></update-pic>
</div>
</div>
</template>
......@@ -181,13 +185,16 @@
<script>
import { piclevelList } from '@/utils'
import AddOrUpdate from './news-add-or-update'
import UpdatePic from './picture-add-or-update'
export default {
components: {
AddOrUpdate
AddOrUpdate,
UpdatePic
},
data () {
return {
addOrUpdateVisible: false,
updatePicVisible: false,
dataForm: {
'title': '',
'levels': null,
......@@ -290,13 +297,33 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
// 展示图片资讯
UpdatePicHandle (row) {
console.log('new:'+row)
this.updatePicVisible = true
this.$nextTick(() => {
this.$refs.updatePic.getPicInfo(row)
})
},
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
......@@ -381,3 +408,16 @@ export default {
}
}
</script>
<style scoped lang="scss">
.el-form /deep/.el-form-item__label,.el-table{
font-size: 12px;
}
.el-table td, .el-table th{
padding: 5px 0;
}
input::-webkit-input-placeholder {
/* placeholder颜色 */
/* placeholder字体大小 */
font-size: 12px;
}
</style>
src/views/modules/info/newsmovie-add-or-update.vue
......@@ -60,6 +60,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="简介：" prop="brief">
<el-input type="textarea" rows="5" v-model="dataForm.brief" placeholder="请输入简介" v-show="!showInfo"></el-input>
<p v-show="showInfo">{{dataForm.brief}}</p>
</el-form-item>
<el-form-item label="上传图片命名规则" prop="rules">
<span style="color:red;font-size:12px">图片命名格式为DB+时间+拼音，如：DB20180701tupian1；图片尺寸500*375</span>
</el-form-item>
......@@ -109,7 +113,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -126,6 +130,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -143,6 +148,7 @@ export default {
longStr: '',
stdate: '',
clanguage: '',
brief:'',
wavname: '',
showtime: ''
},
......@@ -245,6 +251,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// } else
this.disabled = true
if (this.dataForm.wavname === '' || this.dataForm.wavname === null) {
this.$message.error('视频未上传，请上传视频！')
return
......@@ -266,7 +273,8 @@ export default {
'pic': this.dataForm.pic,
'wavname': this.dataForm.wavname,
'content': this.dataForm.content,
'showtime': this.dataForm.showtime
'showtime': this.dataForm.showtime,
'brief':this.dataForm.brief
})
}).then(({data}) => {
this.loading = false
......@@ -278,6 +286,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/info/newsmovie.vue
......@@ -10,9 +10,9 @@
<el-form-item label='编辑' prop='editor'>
<el-input v-model='dataForm.editor' placeholder='请输入编辑' clearable></el-input>
</el-form-item>
<el-form-item label='关键字' prop='keyword'>
<!-- <el-form-item label='关键字' prop='keyword'>
<el-input v-model='dataForm.keyword' placeholder='请输入关键字' clearable></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label='状态' prop='status'>
<el-select v-model="dataForm.status" placeholder="请选择状态" clearable>
<el-option
......@@ -96,12 +96,12 @@
width="360px"
label="显示标题">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="keyword"
header-align="center"
align="left" width="260px"
label="关键字">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="author"
header-align="center"
......@@ -109,7 +109,7 @@
label="演讲人">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="longStr"
header-align="center"
align="center"
......@@ -120,7 +120,7 @@
header-align="center"
align="center"
label="时间">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="clanguage"
header-align="center"
......@@ -332,13 +332,24 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msgVideo?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(`${this.$store.state.config.urls}/News/msgVideo?id=${item.id}&token=${data.data}`, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/info/newtopic-add-or-update.vue
......@@ -97,7 +97,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -114,6 +114,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -253,6 +254,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// }
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/newtopic/${!this.dataForm.classid ? 'save' : 'update'}`),
method: 'post',
......@@ -279,6 +281,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled =false
}
})
} else {
......
src/views/modules/info/newtopic.vue
......@@ -252,13 +252,24 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/viewsub?id=' + data.classid, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(`${this.$store.state.config.urls}/News/viewsub?id=${item.classid}&token=${data.data}`, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/info/picture-add-or-update.vue
......@@ -95,7 +95,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -109,6 +109,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
title: '',
dataForm: {
pictureid: 0,
......@@ -204,7 +205,8 @@ export default {
},
imgUrl: new FormData(),
imgUrlStr: '',
dialogVisible: false
dialogVisible: false,
articleId:''
}
},
created () {
......@@ -248,6 +250,17 @@ export default {
}
})
},
// 文章管理展示图片资讯
getPicInfo (row) {
console.log(row)
this.visible = true
this.dataForm.title = row.title
this.dataForm.pictureType = this.pictureTypeList[0].value
this.dataForm.keyword = row.keyword
this.dataForm.showtime = row.showtime
this.dataForm.jumppath = this.$store.state.config.urls + '/News/msg?id=' + row.id
this.articleId = row.id
},
// 表单提交
dataFormSubmit () {
this.loading = true
......@@ -257,6 +270,7 @@ export default {
this.$message.error('图片未上传，请上传图片！')
return
}
this.disabled = true
this.$http({
url: this.$http.adornUrl(
`/office/picture/${!this.dataForm.pictureid ? 'save' : 'update'}`
......@@ -270,7 +284,8 @@ export default {
piclevel: this.dataForm.piclevel,
keyword: this.dataForm.keyword,
jumppath: this.dataForm.jumppath,
showtime: this.dataForm.showtime
showtime: this.dataForm.showtime,
articleId: this.articleId
})
}).then(({ data }) => {
this.loading = false
......@@ -282,6 +297,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/info/picture.vue
......@@ -121,7 +121,7 @@
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<add-or-update v-if="updatePicVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</div>
</template>
......@@ -132,7 +132,7 @@ import AddOrUpdate from './picture-add-or-update'
export default {
data () {
return {
addOrUpdateVisible: false,
updatePicVisible: false,
dataForm: {
title: '',
pictureLevel: null,
......@@ -242,13 +242,24 @@ export default {
},
// 新增 / 修改
addOrUpdateHandle (pictureid, showInfo) {
this.addOrUpdateVisible = true
this.updatePicVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(pictureid, showInfo)
})
},
showMsg (data) {
window.open(`${this.$store.state.config.urls}/home?pictureId=${data.pictureid}`, '_blank')
showMsg (item) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(`${this.$store.state.config.urls}?pictureId=${item.pictureid}&token=${data.data}`, '_blank')
} else {
this.$message.error('获取失败')
}
})
},
// 删除
......
src/views/modules/job/schedule-add-or-update.vue
......@@ -19,7 +19,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -29,6 +29,7 @@
data () {
return {
visible: false,
disabled: false,
dataForm: {
id: 0,
beanName: '',
......@@ -74,6 +75,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/sys/schedule/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -94,6 +96,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/logistics/logistics-add-or-update.vue
......@@ -83,7 +83,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -100,6 +100,7 @@
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -229,6 +230,7 @@
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/logistics/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -257,6 +259,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/medical/medical-add-or-update.vue
......@@ -80,7 +80,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -97,6 +97,7 @@
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -197,9 +198,6 @@
this.$message.error(data.msg)
}
})
} else {
this.dataForm = {}
this.ueditor.value = ''
}
})
},
......@@ -215,6 +213,7 @@
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/medical/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -242,6 +241,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......@@ -250,7 +250,7 @@
})
}
})
},
},
// 获取医疗管理列表
getMedicalTypeList () {
this.$http({
......@@ -269,6 +269,7 @@
this.$refs['dataForm'].resetFields()
this.imgUrlStr = ''
this.dialogVisible = false
this.ueditor.value = ''
}
}
}
......
src/views/modules/medical/medical.vue
......@@ -67,6 +67,13 @@
label="编辑">
</el-table-column>
<el-table-column
prop="lasteditor"
header-align="center"
align="center"
sortable='custom'
label="最后编辑">
</el-table-column>
<el-table-column
prop="releasetime"
header-align="center"
align="center"
......@@ -77,6 +84,16 @@
</template>
</el-table-column>
<el-table-column
prop="updatetime"
header-align="center"
align="center"
sortable='custom'
label="最后修改时间">
<template slot-scope="scope">
<div>{{ scope.row.updatetime && scope.row.updatetime.substring(0,10) }}</div>
</template>
</el-table-column>
<el-table-column
prop="checkname"
header-align="center"
align="center"
......@@ -215,13 +232,23 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/HealthDetail?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/HealthDetail?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/party/center-add-or-update.vue
......@@ -77,7 +77,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -94,6 +94,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -207,6 +208,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// }
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/center/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -237,6 +239,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/party/center.vue
......@@ -288,13 +288,24 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/party/hotFlow-add-or-update.vue
......@@ -77,7 +77,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -94,6 +94,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -204,6 +205,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// }
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/hotFlow/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -234,6 +236,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/party/hotFlow.vue
......@@ -284,13 +284,24 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/party/rules-add-or-update.vue
......@@ -77,7 +77,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -94,6 +94,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -205,6 +206,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// }
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/rules/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -235,6 +237,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/party/rules.vue
......@@ -287,13 +287,24 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/party/topicnews-add-or-update.vue
......@@ -77,7 +77,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -94,6 +94,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -207,6 +208,7 @@ export default {
// this.$message.error('图片未上传，请上传图片！')
// return
// }
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/topicnews/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -237,6 +239,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled= false
}
})
} else {
......
src/views/modules/party/topicnews.vue
......@@ -285,13 +285,24 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
// 获取token
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/msg?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/planbranch/annual-add-or-update.vue
......@@ -22,7 +22,7 @@
</el-form>
<span slot="footer" class="dialog-footer" >
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -37,6 +37,7 @@
return {
loading: false,
visible: false,
disabled: false,
dataForm: {
id: 0,
name: '',
......@@ -70,6 +71,7 @@
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/planbranch/batchUpdateStatus`),
method: 'post',
......@@ -87,6 +89,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/plate/glossary-add-or-update.vue
......@@ -32,7 +32,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -43,6 +43,7 @@ export default {
return {
showInfo: false,
visible: false,
disabled: false,
dataForm: {
id: 0,
titleEn: '',
......@@ -133,6 +134,7 @@ export default {
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(
`/office/glossary/${!this.dataForm.id ? 'save' : 'update'}`
......@@ -156,6 +158,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/plate/knowledgeinfo-add-or-update.vue
......@@ -52,7 +52,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -69,6 +69,7 @@
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -164,6 +165,7 @@
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
console.log(this.dataForm.id)
this.$http({
url: this.$http.adornUrl(`/office/knowledgeinfo/${!this.dataForm.id ? 'save' : 'update'}`),
......@@ -187,6 +189,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/plate/knowledgeinfo.vue
......@@ -268,13 +268,23 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/Knowledge/article?id=' + data.knowledgeinfoid, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/Knowledge/article?id=' + item.knowledgeinfoid + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/plate/pcategory-add-or-update.vue
......@@ -10,7 +10,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -20,6 +20,7 @@
data () {
return {
visible: false,
disabled: false,
dataForm: {
categoryid: 0,
category: '',
......@@ -54,12 +55,13 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/pcategory/${!this.dataForm.categoryid ? 'save' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'categoryid': this.dataForm.categoryid || undefined,
'category': this.dataForm.category,
'category': this.dataForm.category
})
}).then(({data}) => {
if (data && data.code === 0) {
......@@ -70,6 +72,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/plate/product-add-or-update.vue
......@@ -88,7 +88,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -106,6 +106,7 @@ export default {
visible: false,
showInfo: false,
dialogVisible: false,
disabled: false,
ueditor: {
value: '',
config: {}
......@@ -342,6 +343,7 @@ export default {
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(
`/office/product/${!this.dataForm.id ? 'save' : 'update'}`
......@@ -397,6 +399,7 @@ export default {
duration: 1500,
onClose: () => {
this.visible = false
this.disabled = false
this.$emit('refreshDataList')
}
})
......
src/views/modules/plate/product.vue
......@@ -272,8 +272,18 @@ export default {
this.$refs.addOrUpdate.init(id)
})
},
showMsg (data) {
window.open(this.$store.state.config.urls + '/Service/Book?id=' + data.id, '_blank')
showMsg (item) {
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/Service/Book?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
},
// 删除
deleteHandle (id, title) {
......
src/views/modules/policy/policy-add-or-update.vue
......@@ -83,7 +83,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -100,6 +100,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -225,6 +226,7 @@ export default {
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/policy/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -253,6 +255,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/policy/policy.vue
......@@ -289,13 +289,23 @@ export default {
this.$refs.addOrUpdate.init(id, showInfo)
})
},
showMsg (data) {
if (!data.directpath || data.directpath === null) {
window.open(this.$store.state.config.urls + '/Knowledge/Statuteinfo?id=' + data.id, '_blank')
} else if (/^\//.test(data.directpath)) {
window.open(this.$store.state.config.urls + data.directpath, '_blank')
showMsg (item) {
if (!item.directpath || item.directpath === null) {
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/Knowledge/Statuteinfo?id=' + item.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(item.directpath)) {
window.open(this.$store.state.config.urls + item.directpath, '_blank')
} else {
window.open(data.directpath, '_blank')
window.open(item.directpath, '_blank')
}
},
// 删除
......
src/views/modules/retail/picture-add-or-update.vue
......@@ -81,7 +81,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -94,6 +94,7 @@ export default {
loading: false,
visible: false,
showInfo: false,
disabled: false,
title: '',
dataForm: {
pictureid: 0,
......@@ -236,6 +237,7 @@ export default {
this.loading = true
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.disabled = true
if (this.dataForm.picFile === '' || this.dataForm.picFile === null) {
this.$message.error('图片未上传，请上传图片！')
return
......@@ -265,6 +267,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/retail/picture.vue
......@@ -247,8 +247,18 @@ export default {
this.$refs.addOrUpdate.init(pictureid, showInfo)
})
},
showMsg (data) {
window.open(this.$store.state.config.urls + '/News/Retail?retailPictureId=' + data.pictureid, '_blank')
showMsg (item) {
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/News/Retail?retailPictureId=' + item.pictureid + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
},
// 删除
......
src/views/modules/service/branch-add-or-update.vue
......@@ -43,7 +43,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -53,6 +53,7 @@
data () {
return {
visible: false,
disabled: false,
dataForm: {
id: 0,
branchName: '',
......@@ -98,6 +99,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/branch/update`),
method: 'post',
......@@ -118,6 +120,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/service/doc-add-or-update.vue
......@@ -5,8 +5,7 @@
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" >
<el-form-item label="标题：" prop="title">
<el-input v-model="dataForm.title" placeholder="请输入显示标题" :disabled='!showInfo'></el-input>
<p v-show="showInfo">{{dataForm.title}}</p>
<el-input v-model="dataForm.title" placeholder="请输入显示标题" ></el-input>
</el-form-item>
<el-form-item label='级别：' prop='levels'>
<el-select v-model="dataForm.levels" placeholder="请输入级别" >
......@@ -17,18 +16,15 @@
:value="item.value">
</el-option>
</el-select>
<p v-show="showInfo">{{dataForm.levels}}</p>
</el-form-item>
<el-form-item label='类型：' prop='category'>
<el-select v-model="dataForm.category" placeholder="请输入类型" @change="changeType" :disabled='!showInfo'>
<el-select v-model="dataForm.category" placeholder="请输入类型" @change="changeType" >
<el-option label='表格下载' value="1"></el-option>
<el-option label="分支机构培训计划" value="2"></el-option>
</el-select>
<p v-show="showInfo">{{dataForm.categoryname}}</p>
</el-form-item>
<el-form-item label="作者：" prop="author">
<el-input v-model="dataForm.author" placeholder="请输入作者" :disabled='!showInfo'></el-input>
<p v-show="showInfo">{{dataForm.author}}</p>
<el-input v-model="dataForm.author" placeholder="请输入作者" ></el-input>
</el-form-item>
<el-form-item label="文件：" prop="file" class="pic">
<!-- <el-upload
......@@ -42,22 +38,20 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload> -->
<el-upload
v-show="!showInfo"
class="avatar-uploaderFile"
action=""
:show-file-list="false"
:http-request="UploadFile"
:before-upload="beforeUploadFile">
<el-button size="small" type="primary" v-show="showInfo">点击上传</el-button>
<el-button size="small" type="primary" >点击上传</el-button>
</el-upload>
<a :href="dataForm.docfile" target="_blank">{{dataForm.docfile}}</a>
<p v-show="showInfo"><a :href="dataForm.docfile"></a></p>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<span slot="footer" class="dialog-footer" >
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -71,6 +65,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
dataForm: {
id: 0,
title: '',
......@@ -159,6 +154,7 @@ export default {
this.loading = true
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
if (this.dataForm.docfile === '' || this.dataForm.docfile === null) {
this.$message.error('文件未上传，请上传文件！')
return
......@@ -184,6 +180,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/standard/cases-add-or-update.vue
......@@ -89,7 +89,7 @@
</el-form>
<span slot="footer" class="dialog-footer" v-show="!showInfo">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -106,6 +106,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -223,6 +224,7 @@ export default {
this.$refs['dataForm'].validate((valid) => {
console.log(valid, '表单提交表单提交')
if (valid) {
this.disabled = true
this.loading = true
this.$http({
url: this.$http.adornUrl(
......@@ -248,6 +250,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/standard/cases.vue
......@@ -416,13 +416,25 @@ export default {
console.log(info, '预览')
let url
if (!info.directpath || info.directpath === null) {
url = `${this.$store.state.config.urls}/Service/Partners/caseMsg?id=${info.id}`
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/Service/Partners/caseMsg?id=' + info.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(info.directpath)) {
url = `${this.$store.state.config.urls}${info.directpath}`
window.open(url, '_blank')
} else {
url = info.directpath
window.open(url, '_blank')
}
window.open(url, '_blank')
},
// 新增 / 修改
addOrUpdateHandle (id, showInfo) {
......
src/views/modules/standard/partners-add-or-update.vue
......@@ -113,7 +113,7 @@
</el-form>
<span slot="footer" class="dialog-footer" >
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -130,6 +130,7 @@ export default {
loading: false,
showInfo: false,
visible: false,
disabled: false,
defaultProps: {
children: 'children',
label: 'label'
......@@ -284,6 +285,7 @@ export default {
this.$refs['dataForm'].validate((valid) => {
console.log(valid, '表单提交表单提交')
if (valid) {
this.disabled = true
this.loading = true
this.$http({
url: this.$http.adornUrl(
......@@ -313,6 +315,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/standard/partners.vue
......@@ -464,13 +464,25 @@ export default {
console.log(info, '预览')
let url
if (!info.directpath || info.directpath === null) {
url = `${this.$store.state.config.urls}/Service/Partners/content?id=${info.id}`
this.$http({
url: this.$http.adornUrl('/office/token/getToken'),
method: 'post'
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
window.open(this.$store.state.config.urls + '/Service/Partners/content?id=' + info.id + '&token=' + data.data, '_blank')
} else {
this.$message.error('获取失败')
}
})
} else if (/^\//.test(info.directpath)) {
url = `${this.$store.state.config.urls}${info.directpath}`
window.open(url, '_blank')
} else {
url = info.directpath
window.open(url, '_blank')
}
window.open(url, '_blank')
},
// 新增 / 修改
......
src/views/modules/sys/config-add-or-update.vue
......@@ -16,7 +16,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -26,6 +26,7 @@
data () {
return {
visible: false,
disabled:false,
dataForm: {
id: 0,
paramKey: '',
......@@ -67,6 +68,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -85,6 +87,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/sys/menu-add-or-update.vue
......@@ -72,7 +72,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -91,6 +91,7 @@
}
return {
visible: false,
disabled: false,
dataForm: {
id: 0,
type: 1,
......@@ -181,6 +182,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -203,6 +205,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/sys/role-add-or-update.vue
......@@ -23,7 +23,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -34,6 +34,7 @@
data () {
return {
visible: false,
disabled: false,
menuList: [],
menuListTreeProps: {
label: 'name',
......@@ -91,6 +92,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/sys/role/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -109,6 +111,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
src/views/modules/sys/user-add-or-update.vue
......@@ -33,7 +33,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()" :disabled="disabled">确定</el-button>
</span>
</el-dialog>
</template>
......@@ -74,6 +74,7 @@
}
return {
visible: false,
disabled: false,
roleList: [],
dataForm: {
id: 0,
......@@ -144,6 +145,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.disabled = true
this.$http({
url: this.$http.adornUrl(`/office/sys/user/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
......@@ -166,6 +168,7 @@
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.disabled = false
}
})
} else {
......
static/plugins/ueditor-1.4.3.3/themes/default/css/ueditor.css
......@@ -143,7 +143,8 @@ div.edui-box {
border-radius: 4px;
}
.edui-editor div{
width:auto!important;
width:auto;
/* width:auto!important; */
height:auto;
}
.edui-default .edui-editor-toolbarbox {
......@@ -181,6 +182,7 @@ div.edui-box {
}
.edui-default .edui-editor-iframeholder {
width: 100%!important;
position: relative;
/*for fix ie6 toolbarmsg under iframe bug. relative -> static */
/*_position: static !important;*
......
static/plugins/ueditor-1.4.3.3/ueditor.all.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/plugins/ueditor-1.4.3.3/ueditor.config.js
......@@ -26,12 +26,12 @@
window.UEDITOR_CONFIG = {
// 为编辑器实例添加一个路径，这个不能被注释
UEDITOR_HOME_URL: URL,
UEDITOR_HOME_URL: URL,
// 服务器统一请求接口路径
// serverUrl: URL + 'jsp/controller.jsp',
// serverUrl: 'http://81.68.189.225:9091/office/ueditorConfig',
serverUrl: window.SITE_CONFIG.baseUrl + '/office/ueditorConfig',
serverUrl: ' http://dynamic.gs1cn.org/office/ueditorConfig',
// 工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
toolbars: [[
......@@ -270,7 +270,7 @@
// fontfamily
// 字体设置 label留空支持多语言自动切换，若配置，则以配置值为准
//, 'fontfamily':[
// 'fontfamily':[
// { label:'',name:'songti',val:'宋体,SimSun'},
// { label:'',name:'kaiti',val:'楷体,楷体_GB2312, SimKai'},
// { label:'',name:'yahei',val:'微软雅黑,Microsoft YaHei'},
......@@ -453,7 +453,7 @@
// output xss过滤
outputXssFilter: true,
// xss过滤白名单 名单来源: https://raw.githubusercontent.com/leizongmin/js-xss/master/lib/default.js
whitList: {
whiteList: {
a: ['target', 'href', 'title', 'class', 'style'],
abbr: ['title', 'class', 'style'],
address: ['class', 'style'],
......@@ -491,7 +491,7 @@
header: [],
hr: [],
i: ['class', 'style'],
img: ['src', 'alt', 'title', 'width', 'height', 'id', '_src', 'loadingclass', 'class', 'data-latex'],
img: ['src', 'alt', 'title', 'width', 'height', 'id', '_src', '_url', 'loadingclass', 'class', 'data-latex'],
ins: ['datetime'],
li: ['class', 'style'],
mark: [],
......@@ -516,7 +516,10 @@
tt: [],
u: [],
ul: ['class', 'style'],
video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style']
video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style'],
source: ['src', 'type'],
embed: ['type', 'class', 'pluginspage', 'src', 'width', 'height', 'align', 'style', 'wmode', 'play',
'loop', 'menu', 'allowscriptaccess', 'allowfullscreen']
}
}
......
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