From 4818bf0146094040bca487f9729dcf910806be88 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 13 Nov 2025 10:23:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/manage/bake-process.vue | 2 +-
pages/manage/raw-foil-progess.vue | 53 ++++++++++++++++++++++++-------
utils/getData2.js | 23 ++++++++++++--
3 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue
index e5c2e9e..0e68171 100644
--- a/pages/manage/bake-process.vue
+++ b/pages/manage/bake-process.vue
@@ -47,7 +47,7 @@
是否烘烤
-
+
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
index a5ead83..f915f9d 100644
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -35,20 +35,41 @@
- 收卷辊码
+ 呼叫收卷辊
-
-
+
+
+
- 呼叫收卷辊
+ 大/小卷
-
-
-
+
+
+ {{index1 !== '' ? options1[index1].text : ''}}
+
+
+
+
+
+ 温度
+
+
+
+
+ 度
+
+
+
+ 时间
+
+
+
+
+ 小时
@@ -70,7 +91,7 @@
-
+
@@ -89,9 +110,12 @@
title: '',
val1: '',
val2: '',
- val3: '',
val4: '',
val5: '',
+ options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}],
+ index1: '',
+ temperature: null,
+ time: null,
isChecked: false,
disabled: false
};
@@ -103,14 +127,19 @@
setWStatus () {
this.isChecked = !this.isChecked
},
+ pickerChange (e) {
+ this.index1 = e.detail.value
+ },
clearUp () {
this.val1 = ''
this.val2 = ''
- this.val3 = ''
this.isChecked = false
this.disabled = false
this.val4 = ''
this.val5 = ''
+ this.index1 = ''
+ this.temperature = null
+ this.time = null
},
async _needEmptyVehicle () {
this.disabled = true
@@ -148,13 +177,13 @@
},
async _needEmptyAxisv2 () {
this.disabled = true
- if (!this.val1 || !this.val3 || !this.val2) {
+ if (!this.val1 || !this.val2 || this.index1 === '' || !this.temperature || !this.time) {
this.disabled = false
return
}
try {
let checked = this.isChecked ? '1' : '0'
- let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val3, this.val4, this.val5)
+ let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val4, this.val5, this.options1[this.index1].value, this.temperature, this.time)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/utils/getData2.js b/utils/getData2.js
index 0a3a692..18a7f82 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -170,9 +170,18 @@ export const necessaryEmptyVehicle = (code) => request({
url:'api/pda/raw/necessaryEmptyVehicle',
data: {point_code: code}
})
-export const needEmptyAxisv2 = (code, order, is, roll, height, qty) => request({
+export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature, time) => request({
url:'api/pda/raw/needEmptyAxis/v2',
- data: {point_code: code, order_code: order, is_call_empty: is, roll_code: roll, theory_height: height, productin_qty: qty}
+ data: {
+ point_code: code,
+ order_code: order,
+ is_call_empty: is,
+ theory_height: height,
+ productin_qty: qty,
+ roll_type: type,
+ temperature: temperature,
+ time: time
+ }
})
export const confirmBlanking = (code, option) => request({
url:'api/pda/raw/confirmBlanking',
@@ -185,7 +194,15 @@ export const getHotTempPointInfo = (code, order) => 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}
+ 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',