From 2e07185f4dde37aae93a32f391c57dfa02b5c949 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 20 Mar 2025 11:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E9=80=89=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.styl | 8 +++-
pages/common/mater-list.vue | 9 +----
pages/entry/document.vue | 7 ----
pages/manage/cbj-carry.vue | 9 +----
pages/manage/mater-scrap.vue | 7 ----
pages/manage/press-carry.vue | 9 +----
pages/pick/pick-list.vue | 9 +----
pages/pick/pick-task.vue | 78 ++++++++++++++++++++++--------------
pages/task/task-manage.vue | 9 +----
9 files changed, 59 insertions(+), 86 deletions(-)
diff --git a/common/style/layout.styl b/common/style/layout.styl
index 2d46133..7e5bc48 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -368,7 +368,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
bottom: 0;
left: 0;
width: 100%;
- height: calc(100% - var(--status-bar-height) - 72rpx);
+ // height: calc(100% - var(--status-bar-height) - 72rpx);
+ height auto;
+ min-height 30%;
+ max-height: calc(100% - var(--status-bar-height) - 72rpx);
background-color: #f6f6f6;
box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
border-top-left-radius: 20rpx;
@@ -454,8 +457,9 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
}
.font-size-1 {
font-size: 30rpx;
- line-height: 54rpx;
+ line-height: 30rpx;
color: #ff6a00;
+ word-break: break-all;
}
.font-size-2 {
font-size: 30rpx;
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index 14c9f5e..0c2e4b7 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -138,11 +138,4 @@
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/pages/entry/document.vue b/pages/entry/document.vue
index a81cb74..61eb852 100644
--- a/pages/entry/document.vue
+++ b/pages/entry/document.vue
@@ -155,10 +155,3 @@
}
}
-
-
diff --git a/pages/manage/cbj-carry.vue b/pages/manage/cbj-carry.vue
index a8e5027..e22f3fc 100644
--- a/pages/manage/cbj-carry.vue
+++ b/pages/manage/cbj-carry.vue
@@ -264,11 +264,4 @@
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/pages/manage/mater-scrap.vue b/pages/manage/mater-scrap.vue
index 43777d3..858a92e 100644
--- a/pages/manage/mater-scrap.vue
+++ b/pages/manage/mater-scrap.vue
@@ -80,10 +80,3 @@
}
}
-
-
diff --git a/pages/manage/press-carry.vue b/pages/manage/press-carry.vue
index 7f7b99f..8899deb 100644
--- a/pages/manage/press-carry.vue
+++ b/pages/manage/press-carry.vue
@@ -146,11 +146,4 @@
}
}
-
-
-
+
\ No newline at end of file
diff --git a/pages/pick/pick-list.vue b/pages/pick/pick-list.vue
index 8c72df4..0e39c3c 100644
--- a/pages/pick/pick-list.vue
+++ b/pages/pick/pick-list.vue
@@ -139,11 +139,4 @@
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index 945597c..19f9bd4 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -5,10 +5,10 @@
-
+
料箱编码
-
+
-
+
拣选单据
-
+
-
+
车间
-
+
-
+
拣选仓库
-
+
-
+
拣选站台
-
+
-
+
拣选数量
-
+
-
- 移出料箱
+
+ 出库至二楼料箱
-
+
-
+
是否机械搬运
-
+
-
- 移入料箱
+
+ 返回至立库料箱
-
+
@@ -88,8 +88,27 @@
-
+
+
+
+
+
+ 出库二楼料箱号为：
+ {{val2}}
+
+
+ 返回立库料箱号为：
+ {{val3}}
+
+ 是否确认？
+
+
+
+
+
+
+
@@ -109,7 +128,8 @@
val3: '',
isChecked: true,
data: {},
- disabled: false
+ disabled: false,
+ show: false
};
},
onLoad (options) {
@@ -139,12 +159,14 @@
this.isChecked = true
this.disabled = false
},
- async _savePickTask () {
- this.disabled = true
+ toSure () {
if (!this.val1|| !this.val2 || !this.val3) {
- this.disabled = false
return
}
+ this.show = true
+ },
+ async _savePickTask () {
+ this.disabled = true
try {
let obj = Object.assign({}, this.data, {is_move: this.isChecked, pick_vehicle_23: this.val2, pick_vehicle_13: this.val3})
let res = await savePickTask(obj)
@@ -163,8 +185,4 @@
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/pages/task/task-manage.vue b/pages/task/task-manage.vue
index 68711d6..4db8b01 100644
--- a/pages/task/task-manage.vue
+++ b/pages/task/task-manage.vue
@@ -173,11 +173,4 @@
}
}
}
-
-
-
+
\ No newline at end of file