From ce1971727ae65b123daa124c70d5517a81fb2f57 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Wed, 28 Feb 2024 16:56:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order/base/orderGroup/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue index c14e840b..a531e16e 100644 --- a/src/views/order/base/orderGroup/index.vue +++ b/src/views/order/base/orderGroup/index.vue @@ -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(() => {}); } }, From d750cbe0f896626be7c6e4409b081d40826994ee Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 29 Feb 2024 09:20:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 ++-- .../energy/base/energyType/components/energyTypeAdd.vue | 8 -------- src/views/order/base/orderGroup/index.vue | 2 +- src/views/order/base/orderManage/index.vue | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.env.dev b/.env.dev index e6eafbc1..4df551ac 100644 --- a/.env.dev +++ b/.env.dev @@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统 # VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # VUE_APP_BASE_API = 'http://192.168.1.104:48082' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082' -VUE_APP_BASE_API = 'http://192.168.1.47:48082' +# VUE_APP_BASE_API = 'http://192.168.1.47:48082' # socket地址 VUE_APP_Socket_API = 'ws://192.168.0.30:8888' VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' 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 a531e16e..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 } ] } 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 } ] }