diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue
index 0e68171..eea6a4b 100644
--- a/pages/manage/bake-process.vue
+++ b/pages/manage/bake-process.vue
@@ -42,6 +42,17 @@
+
+
+ 幅宽
+
+
+
+ {{index2 !== '' ? options2[index2].text : ''}}
+
+
+
+
是否烘烤
@@ -93,7 +104,7 @@
-
+
@@ -116,6 +127,8 @@
val2: '',
options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}],
index1: '',
+ options2: [{value: '1', text: '幅宽大于1550'}, {value: '0', text: '幅宽小于1550'}],
+ index2: '',
isChecked: false,
val3: '',
val4: '',
@@ -148,6 +161,9 @@
pickerChange (e) {
this.index1 = e.detail.value
},
+ pickerChange2 (e) {
+ this.index2 = e.detail.value
+ },
setWStatus () {
this.isChecked = !this.isChecked
},
@@ -155,6 +171,7 @@
this.val1 = ''
this.val2 = ''
this.index1 = ''
+ this.index2 = ''
this.isChecked = false
this.val3 = ''
this.val4 = ''
@@ -181,13 +198,13 @@
},
async _doModifyRawInfos () {
this.disabled = true
- if (!this.val1 || !this.val5 || this.index1 === '' || !this.val3 || !this.val4 || !this.val2) {
+ if (!this.val1 || !this.val5 || this.index1 === '' || this.index2 === '' || !this.val3 || !this.val4 || !this.val2) {
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, this.val5)
+ let res = await doModifyRawInfos(this.val1, this.val2, this.options1[this.index1].value, checked, this.val3, this.val4, this.val5, this.options2[this.index2].value)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
index bd39eec..5d59508 100644
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -53,6 +53,17 @@
+
+
+ 幅宽
+
+
+
+ {{index2 !== '' ? options2[index2].text : ''}}
+
+
+
+
温度
@@ -91,7 +102,7 @@
-
+
@@ -114,6 +125,8 @@
val5: '',
options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}],
index1: '',
+ options2: [{value: '1', text: '幅宽大于1550'}, {value: '0', text: '幅宽小于1550'}],
+ index2: '',
temperature: null,
time: null,
isChecked: false,
@@ -130,6 +143,9 @@
pickerChange (e) {
this.index1 = e.detail.value
},
+ pickerChange2 (e) {
+ this.index2 = e.detail.value
+ },
clearUp () {
this.val1 = ''
this.val2 = ''
@@ -140,6 +156,7 @@
this.index1 = ''
this.temperature = null
this.time = null
+ this.index2 = ''
},
async _needEmptyVehicle () {
this.disabled = true
@@ -177,13 +194,14 @@
},
async _needEmptyAxisv2 () {
this.disabled = true
- if (!this.val1 || !this.val2) {
+ if (!this.val1 || !this.val2 || this.index2 === '') {
this.disabled = false
return
}
try {
let checked = this.isChecked ? '1' : '0'
- let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val4, this.val5, this.options1[this.index1].value, this.temperature, this.time)
+ let index1 = this.index1 === '' ? '' : this.options1[this.index1].value
+ let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val4, this.val5, index1, this.temperature, this.time, this.options2[this.index2].value)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/utils/getData2.js b/utils/getData2.js
index 18a7f82..80209be 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -170,7 +170,7 @@ export const necessaryEmptyVehicle = (code) => request({
url:'api/pda/raw/necessaryEmptyVehicle',
data: {point_code: code}
})
-export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature, time) => request({
+export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature, time, isW) => request({
url:'api/pda/raw/needEmptyAxis/v2',
data: {
point_code: code,
@@ -180,7 +180,8 @@ export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature,
productin_qty: qty,
roll_type: type,
temperature: temperature,
- time: time
+ time: time,
+ is_width: isW
}
})
export const confirmBlanking = (code, option) => request({
@@ -192,7 +193,7 @@ 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, roll) => request({
+export const doModifyRawInfos = (code, order, type, is, temperature, time, roll, isW) => request({
url:'api/pda/baking/doModifyRawInfos',
data: {
point_code: code,
@@ -201,7 +202,8 @@ export const doModifyRawInfos = (code, order, type, is, temperature, time, roll)
is_baking: is,
temperature: temperature,
time: time,
- roll_code: roll
+ roll_code: roll,
+ is_width: isW
}
})
export const bakingQuality = (code, quality) => request({