diff --git a/pages/manage/roll-manage.vue b/pages/manage/roll-manage.vue index eaa764e..df42798 100644 --- a/pages/manage/roll-manage.vue +++ b/pages/manage/roll-manage.vue @@ -3,7 +3,7 @@ - + 点位 @@ -13,30 +13,12 @@ /> - - - 收卷辊码 - - - - - - - - 收卷辊规格 - - - - - - - + + @@ -54,9 +36,6 @@ return { title: '', val1: '', - val2: '', - options: [], - index: '', disabled: false }; }, @@ -69,12 +48,12 @@ }, async _onlySendRollTruss () { this.disabled = true - if (!this.val1 || !this.val2 || !this.index) { + if (!this.val1) { this.disabled = false return } try { - let res = await handhonlySendRollTrusseldLock(this.val1, this.val2, this.index) + let res = await onlySendRollTruss(this.val1) this.clearUp() uni.showToast({ title: res.message, @@ -86,12 +65,12 @@ }, async _onlyCallRollTruss () { this.disabled = true - if (!this.val1 || !this.index) { + if (!this.val1) { this.disabled = false return } try { - let res = await onlyCallRollTruss(this.val1, this.index) + let res = await onlyCallRollTruss(this.val1) this.clearUp() uni.showToast({ title: res.message, @@ -103,8 +82,6 @@ }, clearUp () { this.val1 = '' - this.val2 = '' - this.index = '' this.disabled = false } } diff --git a/pages/manage/waste-foil-move.vue b/pages/manage/waste-foil-move.vue index 8eded0f..d8e7a31 100644 --- a/pages/manage/waste-foil-move.vue +++ b/pages/manage/waste-foil-move.vue @@ -3,7 +3,7 @@ - + 点位 diff --git a/pages/manage/weight-bind.vue b/pages/manage/weight-bind.vue index 51aeb92..7fa02ae 100644 --- a/pages/manage/weight-bind.vue +++ b/pages/manage/weight-bind.vue @@ -33,7 +33,7 @@ - + @@ -62,7 +62,7 @@ methods: { async _doSubVolumeBindingWeight () { this.disabled = true - if (!this.val1 || !this.val2 || !this.val3) { + if (!this.val1 || (!this.val2 && !this.val3)) { this.disabled = false return } diff --git a/utils/getData2.js b/utils/getData2.js index 3288d62..42afda3 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -26,14 +26,14 @@ export const authority = () => request({ data: {} }) // 入辊 -export const onlySendRollTruss = (code, vcode, type) => request({ +export const onlySendRollTruss = (code) => request({ url:'api/pda/other/onlySendRollTruss', - data: {point_code: code, vehicle_code: vcode, vehicle_type: type} + data: {point_code: code} }) // -export const onlyCallRollTruss = (code, vcode, type) => request({ +export const onlyCallRollTruss = (code) => request({ url:'api/pda/other/onlyCallRollTruss', - data: {point_code: code, vehicle_type: type} + data: {point_code: code} }) // 呼叫取样 export const callAgvToSampling = (code1, code2) => request({