From a8cf1417ddd304087bedde262c57decba124a045 Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Wed, 19 Mar 2025 09:37:00 +0800 Subject: [PATCH] '最新' --- admin-web-master/dist.zip | Bin 0 -> 6005088 bytes admin-web-master/src/api/activityBz.js | 8 ++++++++ admin-web-master/src/assets/images/vs.png | Bin 0 -> 49150 bytes admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/views/activity/activityHis.vue | 671 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- admin-web-master/src/views/activity/activitySp.vue | 26 +++++++++++++------------- admin-web-master/src/views/activity/index.vue | 27 ++++++++++++++------------- admin-web-master/src/views/atmosphere/atmosphereBian.vue | 14 +++++++------- admin-web-master/src/views/atmosphere/atmosphereBz.vue | 16 ++++++++-------- admin-web-master/src/views/atmosphere/atmosphereGl.vue | 27 ++++++++++++++------------- admin-web-master/src/views/atmosphere/atmosphereHis.vue | 3 ++- admin-web-master/src/views/atmosphere/atmosphereSp.vue | 26 +++++++++++++------------- admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue | 29 ++++++++++++++++++----------- admin-web-master/src/views/shopRental/manage/index.vue | 4 +++- ceres-uniapp-master/pages/tabbar/user/index.data.js | 12 ++++++------ ceres-uniapp-master/pages_category_page1/orderModule/index.vue | 2 ++ lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue | 2 ++ lvdao-miniapp/utils/request.js | 12 ++++++------ merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue | 4 ++-- merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue | 8 ++++---- merchant-web-master/src/views/dashboard/index.vue | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------- 21 files changed, 716 insertions(+), 462 deletions(-) create mode 100644 admin-web-master/dist.zip create mode 100644 admin-web-master/src/assets/images/vs.png diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip new file mode 100644 index 0000000..8771508 Binary files /dev/null and b/admin-web-master/dist.zip differ diff --git a/admin-web-master/src/api/activityBz.js b/admin-web-master/src/api/activityBz.js index dbd3757..3132338 100644 --- a/admin-web-master/src/api/activityBz.js +++ b/admin-web-master/src/api/activityBz.js @@ -245,3 +245,11 @@ export function lishiDeta(data) { data }) } +//效果调整历史方案查询 +export function effectivenessLog(data) { + return request({ + url: '/cereActivityEffectivenessLog/getAll', + method: 'post', + data + }) +} diff --git a/admin-web-master/src/assets/images/vs.png b/admin-web-master/src/assets/images/vs.png new file mode 100644 index 0000000..3ce55ac Binary files /dev/null and b/admin-web-master/src/assets/images/vs.png differ diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 1c44d31..35f61ca 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,12 +16,12 @@ 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://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.23:9003'; + baseURL = 'http://128.10.249.13:9003'; } else { console.error('---------------------') diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue index 261b8b1..32dc83e 100644 --- a/admin-web-master/src/views/activity/activityHis.vue +++ b/admin-web-master/src/views/activity/activityHis.vue @@ -69,7 +69,7 @@
+ :labelStyle="labelStyle" :contentStyle="contentStyle"> - {{lixiang.id}} - - - - {{lixiang.planName}} + {{duibiList.planName}} - {{lixiang.planType}} + {{duibiList.eventAddrs}} - {{lixiang.eventAddrs}} - - - - - {{lixiang.eventStartTime}} - - - - - {{lixiang.eventEndTime}} - - - - {{lixiang.eventTheme}} + {{formatTimestampToDate(duibiList.eventStartTime)}}-{{formatTimestampToDate(duibiList.eventEndTime)}} - {{lixiang.sponsor}} + {{duibiList.participants}} - {{lixiang.participants}} - - - - - {{lixiang.mainPurpose}} - - - - - {{lixiang.rangeSetting}} - - - - - {{getStatus(lixiang.state)}} - + {{duibiList.sponsor}} + +
-
+
- + - {{lixiang.internalLaborCostEstimation}} + {{duibiList.internalLaborCostEstimation}} - - {{lixiang.externalLaborCostEstimation}} +{{duibiList.externalLaborCostEstimation}} + + - - {{lixiang.costEstimationGoods}} +{{duibiList.costEstimationGoods}} + - - {{lixiang.setCostEstimate}} +{{duibiList.setCostEstimate}} + - - {{lixiang.estimatedPromotionalExpenses}} +{{duibiList.estimatedPromotionalExpenses}} + - - {{lixiang.otherNecessaryEstimates}} +{{duibiList.otherNecessaryEstimates}} + - - {{lixiang.totalCostEstimation}} +{{duibiList.totalCostEstimation}} + - - {{lixiang.notes}} +{{duibiList.notes}} +
@@ -761,91 +706,43 @@
- + - - {{lixiang.expectedAttractTraffic}} +{{duibiList.expectedAttractTraffic}} + - - {{lixiang.expectedParticipation}} +{{duibiList.expectedParticipation}} + - - {{lixiang.expectedDirectBenefits}} +{{duibiList.expectedDirectBenefits}} + - - {{lixiang.expectedIndirectBenefits}} +{{duibiList.expectedIndirectBenefits}} +
-
-
相关附件信息
-
- - - - - - - - - - - -
-
-
-
系统信息
-
- - - - - - - - - - - - - -
-
+ +
@@ -1306,10 +1203,158 @@
- -
-
+
+ + + + +
+ +
+ + + + + +
+
+
+
实际成本
+
+
内部人力
+
+ {{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}}元 +
+
+
+
+
间接收入
- +
人力
-
设备
-
宣传
- +
其他
- +
-
-
+
--> + +
间接收入
- +
人力
- +
设备
- +
宣传
- +
-
-
+
--> + @@ -1516,7 +1558,8 @@ excelQueryByPage, excelAdd, effectEvaluation, - lishiDeta + lishiDeta, + effectivenessLog } from '../../api/activityBz' import actbians from "./activityBian" import * as echarts from 'echarts' @@ -1691,7 +1734,8 @@ pageNumber: 1, pageSize: 10, dataOwnership: '1', - isDraft: 0 + isDraft: 0, + state: '5' }, multipleSelection: [], options: [], @@ -1731,9 +1775,14 @@ }, lishiList: null, labelStyle: { - width: '197px', + width: '250px', height: '42px', }, + contentStyle: { + width: '300px', + + // height:'42px', + }, labelStyleOne: { width: '94px', height: '42px', @@ -1751,7 +1800,12 @@ jiucuoShow: false, jiuMsg: '', editId: '', - zhixingqingk: '' + zhixingqingk: '', + effectivenessList: [], + ListOne: '', + ListTwo: '', + effectivenessListOne: {}, + effectivenessListTwo: {} } }, created() { @@ -1853,6 +1907,16 @@ const res = await danqueryById(this.formSear) this.tableData = res.data.content }, + formatTimestampToDate(timestamp) { + const date = new Date(timestamp); + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + const hours = String(date.getHours()).padStart(2, '0'); + const minutes = String(date.getMinutes()).padStart(2, '0'); + const seconds = String(date.getSeconds()).padStart(2, '0'); + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, //重置按钮 resetting() { this.formSear = { @@ -1885,7 +1949,13 @@ } else if (val == 3) { this.zhixingBian = flag this.activeName = 'fourd' + } + effectivenessLog({ + activityEffectivenessId: item.id + }).then(res => { + this.effectivenessList = res.data + }) this.liData = [] this.editId = item.id @@ -1972,7 +2042,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,10 +2069,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 = res.data.content[0].updateDate - 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) @@ -2228,32 +2298,43 @@ 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 = {} + + // 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)}%` + // } @@ -2289,14 +2370,14 @@ }, - customFormat(percentage) { - let zong - if (percentage == undefined || percentage === null || percentage == '') { - percentage = 0 - zong = 10000 - } - return `${percentage} / ${percentage==''?zong:parseInt(percentage) *10}`; - }, + // customFormat(percentage) { + // let zong + // if (percentage == undefined || percentage === null || percentage == '') { + // percentage = 0 + // zong = 10000 + // } + // return `${percentage} / ${percentage==''?zong:parseInt(percentage) *10}`; + // }, baifenbi(item) { let zong @@ -2414,11 +2495,107 @@ this.searchShow = true }, lichange(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.effectivenessList[e] + // this.duibiList = JSON.parse(msg.modifyContent) + + this.duibiList = JSON.parse(msg.modifiedData) +console.log(this.duibiList,'msgmsgmsg') + }, + 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 diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue index 62b581d..ab60241 100644 --- a/admin-web-master/src/views/activity/activitySp.vue +++ b/admin-web-master/src/views/activity/activitySp.vue @@ -848,11 +848,11 @@ min-width="22%"> - - + @@ -880,7 +880,7 @@ label-width="120px" style="position: relative"> - @@ -888,7 +888,7 @@ - @@ -897,7 +897,7 @@ - +
{{ zhixingList.costEstimationGoods }}
@@ -907,21 +907,21 @@ - +
{{ zhixingList.setCostEstimate }}
 - +
{{ zhixingList.estimatedPromotionalExpenses }}
 - +
{{ zhixingList.otherNecessaryEstimates }}
@@ -931,7 +931,7 @@ - +
{{ zhixingList.totalCostEstimation }}
@@ -962,7 +962,7 @@ label-width="120px" style="position: relative"> - @@ -970,7 +970,7 @@ - +
{{ zhixingList.expectedParticipation }}
@@ -978,7 +978,7 @@ - +
{{ zhixingList.expectedDirectBenefits }}
@@ -987,7 +987,7 @@ - +
{{ zhixingList.expectedIndirectBenefits }}
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue index f3ef54c..6b0925d 100644 --- a/admin-web-master/src/views/activity/index.vue +++ b/admin-web-master/src/views/activity/index.vue @@ -848,10 +848,10 @@ - + - + @@ -879,7 +879,7 @@ label-width="120px" style="position: relative"> - - +
{{ zhixingList.externalLaborCostEstimation }}
@@ -896,7 +896,7 @@ - +
{{ zhixingList.costEstimationGoods }}
@@ -906,21 +906,21 @@ - +
{{ zhixingList.setCostEstimate }}
 - +
{{ zhixingList.estimatedPromotionalExpenses }}
 - +
{{ zhixingList.otherNecessaryEstimates }}
@@ -930,7 +930,7 @@ - +
{{ zhixingList.totalCostEstimation }}
@@ -961,7 +961,7 @@ label-width="120px" style="position: relative"> - @@ -969,7 +969,7 @@ - +
{{ zhixingList.expectedParticipation }}
@@ -977,7 +977,7 @@ - +
{{ zhixingList.expectedDirectBenefits }}
@@ -986,7 +986,7 @@ - +
{{ zhixingList.expectedIndirectBenefits }}
@@ -1858,6 +1858,7 @@ }).then(res => { this.fenxiData = res.data + this.fenxiData.incomeAnalysis = Number(res.data.incomeAnalysis).toFixed(2) this.xiaoguoBox = true this.$nextTick(() => { // this.shopLiu(this.$refs.shopL); diff --git a/admin-web-master/src/views/atmosphere/atmosphereBian.vue b/admin-web-master/src/views/atmosphere/atmosphereBian.vue index 5396368..4c434bb 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereBian.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereBian.vue @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - - + - + - + - + @@ -82,7 +82,7 @@
- + diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue index f4037f7..ff6831b 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - - + @@ -77,12 +77,12 @@ - + - + @@ -99,7 +99,7 @@ - + - + - + diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue index 43699a9..29d95ee 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue @@ -907,10 +907,10 @@ - + - + @@ -937,14 +937,14 @@ label-width="120px" style="position: relative"> - - @@ -952,7 +952,7 @@ - + @@ -961,19 +961,19 @@ - + - + - + @@ -982,7 +982,7 @@ - + @@ -1011,21 +1011,21 @@ label-width="120px" style="position: relative"> - - + - + @@ -1033,7 +1033,7 @@ - + @@ -1855,6 +1855,7 @@ id: item.id }).then(res => { this.fenxiData = res.data + this.fenxiData.incomeAnalysis = Number(res.data.incomeAnalysis).toFixed(2) this.xiaoguoBox = true this.$nextTick(() => { this.jiaoLiu(this.$refs.jiaoL, this.fenxiData); diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue index b3bcb68..61f6504 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue @@ -1675,7 +1675,8 @@ pageNumber: 1, pageSize: 10, dataOwnership: '2', - isDraft: 0 + isDraft: 0, + state:'5' }, multipleSelection: [], options: [], diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue index be60c9b..06fe6ab 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue @@ -987,10 +987,10 @@ - + - + @@ -1016,18 +1016,18 @@ style="position: relative"> - + - + - + @@ -1035,17 +1035,17 @@ - + - + - + @@ -1053,7 +1053,7 @@ - + @@ -1080,25 +1080,25 @@ style="position: relative"> - + - + - + - + diff --git a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue index 1026270..a739c7e 100644 --- a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue +++ b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue @@ -51,19 +51,26 @@ :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" > + - + - + - + diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue index 921793b..3b24148 100644 --- a/admin-web-master/src/views/shopRental/manage/index.vue +++ b/admin-web-master/src/views/shopRental/manage/index.vue @@ -297,12 +297,14 @@ // return const file = new File([response.data], 'filename.txt', { type: 'text/plain' }); console.log(file); + let userData = JSON.parse(localStorage.getItem('user')); let fd = new FormData(); fd.append('files', file); // 假设 formData 包含文件 fd.append('reviewers', this.ruleForm.reviewers); fd.append('fileNames', '合同.docx'); - fd.append('title', '合同审批'); + fd.append('title', `${row.contractName}审批`); fd.append('contractNumber', row.contractNumber); + fd.append('sponsor', userData.user.id); console.log(fd); // return // let c1 ={ diff --git a/ceres-uniapp-master/pages/tabbar/user/index.data.js b/ceres-uniapp-master/pages/tabbar/user/index.data.js index 1c8c64a..6d78ab9 100644 --- a/ceres-uniapp-master/pages/tabbar/user/index.data.js +++ b/ceres-uniapp-master/pages/tabbar/user/index.data.js @@ -56,12 +56,12 @@ export const fastCardOneList = [ icon:'../../../static/images/llzj.png', jumpUrl:'../../../pages_category_page2/userModule/footprintList' }, - { - id:3, - label:'分销中心', - icon:'../../../static/images/fxzx.png', - jumpUrl:'../../../pages_category_page1/distributionModule/index' - }, + // { + // id:3, + // label:'分销中心', + // icon:'../../../static/images/fxzx.png', + // jumpUrl:'../../../pages_category_page1/distributionModule/index' + // }, { id:4, label:'我的评价', diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue index e43767b..07a056d 100644 --- a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue +++ b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue @@ -197,9 +197,11 @@ export default { if (options.type) { this.tabCurrentType = options.type this.orderState = options.type + }else{ this.orderState = '' } + this.handleGetOrderList() }, onShow() { // #ifdef H5 diff --git a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue index e33a69b..4090bce 100644 --- a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue +++ b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue @@ -344,6 +344,8 @@ if(this.ids == ''){ info.storePrimaryKey = this.getTimestampWithRandom() } + // console.log(this.ids,info.storePrimaryKey,'ids') + // return this.$http.sendRequest('/cereAssetShopInformation/add', 'POST', info, 1).then(res => { uni.showToast({ title: '提交成功', diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index ddb3a5b..0baf976 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -21,17 +21,17 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; - // bases = 'http://128.10.249.23:9003'+ url; + bases = 'http://128.10.249.23:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - bases = c1 + 'cdwlMall/meserver/admin-server' + url; + // bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - // bases = 'http://128.10.249.46:9007' + url; - bases = c1 + 'cdwlMall/meserver/api' + url; + bases = 'http://128.10.249.23:9007' + url; + // bases = c1 + 'cdwlMall/meserver/api' + url; }else{ // bases = 'http://128.10.249.22:9004' + url; @@ -39,9 +39,9 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; - // bases = 'http://128.10.249.46:9004' + url; + bases = 'http://128.10.249.23:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; - bases = c1 + 'cdwlMall/business-server' + url; + // bases = c1 + 'cdwlMall/business-server' + url; } var token = uni.getStorageSync('token') || ''; diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue index f726b88..e48b205 100644 --- a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue +++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue @@ -30,7 +30,7 @@
- +
@@ -85,7 +85,7 @@ - + diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue index 5763b6c..baab9e8 100644 --- a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue +++ b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue @@ -47,13 +47,13 @@ - + - +