|
@@ -30,7 +30,7 @@ import TemplatePage from '@/components/template/template-page-1.vue'
|
|
import import_mixin from '@/components/template/import_mixin.js'
|
|
import import_mixin from '@/components/template/import_mixin.js'
|
|
import ImageUpload from '@/components/file-upload'
|
|
import ImageUpload from '@/components/file-upload'
|
|
import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
|
|
import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
|
|
-import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
|
|
|
|
|
|
+import { noticeReadList, noticeReadListExport, getNoticeDetail, zfapiNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
|
|
import { memberListPageV2 } from "@/api/masterManagement";
|
|
import { memberListPageV2 } from "@/api/masterManagement";
|
|
import { getList as getListaa } from "@/api/merchant";
|
|
import { getList as getListaa } from "@/api/merchant";
|
|
export default {
|
|
export default {
|
|
@@ -135,9 +135,9 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
// 列表请求函数
|
|
// 列表请求函数
|
|
- getList: noticeListPageV2,
|
|
|
|
|
|
+ getList: noticeReadList,
|
|
// 列表导出函数
|
|
// 列表导出函数
|
|
- exportList: noticePageExport,
|
|
|
|
|
|
+ exportList: noticeReadListExport,
|
|
// 表格列解析渲染数据更改
|
|
// 表格列解析渲染数据更改
|
|
columnParsing(item, defaultData) {
|
|
columnParsing(item, defaultData) {
|
|
return defaultData
|
|
return defaultData
|
|
@@ -157,9 +157,10 @@ export default {
|
|
triggerEvent: () => {
|
|
triggerEvent: () => {
|
|
this.formCancel()
|
|
this.formCancel()
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
- getNoticeDetail({
|
|
|
|
- noticeId: row.noticeId
|
|
|
|
|
|
+ zfapiNoticeDetail({
|
|
|
|
+ id: row.id
|
|
}).then(res => {
|
|
}).then(res => {
|
|
|
|
+ console.log(res)
|
|
Object.assign(this.formData, res.data, {
|
|
Object.assign(this.formData, res.data, {
|
|
files: res.data.files ? res.data.files.map(item => ({
|
|
files: res.data.files ? res.data.files.map(item => ({
|
|
...item,
|
|
...item,
|