diff --git a/src/views/productionManagement/components/batchesDialog.vue b/src/views/productionManagement/components/batchesDialog.vue index ec76805..78e4f11 100644 --- a/src/views/productionManagement/components/batchesDialog.vue +++ b/src/views/productionManagement/components/batchesDialog.vue @@ -48,7 +48,7 @@ @@ -69,6 +69,7 @@ export default { }, data() { return { + saveLoading: false, isOpen: false, batchesForm: {}, batchesRules: { @@ -87,6 +88,7 @@ export default { submit() { this.$refs.batchesForm.validate(valid => { if (valid) { + this.saveLoading = true; let query = { id: this.itemData[0].woId, batchNo: this.itemData[0].batchNo, @@ -95,13 +97,17 @@ export default { makeQty: this.batchesForm.makeQty, batchReason: this.batchesForm.batchReason, }; - inBatches(query).then((res) => { - if (res.code == 200) { + inBatches(query) + .then(res => { this.$message.success('操作成功'); + this.saveLoading = false; this.closeDialog(); - } - }); + }) + .catch(err => { + this.saveLoading = false; + }); } else { + this.saveLoading = false; console.log('error submit!!'); return false; } diff --git a/src/views/productionManagement/components/productionMonitoringDialog.vue b/src/views/productionManagement/components/productionMonitoringDialog.vue index 839fe22..b1f4911 100644 --- a/src/views/productionManagement/components/productionMonitoringDialog.vue +++ b/src/views/productionManagement/components/productionMonitoringDialog.vue @@ -11,7 +11,7 @@ @@ -31,6 +31,7 @@ export default { }, data() { return { + loadingSave:false, openShow: false, form: { priority: '', @@ -74,16 +75,22 @@ export default { //如果存在验证不通过,msg为错误信息 this.$refs.form.validate((valid, done, msg) => { if (valid) { + this.loadingSave = true // this.$emit('submitPriority', this.form); updatePrioritye({ demandDate: this.form.demandDate, - priority: this.form.priority, - id: this.itemData[0].woId, + priority:Number(this.form.priority), + woId: this.itemData[0].woId, }).then(res => { + this.loadingSave = false this.$message.success('操作成功'); this.closeDialog(); - }); + }).catch(err=>{ + this.loadingSave = false + done() + }) } else { + this.loadingSave = false console.log('error submit!!'); return false; } diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue index 334a13d..142a056 100644 --- a/src/views/productionManagement/productionMonitoring.vue +++ b/src/views/productionManagement/productionMonitoring.vue @@ -703,9 +703,9 @@ export default { this.showClose = false; this.showAbnormal = false; this.isPriorityOpen = false; - if (type) { + // if (type) { this.onLoad(this.page, this.query); - } + // } }, currentChange(currentPage) { this.page.currentPage = currentPage; diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index b824a5c..b6a4e31 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -582,9 +582,9 @@ export default { this.showClose = false; this.showAbnormal = false; this.isPriorityOpen = false; - if (type) { + // if (type) { this.onLoad(this.page, this.query); - } + // } }, currentChange(currentPage) { this.page.currentPage = currentPage;