diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 2393388..429d95f 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -21,7 +21,11 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; +<<<<<<< HEAD + baseURL = 'http://128.10.249.23:9003'; +======= // baseURL = 'http://128.10.249.13:9003'; +>>>>>>> 89bb9f2b58e667e7b1bc81a97a5c37f15bfe7980 } else { console.error('---------------------') diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue index 32dc83e..5e3fb59 100644 --- a/admin-web-master/src/views/activity/activityHis.vue +++ b/admin-web-master/src/views/activity/activityHis.vue @@ -316,12 +316,12 @@
- + prop="planName"> @@ -1203,20 +1203,20 @@
- -
+
+ :value="index">
- +
+ :value="index">
@@ -1289,7 +1290,14 @@ peiShow: false, peiId: '', zhixingqingk: '', - editFen:0 + editFen:0, + zhixingRules:{ + planName: [{ + required: true, + message: '请输入活动名称', + trigger: 'blur' + }], + } } }, created() { @@ -1622,36 +1630,51 @@ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; }, //执行效果保存 - async bianji() { - if (this.fileData.length != 0) { - this.zhixingList.feedbackContent = this.fileData[0].url - } - if (this.zhiXing) { - this.zhixingList.eventStartTime = this.zhixingList.planTime[0] - this.zhixingList.eventEndTime = this.zhixingList.planTime[1] - this.zhixingList.detailsId = this.secondData.id - this.zhixingList.createDate = this.updateCurrentTime() - actAdd(this.zhixingList).then(res => { - for (let i = 0; i < this.tableDa.length; i++) { - this.tableDa[i].detailsId = res.data.id - MingAdd(this.tableDa[i]).then(res => { - console.log('成功') - }) - } + bianji() { + this.$refs.zhixingFormInfo.validate((valid) => { + if (valid) { + if (this.fileData.length != 0) { + this.zhixingList.feedbackContent = this.fileData[0].url + } + if (this.zhiXing) { + this.zhixingList.eventStartTime = this.zhixingList.planTime[0] + this.zhixingList.eventEndTime = this.zhixingList.planTime[1] + this.zhixingList.detailsId = this.secondData.id + this.zhixingList.createDate = this.updateCurrentTime() + actAdd(this.zhixingList).then(res => { + 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() + }) + } + }) + + } else { + let that = this + Vue.delete(that.zhixingList, 'createDate') + this.zhixingList.eventStartTime = this.zhixingList.planTime[0] + this.zhixingList.eventEndTime = this.zhixingList.planTime[1] + Vue.delete(that.zhixingList, 'planTime') + this.zhixingList.updateDate = '' + actEdit(this.zhixingList).then(()=>{ + this.ggXin = false + this.getAll() + }) + } + + + }else{ + this.$message({ + message: '请填写数据', + type: 'error', + offset: 100 + }) + return false; + } }) - - } else { - let that = this - Vue.delete(that.zhixingList, 'createDate') - this.zhixingList.eventStartTime = this.zhixingList.planTime[0] - this.zhixingList.eventEndTime = this.zhixingList.planTime[1] - Vue.delete(that.zhixingList, 'planTime') - this.zhixingList.updateDate = '' - await actEdit(this.zhixingList) - } - - this.ggXin = false - this.getAll() + }, handleCurrentChange(val) { this.currentPage = val diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue index 29d95ee..73481e7 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue @@ -837,12 +837,12 @@
- + prop="planName"> @@ -1337,7 +1337,14 @@ peiShow: false, peiId: '', zhixingqingk: '', - editFen: 0 + editFen: 0, + zhixingRules:{ + planName: [{ + required: true, + message: '请输入活动名称', + trigger: 'blur' + }], + } } }, @@ -1509,28 +1516,45 @@ this.zhixingList.planTime = data }, //执行效果保存 - async bianji() { - if (this.fileData.length != 0) { - this.zhixingList.feedbackContent = this.fileData[0].url - } - if (this.zhiXing) { - this.zhixingList.eventStartTime = this.zhixingList.planTime[0] - this.zhixingList.eventEndTime = this.zhixingList.planTime[1] - this.zhixingList.detailsId = this.secondData.id - this.zhixingList.createDate = this.updateCurrentTime() - await actAdd(this.zhixingList) - } else { - let that = this - Vue.delete(that.zhixingList, 'createDate') - this.zhixingList.eventStartTime = this.zhixingList.planTime[0] - this.zhixingList.eventEndTime = this.zhixingList.planTime[1] - Vue.delete(that.zhixingList, 'planTime') - this.zhixingList.updateDate = '' - await actEdit(this.zhixingList) - } - - this.ggXin = false - this.getAll() + bianji() { + this.$refs.zhixingFormInfo.validate((valid) => { + if (valid) { + if (this.fileData.length != 0) { + this.zhixingList.feedbackContent = this.fileData[0].url + } + if (this.zhiXing) { + this.zhixingList.eventStartTime = this.zhixingList.planTime[0] + this.zhixingList.eventEndTime = this.zhixingList.planTime[1] + this.zhixingList.detailsId = this.secondData.id + this.zhixingList.createDate = this.updateCurrentTime() + actAdd(this.zhixingList).then(()=>{ + this.ggXin = false + this.getAll() + }) + } else { + let that = this + Vue.delete(that.zhixingList, 'createDate') + this.zhixingList.eventStartTime = this.zhixingList.planTime[0] + this.zhixingList.eventEndTime = this.zhixingList.planTime[1] + Vue.delete(that.zhixingList, 'planTime') + this.zhixingList.updateDate = '' + actEdit(this.zhixingList).then(()=>{ + this.ggXin = false + this.getAll() + }) + } + + + }else{ + this.$message({ + message: '请填写数据', + type: 'error', + offset: 100 + }) + return false; + } + }) + }, //详情点击 handleEditForm(item, val) { diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue index 61f6504..016b7b8 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue @@ -314,12 +314,12 @@
- + prop="planName"> @@ -543,299 +543,188 @@
历史氛围策划方案搜索
- - 调整对比 - + -->
-
-
- - - - {{lixiang.id}} - - - - - {{lixiang.planName}} - - - - {{lixiang.planType}} - - - - - {{lixiang.eventAddrs}} - - - - - {{lixiang.eventStartTime}} - - - - - {{lixiang.eventEndTime}} - - - - {{lixiang.eventTheme}} - - - - {{lixiang.sponsor}} - - - - - - {{lixiang.participants}} - - - - - {{lixiang.mainPurpose}} - - - - - {{lixiang.rangeSetting}} - - - - - {{getStatus(lixiang.state)}} - - - - -
-
-
-
氛围明细信息
-
- - - - - - - - - - - - - - - -
-
-
-
- - - - - {{lixiang.internalLaborCostEstimation}} - - - - - {{lixiang.externalLaborCostEstimation}} - - - - - {{lixiang.costEstimationGoods}} - - - - - {{lixiang.setCostEstimate}} - - - - - {{lixiang.estimatedPromotionalExpenses}} - - - - - {{lixiang.otherNecessaryEstimates}} - - - - - {{lixiang.totalCostEstimation}} - - - - - {{lixiang.notes}} - - -
-
-
- -
- - - - - {{lixiang.expectedAttractTraffic}} - - - - - {{lixiang.expectedParticipation}} - - - - - {{lixiang.expectedDirectBenefits}} - - - - - {{lixiang.expectedIndirectBenefits}} - - - - -
-
-
-
相关附件信息
-
- - - - - - - - - - - -
-
-
-
系统信息
-
- - - - - - - - - - - - - -
-
-
+
+
+ + + + + {{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}} + + + + + +
+
+ + +
@@ -1293,15 +1182,164 @@
- -
-
+ +
+ + + + +
+ +
+ + + + + +
+
+
+
实际成本
+
+
内部人力
+
+ {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元 +
+
+
+
外部人力
+
+ {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元 +
+
+
+
商品成本
+
{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元 +
+
+
+
设备成本
+
{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元
+
+
+
宣传费用
+
+ {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元 +
+
+
+
其他成本
+
+ {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元 +
+
+
+
总成本
+
{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元 +
+
+
+
+
增长率
+
+ {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}% +
+
+ {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}% +
+
+ {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}% +
+
+ {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}% +
+
+ {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}% +
+
+ {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:0}}% +
+
+ {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:0}}% +
+ + +
+
+
实际成本
+
+
内部人力
+
+ {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元 +
+
+
+
外部人力
+
+ {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元 +
+
+
+
商品成本
+
{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元 +
+
+
+
设备成本
+
{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元
+
+
+
宣传费用
+
+ {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元 +
+
+
+
其他成本
+
+ {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元 +
+
+
+
总成本
+
{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元 +
+
+
+
+
间接收入
- +
人力
-
设备
-
宣传
- +
其他
- +
-
-
+
--> + +
间接收入
- +
人力
- +
设备
- +
宣传
- +
-
-
+
--> + @@ -1500,7 +1536,8 @@ excelQueryByPage, excelAdd, effectEvaluation, - lishiDeta + lishiDeta, + effectivenessLog } from '../../api/activityBz' import actbians from "./atmosphereBian" import * as echarts from 'echarts' @@ -1736,7 +1773,19 @@ jiucuoShow: false, jiuMsg: '', editId: '', - zhixingqingk: '' + zhixingqingk: '', + effectivenessList: [], + ListOne: '', + ListTwo: '', + effectivenessListOne: {}, + effectivenessListTwo: {}, + zhixingRules:{ + planName: [{ + required: true, + message: '请输入活动名称', + trigger: 'blur' + }], + } } }, created() { @@ -1873,7 +1922,11 @@ this.activeName = 'fourd' } - + effectivenessLog({ + activityEffectivenessId: item.id + }).then(res => { + this.effectivenessList = res.data + }) this.liData = [] this.lixiang = {} this.lishiList = null @@ -2202,37 +2255,51 @@ }, xiaoguo(item) { - - this.xiaoDui = true + this.xiaoDui = true this.duibiOne = item console.log(item) let that = this - actPage({ - detailsId: item.id, - pageNumber: 1, - pageSize: 10, + effectivenessLog({ + activityEffectivenessId: item.id }).then(res => { - this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0]; - if (res.data.content[0] === undefined || res.data.content[0].totalCostEstimation == '') { - that.xiaoduiObj.biliTwo = '0%' - that.xiaoduiObj.biliT = 0 - } else { - that.xiaoduiObj.biliT = that.duibiTwo.internalLaborCostEstimation / that.duibiTwo - .totalCostEstimation * 100 - that.xiaoduiObj.biliTwo = - `${Math.round(that.duibiTwo.internalLaborCostEstimation / that.duibiTwo.totalCostEstimation*100)}%` - } - + console.log(res.data, 'effectivenessListeffectivenessList') + this.effectivenessList = res.data }) - if (that.duibiOne.totalCostEstimation == '') { - that.xiaoduiObj.biliOne = '0%' - that.xiaoduiObj.bilis = 0 - } else { - that.xiaoduiObj.bilis = that.duibiOne.internalLaborCostEstimation / that.duibiOne - .totalCostEstimation * 100 - that.xiaoduiObj.biliOne = - `${Math.round(that.duibiOne.internalLaborCostEstimation / that.duibiOne.totalCostEstimation*100)}%` - } + this.ListOne ='' + this.ListTwo = '' + this.effectivenessListOne ={} + this.effectivenessListTwo = {} + + // this.xiaoDui = true + // this.duibiOne = item + // console.log(item) + // let that = this + // actPage({ + // detailsId: item.id, + // pageNumber: 1, + // pageSize: 10, + // }).then(res => { + // this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0]; + // if (res.data.content[0] === undefined || res.data.content[0].totalCostEstimation == '') { + // that.xiaoduiObj.biliTwo = '0%' + // that.xiaoduiObj.biliT = 0 + // } else { + // that.xiaoduiObj.biliT = that.duibiTwo.internalLaborCostEstimation / that.duibiTwo + // .totalCostEstimation * 100 + // that.xiaoduiObj.biliTwo = + // `${Math.round(that.duibiTwo.internalLaborCostEstimation / that.duibiTwo.totalCostEstimation*100)}%` + // } + + // }) + // if (that.duibiOne.totalCostEstimation == '') { + // that.xiaoduiObj.biliOne = '0%' + // that.xiaoduiObj.bilis = 0 + // } else { + // that.xiaoduiObj.bilis = that.duibiOne.internalLaborCostEstimation / that.duibiOne + // .totalCostEstimation * 100 + // that.xiaoduiObj.biliOne = + // `${Math.round(that.duibiOne.internalLaborCostEstimation / that.duibiOne.totalCostEstimation*100)}%` + // } @@ -2390,12 +2457,107 @@ this.searchShow = true }, lichange(e) { - console.log(this.liData[e]) - this.lishiList = e - let msg = this.liData[e] - this.duibiList = JSON.parse(msg.modifyContent) - this.lixiang = JSON.parse(msg.originalData) - + + // this.lishiList = e + // let msg = this.liData[e] + // this.duibiList = JSON.parse(msg.modifyContent) + // this.lixiang = JSON.parse(msg.originalData) + let msg = this.effectivenessList[e] + this.duibiList = JSON.parse(msg.modifiedData) + }, + lichangeOne(e) { + this.effectivenessListOne = JSON.parse(e.modifiedData) + if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo + .internalLaborCostEstimation != '') { + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) / + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100 + } + if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo + .externalLaborCostEstimation != '') { + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) / + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100 + } + if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo + .costEstimationGoods != '') { + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) / + Number(this.effectivenessListTwo.costEstimationGoods) * 100 + } + if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo + .setCostEstimate != '') { + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) / + Number(this.effectivenessListTwo.setCostEstimate) * 100 + } + if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo + .estimatedPromotionalExpenses != '') { + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) / + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100 + } + if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo + .otherNecessaryEstimates != '') { + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) / + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100 + } + if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo + .totalCostEstimation != '') { + + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) / + Number(this.effectivenessListTwo.totalCostEstimation) * 100 + } + // sumNei + // sumWai + // sumShop + // sumSe + // sumXuan + // sumQi + // sumAll + // internalLaborCostEstimation + // externalLaborCostEstimation + // costEstimationGoods + // setCostEstimate + // estimatedPromotionalExpenses + // otherNecessaryEstimates + // totalCostEstimation + + console.log(JSON.parse(e.modifiedData)) + }, + lichangeTwo(e) { + this.effectivenessListTwo = JSON.parse(e.modifiedData) + if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo + .internalLaborCostEstimation != '') { + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) / + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100 + } + if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo + .externalLaborCostEstimation != '') { + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) / + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100 + } + if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo + .costEstimationGoods != '') { + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) / + Number(this.effectivenessListTwo.costEstimationGoods) * 100 + } + if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo + .setCostEstimate != '') { + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) / + Number(this.effectivenessListTwo.setCostEstimate) * 100 + } + if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo + .estimatedPromotionalExpenses != '') { + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) / + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100 + } + if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo + .otherNecessaryEstimates != '') { + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) / + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100 + } + if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo + .totalCostEstimation != '') { + + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) / + Number(this.effectivenessListTwo.totalCostEstimation) * 100 + } }, tiaozheng() { this.tiaozhengShow = true @@ -2414,42 +2576,44 @@ }, //执行效果保存 async bianji() { - if (this.fileData.length != 0) { - this.zhixingList.feedbackContent = this.fileData[0].url - } - if (this.zhiXing) { - this.zhixingList.eventStartTime = this.zhixingList.planTime[0] - this.zhixingList.eventEndTime = this.zhixingList.planTime[1] - this.zhixingList.detailsId = this.secondData.id - this.zhixingList.createDate = this.updateCurrentTime() - actAdd(this.zhixingList).then(res => { - for (let i = 0; i < this.tableDa.length; i++) { - this.tableDa[i].detailsId = res.data.id - MingAdd(this.tableDa[i]).then(res => { - this.$message({ - message: '保存成功', - type: 'success' + this.$refs.zhixingFormInfo.validate((valid) => { + if (valid) { + if (this.fileData.length != 0) { + this.zhixingList.feedbackContent = this.fileData[0].url + } + if (this.zhiXing) { + this.zhixingList.eventStartTime = this.zhixingList.planTime[0] + this.zhixingList.eventEndTime = this.zhixingList.planTime[1] + this.zhixingList.detailsId = this.secondData.id + this.zhixingList.createDate = this.updateCurrentTime() + actAdd(this.zhixingList).then(()=>{ + this.ggXin = false + this.getAll() + }) + } else { + let that = this + Vue.delete(that.zhixingList, 'createDate') + this.zhixingList.eventStartTime = this.zhixingList.planTime[0] + this.zhixingList.eventEndTime = this.zhixingList.planTime[1] + Vue.delete(that.zhixingList, 'planTime') + this.zhixingList.updateDate = '' + actEdit(this.zhixingList).then(()=>{ + this.ggXin = false + this.getAll() + }) + } + + + }else{ + this.$message({ + message: '请填写数据', + type: 'error', + offset: 100 + }) + return false; + } }) - }) - } - }) - - } else { - let that = this - Vue.delete(that.zhixingList, 'createDate') - this.zhixingList.eventStartTime = this.zhixingList.planTime[0] - this.zhixingList.eventEndTime = this.zhixingList.planTime[1] - Vue.delete(that.zhixingList, 'planTime') - this.zhixingList.updateDate = '' - await actEdit(this.zhixingList) - this.$message({ - message: '保存成功', - type: 'success' - }) - } - - this.ggXin = false - this.getAll() + }, searchQuit() { this.searPei = { diff --git a/admin-web-master/src/views/media/mediaMana.vue b/admin-web-master/src/views/media/mediaMana.vue index b91b157..d0ea23c 100644 --- a/admin-web-master/src/views/media/mediaMana.vue +++ b/admin-web-master/src/views/media/mediaMana.vue @@ -132,10 +132,14 @@
- -
- + +
+ + + +
{{secondData.auditOpinion}}
+
-
媒体推广 > 内容管理{{index == 1?'内容新增':index == 2?'内容详情':'内容编辑'}}
+
媒体推广 > {{index == 1?'内容新增':index == 2?'内容详情':'内容编辑'}}
diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue index a555e1f..90b27d8 100644 --- a/admin-web-master/src/views/serve/procedure.vue +++ b/admin-web-master/src/views/serve/procedure.vue @@ -1,88 +1,53 @@ + ::v-deep .bian_css { + .el-dialog__header { + padding: 0px; + } + + } + + ::v-deep .buttonHover:hover { + color: #3f9b6a !important; + border-color: #c5e1d2 !important; + background-color: #ecf5f0 !important; + outline: none; + } + + ::v-deep .el-pagination__total { + position: absolute; + left: 10px; + } + + ::v-deep .diaslog_zhong { + .el-dialog__body { + padding: 10px 20px 20px 20px; + } + + .el-upload--picture-card { + width: 130px; + height: 130px; + } + } + \ No newline at end of file diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 2da4eaf..0e1f1db 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -675,7 +675,7 @@ }, tabsChange(itme) { - console.log(itme) + this.onCouponTab(itme) }, gopath(e) { @@ -685,9 +685,16 @@ }, wuye() { - uni.navigateTo({ - url: `/pages/propertyPay/propertyPayList/propertyPayList` - }) + if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){ + uni.navigateTo({ + url: `/pages/propertyPay/propertyPayList/propertyPayList` + }) + }else{ + uni.navigateTo({ + url: `/pages/login/login` + }) + } + }, piaowu() { diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue index ee881a6..856703a 100644 --- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue +++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue @@ -41,7 +41,7 @@ {{item.itemName}}：{{ item.itemDetailsVOList | jsitem}} + style="font-size: 24rpx;" />{{ item.detailsVOList | jsitem}} 单价：￥{{item.itemStandard}} @@ -53,15 +53,15 @@ - - + + 周期：{{item1.startDate}} - {{item1.endDate}} 数量：{{item1.number}}{{item1.itemUnit}} - 门店号：{{item1.storeCode}} + 门牌号：{{item1.houseNumber}} @@ -183,7 +183,7 @@ allnum() { let num = 0 for (let i = 0; i < this.recordList.length; i++) { - let list = this.recordList[i].itemDetailsVOList + let list = this.recordList[i].detailsVOList for (let n = 0; n < list.length; n++) { num = num + Number(list[n].payPrice) } @@ -193,7 +193,7 @@ allcknum() { let num = 0 for (let i = 0; i < this.recordList.length; i++) { - let list = this.recordList[i].itemDetailsVOList + let list = this.recordList[i].detailsVOList for (let n = 0; n < list.length; n++) { if (list[n].isshowxz) { num = num + Number(list[n].payPrice) @@ -208,7 +208,7 @@ deep: true, handler(newVal) { for (let i = 0; i < this.recordList.length; i++) { - this.recordList[i].isshowxz = this.recordList[i].itemDetailsVOList.every(item => item.isshowxz) + this.recordList[i].isshowxz = this.recordList[i].detailsVOList.every(item => item.isshowxz) } const allTrue = this.recordList.every(item => item.isshowxz) this.showAll = allTrue @@ -249,8 +249,8 @@ methods: { changeitemisshowxz(index,index1) { console.error(index,index1) - console.error(this.recordList[index].itemDetailsVOList[index1].isshowxz) - this.recordList[index].itemDetailsVOList[index1].isshowxz = !this.recordList[index].itemDetailsVOList[index1].isshowxz + console.error(this.recordList[index].detailsVOList[index1].isshowxz) + this.recordList[index].detailsVOList[index1].isshowxz = !this.recordList[index].detailsVOList[index1].isshowxz this.$forceUpdate() }, changeisxl(e) { @@ -258,14 +258,14 @@ }, quanxuanitem(e, index) { console.error(e) - console.error(this.recordList[index].itemDetailsVOList) + console.error(this.recordList[index].detailsVOList) if (e.value) { - for (let i = 0; i < this.recordList[index].itemDetailsVOList.length; i++) { - this.recordList[index].itemDetailsVOList[i].isshowxz = true + for (let i = 0; i < this.recordList[index].detailsVOList.length; i++) { + this.recordList[index].detailsVOList[i].isshowxz = true } } else { - for (let i = 0; i < this.recordList[index].itemDetailsVOList.length; i++) { - this.recordList[index].itemDetailsVOList[i].isshowxz = false + for (let i = 0; i < this.recordList[index].detailsVOList.length; i++) { + this.recordList[index].detailsVOList[i].isshowxz = false } } }, @@ -277,7 +277,7 @@ this.recordList = this.recordList.map(item => { item.isxl = true item.isshowxz = true - item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { + item.detailsVOList = item.detailsVOList.map(item1 => { item1.isshowxz = true return item1 }) @@ -287,7 +287,7 @@ this.recordList = this.recordList.map(item => { item.isxl = true item.isshowxz = false - item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { + item.detailsVOList = item.detailsVOList.map(item1 => { item1.isshowxz = false return item1 }) @@ -322,10 +322,10 @@ c1.push(this.recordList[i]) } else { let newitem = JSON.parse(JSON.stringify(this.recordList[i])) - newitem.itemDetailsVOList = newitem.itemDetailsVOList.filter(function(item1) { + newitem.detailsVOList = newitem.detailsVOList.filter(function(item1) { return item1.isshowxz }) - if (newitem.itemDetailsVOList.length > 0) { + if (newitem.detailsVOList.length > 0) { c1.push(newitem) } } @@ -334,10 +334,10 @@ let storeNumber = [] let orderNumber = [] for (let i = 0; i < c1.length; i++) { - for (let n = 0; n < c1[i].itemDetailsVOList.length; n++) { - // console.error(c1[i].itemDetailsVOList[n]) - storeNumber.push(c1[i].itemDetailsVOList[n].storeCode) - orderNumber.push(c1[i].itemDetailsVOList[n].orderNo) + for (let n = 0; n < c1[i].detailsVOList.length; n++) { + // console.error(c1[i].detailsVOList[n]) + storeNumber.push(c1[i].detailsVOList[n].storeCode) + orderNumber.push(c1[i].detailsVOList[n].orderNo) } } let info = { @@ -434,10 +434,10 @@ pageSize: 10 }, 1).then(res => { console.error(res) - this.recordList = res.data.data.itemDetailsVOList.map(item => { + this.recordList = res.data.data.detailsVOList.map(item => { item.isxl = true item.isshowxz = false - item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { + item.detailsVOList = item.detailsVOList.map(item1 => { item1.isshowxz = false return item1 }) diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index 0bf4afc..9866d3f 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -303,8 +303,8 @@ pageList6: [{ }, methods: { async toPath1(path) { - // let c1 = uni.getStorageSync('user').phone - let c1 = '18188305496' + let c1 = uni.getStorageSync('user').phone + // let c1 = '18188305496' await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => { if(res.data.data.list.length>0) { uni.setStorageSync('shopId', res.data.data.list[0].shopId); diff --git a/lvdao-miniapp/pagesA/application/application.vue b/lvdao-miniapp/pagesA/application/application.vue index 2ff245f..899f725 100644 --- a/lvdao-miniapp/pagesA/application/application.vue +++ b/lvdao-miniapp/pagesA/application/application.vue @@ -91,7 +91,7 @@ createUser: '', promotionContent: '', coverImage: '', - state:'1' + state:'2' }, Fenshow:true, editorIns: null diff --git a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue index 4090bce..ef26824 100644 --- a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue +++ b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue @@ -153,7 +153,8 @@ contactNumber: '', locationDescription: '', shopPhotos: [], - contractId: '' + contractId: '', + storePrimaryKey:'', }, edit: false, typeShow:false, @@ -168,7 +169,10 @@ } }, onLoad(options) { - + if(options.phone){ + this.ruleForm.contactNumber = options.phone + this.pageindex.contactNumber = options.phone + } if (options.msg != '' && options.msg) { this.ruleForm = JSON.parse(options.msg) // this.ruleForm.shopPhotos = shopPhotos @@ -187,10 +191,7 @@ if (options.ids) { this.ruleForm.contractId = options.ids } - if(options.phone){ - this.ruleForm.contactNumber = options.phone - this.pageindex.contactNumber = options.phone - } + this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1) .then(res => { if (res.data.data.content.length != 0) { diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue index d812f84..36907bf 100644 --- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue +++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue @@ -224,7 +224,7 @@ onLoad(options) { this.imgurl = this.$img const item = JSON.parse(decodeURIComponent(options.item)); - console.log(item, '1123123213') + console.log(options.item, '1123123213') this.record = item let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item .cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item @@ -263,7 +263,6 @@ this.btnShow = false this.myshopMsg = res.data.data.content[0] this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',') - console.log(this.myshopMsg.shopPhotos) this.myshopMsg.shopPhotos.map(item => { item = this.imgurl + item }) @@ -308,6 +307,7 @@ }) }, xiuMsg(val) { + console.log(this.record.applicant) if (val == 1) { uni.navigateTo({ url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&phone=${this.record.applicant}` diff --git a/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue b/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue index d780bbf..7f85842 100644 --- a/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue +++ b/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue @@ -67,17 +67,13 @@ title:'全部' }, { - state:'1', - title:'待提交' - }, - { state:'2', title:'待审核' }], listIn:0, tableData:[], pageindex: { - pageNumber: 1, + pageNumber: 0, pageSize: 10, createUser:'', schemeTitle:'' @@ -100,7 +96,7 @@ this.listIn = index if(val=='0'){ this.pageindex={ - pageNumber: 1, + pageNumber: 0, pageSize: 10, createUser:'' } diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js index 8b5bc51..6d46b64 100644 --- a/merchant-web-master/src/utils/request.js +++ b/merchant-web-master/src/utils/request.js @@ -20,7 +20,6 @@ let PREFIX; // 其他情况的默认值 // PREFIX = 'http://8.130.38.56:8027/business-server'; // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server' PREFIX = 'http://128.10.249.23:9004'; }else{ // PREFIX = '/merchant-business'; diff --git a/merchant-web-master/src/views/comprehensive/dAddress/index.vue b/merchant-web-master/src/views/comprehensive/dAddress/index.vue index d42ef72..8719b1e 100644 --- a/merchant-web-master/src/views/comprehensive/dAddress/index.vue +++ b/merchant-web-master/src/views/comprehensive/dAddress/index.vue @@ -143,6 +143,17 @@ async search(){ name: item.address, value: item.refundAmount })) + processedData = [ + { + name:'重庆市', + value:1000 + }, + { + name:'成都市', + value:3000 + }, + ] + // console.log() // 指定图表的配置项和数据 const option = { diff --git a/merchant-web-master/src/views/dashboard/index.vue b/merchant-web-master/src/views/dashboard/index.vue index 2c66526..8c55be4 100644 --- a/merchant-web-master/src/views/dashboard/index.vue +++ b/merchant-web-master/src/views/dashboard/index.vue @@ -208,8 +208,23 @@ export default { myEchart.setOption(option) }, + filterData(arr) { + const targetNames = ["加购", "支付成功"]; + const result = { + names: [], + rates: [] + }; + for (let i = 0; i < arr.names.length; i++) { + if (targetNames.includes(arr.names[i])) { + result.names.push(arr.names[i]); + result.rates.push(arr.rates[i]); + } + } + return result; + }, + draws(arr) { - console.log(arr,'arr.ratesarr.ratesarr.rates') + const filteredData = this.filterData(arr); const myEchart = echarts.init(this.$refs.myEcharts, 'light') const option = { color: "#3F9B6A", @@ -230,7 +245,7 @@ export default { }, xAxis: { type: 'category', - data: arr.names + data: filteredData.names }, yAxis: { type: 'value', @@ -238,7 +253,7 @@ export default { }, series: [ { - data: arr.rates, + data: filteredData.rates, type: 'line' } ]