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

Merge branch 'projects/mesxc-test' into projects/mesxc-dy

Browse Source
This commit is contained in:
helloDy 2024-02-29 15:55:12 +08:00
commit 7c8c584837
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,10 +233,6 @@ export default {
// 增加 // 增加
emitButtonClick1() { emitButtonClick1() {
let n = this.tableData1.length let n = this.tableData1.length
if (n >=3) {
this.$modal.msgWarning('最多可添加3档计价')
return false
}
let obj = {} let obj = {}
obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
obj.endTime = '' obj.endTime = ''
@ -245,10 +241,6 @@ export default {
}, },
emitButtonClick2() { emitButtonClick2() {
let n = this.tableData2.length let n = this.tableData2.length
// if (n >=3) {
// this.$modal.msgWarning('最多可添加3档计价')
// return false
// }
let obj = {} let obj = {}
obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
obj.endUsed = 0 obj.endUsed = 0

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

@ -283,7 +283,7 @@ export default {
{ {
type: 'less', type: 'less',
name: 'status', name: 'status',
value: 3 value: 2
} }
] ]
} }
@ -383,9 +383,9 @@ export default {
}, },
// 完成,终止，作废 // 完成,终止，作废
handleEditStatus(val, tip, status) { handleEditStatus(val, tip, status) {
console.log(val) let _this = this
if (val.orderIdNum > 0) {// 有下级订单 if (val.orderIdNum > 0) {// 有下级订单
this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', { _this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
type: 'warning', type: 'warning',
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '同步', confirmButtonText: '同步',
@ -393,26 +393,26 @@ export default {
}).then(function() { }).then(function() {
console.log('同步') console.log('同步')
groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => { groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}) })
}).catch(action => { }).catch(action => {
if (action === 'cancel') { if (action === 'cancel') {
console.log('不同步') console.log('不同步')
groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => { groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}) })
}else { }else {
return console.log('关闭') return console.log('关闭')
} }
}) })
}else{// 无下级订单 }else{// 无下级订单
this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() { _this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
return groupOrderStatusSet({ id: val.id, status: status}) return groupOrderStatusSet({ id: val.id, status: status})
}).then(() => { }).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}).catch(() => {}); }).catch(() => {});
} }
}, },

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

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