diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip new file mode 100644 index 0000000..28a863d --- /dev/null +++ b/admin-web-master/dist.zip diff --git a/admin-web-master/src/api/salesReport.js b/admin-web-master/src/api/salesReport.js index d26a48e..6855843 100644 --- a/admin-web-master/src/api/salesReport.js +++ b/admin-web-master/src/api/salesReport.js @@ -16,4 +16,11 @@ export function cereSalesPage(data) { data }) } - +// 销售统计 +export function getSalesReportingToSalesStatistics(data) { + return request({ + url: '/cereSalesReporting/getSalesReportingToSalesStatistics', + method: 'post', + data + }) +} diff --git a/admin-web-master/src/router/index.js b/admin-web-master/src/router/index.js index 9f6d2d5..6fc4aea 100644 --- a/admin-web-master/src/router/index.js +++ b/admin-web-master/src/router/index.js @@ -760,6 +760,16 @@ export const mainRoutes = [ hidden: true }, { + path: '/investigation/wenjuanList', + component: () => import('@/views/investigation/wenjuanList'), + hidden: true + }, + { + path: '/investigation/wenjuanAnswer', + component: () => import('@/views/investigation/wenjuanAnswer'), + hidden: true + }, + { path: '/setup', component: Layout, redirect: '/setup/user', diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index cf70517..9860c64 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,13 +16,13 @@ let hostall = window.location.href; let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - // baseURL = 'http://128.10.249.39:9003'; + // baseURL = 'http://128.10.249.42:9003'; } else { diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index 776afaa..f35ad56 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; // baseURL = 'http://172.16.61.125:9004'; // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - baseURL = 'http://128.10.249.39:9004'; + baseURL = 'http://128.10.249.42:9004'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue index a5e2c4a..ce32d1f 100644 --- a/admin-web-master/src/views/activity/activityHis.vue +++ b/admin-web-master/src/views/activity/activityHis.vue @@ -2,7 +2,7 @@
-
品牌策划 > 活动策划 > 活动策划调整
@@ -2802,10 +2802,12 @@ this.ListOne = item.planName for (let i = 0; i < this.tableDa.length; i++) { this.tableDa[i].detailsId = res.data.id MingAdd(this.tableDa[i]).then(res => { - this.ggXin = false - this.getAll() + }) } + this.ggXin = false + this.zhixingBian = false + this.getAll() }) } else { @@ -2819,6 +2821,7 @@ this.ListOne = item.planName this.zhixingList.updateUser = localStorage.getItem('roleName') actEdit(this.zhixingList).then(() => { this.ggXin = false + this.zhixingBian = false this.getAll() }) } diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue index 90ab818..ac8fdf0 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue @@ -1556,6 +1556,7 @@ this.zhixingList.createUser = localStorage.getItem('roleName') actAdd(this.zhixingList).then(()=>{ this.ggXin = false + this.zhixingBian = false this.getAll() }) } else { @@ -1568,6 +1569,7 @@ this.zhixingList.updateUser = localStorage.getItem('roleName') actEdit(this.zhixingList).then(()=>{ this.ggXin = false + this.zhixingBian = false this.getAll() }) } diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue index cae3332..6e684b8 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue @@ -2,7 +2,7 @@
-
品牌策划 > 氛围策划 > 氛围策划调整
@@ -743,6 +743,217 @@
+
+
+
+ + + + + {{duibiList.planName || ''}} + + + + {{duibiList.eventAddrs || ''}} + + + + + {{formatTimestampToDate(duibiList.eventStartTime)}}-{{formatTimestampToDate(duibiList.eventEndTime)}} + + + + + {{duibiList.participants}} + + + + + {{duibiList.sponsor}} + + + + + +
+
+ +
+
+ + + + + {{duibiList.internalLaborCostEstimation}} + + + + {{duibiList.externalLaborCostEstimation}} + + + + + + {{duibiList.costEstimationGoods}} + + + + + {{duibiList.setCostEstimate}} + + + + + {{duibiList.estimatedPromotionalExpenses}} + + + + + {{duibiList.otherNecessaryEstimates}} + + + + + {{duibiList.totalCostEstimation}} + + + + + {{duibiList.notes}} + + + +
+
+
+ +
+ + + + {{duibiList.expectedAttractTraffic}} + + + + + {{duibiList.expectedParticipation}} + + + + + {{duibiList.expectedDirectBenefits}} + + + + + {{duibiList.expectedIndirectBenefits}} + + + + + +
+
+
+ +
+ + + + {{duibiList.createUser}} + + + + + {{duibiList.createDate}} + + + + + {{duibiList.updateUser}} + + + + + {{duibiList.updateDate}} + + + + + +
+
+ +
@@ -2739,6 +2950,7 @@ this.ListOne = item.planName this.zhixingList.createUser = localStorage.getItem('roleName') actAdd(this.zhixingList).then(() => { this.ggXin = false + this.zhixingBian = false this.getAll() }) } else { @@ -2751,6 +2963,7 @@ this.ListOne = item.planName this.zhixingList.updateUser = localStorage.getItem('roleName') actEdit(this.zhixingList).then(() => { this.ggXin = false + this.zhixingBian = false this.getAll() }) } diff --git a/admin-web-master/src/views/investigation/wenjuanAnswer.vue b/admin-web-master/src/views/investigation/wenjuanAnswer.vue new file mode 100644 index 0000000..f06ec2a --- /dev/null +++ b/admin-web-master/src/views/investigation/wenjuanAnswer.vue @@ -0,0 +1,1387 @@ + + + + + + \ No newline at end of file diff --git a/admin-web-master/src/views/investigation/wenjuanList.vue b/admin-web-master/src/views/investigation/wenjuanList.vue new file mode 100644 index 0000000..68c38c6 --- /dev/null +++ b/admin-web-master/src/views/investigation/wenjuanList.vue @@ -0,0 +1,3294 @@ +