diff --git a/yanshouban/src/api/account.js b/yanshouban/src/api/account.js index 0a6ff92..e326f76 100644 --- a/yanshouban/src/api/account.js +++ b/yanshouban/src/api/account.js @@ -39,3 +39,11 @@ export function quDel(data) { }) } +export function statisticalAnalysis(data) { + return request({ + url: 'cereChannelManagement/statisticalAnalysis', + method: 'post', + data + }) +} + diff --git a/yanshouban/src/api/activityBz.js b/yanshouban/src/api/activityBz.js index de78c29..dbd3757 100644 --- a/yanshouban/src/api/activityBz.js +++ b/yanshouban/src/api/activityBz.js @@ -237,3 +237,11 @@ export function effectEvaluation(data) { data }) } +//历史方案查询 +export function lishiDeta(data) { + return request({ + url: '/cereEventDetailsLog/getAll', + method: 'post', + data + }) +} diff --git a/yanshouban/src/api/information.js b/yanshouban/src/api/information.js index ed4353b..6c98018 100644 --- a/yanshouban/src/api/information.js +++ b/yanshouban/src/api/information.js @@ -106,3 +106,24 @@ export function statistical(data) { data }) } + +// 商户导入管理模板 +export const excelAdd = (data = {}) => { + return request({ + url: '/cereBasicInformationShop/excelAdd', + method: 'post', + data, + headers: { + 'Content-type': 'multipart/form-data' + } + }) +} + +// 租赁信息 +export function zulxin(data) { + return request({ + url: `cereBasicInformationShop/${data.venueNumber}`, + method: 'get', + data + }) +} diff --git a/yanshouban/src/api/kefuServeBao.js b/yanshouban/src/api/kefuServeBao.js index c83cd71..565bb82 100644 --- a/yanshouban/src/api/kefuServeBao.js +++ b/yanshouban/src/api/kefuServeBao.js @@ -16,6 +16,14 @@ export function ReportDel(data) { data }) } +// 报修修改 +export function Reportedit(data) { + return request({ + url: '/cereReportIssuesRepairs/edit', + method: 'post', + data + }) +} // 投诉 export function ComplaintGetAll(data) { return request({ diff --git a/yanshouban/src/api/map1.js b/yanshouban/src/api/map1.js index 69dd3f7..f538869 100644 --- a/yanshouban/src/api/map1.js +++ b/yanshouban/src/api/map1.js @@ -44,3 +44,12 @@ export function likeGet(data) { data }) } + +// 租赁信息 +export function zulxin(data) { + return request({ + url: `cereBasicInformationShop/${data.venueNumber}`, + method: 'get', + data + }) +} diff --git a/yanshouban/src/api/piaowu.js b/yanshouban/src/api/piaowu.js index 8ef1c15..0f2d819 100644 --- a/yanshouban/src/api/piaowu.js +++ b/yanshouban/src/api/piaowu.js @@ -89,3 +89,14 @@ export function excelToRefundData(data) { responseType: 'blob' }) } + + +// 总销售额导出 +export function excelToTotalSales(data) { + return request({ + url: '/ticket/excelToTotalSales', + method: 'post', + data, + responseType: 'blob' + }) +} diff --git a/yanshouban/src/api/sam.js b/yanshouban/src/api/sam.js index c573dd1..019ad1f 100644 --- a/yanshouban/src/api/sam.js +++ b/yanshouban/src/api/sam.js @@ -33,3 +33,34 @@ export function ceDel(data) { data }) } + + +export function addAddress(data) { + return request({ + url: '/cereBasicInformationShopLocation/add', + method: 'post', + data + }) +} + +export function deleteAddress(data) { + return request({ + url: `cereBasicInformationShopLocation/delete/${data.id}`, + method: 'get', + data + }) +} +export function editAddress(data) { + return request({ + url: '/cereBasicInformationShopLocation/edit', + method: 'post', + data + }) +} +export function getAllAddress(data) { + return request({ + url: '/cereBasicInformationShopLocation/getAll', + method: 'post', + data + }) +} diff --git a/yanshouban/src/utils/request.js b/yanshouban/src/utils/request.js index 26311a8..e34cb53 100644 --- a/yanshouban/src/utils/request.js +++ b/yanshouban/src/utils/request.js @@ -21,7 +21,7 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.1 // PREFIX = 'http://172.16.61.48/meserver/admin-server'; // PREFIX = 'http://192.168.2.213:9003'; // PREFIX = 'http://8.130.38.56:8019/admin-server'; - PREFIX = 'http://192.168.8.106:9003'; + PREFIX = 'http://192.168.2.250:9003'; // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'; // PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; diff --git a/yanshouban/src/views/activity/activityBz.vue b/yanshouban/src/views/activity/activityBz.vue index f601bca..13a093e 100644 --- a/yanshouban/src/views/activity/activityBz.vue +++ b/yanshouban/src/views/activity/activityBz.vue @@ -97,6 +97,18 @@ + + + + + + + + @@ -359,7 +371,8 @@ MingEdit, MingDel, fujiaAdd, - imgUp + imgUp, + lishiDeta } from '../../api/activityBz' // import { Editor, Toolbar } from '@wangeditor/editor-for-vue' import wangEditor from "@/components/editor/index"; @@ -387,6 +400,7 @@ wangEditor, upimg }, + data() { return { uploadFileUrl: uploadUrl, // 请求地址 @@ -481,6 +495,8 @@ yugu: null, fun: null }, +fenxiData:[], +lishiList:'', } }, @@ -490,6 +506,7 @@ }, mounted() { this.editTrue = true + this.lishi() }, methods: { //获取当前时间 @@ -504,6 +521,22 @@ this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; }, + lishi(){ + lishiDeta({eventDetailsType:'1'}).then(res=>{ + this.fenxiData = res.data + }) + }, + lichange(e){ + + let msg =this.fenxiData[e] + let obj = JSON.parse(msg.originalData) + + for (let key in obj) { + if (this.ruleForm.hasOwnProperty(key)) { + this.ruleForm[key] = obj[key]; + } + } + }, zancun() {}, //上传 submitUpload() { diff --git a/yanshouban/src/views/activity/activityHis.vue b/yanshouban/src/views/activity/activityHis.vue new file mode 100644 index 0000000..6f3adcd --- /dev/null +++ b/yanshouban/src/views/activity/activityHis.vue @@ -0,0 +1,2759 @@ + + + + + + diff --git a/yanshouban/src/views/activity/activitySp.vue b/yanshouban/src/views/activity/activitySp.vue index 2a9852e..50ef0fa 100644 --- a/yanshouban/src/views/activity/activitySp.vue +++ b/yanshouban/src/views/activity/activitySp.vue @@ -59,7 +59,7 @@ - + diff --git a/yanshouban/src/views/activity/index.vue b/yanshouban/src/views/activity/index.vue index d8fb7b5..a5e1549 100644 --- a/yanshouban/src/views/activity/index.vue +++ b/yanshouban/src/views/activity/index.vue @@ -86,9 +86,9 @@ - +