diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue index 0eaaedb..0e68171 100644 --- a/pages/manage/bake-process.vue +++ b/pages/manage/bake-process.vue @@ -31,6 +31,17 @@ + + + 大/小卷 + + + + {{index1 !== '' ? options1[index1].text : ''}} + + + + 是否烘烤 @@ -40,6 +51,24 @@ + + + 温度 + + + + + + + + + 时间 + + + + + 小时 + @@ -63,10 +92,10 @@ - - - - + + + + @@ -85,7 +114,11 @@ title: '', val1: '', val2: '', + options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}], + index1: '', isChecked: false, + val3: '', + val4: '', obj: {container_name: '-', status: '-', tip: '-'}, disabled: false, val5: '' @@ -112,13 +145,19 @@ this._getHotTempPointInfo() } }, + pickerChange (e) { + this.index1 = e.detail.value + }, setWStatus () { this.isChecked = !this.isChecked }, clearUp () { this.val1 = '' this.val2 = '' + this.index1 = '' this.isChecked = false + this.val3 = '' + this.val4 = '' this.val5 = '' this.obj = {container_name: '-', status: '-', tip: '-'} this.disabled = false @@ -142,13 +181,13 @@ }, async _doModifyRawInfos () { this.disabled = true - if (!this.val1 || !this.val5 || !this.val2) { + if (!this.val1 || !this.val5 || this.index1 === '' || !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, checked, this.val5) + 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 f915f9d..bd39eec 100644 --- a/pages/manage/raw-foil-progess.vue +++ b/pages/manage/raw-foil-progess.vue @@ -91,7 +91,7 @@ - + @@ -177,7 +177,7 @@ }, async _needEmptyAxisv2 () { this.disabled = true - if (!this.val1 || !this.val2 || this.index1 === '' || !this.temperature || !this.time) { + if (!this.val1 || !this.val2) { this.disabled = false return } diff --git a/utils/getData2.js b/utils/getData2.js index c5759c4..18a7f82 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -192,12 +192,15 @@ export const getHotTempPointInfo = (code, order) => request({ url:'api/pda/baking/getHotTempPointInfo', data: {point_code: code, order_code: order} }) -export const doModifyRawInfos = (code, order, is, roll) => 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, roll_code: roll } })