From 9a807ff798a3ef2aaa5613aa7193aab97fb7aae0 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Mon, 26 Feb 2024 10:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E6=BA=90bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/energyQuantityRealtime/index.vue | 2 +- .../energyType/components/energyTypeAdd.vue | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue index 3c96905d..956c4077 100644 --- a/src/views/energy/base/energyQuantityRealtime/index.vue +++ b/src/views/energy/base/energyQuantityRealtime/index.vue @@ -193,7 +193,7 @@ export default { if (this.exportList.length > 0) { let body = this.exportList.map((x) => [ x.objName, - x.objRemark, + x.objCode, x.energyTypeName, x.startValue, x.endValue, diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue index 434f06f3..e9f085c0 100644 --- a/src/views/energy/base/energyType/components/energyTypeAdd.vue +++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue @@ -152,7 +152,7 @@ export default { id: '', name: '', code: '', - nuit: '', + unit: '', pricingMethod: 2, leaderName: '', push: false @@ -186,16 +186,16 @@ export default { if (res.code === 0) { this.form.name = res.data.name this.form.code = res.data.code - this.form.nuit = res.data.nuit + this.form.unit = res.data.unit this.form.pricingMethod = res.data.pricingMethod this.form.leaderName = res.data.leaderName this.form.push = res.data.push ? true : false switch(this.form.pricingMethod) { case 0: - this.tableData1 = this.form.segPriceList || [] + this.tableData1 = res.data.segPriceList || [] break; case 1: - this.tableData2 = this.form.usedPriceList || [] + this.tableData2 = res.data.usedPriceList || [] break; default: } @@ -233,10 +233,10 @@ export default { // 增加 emitButtonClick1() { let n = this.tableData1.length - // if (n >=3) { - // this.$modal.msgWarning('最多可添加3档计价') - // return false - // } + if (n >=3) { + this.$modal.msgWarning('最多可添加3档计价') + return false + } let obj = {} obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.endTime = '' @@ -245,10 +245,10 @@ export default { }, emitButtonClick2() { let n = this.tableData2.length - if (n >=3) { - this.$modal.msgWarning('最多可添加3档计价') - return false - } + // if (n >=3) { + // this.$modal.msgWarning('最多可添加3档计价') + // return false + // } let obj = {} obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.endUsed = 0