diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue index e9f085c0..1b808543 100644 --- a/src/views/energy/base/energyType/components/energyTypeAdd.vue +++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue @@ -233,10 +233,6 @@ export default { // 增加 emitButtonClick1() { let n = this.tableData1.length - if (n >=3) { - this.$modal.msgWarning('最多可添加3档计价') - return false - } let obj = {} obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.endTime = '' @@ -245,10 +241,6 @@ export default { }, emitButtonClick2() { let n = this.tableData2.length - // if (n >=3) { - // this.$modal.msgWarning('最多可添加3档计价') - // return false - // } let obj = {} obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.endUsed = 0 diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue index c14e840b..79316f63 100644 --- a/src/views/order/base/orderGroup/index.vue +++ b/src/views/order/base/orderGroup/index.vue @@ -283,7 +283,7 @@ export default { { type: 'less', name: 'status', - value: 3 + value: 2 } ] } @@ -383,9 +383,9 @@ export default { }, // 完成,终止,作废 handleEditStatus(val, tip, status) { - console.log(val) + let _this = this if (val.orderIdNum > 0) {// 有下级订单 - this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', { + _this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', { type: 'warning', distinguishCancelAndClose: true, confirmButtonText: '同步', @@ -393,26 +393,26 @@ export default { }).then(function() { console.log('同步') groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }) }).catch(action => { if (action === 'cancel') { console.log('不同步') groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }) }else { return console.log('关闭') } }) }else{// 无下级订单 - this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() { + _this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() { return groupOrderStatusSet({ id: val.id, status: status}) }).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }).catch(() => {}); } }, diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue index b3c722ed..ae99032f 100644 --- a/src/views/order/base/orderManage/index.vue +++ b/src/views/order/base/orderManage/index.vue @@ -293,7 +293,7 @@ export default { { type: 'less', name: 'status', - value: 3 + value: 2 } ] }