diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue
index 4b3512c..9206a72 100644
--- a/pages/manage/bake-process.vue
+++ b/pages/manage/bake-process.vue
@@ -23,6 +23,14 @@
/>
+
+
+ 收卷辊码
+
+
+
+
+
大/小卷
@@ -85,7 +93,7 @@
-
+
@@ -112,7 +120,8 @@
val3: '',
val4: '',
obj: {container_name: '-', status: '-', tip: '-'},
- disabled: false
+ disabled: false,
+ val5: ''
};
},
watch: {
@@ -149,6 +158,7 @@
this.isChecked = false
this.val3 = ''
this.val4 = ''
+ this.val5 = ''
this.obj = {container_name: '-', status: '-', tip: '-'}
this.disabled = false
},
@@ -171,13 +181,13 @@
},
async _doModifyRawInfos () {
this.disabled = true
- if (!this.val1 || !this.val2 || this.index1 === '' || !this.val3 || !this.val4) {
+ if (!this.val1 || !this.val5 || this.index1 === '' || !this.val3 || !this.val4) {
this.disabled = false
return
}
try {
let checked = this.isChecked ? '1' : '0'
- let res = await doModifyRawInfos(this.val1, this.val2, this.options1[this.index1].value, checked, this.val3, this.val4)
+ let res = await doModifyRawInfos(this.val1, this.val2, this.options1[this.index1].value, checked, this.val3, this.val4, this.val5)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
index ee77eb6..7e13d40 100644
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -31,6 +31,14 @@
+
+
+ 收卷辊码
+
+
+
+
+
呼叫收卷辊
@@ -44,7 +52,7 @@
-
+
@@ -63,6 +71,7 @@
title: '',
val1: '',
val2: '',
+ val3: '',
isChecked: false,
disabled: false
};
@@ -77,6 +86,7 @@
clearUp () {
this.val1 = ''
this.val2 = ''
+ this.val3 = ''
this.isChecked = false
this.disabled = false
},
@@ -116,13 +126,13 @@
},
async _needEmptyAxisv2 () {
this.disabled = true
- if (!this.val1 || !this.val2) {
+ if (!this.val1 || !this.val3) {
this.disabled = false
return
}
try {
let checked = this.isChecked ? '1' : '0'
- let res = await needEmptyAxisv2(this.val1, this.val2, checked)
+ let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val3)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/utils/getData2.js b/utils/getData2.js
index 42afda3..7e8ba1a 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -158,9 +158,9 @@ export const necessaryEmptyVehicle = (code) => request({
url:'api/pda/raw/necessaryEmptyVehicle',
data: {point_code: code}
})
-export const needEmptyAxisv2 = (code, order, is) => request({
+export const needEmptyAxisv2 = (code, order, is, roll) => request({
url:'api/pda/raw/needEmptyAxis/v2',
- data: {point_code: code, order_code: order, is_call_empty: is}
+ data: {point_code: code, order_code: order, is_call_empty: is, roll_code: roll}
})
export const confirmBlanking = (code, option) => request({
url:'api/pda/raw/confirmBlanking',
@@ -171,9 +171,9 @@ export const getHotTempPointInfo = (code, order) => request({
url:'api/pda/baking/getHotTempPointInfo',
data: {point_code: code, order_code: order}
})
-export const doModifyRawInfos = (code, order, type, is, temperature, time) => request({
+export const doModifyRawInfos = (code, order, type, is, temperature, time, roll) => request({
url:'api/pda/baking/doModifyRawInfos',
- data: {point_code: code, order_code: order, roll_type: type, is_baking: is, temperature: temperature, time: time}
+ data: {point_code: code, order_code: order, roll_type: type, is_baking: is, temperature: temperature, time: time, roll_code: roll}
})
export const bakingQuality = (code, quality) => request({
url:'api/pda/baking/bakingQuality',