diff --git a/pages/SecondPhase/production/BakeProcess.vue b/pages/SecondPhase/production/BakeProcess.vue
index 91d9345..3ce9bd5 100644
--- a/pages/SecondPhase/production/BakeProcess.vue
+++ b/pages/SecondPhase/production/BakeProcess.vue
@@ -4,7 +4,7 @@
-
+
{{$t('grid.point-code')}}
@@ -12,7 +12,7 @@
-
+
{{$t('filter.mother-roll')}}
@@ -20,7 +20,7 @@
-
+
{{$t('filter.temperature')}}
@@ -32,7 +32,7 @@
/>
-
+
{{$t('filter.time')}}({{$t('unit.minute')}})
@@ -47,8 +47,8 @@
-
-
+
+
@@ -115,6 +115,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
+ import { confirmAction } from '@/utils/utils.js'
import {ovenInAndOut, bakingquery, inHotByPoint} from '@/utils/getData1.js'
export default {
components: {
@@ -153,12 +154,26 @@
let res = await bakingquery(val1)
this.val2 = res.data.container_name
},
- async _ovenInAndOut1 (type) {
- this.disabled = true
- if (!this.val1 || !this.val2 ||!this.val3 || !this.val4) {
+ async handleConfirm(type) {
+ if ((!this.val1 || !this.val2 ||!this.val3 || !this.val4) && type === '1') {
this.disabled = false
return
}
+ if (!this.val1 && type === '2') {
+ return
+ }
+ const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
+ if (isConfirmed) {
+ if (type === '1') {
+ this._ovenInAndOut1()
+ }
+ if (type === '2') {
+ this._ovenInAndOut2()
+ }
+ }
+ },
+ async _ovenInAndOut1 (type) {
+ this.disabled = true
try {
let res = await ovenInAndOut(this.val1, this.val2,this.val3, this.val4, type)
uni.showToast({
@@ -172,10 +187,6 @@
},
async _ovenInAndOut2 (type) {
this.disabled = true
- if (!this.val1) {
- this.disabled = false
- return
- }
try {
let res = await ovenInAndOut(this.val1, '','', '', type)
uni.showToast({
diff --git a/pages/SecondPhase/production/ControlPoint.vue b/pages/SecondPhase/production/ControlPoint.vue
index b24a543..055dd3b 100644
--- a/pages/SecondPhase/production/ControlPoint.vue
+++ b/pages/SecondPhase/production/ControlPoint.vue
@@ -4,7 +4,7 @@
-
+
{{$t('grid.sub-roll-number')}}
@@ -12,7 +12,7 @@
-
+
{{$t('filter.control-point')}}
@@ -28,7 +28,7 @@
-
+
@@ -36,6 +36,7 @@