From fff90f6d0db97fad9c586c5ce83785d705bd5e0f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 21:30:57 +0800
Subject: [PATCH] no message

---
 pages/listing/matnrPalletising.vue |   17 +
 pages/home/index.vue               |   16 +-
 pages.json                         |   10 +
 pages/listing/unPakin.vue          |  330 +++++++++++++++++++++++++++++++++++++++++++++++
 pages/rece/other.vue               |   12 +
 5 files changed, 366 insertions(+), 19 deletions(-)

diff --git a/pages.json b/pages.json
index 70790d0..8255ecf 100644
--- a/pages.json
+++ b/pages.json
@@ -552,7 +552,15 @@
 			}
 		}
 
-	],
+	    ,{
+            "path" : "pages/listing/unPakin",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "缁勬墭瑙g粦"
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 4e82def..12e7ad4 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -50,13 +50,13 @@
 				</navigator>
 			</view>
 
-			<!-- 			<view class="cu-item">
-				<navigator hover-class='none' url="/pages/listing/untie" navigateTo>
+			<view class="cu-item">
+				<navigator hover-class='none' url="/pages/listing/unPakin" navigateTo>
 					<view class="cuIcon-cardboardforbid text-blue">
 					</view>
-					<text>瑙g粦</text>
+					<text>缁勬墭瑙g粦</text>
 				</navigator>
-			</view> -->
+			</view>
 
 			<view class="cu-item">
 				<navigator hover-class='none' url="/pages/inspect/report" navigateTo>
@@ -106,13 +106,13 @@
 				</navigator>
 			</view>
 		</view>
-		
+
 		<view class="cu-bar bg-white solid-bottom margin-top">
 			<view class="action">
 				<text class="cuIcon-title text-orange "></text> 鍑哄簱
-			</view>		
+			</view>
 		</view>
-		
+
 		<view class="cu-list grid col-4 no-border">
 			<view class="cu-item">
 				<navigator hover-class='none' url="/pages/outbound/fastPicking" navigateTo>
@@ -121,7 +121,7 @@
 					<text>蹇�熸嫞璐�</text>
 				</navigator>
 			</view>
-		
+
 		</view>
 
 		<view class="padding flex flex-direction">
diff --git a/pages/listing/matnrPalletising.vue b/pages/listing/matnrPalletising.vue
index fc247ce..2750b38 100644
--- a/pages/listing/matnrPalletising.vue
+++ b/pages/listing/matnrPalletising.vue
@@ -54,10 +54,10 @@
 					</view>
 					<view class="cu-item">
 						<view class="content">
-							<text class="text-black">鐗╂枡鏉$爜:</text>
+							<text class="text-black">鐗╂枡缂栫爜:</text>
 						</view>
 						<view class="action">
-							<text class="text-grey ">{{item.trackCode}}</text>
+							<text class="text-grey ">{{item.matnrCode}}</text>
 						</view>
 					</view>
 					<view class="cu-item">
@@ -67,6 +67,12 @@
 						<view class="action">
 							<text class="text-grey ">{{item.splrBatch}}</text>
 						</view>
+						<view class="content">
+							<text class="text-black">璐ㄦ鐘舵��:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey ">{{item.isptResult$}}</text>
+						</view>
 					</view>
 					<view class="cu-item">
 						<view class="content">
@@ -74,6 +80,9 @@
 						</view>
 						<view class="action">
 							<text class="text-grey ">{{item.batch}}</text>
+						</view>
+						<view class="content">
+							<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
 						</view>
 					</view>
 					<!-- <view class="cu-item">
@@ -86,9 +95,7 @@
 					</view> -->
 
 					<view class="cu-item">
-						<view class="content">
-							<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
-						</view>
+		
 						<view class="content">
 							<text class="text-black">鏀惰揣鏁伴噺: <text class="text-grey ">{{item.anfme}}</text></text>
 						</view>
diff --git a/pages/listing/unPakin.vue b/pages/listing/unPakin.vue
new file mode 100644
index 0000000..fed1283
--- /dev/null
+++ b/pages/listing/unPakin.vue
@@ -0,0 +1,330 @@
+<template>
+	<view class="has-foot">
+		<view>
+			<form>
+				<view class="cu-form-group margin-top">
+					<view class="title">瀹瑰櫒鍙�</view>
+					<input placeholder="璇锋壂鎻忓鍣ㄥ彿" v-model="container" focus></input>
+					<text class='cuIcon-search text-blue' @click="getList"></text>
+				</view>
+<!-- 				<view class="cu-form-group">
+					<view class="title">ASN鍗曞彿</view>
+					<input placeholder="璇疯緭鍏SN鍗曞彿" v-model="asnCode"></input>
+				</view>
+				<view class="cu-form-group">
+					<view class="title">鐗╂枡缂栫爜</view>
+					<input placeholder="璇锋壂鎻忕墿鏂欑紪鐮�" v-model="matnrCode"></input>
+					<text class='cuIcon-search text-blue' @click="search"></text>
+				</view> -->
+			</form>
+
+			<view class="flex solid-bottom padding-sm justify-between">
+				<view class="text-blue">鐗╂枡鎬荤被:{{list.length}}</view>
+				<view class="text-blue">缁勭洏鎬绘暟:{{allCount}}</view>
+			</view>
+
+		</view>
+
+		<view class="padding-lr margin-top-sm">
+			<block v-for="(item, index) in list" :key="index">
+				<view class="cu-list det menu sm-border margin-bottom-sm " :class="[item.trackCode===barcode&&'act']"
+					:ref="item.trackCode+'ref'">
+					<view class="cu-bar bg-white solid-bottom ">
+						<view class="action">
+							<view class="index">
+								{{index+1}}
+							</view>
+							<view class="text-blue">
+								缂栫爜:
+								{{`${item.matnrCode}`}}
+							</view>
+						</view>
+						<view class="action" v-if="!isconfirm">
+							<text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="content">
+							<text class="text-black">ASN:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey ">{{item.asnCode}}</text>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="content">
+							<text class="text-black">鐗╂枡缂栫爜:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey ">{{item.matnrCode}}</text>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="content">
+							<text class="text-black">渚涘簲鍟嗘壒娆�:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey ">{{item.splrBatch}}</text>
+						</view>
+						<view class="content">
+							<text class="text-black">璐ㄦ鐘舵��:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey ">{{item.isptResult$}}</text>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="content">
+							<text class="text-black">搴撳瓨鎵规:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey ">{{item.batch}}</text>
+						</view>
+						<view class="content">
+							<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
+						</view>
+					</view>
+					<!-- <view class="cu-item">
+						<view class="content">
+							<text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
+						</view>
+						<view class="content">
+							<text class="text-black">璐ㄦ缁撴灉: <text class="text-grey ">{{item.inspect}}</text></text>
+						</view>
+					</view> -->
+
+					<view class="cu-item">
+
+						<view class="content">
+							<text class="text-black">鏀惰揣鏁伴噺: <text class="text-grey ">{{item.anfme}}</text></text>
+						</view>
+						<view class="content">
+							<text class="text-black">宸蹭笂鏋舵暟閲�: <text
+									class="text-grey ">{{item.workQty + item.qty}}</text></text>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="content">
+							<text class="text-black">鍙粍鐩樻暟閲�: <text
+									class="text-grey ">{{item.anfme - item.workQty}}</text></text>
+						</view>
+
+					</view>
+					<view class="cu-item">
+						<view class="content">
+							<view class="cu-form-group padding-lr-0">
+								<view class="title text-blue"><text
+										class="text-red text-xl vertical-middle">*</text>缁勭洏鏁伴噺:
+								</view>
+								<uni-number-box style="width: 70%;" :max="max" v-model="item.receiptQty"
+									:step='1'></uni-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="cu-bar btn-group foot">
+			<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
+			<button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="confirm">瑙g粦</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		request
+	} from '../../common/request.js'
+	import {
+		mapState,
+		mapMutations,
+		mapActions,
+		mapGetters
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				barcode: '',
+				container: '',
+				megreQty: '',
+				list: [],
+				range: [],
+				asnCode: '',
+				repeatClick: false,
+				isconfirm: false,
+				matnrCode: '',
+				max: 99999999,
+			}
+		},
+		computed: {
+			...mapState('user', ['dynamicFields']),
+			allCount() {
+				return this.list.reduce((acc, row) => +row.anfme + acc, 0) || 0
+			}
+		},
+		mounted() {},
+		methods: {
+			async search() {
+				const find = this.list.find(el => el.trackCode === this.barcode);
+				find ? this.scrollTo() : this.getDet();
+
+			},
+			async getDet() {
+				const {
+					code,
+					data,
+					msg
+				} = await request('/asnOrderItem/trackCode', {
+					matnrCode: this.matnrCode,
+					asnCode: this.asnCode
+				}, "post")
+				if (code === 200) {
+					// if(data !== [] || data !== null){					
+					// uni.navigateTo({
+					// 		url: "../listing/itemSelect",
+					// 		success: function(res) {
+					// 			// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+					// 			res.eventChannel.emit('data', {
+					// 				item: data
+					// 			})
+					// 		},
+					// 		events: {
+					// 			// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+					// 			acceptDataFromOpenedPage: function(data) {
+					// 				that.matnr = data.data
+					// 				that.findMat(that.matnr)
+					// 			},
+					// 		},
+
+
+					// 	});
+
+					// }
+					for (var i = 0; i < data.length; i++) {
+						data[i].receiptQty = 1;
+						data[i].selected = false;
+					}
+					this.list = data
+				} else {
+					uni.showToast({
+						title: msg,
+						icon: "none",
+						position: 'top'
+					})
+				}
+			},
+			async getList() {
+				const {
+					code,
+					data,
+					msg
+				} = await request('/asnOrderItem/container', {
+					barcode: this.container,
+					type: 'unbind'
+				})
+				if (code === 200) {
+					this.list = data
+				} else {
+					uni.showToast({
+						title: msg,
+						icon: "none",
+						position: 'top'
+					})
+				}
+			},
+			scrollTo() {
+				const ref = this.$refs[`${this.barcode}ref`][0];
+				uni.pageScrollTo({
+					scrollTop: ref.$el.offsetTop,
+					duration: 300
+				})
+			},
+			remove(index) {
+				this.list.splice(index, 1);
+			},
+			clear() {
+				this.list = []
+				this.barcode = ''
+			},
+			next() {
+				if (this.list.length) {
+					this.isconfirm = true
+				} else {
+					uni.showToast({
+						icon: "none",
+						title: '鏈�夌墿鏂欐爣绛�'
+					})
+				}
+			},
+			prev() {
+				this.isconfirm = false
+			},
+			async confirm() {
+				this.repeatClick = true
+				const newArr = this.list.map(item => {
+
+					return {
+						...item,
+						anfme: item.anfme === null ? 0 : +item.anfme,
+					};
+				});
+
+				const {
+					code,
+					data,
+					msg
+				} = await request('/waitPakin/unbind', {
+					items: newArr,
+					barcode: this.container,
+				})
+				if (code === 200) {
+					uni.showToast({
+						title: '瑙g粦鎴愬姛'
+					})
+					this.list = []
+					this.barcode = ''
+					this.container = ''
+					this.isconfirm = false
+				} else {
+					uni.showToast({
+						title: msg,
+						icon: "none",
+						position: 'top'
+					})
+				}
+				this.repeatClick = false
+			},
+		}
+	}
+</script>
+
+<style>
+	.index {
+		border: 1px solid #e54d42;
+		color: #e54d42;
+		border-radius: 50%;
+		display: block;
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 48rpx;
+		text-align: center;
+		margin-right: 20rpx;
+		font-size: 30rpx;
+	}
+
+	.text-blue {
+		color: #0081ff !important;
+
+	}
+
+	.act {
+		border: 1px solid #e54d42;
+	}
+
+	.item {
+		position: relative;
+		display: flex;
+		min-height: 80upx;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/rece/other.vue b/pages/rece/other.vue
index f53d939..60239c7 100644
--- a/pages/rece/other.vue
+++ b/pages/rece/other.vue
@@ -42,14 +42,14 @@
 							<text class="text-grey ">{{item.asnCode}}</text>
 						</view>
 						<view class="action">
-							
+
 						</view>
 					</view>
 					<view class="cu-item">
 						<view class="content">
 							<text class="text-black">鐗╂枡鍚嶇О:</text>
 							<text class="text-grey ">{{item.maktx}}</text>
-						</view>						
+						</view>
 					</view>
 
 					<!-- 	<view class="cu-item">
@@ -159,8 +159,10 @@
 
 		<view class="cu-form-group margin-bottom">
 			<view class="title">鏀惰揣鍖�</view>
-			<uni-data-select v-model="whAreaId" :localdata="range" placement="top"
-				@change="selChange"></uni-data-select>
+			<view>
+				<uni-data-select v-model="whAreaId" :localdata="range" placement="top"
+					@change="selChange"></uni-data-select>
+			</view>>
 		</view>
 
 		<view class="cu-bar btn-group foot" v-show="!isconfirm">
@@ -238,7 +240,7 @@
 				this.barcode = ''
 			},
 			scrollTo() {
-				
+
 				// const ref = this.$refs[`${this.barcode}ref`][0];
 				// uni.pageScrollTo({
 				// 	scrollTop: ref.$el.offsetTop,

--
Gitblit v1.9.1