master
lion 3 years ago
parent 439963fd07
commit b2b83c8179

@ -3,7 +3,7 @@ tinymce.PluginManager.add('axupimgs', function(editor, url) {
window.axupimgs={}; //扔外部公共变量,也可以扔一个自定义的位置
var baseURL = `${process.env.VUE_APP_BASE_API}`
// var baseURL = 'http://localhost:8012/'
var iframe1 =baseURL+'tinymce/plugins/axupimgs/upfiles.html';
var iframe1 =baseURL+'admin/tinymce/plugins/axupimgs/upfiles.html';
axupimgs.images_upload_handler = editor.getParam('images_upload_handler', undefined, 'function');
axupimgs.images_upload_base_path = editor.getParam('images_upload_base_path', '', 'string');
axupimgs.axupimgs_filetype = editor.getParam('axupimgs_filetype', '.png,.gif,.jpg,.jpeg', 'string');

@ -16,9 +16,24 @@
:total="total"
@pageSizeChange="e => select.pageSize = e"
@pageIndexChange="pageChange"
:table-item="table"
@delete="deleteActivity"
@editor="editorActivity"></xy-table>
:table-item="table">
<template v-slot:btns>
<el-table-column fixed="right" label="操作" width="220" header-align="center">
<template slot-scope="scope">
<Button type="primary" size="small" @click="editorActivity(scope.row.id,'editor')"></Button>
<Button type="primary" size="small" style="margin-left: 10px;" @click="editorActivity(scope.row.id,'copy')"></Button>
<Poptip
transfer
confirm
title="确认要删除吗?"
@on-ok="deleteActivity(scope.row)">
<Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
</Poptip>
</template>
</el-table-column>
</template>
</xy-table>
<addActivity ref="addActivity" @refresh="getActivities"></addActivity>
<showActiveOrder :id="activeId" :name="activeName" :is-show.sync="isShowOrder"></showActiveOrder>
@ -225,9 +240,9 @@ export default {
this.getActivities()
})
},
editorActivity(row){
this.$refs['addActivity'].id = row.id
this.$refs['addActivity'].type = 'editor'
editorActivity(id,type){
this.$refs['addActivity'].id = id
this.$refs['addActivity'].type = type
this.$refs['addActivity'].isShow = true
}
},

@ -579,7 +579,7 @@ companykeyword:"",
return
}
if(this.type === 'add'){
if(this.type === 'add'||this.type === 'copy'){
console.log(this.form)
// return
store({
@ -607,7 +607,7 @@ companykeyword:"",
apply_end:this.form.applyDate[1],
active_playbill:this.form.activePlaybill,
sort:this.form.sort,
content: replaceAll(this.form.content,'../storage/files',`${process.env.VUE_APP_BASE_API}storage/files`)
content: replaceAll(this.form.content,'../storage/files',`${process.env.VUE_APP_BASE_API}storage/files`)
}).then(res => {
Message({
@ -662,7 +662,7 @@ companykeyword:"",
watch:{
isShow(newVal){
if(newVal){
if(this.type === 'editor'){
if(this.type === 'editor'||this.type === 'copy'){
this.getDetail()
}
}else{

Loading…
Cancel
Save