实际成本
内部人力
- {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元
+ {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:''}}元
外部人力
- {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元
+ {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:''}}元
商品成本
-
{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元
+
+ {{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:''}}元
设备成本
-
{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元
+
{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:''}}元
宣传费用
- {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元
+ {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:''}}元
其他成本
- {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元
+ {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:''}}元
总成本
-
{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元
+
+ {{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:''}}元
@@ -1256,34 +1277,34 @@
增长率
- {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}%
+ {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:''}}%
- {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}%
+ {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:''}}%
- {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}%
+ {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:''}}%
- {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}%
+ {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:''}}%
- {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}%
+ {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:''}}%
- {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:0}}%
+ {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:''}}%
- {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:0}}%
+ {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:''}}%
-
-
+
+
实际成本
@@ -1291,45 +1312,47 @@
style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
内部人力
- {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元
+ {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:''}}元
外部人力
- {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元
+ {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:''}}元
商品成本
-
{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元
+
+ {{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:''}}元
设备成本
-
{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元
+
{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:''}}元
宣传费用
- {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元
+ {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:''}}元
其他成本
- {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元
+ {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:''}}元
总成本
-
{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元
+
+ {{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:''}}元
@@ -1449,7 +1472,7 @@
:format="() => customFormat(duibiTwo.otherNecessaryEstimates==undefined?'':duibiTwo.otherNecessaryEstimates)">
-->
-
+
@@ -1539,7 +1562,7 @@
excelAdd,
effectEvaluation,
lishiDeta,
- effectivenessLog
+ effectivenessLog
} from '../../api/activityBz'
import actbians from "./atmosphereBian"
import * as echarts from 'echarts'
@@ -1572,7 +1595,7 @@
pageNumber: 1,
pageSize: 10,
isDraft: 0,
- state:'5'
+ state: '5'
},
planFen: '',
@@ -1716,7 +1739,7 @@
pageSize: 10,
dataOwnership: '2',
isDraft: 0,
- state:'5'
+ state: '5'
},
multipleSelection: [],
options: [],
@@ -1782,13 +1805,30 @@
ListTwo: '',
effectivenessListOne: {},
effectivenessListTwo: {},
- zhixingRules:{
+ zhixingRules: {
planName: [{
required: true,
message: '请输入活动名称',
trigger: 'blur'
}],
- }
+ },
+ numBerList: 0
+ }
+ },
+ watch: {
+ tableDa: {
+ handler(newVal, oldVal) {
+ this.numBerList += 1
+
+ },
+ deep: true
+ },
+ zhixingList: {
+ handler(newVal, oldVal) {
+ this.numBerList += 1
+
+ },
+ deep: true
}
},
created() {
@@ -1899,7 +1939,7 @@
pageNumber: 1,
pageSize: 10,
isDraft: 0,
- state:'5'
+ state: '5'
}
this.getAll()
@@ -1926,7 +1966,7 @@
this.activeName = 'fourd'
}
- effectivenessLog({
+ effectivenessLog({
activityEffectivenessId: item.id
}).then(res => {
this.effectivenessList = res.data
@@ -2018,7 +2058,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
@@ -2069,7 +2109,7 @@
formTime(data) {
this.zhixingList.planTime = data
},
- blur(){
+ blur() {
this.$forceUpdate()
},
removeEmptyValues(obj) {
@@ -2266,7 +2306,7 @@
},
xiaoguo(item) {
- this.xiaoDui = true
+ this.xiaoDui = true
this.duibiOne = item
console.log(item)
let that = this
@@ -2279,9 +2319,9 @@
this.effectivenessList[index].operationType = actName[0]
})
})
- this.ListOne =''
+ this.ListOne = ''
this.ListTwo = ''
- this.effectivenessListOne ={}
+ this.effectivenessListOne = {}
this.effectivenessListTwo = {}
// this.xiaoDui = true
@@ -2471,13 +2511,13 @@
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)
- let msg = this.effectivenessList[e]
- this.duibiList = JSON.parse(msg.modifiedData)
+ let msg = this.effectivenessList[e]
+ this.duibiList = JSON.parse(msg.modifiedData)
},
lichangeOne(e) {
let msg = this.effectivenessList[e]
@@ -2491,8 +2531,8 @@
.internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
'' && this.effectivenessListTwo
.internalLaborCostEstimation != '') {
- let sum = (Number(this.effectivenessListOne.internalLaborCostEstimation) - Number(this
- .effectivenessListTwo.internalLaborCostEstimation)) / Number(this.effectivenessListTwo
+ let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
+ .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
.internalLaborCostEstimation) * 100
this.effectivenessListOne.sumNei = sum.toFixed(2)
}
@@ -2500,53 +2540,52 @@
.externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
'' && this.effectivenessListTwo
.externalLaborCostEstimation != '') {
- let sum = (Number(this.effectivenessListOne.externalLaborCostEstimation) - Number(this
- .effectivenessListTwo.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
+
+ let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
+ .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
.externalLaborCostEstimation) * 100
this.effectivenessListOne.sumWai = sum.toFixed(2)
-
+
}
if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
.costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
.effectivenessListTwo
.costEstimationGoods != '') {
- let sum = (Number(this.effectivenessListOne.costEstimationGoods) - Number(this.effectivenessListTwo
+ let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
this.effectivenessListOne.sumShop = sum.toFixed(2)
-
+
}
if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
.setCostEstimate != '') {
- let sum = (Number(this.effectivenessListOne.setCostEstimate) - Number(this.effectivenessListTwo
+ let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
this.effectivenessListOne.sumSe = sum.toFixed(2)
-
+
}
if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
.estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
'' && this.effectivenessListTwo
.estimatedPromotionalExpenses != '') {
- let sum = (Number(this.effectivenessListOne.estimatedPromotionalExpenses) - Number(this
- .effectivenessListTwo.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
+ let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
+ .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
.estimatedPromotionalExpenses) * 100
-
+
this.effectivenessListOne.sumXuan = sum.toFixed(2)
}
if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
this.effectivenessListTwo
.otherNecessaryEstimates != '') {
- let sum = (Number(this.effectivenessListOne.otherNecessaryEstimates) - Number(this.effectivenessListTwo
- .otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
+ let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
this.effectivenessListOne.sumQi = sum.toFixed(2)
}
if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
.effectivenessListTwo
.totalCostEstimation != '') {
- let sum = (Number(this.effectivenessListOne.totalCostEstimation) - Number(this.effectivenessListTwo
- .totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
+ let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
this.effectivenessListOne.sumAll = sum.toFixed(2)
}
// sumNei
@@ -2572,68 +2611,80 @@
} else {
this.effectivenessListTwo = msg.modifiedData
}
- if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
- .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
- '' && this.effectivenessListTwo
- .internalLaborCostEstimation != '') {
- let sum = (Number(this.effectivenessListOne.internalLaborCostEstimation) - Number(this
- .effectivenessListTwo.internalLaborCostEstimation)) / Number(this.effectivenessListTwo
- .internalLaborCostEstimation) * 100
- this.effectivenessListOne.sumNei = sum.toFixed(2)
- }
- if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
- .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
- '' && this.effectivenessListTwo
- .externalLaborCostEstimation != '') {
- let sum = (Number(this.effectivenessListOne.externalLaborCostEstimation) - Number(this
- .effectivenessListTwo.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
- .externalLaborCostEstimation) * 100
- this.effectivenessListOne.sumWai = sum.toFixed(2)
-
- }
- if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
- .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
- .effectivenessListTwo
- .costEstimationGoods != '') {
- let sum = (Number(this.effectivenessListOne.costEstimationGoods) - Number(this.effectivenessListTwo
- .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
- this.effectivenessListOne.sumShop = sum.toFixed(2)
-
- }
- if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
- undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
- .setCostEstimate != '') {
- let sum = (Number(this.effectivenessListOne.setCostEstimate) - Number(this.effectivenessListTwo
- .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
- this.effectivenessListOne.sumSe = sum.toFixed(2)
-
- }
- if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
- .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
- '' && this.effectivenessListTwo
- .estimatedPromotionalExpenses != '') {
- let sum = (Number(this.effectivenessListOne.estimatedPromotionalExpenses) - Number(this
- .effectivenessListTwo.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
- .estimatedPromotionalExpenses) * 100
-
- this.effectivenessListOne.sumXuan = sum.toFixed(2)
- }
- if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
- .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
- this.effectivenessListTwo
- .otherNecessaryEstimates != '') {
- let sum = (Number(this.effectivenessListOne.otherNecessaryEstimates) - Number(this.effectivenessListTwo
- .otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
- this.effectivenessListOne.sumQi = sum.toFixed(2)
- }
- if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
- .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
- .effectivenessListTwo
- .totalCostEstimation != '') {
- let sum = (Number(this.effectivenessListOne.totalCostEstimation) - Number(this.effectivenessListTwo
- .totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
- this.effectivenessListOne.sumAll = sum.toFixed(2)
- }
+ if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
+ .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
+ '' && this.effectivenessListTwo
+ .internalLaborCostEstimation != '') {
+ let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
+ .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
+ .internalLaborCostEstimation) * 100
+ this.effectivenessListOne.sumNei = sum.toFixed(2)
+ }
+ if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
+ .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
+ '' && this.effectivenessListTwo
+ .externalLaborCostEstimation != '') {
+ let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
+ .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
+ .externalLaborCostEstimation) * 100
+ this.effectivenessListOne.sumWai = sum.toFixed(2)
+
+ }
+ if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
+ .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
+ .effectivenessListTwo
+ .costEstimationGoods != '') {
+ let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
+ .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
+ this.effectivenessListOne.sumShop = sum.toFixed(2)
+
+ }
+ if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
+ undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
+ .setCostEstimate != '') {
+ let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
+ .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
+ this.effectivenessListOne.sumSe = sum.toFixed(2)
+
+ }
+ if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
+ .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
+ '' && this.effectivenessListTwo
+ .estimatedPromotionalExpenses != '') {
+ let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
+ .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
+ .estimatedPromotionalExpenses) * 100
+
+ this.effectivenessListOne.sumXuan = sum.toFixed(2)
+ }
+ if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
+ .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
+ this.effectivenessListTwo
+ .otherNecessaryEstimates != '') {
+ let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
+ this.effectivenessListOne.sumQi = sum.toFixed(2)
+ }
+ if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
+ .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
+ .effectivenessListTwo
+ .totalCostEstimation != '') {
+ let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
+ this.effectivenessListOne.sumAll = sum.toFixed(2)
+ }
+ // sumNei
+ // sumWai
+ // sumShop
+ // sumSe
+ // sumXuan
+ // sumQi
+ // sumAll
+ // internalLaborCostEstimation
+ // externalLaborCostEstimation
+ // costEstimationGoods
+ // setCostEstimate
+ // estimatedPromotionalExpenses
+ // otherNecessaryEstimates
+ // totalCostEstimation
},
tiaozheng() {
this.tiaozhengShow = true
@@ -2652,44 +2703,54 @@
},
//执行效果保存
async bianji() {
+ if (this.numBerList > 3) {
+
+ } else {
+ this.$message({
+ message: '请填写或修改数据',
+ type: 'error',
+ offset: 100
+ })
+ return false;
+ }
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;
- }
- })
-
+ 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;
+ }
+ })
+
},
searchQuit() {
this.searPei = {
diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
index f6338ab..6a50605 100644
--- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
@@ -35,7 +35,7 @@
{{data.day.split("-").slice(2).join("-")}}
-
+
{{item.negotiationTime == data.day?item.negotiationResult:''}}
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 2e4ccf6..db9c6f1 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -368,6 +368,13 @@
resourcesId: this.oncetype + this.oninfo.id,
rentalPoliciesIds: ids,
}
+ if(c1.rentalPoliciesIds.length==0){
+ this.$message({
+ message: '请选择策略进行绑定',
+ type: 'warning'
+ })
+ return
+ }
console.error(c1)
cereResourceStrategy(c1).then(res => {
if (res.code == 200) {
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index f85f505..00531f5 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -205,6 +205,13 @@
resourcesId: this.oncetype+this.oninfo.id,
rentalPoliciesIds: ids,
}
+ if(c1.rentalPoliciesIds.length==0){
+ this.$message({
+ message: '请选择策略进行绑定',
+ type: 'warning'
+ })
+ return
+ }
console.error(c1)
cereResourceStrategy(c1).then(res => {
if (res.code == 200) {
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index 2a82865..3364260 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -223,6 +223,13 @@
resourcesId: this.oncetype + this.oninfo.id,
rentalPoliciesIds: ids,
}
+ if(c1.rentalPoliciesIds.length==0){
+ this.$message({
+ message: '请选择策略进行绑定',
+ type: 'warning'
+ })
+ return
+ }
console.error(c1)
cereResourceStrategy(c1).then(res => {
if (res.code == 200) {
diff --git a/admin-web-master/src/views/online/transaction/index.vue b/admin-web-master/src/views/online/transaction/index.vue
index a48c86a..5689fdc 100644
--- a/admin-web-master/src/views/online/transaction/index.vue
+++ b/admin-web-master/src/views/online/transaction/index.vue
@@ -26,7 +26,7 @@
-
总销售额
+
总销售额(元)
{{rules.totalSales}}
-
+
-
{{index + 1 }}
@@ -92,7 +92,7 @@
-
@@ -149,7 +149,8 @@
orderStatisticsProductInformation,
orderGetAll,
orderIndex,
- getAllNotPage
+ getAllNotPage,
+ salesRanking
} from '@/api/orderany'
export default {
data() {
@@ -177,18 +178,7 @@
trigger: 'change'
}]
},
- info:{
- hotSellProducts:[
- {
- "productName": "wo",
- "number": 1
- },
- {
- "productName": "测试商品",
- "number": 3
- }
-]
- },
+
dataList: [{
name: '订单总数 (件)',
value: '0',
@@ -263,13 +253,16 @@
async getTotalData() {
const res = await getAllNotPage(this.formParams)
+ const biao = await salesRanking(res.data)
+ this.tableData = biao.data.sort((a, b) => b.multiply - a.multiply);
+ this.total = biao.data.length
const Orderlist = await orderStatistics(res.data)
const tablelist = await orderStatisticsProductInformation(res.data)
// console.log(tablelist.data.commodityInformation)
- this.tableData = Object.values(tablelist.data.commodityInformation).flat();
- console.log(this.tableData)
- this.total = this.tableData.length
+ // this.tableData = Object.values(tablelist.data.commodityInformation).flat();
+ // console.log(this.tableData)
+ // this.total = this.tableData.length
this.Orderlist = Orderlist.data.bestSellers
let length = 0;
let keys = []
@@ -298,8 +291,7 @@
this.draws(orderIn.data.conversion)
- // this.info = d
- // }
+
},
handleCurrentChange(val) {
@@ -637,7 +629,7 @@ async userVisitExport() {
height: 500px;
}
.empty {
- height: 450px;
+ /* height: 450px; */
img {
width: 80px;
height: 80px;
diff --git a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
index a739c7e..9526014 100644
--- a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
+++ b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
@@ -42,6 +42,10 @@
待审核
审核失败
+
+ 商品组合：
+ {{productItem.combinationName}}
+
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index e66418a..613b745 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -94,6 +94,7 @@
查看
审核
+ 终止
录入合同
@@ -314,6 +315,34 @@
this.detailsinfo = row
this.onaction = '3'
},
+ zhongzhi(item,val){
+
+ let that = this
+ this.$confirm('确定要当前记录吗？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => { msgedit({
+ id: item.id,
+ auditStatus: val,
+ }).then(res => {
+ if (res.code == 200) {
+ this.$message({
+ message: '处理成功',
+ type: 'success'
+ })
+ this.getAll()
+ } else {
+ this.$message({
+ message: '处理失败',
+ type: 'error'
+ })
+ }
+ })
+ })
+
+
+ },
removeinfo(row, e) {
this.contractChangeReason = e
this.detailsinfo = row
diff --git a/admin-web-master/src/views/revenue/totalsales/index.vue b/admin-web-master/src/views/revenue/totalsales/index.vue
index 9a150a7..faac9d8 100644
--- a/admin-web-master/src/views/revenue/totalsales/index.vue
+++ b/admin-web-master/src/views/revenue/totalsales/index.vue
@@ -58,7 +58,7 @@
{{item.ticketChannel==1?'有赞':''}}销售总额(元)
-
{{item.sum}}
+
{{item.sum.toFixed(2)}}
@@ -190,7 +190,7 @@ numOne:0,
moyeOne += Number(item.price)
})
- this.moyeOne = moyeOne
+ this.moyeOne = moyeOne.toFixed(2)
this.echar2(this.tableData)
this.echar3( this.tableData)
diff --git a/admin-web-master/src/views/salesSta/dataSta.vue b/admin-web-master/src/views/salesSta/dataSta.vue
index 21e86e1..76037e5 100644
--- a/admin-web-master/src/views/salesSta/dataSta.vue
+++ b/admin-web-master/src/views/salesSta/dataSta.vue
@@ -28,7 +28,7 @@
-
+
@@ -97,7 +97,7 @@
-->
-
+
@@ -286,7 +286,7 @@