From a1dc1deb9f766455fc4c81dc17ffa4f7a70d5552 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 15 Sep 2025 08:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl       |  5 +++++
 pages/ftdl/fixedpoint-work.vue |  2 ++
 pages/ftdl/inout-area-mark.vue |  6 ++----
 pages/ftdl/line-call-mater.vue | 13 ++++++++-----
 pages/ftdl/line-down-mater.vue |  4 +---
 pages/ftdl/man-get-goods.vue   |  3 +--
 pages/ftdl/man-load-goods.vue  |  2 ++
 pages/ftdl/work-manage.vue     | 14 ++++++++------
 8 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index c5961d5..6caceeb 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -98,6 +98,11 @@ uni-button:after {
 	justify-content: flex-start;
 	align-items: center;
 }
+.filter_unit {
+	font-size: 28rpx;
+	color: #ff6a00;
+	font-weight: bold; 
+}
 .tab-line {
 	_wh(32rpx, 10rpx)
 	background-color #fff
diff --git a/pages/ftdl/fixedpoint-work.vue b/pages/ftdl/fixedpoint-work.vue
index 7a88f2c..21c3fd8 100644
--- a/pages/ftdl/fixedpoint-work.vue
+++ b/pages/ftdl/fixedpoint-work.vue
@@ -133,6 +133,8 @@
 				}
 			},
 			clearUp () {
+				this.index = ''
+				this.index2 = ''
 				this.index3 = ''
 				this.index4 = ''
 				this.disabled = false
diff --git a/pages/ftdl/inout-area-mark.vue b/pages/ftdl/inout-area-mark.vue
index 8d08e55..507674b 100644
--- a/pages/ftdl/inout-area-mark.vue
+++ b/pages/ftdl/inout-area-mark.vue
@@ -146,12 +146,11 @@
 				try {
 					let res = await inArea(this.index)
 					if (res.code === '200') {
-						this.index = ''
-						this.dataList = []
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -172,12 +171,11 @@
 				try {
 					let res = await outArea(this.index)
 					if (res.code === '200') {
-						this.index = ''
-						this.dataList = []
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/ftdl/line-call-mater.vue b/pages/ftdl/line-call-mater.vue
index 2e9d270..9696ca8 100644
--- a/pages/ftdl/line-call-mater.vue
+++ b/pages/ftdl/line-call-mater.vue
@@ -24,16 +24,17 @@
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-6">
 						<span class="filter_label">用料数量</span>
 					</view>
-					<view class="zd-col-17">
-						<input type="number" class="filter_input" v-model="val3" disabled>
+					<view class="zd-col-16">
+						<input type="number" v-model="val3" class="filter_input">
 					</view>
+					<view class="zd-col-2"><span class="filter_unit">{{unit}}</span></view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">托盘数</span>
+						<span class="filter_label">叫料托盘数</span>
 					</view>
 					<view class="zd-col-17">
 						<input type="number" class="filter_input" v-model="val2">
@@ -63,6 +64,7 @@
 				val1: '',
 				val2: '1',
 				val3: '',
+				unit: '',
 				options: [],
 				index: '',
 				pointCode: '',
@@ -92,7 +94,8 @@
 			selectChange (e) {
 				this.index = e
 				let selobj = this.options.find(item => item.value === this.index)
-				this.val3 =  selobj.qty
+				this.val3 = selobj.qty
+				this.unit = selobj.unit_name
 			},
 			handleChange1 (e) {
 				if (e) {
diff --git a/pages/ftdl/line-down-mater.vue b/pages/ftdl/line-down-mater.vue
index 7e51889..ef890e7 100644
--- a/pages/ftdl/line-down-mater.vue
+++ b/pages/ftdl/line-down-mater.vue
@@ -243,13 +243,11 @@
 				try {
 					let res = await blanking(this.val1, this.dataList, this.index)
 					if (res.code === '200') {
-						this.val1 = ''
-						this.index = ''
-						this.dataList = []
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/ftdl/man-get-goods.vue b/pages/ftdl/man-get-goods.vue
index b76f701..db942a0 100644
--- a/pages/ftdl/man-get-goods.vue
+++ b/pages/ftdl/man-get-goods.vue
@@ -130,12 +130,11 @@
 				try {
 					let res = await comfirmGetting(this.val1, this.dataList)
 					if (res.code === '200') {
-						this.val1 = ''
-						this.dataList = []
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/ftdl/man-load-goods.vue b/pages/ftdl/man-load-goods.vue
index 8e76206..38366fc 100644
--- a/pages/ftdl/man-load-goods.vue
+++ b/pages/ftdl/man-load-goods.vue
@@ -264,6 +264,7 @@
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -289,6 +290,7 @@
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/ftdl/work-manage.vue b/pages/ftdl/work-manage.vue
index a302184..b0bb12f 100644
--- a/pages/ftdl/work-manage.vue
+++ b/pages/ftdl/work-manage.vue
@@ -119,6 +119,12 @@
 			toCheck (e) {
 				this.pkId = e.task_code === this.pkId ? '' : e.task_code
 			},
+			clearUp () {
+				this.val1 = ''
+				this.pkId = ''
+				this.dataList = []
+				this.disabled = false
+			},
 			async _againTask () {
 				this.disabled = true
 				if (!this.pkId) {
@@ -128,13 +134,11 @@
 				try {
 					let res = await againTask(this.pkId)
 					if (res.code === '200') {
-						this.val1 = ''
-						this.dataList = []
-						this.pkId = ''
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -155,13 +159,11 @@
 				try {
 					let res = await forceConfirm(this.pkId)
 					if (res.code === '200') {
-						this.val1 = ''
-						this.dataList = []
-						this.pkId = ''
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,