root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-11-05 20:35:49 +08:00
parent c797416a84
commit f681d81a5d
5 changed files with 98 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mes/qd/src/views/wms/pf/flourwork/OtherConfirmDialog.vue
View File

@@ -4,6 +4,7 @@
append-to-body append-to-body
width="500px" width="500px"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
v-loading.fullscreen.lock="fullscreenLoading"
:before-close="handleClose" :before-close="handleClose"
destroy-on-close destroy-on-close
@close="close" @close="close"
@@ -93,6 +94,7 @@ export default {
outForm: { formula_qty: null, sys_qty: null, fact_qty: null, put_qty: null }, outForm: { formula_qty: null, sys_qty: null, fact_qty: null, put_qty: null },
error_rate1: null, error_rate1: null,
error_rate2: null, error_rate2: null,
fullscreenLoading: false,
openType: null, openType: null,
confirm_type: null, confirm_type: null,
dialogVisible: false dialogVisible: false
@@ -146,10 +148,14 @@ export default {
'error_rate1': this.error_rate1, 'error_rate1': this.error_rate1,
'error_rate2': this.error_rate2 'error_rate2': this.error_rate2
} }
this.fullscreenLoading = true
crudFlourwork.sendMaterConfirm(data).then(res => { crudFlourwork.sendMaterConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.close() this.close()
this.$parent.$parent.refresh() this.$parent.$parent.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 物料确认 // 物料确认
@@ -160,10 +166,14 @@ export default {
'error_rate1': this.error_rate1, 'error_rate1': this.error_rate1,
'error_rate2': this.error_rate2 'error_rate2': this.error_rate2
} }
this.fullscreenLoading = true
crudFlourwork.materConfirm(data).then(res => { crudFlourwork.materConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.close() this.close()
this.$parent.$parent.refresh() this.$parent.$parent.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 配粉确认 // 配粉确认
@@ -174,12 +184,16 @@ export default {
'error_rate1': this.error_rate1, 'error_rate1': this.error_rate1,
'error_rate2': this.error_rate2 'error_rate2': this.error_rate2
} }
this.fullscreenLoading = true
crudFlourwork.flourConfirm(data).then(res => { crudFlourwork.flourConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.dialogVisible = false this.dialogVisible = false
this.$parent.$parent.close() this.$parent.$parent.close()
// this.close() // this.close()
this.$parent.$parent.$parent.crud.toQuery() this.$parent.$parent.$parent.crud.toQuery()
}).catch(() => {
this.fullscreenLoading = false
}) })
} }
} }

6
mes/qd/src/views/wms/pf/flourwork/OutConfirmDialog.vue
View File

@@ -3,6 +3,7 @@
title="出库确认" title="出库确认"
append-to-body append-to-body
width="500px" width="500px"
v-loading.fullscreen.lock="fullscreenLoading"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="handleClose" :before-close="handleClose"
destroy-on-close destroy-on-close
@@ -67,6 +68,7 @@ export default {
data() { data() {
return { return {
outForm: {}, outForm: {},
fullscreenLoading: false,
error_rate: null, error_rate: null,
dialogVisible: false dialogVisible: false
} }
@@ -88,10 +90,14 @@ export default {
'form': this.outForm, 'form': this.outForm,
'error_rate': this.error_rate 'error_rate': this.error_rate
} }
this.fullscreenLoading = true
crudFlourwork.outConfirm(data).then(res => { crudFlourwork.outConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.close() this.close()
this.$parent.$parent.refresh() this.$parent.$parent.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
} }
} }

34
mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
View File

@@ -4,6 +4,7 @@
append-to-body append-to-body
fullscreen fullscreen
:before-close="closeView" :before-close="closeView"
v-loading.fullscreen.lock="fullscreenLoading"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
@open="openView" @open="openView"
> >
@@ -290,6 +291,7 @@ export default {
return { return {
fla: false, fla: false,
form: {}, form: {},
fullscreenLoading: false,
tableDtl: [], tableDtl: [],
tabledis: [], tabledis: [],
dtlJson: null, dtlJson: null,
@@ -361,6 +363,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.fullscreenLoading = true
const data = { const data = {
'device_id': this.form.device_id, 'device_id': this.form.device_id,
'formula_id': this.form.formula_id 'formula_id': this.form.formula_id
@@ -368,6 +371,7 @@ export default {
this.fla = true this.fla = true
crudFlourwork.autoCalledMater(data).then(res => { crudFlourwork.autoCalledMater(data).then(res => {
const num = res.task const num = res.task
this.fullscreenLoading = false
if (num === undefined) { if (num === undefined) {
this.crud.notify('叫料成功,生成0个任务', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('叫料成功,生成0个任务', CRUD.NOTIFICATION_TYPE.SUCCESS)
} else { } else {
@@ -376,6 +380,7 @@ export default {
this.fla = false this.fla = false
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
@@ -388,6 +393,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.fullscreenLoading = true
if (this.dtlJson === null) { if (this.dtlJson === null) {
return this.crud.notify('请选择明细', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('请选择明细', CRUD.NOTIFICATION_TYPE.INFO)
} }
@@ -406,10 +412,12 @@ export default {
} }
this.fla = true this.fla = true
crudFlourwork.calledMater(data).then(res => { crudFlourwork.calledMater(data).then(res => {
this.fullscreenLoading = false
this.fla = false this.fla = false
this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
@@ -449,12 +457,15 @@ export default {
'device_id': this.form.device_id 'device_id': this.form.device_id
} }
this.fla = true this.fla = true
this.fullscreenLoading = true
crudFlourwork.startWork(data).then(res => { crudFlourwork.startWork(data).then(res => {
this.fullscreenLoading = false
this.openView() this.openView()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fla = false this.fla = false
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
this.fullscreenLoading = false
}) })
} }
if (arr[i].status === '10') { if (arr[i].status === '10') {
@@ -493,12 +504,15 @@ export default {
'device_id': this.form.device_id 'device_id': this.form.device_id
} }
this.fla = true this.fla = true
this.fullscreenLoading = true
crudFlourwork.again(data).then(res => { crudFlourwork.again(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
this.fla = false this.fla = false
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
this.fla = false this.fla = false
@@ -515,8 +529,12 @@ export default {
const data = { const data = {
'form': this.disJson 'form': this.disJson
} }
this.fullscreenLoading = true
crudFlourwork.outConfirm(data).then(res => { crudFlourwork.outConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 投料确认按钮 // 投料确认按钮
@@ -536,9 +554,13 @@ export default {
const data = { const data = {
'form': this.disJson 'form': this.disJson
} }
this.fullscreenLoading = true
crudFlourwork.sendMaterConfirm(data).then(res => { crudFlourwork.sendMaterConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
}) })
@@ -564,9 +586,13 @@ export default {
const data = { const data = {
'form': this.dtlJson 'form': this.dtlJson
} }
this.fullscreenLoading = true
crudFlourwork.materConfirm(data).then(res => { crudFlourwork.materConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
}) })
@@ -591,9 +617,13 @@ export default {
const data = { const data = {
'form': this.form 'form': this.form
} }
this.fullscreenLoading = true
crudFlourwork.flourConfirm(data).then(res => { crudFlourwork.flourConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
}) })
@@ -612,9 +642,13 @@ export default {
return this.crud.notify('已出库，不能删除！', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('已出库，不能删除！', CRUD.NOTIFICATION_TYPE.INFO)
} }
const data = this.disJson const data = this.disJson
this.fullscreenLoading = true
crudFlourwork.delDtlTask(data).then(res => { crudFlourwork.delDtlTask(data).then(res => {
this.fullscreenLoading = false
this.refresh() this.refresh()
this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}).catch(() => { }).catch(() => {
}) })

14
mes/qd/src/views/wms/pf/flourwork/WorkDialog2.vue
View File

@@ -4,6 +4,7 @@
append-to-body append-to-body
fullscreen fullscreen
:before-close="closeView" :before-close="closeView"
v-loading.fullscreen.lock="fullscreenLoading"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
@open="openView" @open="openView"
> >
@@ -251,6 +252,7 @@ export default {
isSuccess: true, isSuccess: true,
path: 'ws://localhost:8010/webSocket/10', path: 'ws://localhost:8010/webSocket/10',
webSocketResult: {}, webSocketResult: {},
fullscreenLoading: false,
form: {}, form: {},
tableDtl: [], tableDtl: [],
tabledis: [], tabledis: [],
@@ -327,8 +329,12 @@ export default {
if (this.dtlJson.is_need_move !== '是') { if (this.dtlJson.is_need_move !== '是') {
return this.crud.notify('选择物料必须为需要移库', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('选择物料必须为需要移库', CRUD.NOTIFICATION_TYPE.INFO)
} }
this.fullscreenLoading = true
crudFlourwork.calledMater(data).then(res => { crudFlourwork.calledMater(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
startWork() { startWork() {
@@ -339,9 +345,13 @@ export default {
return this.crud.notify('选择配方明细物料状态必须为生成状态', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('选择配方明细物料状态必须为生成状态', CRUD.NOTIFICATION_TYPE.INFO)
} }
const data = this.dtlJson const data = this.dtlJson
this.fullscreenLoading = true
crudFlourwork.startWork(data).then(res => { crudFlourwork.startWork(data).then(res => {
this.fullscreenLoading = false
this.openView() this.openView()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 出库确认按钮 // 出库确认按钮
@@ -428,9 +438,13 @@ export default {
return this.crud.notify('已出库，不能删除！', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('已出库，不能删除！', CRUD.NOTIFICATION_TYPE.INFO)
} }
const data = this.disJson const data = this.disJson
this.fullscreenLoading = true
crudFlourwork.delDtlTask(data).then(res => { crudFlourwork.delDtlTask(data).then(res => {
this.fullscreenLoading = false
this.refresh() this.refresh()
this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// websocket 监控 // websocket 监控

30
mes/qd/src/views/wms/pf/flourwork/WorkDialog3.vue
View File

@@ -2,6 +2,7 @@
<el-dialog <el-dialog
title="配粉作业" title="配粉作业"
append-to-body append-to-body
v-loading.fullscreen.lock="fullscreenLoading"
fullscreen fullscreen
:before-close="closeView" :before-close="closeView"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
@@ -258,6 +259,7 @@ export default {
form: {}, form: {},
tableDtl: [], tableDtl: [],
tabledis: [], tabledis: [],
fullscreenLoading: false,
dtlJson: null, dtlJson: null,
disJson: null, disJson: null,
dialogVisible: false dialogVisible: false
@@ -332,8 +334,12 @@ export default {
if (this.form.status !== '30') { if (this.form.status !== '30') {
return this.crud.notify('配方状态必须为生产中', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('配方状态必须为生产中', CRUD.NOTIFICATION_TYPE.INFO)
} }
this.fullscreenLoading = true
crudFlourwork.autoCalledMater(data).then(res => { crudFlourwork.autoCalledMater(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
calledMater() { calledMater() {
@@ -353,8 +359,12 @@ export default {
if (this.dtlJson.is_need_move !== '1') { if (this.dtlJson.is_need_move !== '1') {
return this.crud.notify('选择物料必须为需要移库', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('选择物料必须为需要移库', CRUD.NOTIFICATION_TYPE.INFO)
} }
this.fullscreenLoading = true
crudFlourwork.calledMater(data).then(res => { crudFlourwork.calledMater(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('叫料成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
startWork() { startWork() {
@@ -393,8 +403,12 @@ export default {
const data = { const data = {
'form': this.disJson 'form': this.disJson
} }
this.fullscreenLoading = true
crudFlourwork.outConfirm(data).then(res => { crudFlourwork.outConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 投料确认按钮 // 投料确认按钮
@@ -408,9 +422,13 @@ export default {
const data = { const data = {
'form': this.disJson 'form': this.disJson
} }
this.fullscreenLoading = true
crudFlourwork.sendMaterConfirm(data).then(res => { crudFlourwork.sendMaterConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 物料确认按钮 // 物料确认按钮
@@ -428,9 +446,13 @@ export default {
const data = { const data = {
'form': this.dtlJson 'form': this.dtlJson
} }
this.fullscreenLoading = true
crudFlourwork.materConfirm(data).then(res => { crudFlourwork.materConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
// 配粉确认按钮 // 配粉确认按钮
@@ -447,9 +469,13 @@ export default {
const data = { const data = {
'form': this.form 'form': this.form
} }
this.fullscreenLoading = true
crudFlourwork.flourConfirm(data).then(res => { crudFlourwork.flourConfirm(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('确认成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.refresh() this.refresh()
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
delDtlTask() { delDtlTask() {
@@ -460,9 +486,13 @@ export default {
return this.crud.notify('已出库，不能删除！', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('已出库，不能删除！', CRUD.NOTIFICATION_TYPE.INFO)
} }
const data = this.disJson const data = this.disJson
this.fullscreenLoading = true
crudFlourwork.delDtlTask(data).then(res => { crudFlourwork.delDtlTask(data).then(res => {
this.fullscreenLoading = false
this.refresh() this.refresh()
this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
}) })
}, },
statusName1(row, column) { statusName1(row, column) {