@@ -107,7 +107,7 @@
+
取消
保存
@@ -528,13 +528,14 @@ this.fucha(this.secondData.id)
bianji() {
this.secondData.pageNumber = 1
this.secondData.pageSize = 10
+ this.secondData.updateDate = this.updateCurrentTime()
+ this.secondData.updateUser = localStorage.getItem('roleName')
let that = this
Vue.delete(that.secondData,'createDate')
let newobj = this.removeEmptyValues(this.secondData)
this.$refs.jibenFrom.validate((valid) => {
if (valid) {
- this.secondData.updateDate = this.updateCurrentTime()
-
+
xiangedit(newobj).then(res=>{
this.$emit('BianchildClose', false)
})
diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue
index 96e27c6..3e57966 100644
--- a/admin-web-master/src/views/activity/activityBz.vue
+++ b/admin-web-master/src/views/activity/activityBz.vue
@@ -9,7 +9,7 @@
-
+
+ label-width="150px" style="position: relative">
+ :label="item.planName" :value="index">
@@ -133,7 +133,7 @@
基本信息
-
+
活动明细
添加明细
@@ -142,7 +142,7 @@
@@ -155,7 +155,8 @@
-
+
+
@@ -172,23 +173,23 @@
-
+
活动成本
-
-
-
-
-
@@ -216,14 +217,14 @@
-
-
-
@@ -250,12 +251,12 @@
-
+
预估效果信息
-
@@ -273,13 +274,13 @@
-
-
-
+
@@ -350,7 +351,7 @@
append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
相关附件
-
-
+
@@ -392,7 +393,8 @@
MingDel,
fujiaAdd,
imgUp,
- lishiDeta
+ lishiDeta,
+ queryByPage
} from '../../api/activityBz'
// import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
import wangEditor from "@/components/editor/index";
@@ -557,22 +559,55 @@
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
lishi() {
- lishiDeta({
- eventDetailsType: '1'
+ queryByPage({
+ pageNumber: 1,
+ pageSize: 10,
+ dataOwnership: '1',
+ isDraft: 0,
+ state:'5'
+
}).then(res => {
- this.fenxiData = res.data
+ this.fenxiData = res.data.content
})
+
},
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];
- }
+ console.log(msg)
+ // let obj = msg.originalData
+ this.ruleForm={
+ // classificationCode: msg.classificationCode,
+ plan_Time: [msg.eventStartTime,msg.eventEndTime],
+ planName: msg.planName, //方案名称
+ planType: '活动策划', //类型
+ eventAddrs: msg.eventAddrs, //活动地点
+ eventStartTime: msg.eventStartTime, //活动开始时间
+ eventEndTime: msg.eventEndTime, //活动结束时间
+ eventTheme:msg.eventTheme, //活动主题
+ sponsor: msg.sponsor, //活动主办方
+ participants: msg.participants, //活动参与方
+ rangeSetting: msg.rangeSetting,
+ mainPurpose: msg.mainPurpose, //活动主要目的
+ coverPoster: msg.coverPoster, //封面海报
+ internalLaborCostEstimation: msg.internalLaborCostEstimation, //内部人工成本预估
+ externalLaborCostEstimation: msg.externalLaborCostEstimation, //外部人工成本预估
+ costEstimationGoods: msg.costEstimationGoods, //商品成本预估
+ setCostEstimate: msg.setCostEstimate, //设置成本预估
+ estimatedPromotionalExpenses: msg.estimatedPromotionalExpenses, //宣传费用预估
+ otherNecessaryEstimates:msg.otherNecessaryEstimates, //其他成本预估
+ totalCostEstimation: msg.totalCostEstimation, //总成本预估
+ notes: msg.notes, //备注
+ expectedAttractTraffic: msg.expectedAttractTraffic, //预计吸引流量
+ expectedParticipation: msg.expectedParticipation, //预计参与人数
+ expectedDirectBenefits: msg.expectedDirectBenefits, //预计直接收益
+ expectedIndirectBenefits: msg.expectedIndirectBenefits, //预计间接收益
}
+ // for (let key in obj) {
+ // if (this.ruleForm.hasOwnProperty(key)) {
+ // this.ruleForm[key] = obj[key];
+ // }
+ // }
},
zancun() {},
//上传
@@ -669,6 +704,7 @@
let FlieName = this.ruleForm.planName
this.updateCurrentTime();
this.ruleForm.createDate = this.currentTime
+ this.ruleForm.createUser = localStorage.getItem('roleName')
this.ruleForm.dataOwnership = '1'
// this.$nextTick(() => {
// var bian = document.getElementById('bian')
@@ -1023,7 +1059,7 @@
border: none;
margin-right: 10px;
background-color: #F2F2F2;
- font-size: 12px;
+ font-size: 14px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding: 0 15px;
diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue
index 3a0f9e5..261b8b1 100644
--- a/admin-web-master/src/views/activity/activityHis.vue
+++ b/admin-web-master/src/views/activity/activityHis.vue
@@ -156,7 +156,7 @@
@@ -203,7 +203,7 @@
-
+
@@ -217,14 +217,14 @@
-
-
@@ -394,7 +394,7 @@
min-width="15%">
-
+
@@ -423,14 +423,14 @@
label-width="120px" style="position: relative">
-
-
-
+
@@ -447,19 +447,19 @@
-
+
-
+
-
+
@@ -468,7 +468,7 @@
-
+
@@ -511,7 +511,7 @@
-
+
@@ -519,7 +519,7 @@
-
+
@@ -679,7 +679,7 @@
-
+
@@ -693,7 +693,7 @@
:labelStyle="labelStyle">
- 内部人力成本预估
+ 内部人力成本预估(/元)
- 外部人力成本预估
+ 外部人力成本预估(/元)
- 商品成本预估
+ 商品成本预估(/元)
- 设备成本预估
+ 设备成本预估(/元)
- 宣传费用预估
+ 宣传费用预估(/元)
- 其他必要成本预估
+ 其他必要成本预估(/元)
- 总成本预估
+ 总成本预估(/元)
- 预计直接收益
+ 预计直接收益(/元)
- 预计间接收益
+ 预计间接收益(/元)
-
+
@@ -936,14 +936,14 @@
-
-
@@ -1123,7 +1123,7 @@
-
+
@@ -1137,43 +1137,43 @@
- 内部人力成本预估
+ 内部人力成本预估(/元)
{{lixiang.internalLaborCostEstimation}}
- 外部人力成本预估
+ 外部人力成本预估(/元)
{{lixiang.externalLaborCostEstimation}}
- 商品成本预估
+ 商品成本预估(/元)
{{lixiang.costEstimationGoods}}
- 设备成本预估
+ 设备成本预估(/元)
{{lixiang.setCostEstimate}}
- 宣传费用预估
+ 宣传费用预估(/元)
{{lixiang.estimatedPromotionalExpenses}}
- 其他必要成本预估
+ 其他必要成本预估(/元)
{{lixiang.otherNecessaryEstimates}}
- 总成本预估
+ 总成本预估(/元)
{{lixiang.totalCostEstimation}}
@@ -1204,13 +1204,13 @@
- 预计直接收益
+ 预计直接收益(/元)
{{lixiang.expectedDirectBenefits}}
- 预计间接收益
+ 预计间接收益(/元)
{{lixiang.expectedIndirectBenefits}}
@@ -1286,7 +1286,7 @@
-
+
@@ -1616,19 +1616,19 @@
externalLaborCostEstimation: '',
tableData3: [{
id: 0,
- name: '商品成本预估',
+ name: '商品成本预估(/元)',
planName: '',
- text: '设备成本预估',
+ text: '设备成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '宣传费用预估',
+ name: '宣传费用预估(/元)',
planName: '',
- text: '其他必要成本预估',
+ text: '其他必要成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '总成本预估',
+ name: '总成本预估(/元)',
planName: '',
text: '备注',
eventTheme: ''
@@ -1637,9 +1637,9 @@
expectedParticipation: '',
tableData4: [{
id: 0,
- name: '预计直接收益',
+ name: '预计直接收益(/元)',
planName: '',
- text: '预计间接收益',
+ text: '预计间接收益(/元)',
eventTheme: '-'
}],
createUser: '',
@@ -1972,7 +1972,7 @@
}).then(res => {
this.secondData = res.data.content[0]
//基本信息
- // that.id=res.data.content[0].id
+ that.id=res.data.content[0].id
that.text = res.data.content[0].planName
that.tableData1[0].eventTheme = res.data.content[0].planType
that.tableData1[0].planName = res.data.content[0].eventAddrs
@@ -1999,11 +1999,10 @@
that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
//系统信息
- that.createUser = res.data.content[0].createUser
- that.createDate = res.data.content[0].createDate
-
- that.tableData5[0].planName = '-'
- that.tableData5[0].eventTheme = res.data.content[0].updateUser
+ that.createUser = res.data.content[0].createUser
+ that.createDate = res.data.content[0].createDate
+ that.tableData5[0].planName = res.data.content[0].updateDate
+ that.tableData5[0].eventTheme = res.data.content[0].updateUser
}).catch(err => {
console.log(err)
@@ -2230,7 +2229,7 @@
console.log(item)
let that = this
actPage({
- detailsId: titem.id,
+ detailsId: item.id,
pageNumber: 1,
pageSize: 10,
}).then(res => {
diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue
index e99a6eb..62b581d 100644
--- a/admin-web-master/src/views/activity/activitySp.vue
+++ b/admin-web-master/src/views/activity/activitySp.vue
@@ -657,7 +657,7 @@
-
+
@@ -671,14 +671,14 @@
-
-
@@ -852,7 +852,7 @@
min-width="15%">
-
+
@@ -880,7 +880,7 @@
label-width="120px" style="position: relative">
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -305,7 +305,7 @@
活动效果分析
{{ zhixingList.costEstimationGoods }}
@@ -907,21 +907,21 @@
{{ zhixingList.setCostEstimate }}
{{ zhixingList.estimatedPromotionalExpenses }}
{{ zhixingList.otherNecessaryEstimates }}
@@ -931,7 +931,7 @@
{{ zhixingList.totalCostEstimation }}
@@ -978,7 +978,7 @@
{{ zhixingList.expectedDirectBenefits }}
@@ -987,7 +987,7 @@
{{ zhixingList.expectedIndirectBenefits }}
@@ -1149,19 +1149,19 @@
externalLaborCostEstimation: '',
tableData3: [{
id: 0,
- name: '商品成本预估',
+ name: '商品成本预估(/元)',
planName: '',
- text: '设备成本预估',
+ text: '设备成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '宣传费用预估',
+ name: '宣传费用预估(/元)',
planName: '',
- text: '其他必要成本预估',
+ text: '其他必要成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '总成本预估',
+ name: '总成本预估(/元)',
planName: '',
text: '备注',
eventTheme: ''
@@ -1170,9 +1170,9 @@
expectedParticipation: '',
tableData4: [{
id: 0,
- name: '预计直接收益',
+ name: '预计直接收益(/元)',
planName: '',
- text: '预计间接收益',
+ text: '预计间接收益(/元)',
eventTheme: '-'
}],
createUser: '',
@@ -1582,7 +1582,7 @@
}).then(res => {
this.secondData = res.data.content[0]
//基本信息
- // that.id=res.data.content[0].id
+ that.id=res.data.content[0].id
that.text = res.data.content[0].planName
that.tableData1[0].eventTheme = res.data.content[0].planType
that.tableData1[0].planName = res.data.content[0].eventAddrs
@@ -1609,11 +1609,10 @@
that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
//系统信息
- that.createUser = res.data.content[0].createUser
- that.createDate = res.data.content[0].createDate
-
- that.tableData5[0].planName = '-'
- that.tableData5[0].eventTheme = res.data.content[0].updateUser
+ that.createUser = res.data.content[0].createUser
+ that.createDate = res.data.content[0].createDate
+ that.tableData5[0].planName = res.data.content[0].updateDate
+ that.tableData5[0].eventTheme = res.data.content[0].updateUser
}).catch(err => {
console.log(err)
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index 98f83aa..f3ef54c 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -157,7 +157,7 @@
-
-
+
成本分析
+ 成本分析
吸引游客流量
@@ -351,7 +351,7 @@
-
+
+ label-width="150px" style="position: relative">
+ :label="item.planName" :value="index">
@@ -132,7 +132,7 @@
基本信息
-
+
活动明细
添加明细
@@ -141,7 +141,7 @@
@@ -154,7 +154,8 @@
-
+
+
@@ -171,23 +172,23 @@
-
+
+ label-width="180px" style="position: relative">
-
-
-
-
@@ -217,14 +218,14 @@
-
-
-
@@ -251,13 +252,13 @@
-
+
-
活动成本
-
+
+ label-width="150px" style="position: relative">
-
-
预估效果信息
-
+
@@ -338,8 +339,6 @@
保存
-
-
@@ -352,7 +351,7 @@
+ label-width="150px" style="position: relative">
@@ -360,7 +359,7 @@
+
@@ -394,7 +393,8 @@
MingEdit,
MingDel,
fujiaAdd,
- lishiDeta
+ lishiDeta,
+ queryByPage
} from '../../api/activityBz'
import wangEditor from "@/components/editor/index";
import upimg from "@/components/ImageUpload/index"
@@ -547,22 +547,57 @@
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
lishi() {
- lishiDeta({
- eventDetailsType: '2'
- }).then(res => {
- this.fenxiData = res.data
- })
+ queryByPage({
+ pageNumber: 1,
+ pageSize: 10,
+ dataOwnership: '2',
+ isDraft: 0,
+ state:'5'
+
+ }).then(res => {
+ this.fenxiData = res.data.content
+ })
+
},
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];
- }
+ let msg = this.fenxiData[e]
+
+ // let obj = msg.originalData
+ this.ruleForm={
+ // classificationCode: msg.classificationCode,
+ plan_Time: [msg.eventStartTime,msg.eventEndTime],
+ planName: msg.planName, //方案名称
+ planType: '活动策划', //类型
+ eventAddrs: msg.eventAddrs, //活动地点
+ eventStartTime: msg.eventStartTime, //活动开始时间
+ eventEndTime: msg.eventEndTime, //活动结束时间
+ eventTheme:msg.eventTheme, //活动主题
+ sponsor: msg.sponsor, //活动主办方
+ participants: msg.participants, //活动参与方
+ rangeSetting: msg.rangeSetting,
+ mainPurpose: msg.mainPurpose, //活动主要目的
+ coverPoster: msg.coverPoster, //封面海报
+ internalLaborCostEstimation: msg.internalLaborCostEstimation, //内部人工成本预估
+ externalLaborCostEstimation: msg.externalLaborCostEstimation, //外部人工成本预估
+ costEstimationGoods: msg.costEstimationGoods, //商品成本预估
+ setCostEstimate: msg.setCostEstimate, //设置成本预估
+ estimatedPromotionalExpenses: msg.estimatedPromotionalExpenses, //宣传费用预估
+ otherNecessaryEstimates:msg.otherNecessaryEstimates, //其他成本预估
+ totalCostEstimation: msg.totalCostEstimation, //总成本预估
+ notes: msg.notes, //备注
+ expectedAttractTraffic: msg.expectedAttractTraffic, //预计吸引流量
+ expectedParticipation: msg.expectedParticipation, //预计参与人数
+ expectedDirectBenefits: msg.expectedDirectBenefits, //预计直接收益
+ expectedIndirectBenefits: msg.expectedIndirectBenefits, //预计间接收益
}
+ // 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];
+ // }
+ // }
},
// 切换事件
beforeTabLeave(activeName, oldActiveName) {
@@ -619,6 +654,7 @@
let that = this
let FlieName = this.ruleForm.planName
this.ruleForm.createDate = this.currentTime
+ this.ruleForm.createUser = localStorage.getItem('roleName')
this.ruleForm.dataOwnership = '2'
// this.$nextTick(() => {
// var bian = document.getElementById('bian')
@@ -994,7 +1030,7 @@
border: none;
margin-right: 10px;
background-color: #F2F2F2;
- font-size: 12px;
+ font-size: 14px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding: 0 15px;
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index 56dd384..43699a9 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -67,8 +67,8 @@
-
+
@@ -84,7 +84,7 @@
@selection-change="handleSelectionChange" tooltip-effect="dark"
:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
ref="mulTable">
-
@@ -167,11 +167,11 @@
相关附件
- 取消
-
+ 取消
+
确定
-
+
@@ -182,7 +182,7 @@
氛围效果分析
-
成本分析
+ 成本分析
吸引游客流量
@@ -190,7 +190,8 @@
style="font-size:20px;font-weight:600;">{{fenxiData.expectedAttractTraffic}}人
- {{fenxiData.expectedAttractTrafficAnalyse}}%
+ {{fenxiData.expectedAttractTrafficAnalyse}}%
+
@@ -199,7 +200,8 @@
style="font-size:20px;font-weight:600;">{{fenxiData.expectedParticipation}}人
- {{fenxiData.expectedParticipationAnalyse}}%
+ {{fenxiData.expectedParticipationAnalyse}}%
+
@@ -208,7 +210,8 @@
style="font-size:20px;font-weight:600;">{{fenxiData.expectedDirectBenefits?fenxiData.expectedDirectBenefits:'暂无'}}
- {{fenxiData.expectedDirectBenefitsAnalysis}}%
+ {{fenxiData.expectedDirectBenefitsAnalysis}}%
+
@@ -217,7 +220,8 @@
style="font-size:20px;font-weight:600;">{{fenxiData.expectedIndirectBenefits?fenxiData.expectedIndirectBenefits:'暂无'}}
- {{fenxiData.expectedIndirectBenefitsAnalysis}}%
+ {{fenxiData.expectedIndirectBenefitsAnalysis}}%
+
@@ -228,7 +232,7 @@
-
-
+ 品牌策划 > 活动方案详情
-
+
+
品牌策划 > 活动方案详情
+
@@ -594,7 +597,7 @@
![]()
+ style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 14px;">
{{text}}
活动时间：{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
活动地点:{{tableData1[0].planName}}
@@ -611,10 +614,10 @@
-
@@ -635,10 +638,10 @@
基本信息
+ 基本信息
-
@@ -650,7 +653,7 @@
-
+
@@ -659,19 +662,19 @@
活动明细信息
+ 活动明细信息
-
-
-
@@ -683,10 +686,10 @@
活动成本信息
+ 活动成本信息
-
@@ -706,10 +709,10 @@
预估效果
+ 预估效果
-
@@ -730,10 +733,10 @@
相关附件信息
+ 相关附件信息
-
@@ -829,7 +832,7 @@
系统信息
+ 系统信息
-
+
@@ -884,17 +887,17 @@
基本信息
-
+
@@ -907,7 +910,7 @@
-
+
@@ -925,7 +928,7 @@
@@ -387,7 +387,7 @@
-
+
@@ -415,21 +415,21 @@
label-width="120px" style="position: relative">
-
-
+
-
+
@@ -438,19 +438,19 @@
-
+
-
+
-
+
@@ -459,7 +459,7 @@
-
+
@@ -502,7 +502,7 @@
-
+
@@ -510,7 +510,7 @@
-
+
@@ -668,7 +668,7 @@
-
+
@@ -682,7 +682,7 @@
:labelStyle="labelStyle">
- 内部人力成本预估
+ 内部人力成本预估(/元)
- 外部人力成本预估
+ 外部人力成本预估(/元)
- 商品成本预估
+ 商品成本预估(/元)
- 设备成本预估
+ 设备成本预估(/元)
- 宣传费用预估
+ 宣传费用预估(/元)
- 其他必要成本预估
+ 其他必要成本预估(/元)
- 总成本预估
+ 总成本预估(/元)
- 预计直接收益
+ 预计直接收益(/元)
- 预计间接收益
+ 预计间接收益(/元)
-
+
@@ -923,14 +923,14 @@
-
-
@@ -1110,7 +1110,7 @@
-
+
@@ -1124,43 +1124,43 @@
- 内部人力成本预估
+ 内部人力成本预估(/元)
{{lixiang.internalLaborCostEstimation}}
- 外部人力成本预估
+ 外部人力成本预估(/元)
{{lixiang.externalLaborCostEstimation}}
- 商品成本预估
+ 商品成本预估(/元)
{{lixiang.costEstimationGoods}}
- 设备成本预估
+ 设备成本预估(/元)
{{lixiang.setCostEstimate}}
- 宣传费用预估
+ 宣传费用预估(/元)
{{lixiang.estimatedPromotionalExpenses}}
- 其他必要成本预估
+ 其他必要成本预估(/元)
{{lixiang.otherNecessaryEstimates}}
- 总成本预估
+ 总成本预估(/元)
{{lixiang.totalCostEstimation}}
@@ -1191,13 +1191,13 @@
- 预计直接收益
+ 预计直接收益(/元)
{{lixiang.expectedDirectBenefits}}
- 预计间接收益
+ 预计间接收益(/元)
{{lixiang.expectedIndirectBenefits}}
@@ -1273,7 +1273,7 @@
-
+
@@ -1600,19 +1600,19 @@
externalLaborCostEstimation: '',
tableData3: [{
id: 0,
- name: '商品成本预估',
+ name: '商品成本预估(/元)',
planName: '',
- text: '设备成本预估',
+ text: '设备成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '宣传费用预估',
+ name: '宣传费用预估(/元)',
planName: '',
- text: '其他必要成本预估',
+ text: '其他必要成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '总成本预估',
+ name: '总成本预估(/元)',
planName: '',
text: '备注',
eventTheme: ''
@@ -1621,9 +1621,9 @@
expectedParticipation: '',
tableData4: [{
id: 0,
- name: '预计直接收益',
+ name: '预计直接收益(/元)',
planName: '',
- text: '预计间接收益',
+ text: '预计间接收益(/元)',
eventTheme: '-'
}],
createUser: '',
@@ -1956,7 +1956,7 @@
}).then(res => {
this.secondData = res.data.content[0]
//基本信息
- // that.id=res.data.content[0].id
+ that.id=res.data.content[0].id
that.text = res.data.content[0].planName
that.tableData1[0].eventTheme = res.data.content[0].planType
that.tableData1[0].planName = res.data.content[0].eventAddrs
@@ -1985,8 +1985,7 @@
//系统信息
that.createUser = res.data.content[0].createUser
that.createDate = res.data.content[0].createDate
-
- that.tableData5[0].planName = '-'
+ that.tableData5[0].planName = res.data.content[0].updateDate
that.tableData5[0].eventTheme = res.data.content[0].updateUser
}).catch(err => {
@@ -2208,7 +2207,7 @@
console.log(item)
let that = this
actPage({
- detailsId: titem.id,
+ detailsId: item.id,
pageNumber: 1,
pageSize: 10,
}).then(res => {
diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
index 579365f..be60c9b 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
@@ -84,11 +84,11 @@
-
活动明细信息
-
+
添加明细
-
-
+
-
+
-
+
@@ -957,19 +961,19 @@
-
+
-
+
-
+
@@ -978,7 +982,7 @@
-
+
@@ -998,7 +1002,7 @@
-
+
+
@@ -934,21 +937,22 @@
label-width="120px" style="position: relative">
实际花费成本
-
-
+
@@ -1029,7 +1033,7 @@
-
+
@@ -1059,7 +1063,7 @@
+
@@ -1021,7 +1025,7 @@
活动执行效果
@@ -1067,7 +1071,8 @@
编辑
- 保存
+ 保存
下载
@@ -1075,8 +1080,8 @@
保存
-
-
+
+
+
活动效果分析
-
-
关闭
@@ -366,7 +366,7 @@
append-to-body>
成本分析
+ 成本分析
吸引游客流量
@@ -121,7 +121,7 @@
效果分析
+ 效果分析
吸引游客流量
@@ -162,22 +162,22 @@
活动主题
-
主题1
+ 主题1
300/100家
-
主题2
+ 主题2
300/100家
-
主题3
+ 主题3
300/100家
-
主题4
+ 主题4
300/100家
代办任务
- 发起人：
- 任务节点：部门领导审批
+ 发起人：
+ 任务节点：部门领导审批
-
+
基本信息
@@ -438,7 +438,7 @@
-
+
活动明细
@@ -466,7 +466,7 @@
-
+
活动成本
@@ -528,7 +528,7 @@
-
+
预估效果信息
@@ -600,7 +600,7 @@
-
部门领导审批
+ 部门领导审批
@@ -641,7 +641,7 @@
-
公司领导审批
+ 公司领导审批
@@ -682,7 +682,7 @@
-
其他审批
+ 其他审批
@@ -766,7 +766,7 @@
![]()
+ style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 14px;">
{{text}}
活动时间：{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
活动地点:{{tableData1[0].planName}}
@@ -782,10 +782,10 @@
-
@@ -804,10 +804,10 @@
基本信息
+ 基本信息
-
@@ -819,7 +819,7 @@
-
+
@@ -828,10 +828,10 @@
活动明细信息
+ 活动明细信息
-
@@ -848,10 +848,10 @@
活动成本信息
+ 活动成本信息
-
@@ -869,10 +869,10 @@
预估效果
+ 预估效果
-
@@ -892,10 +892,10 @@
相关附件信息
+ 相关附件信息
-
@@ -919,7 +919,7 @@
系统信息
+ 系统信息
-
+
@@ -969,7 +969,7 @@
基本信息
-
+
@@ -990,7 +990,7 @@
-
+
@@ -1007,7 +1007,7 @@
- 允许展示
diff --git a/admin-web-master/src/views/promotion/account.vue b/admin-web-master/src/views/promotion/account.vue
index b962d38..c43e1b1 100644
--- a/admin-web-master/src/views/promotion/account.vue
+++ b/admin-web-master/src/views/promotion/account.vue
@@ -140,16 +140,17 @@
-
+
-
-
+
-
- ![]()
+
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 0cae751..6525725 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,12 +1,12 @@
-// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
-const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
-// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
-const DOMAIN_PREFIXPING = 'http://128.10.249.23:9003'
-const DOMAIN_PREFIX = 'http://128.10.249.23:9007'
+// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
+const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
+// const DOMAIN_PREFIXPING = 'http://128.10.249.23:9003'
+// const DOMAIN_PREFIX = 'http://128.10.249.23:9007'
// const host = `${window.location.protocol}//${window.location.host}`
// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
index ac43029..92a7442 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
@@ -3,7 +3,7 @@
+
+
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
index f30d603..0e1e011 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
@@ -22,7 +22,7 @@
+
+
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
index 0644768..65b546a 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
@@ -41,7 +41,7 @@
- 追加评价
+
{{item.comment}}
@@ -49,7 +49,7 @@
-
+
+
+
@@ -109,7 +109,7 @@
-
+
{{item.createTime}}
--
libgit2 0.21.4
活动明细信息
@@ -977,7 +977,7 @@
-
-
+
-
+
-
+
@@ -1035,17 +1035,17 @@
-
+
-
+
-
+
@@ -1053,7 +1053,7 @@
-
+
@@ -1071,7 +1071,7 @@
-
+
+
@@ -1016,18 +1016,18 @@
style="position: relative">
实际花费成本
-
-
+
-
+
@@ -1250,19 +1250,19 @@
externalLaborCostEstimation: '',
tableData3: [{
id: 0,
- name: '商品成本预估',
+ name: '商品成本预估(/元)',
planName: '',
- text: '设备成本预估',
+ text: '设备成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '宣传费用预估',
+ name: '宣传费用预估(/元)',
planName: '',
- text: '其他必要成本预估',
+ text: '其他必要成本预估(/元)',
eventTheme: ''
}, {
id: 0,
- name: '总成本预估',
+ name: '总成本预估(/元)',
planName: '',
text: '备注',
eventTheme: ''
@@ -1271,9 +1271,9 @@
expectedParticipation: '',
tableData4: [{
id: 0,
- name: '预计直接收益',
+ name: '预计直接收益(/元)',
planName: '',
- text: '预计间接收益',
+ text: '预计间接收益(/元)',
eventTheme: '-'
}],
createUser: '',
@@ -1626,7 +1626,7 @@
danqueryById({id:item.id,dataOwnership:'2', pageNumber: 1,pageSize: 10,}).then(res=>{
this.secondData = res.data.content[0]
//基本信息
- // that.id=res.data.content[0].id
+ that.id=res.data.content[0].id
that.text=res.data.content[0].planName
that.tableData1[0].eventTheme =res.data.content[0].planType
that.tableData1[0].planName = res.data.content[0].eventAddrs
@@ -1654,9 +1654,9 @@
that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
//系统信息
that.createUser = res.data.content[0].createUser
- that.createDate = res.data.content[0].createDate
- that.tableData5[0].planName = '-'
- that.tableData5[0].eventTheme = res.data.content[0].updateUser
+ that.createDate = res.data.content[0].createDate
+ that.tableData5[0].planName = res.data.content[0].updateDate
+ that.tableData5[0].eventTheme = res.data.content[0].updateUser
}).catch(err=>{
@@ -1794,7 +1794,7 @@
padding:0;
}
.el-dialog__title{
- font-size: 12px;
+ font-size: 14px;
}
.el-dialog__body {
padding: 0px 0px;
@@ -2050,13 +2050,13 @@
margin-top:-24px;
position: relative;
border: 2px solid #FABB41;
- font-size: 12px;
+ font-size: 14px;
}
.el-step__icon .is-text{
padding: 10px;
border-radius:10px;
border: 2px solid #FABB41;
- font-size: 12px;
+ font-size: 14px;
}
}
.is-wait{
@@ -2068,13 +2068,13 @@
margin-top:-24px;
position: relative;
border: 2px solid #C0C4CC;
- font-size: 12px;
+ font-size: 14px;
}
.el-step__icon .is-text{
padding: 10px;
border-radius:10px;
border: 2px solid #C0C4CC;
- font-size: 12px;
+ font-size: 14px;
}
}
.is-finish{
@@ -2087,14 +2087,14 @@
position: relative;
border: 2px solid #3F9B6A;
background-color: #D3E6CC;
- font-size: 12px;
+ font-size: 14px;
color: #3F9B6A;
}
.el-step__icon .is-text{
padding: 10px;
border-radius:10px;
border: 2px solid #3F9B6A;
- font-size: 12px;
+ font-size: 14px;
}
.el-step__line{
background-color: #3F9B6A;
@@ -2190,7 +2190,7 @@
border: none;
margin-right: 10px;
background-color: #F2F2F2;
- font-size:12px;
+ font-size:14px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding:0 15px;
diff --git a/admin-web-master/src/views/comment/commentSys/index.vue b/admin-web-master/src/views/comment/commentSys/index.vue
index beb7da9..2e5b613 100644
--- a/admin-web-master/src/views/comment/commentSys/index.vue
+++ b/admin-web-master/src/views/comment/commentSys/index.vue
@@ -107,7 +107,7 @@
/>
+
@@ -1091,14 +1091,14 @@
活动执行效果
+