mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '订单状态对于按钮操作确认修改' (#219) from projects/mesxc-zjl into projects/mesxc-test

Browse Source 
Reviewed-on: #219
This commit is contained in:
朱菊兰 2024-02-29 09:21:07 +08:00
commit a822ffe138
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -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'

8
src/views/energy/base/energyType/components/energyTypeAdd.vue
View File

@ -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

2
src/views/order/base/orderGroup/index.vue
View File

@ -283,7 +283,7 @@ export default {
{
type: 'less',
name: 'status',
value: 3
value: 2
}
]
}

2
src/views/order/base/orderManage/index.vue
View File

@ -293,7 +293,7 @@ export default {
{
type: 'less',
name: 'status',
value: 3
value: 2
}
]
}