From 9884e489c1ba7abbf412e99d4901a223ad2fbb53 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 23 四月 2025 12:57:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 pages/phyz/inStock/inStock.vue |  287 +++++++++++++++++++++++++++++++++++++++++++++++
 pages/listing/disc.vue         |    4 
 pages/home/index.vue           |    8 +
 pages.json                     |    7 +
 pages/listing/labour.vue       |    8 
 pages/rece/other.vue           |   21 --
 common/request.js              |    3 
 7 files changed, 312 insertions(+), 26 deletions(-)

diff --git a/common/request.js b/common/request.js
index 7e0a192..2b08766 100644
--- a/common/request.js
+++ b/common/request.js
@@ -15,7 +15,8 @@
 	return new Promise((resolve, reject) => {
 		const token = uni.getStorageSync('token');
 		// const URL = 'http://47.76.147.249:8080/rsf-server/pda' + url;
-		const URL = 'http://192.168.4.24:8080/rsf-server/pda' + url;
+		// const URL = 'http://192.168.4.24:8080/rsf-server/pda' + url;
+		const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;
 		uni.request({
 			url: URL,
 			data: postData,
diff --git a/pages.json b/pages.json
index 1b9e8c2..d492730 100644
--- a/pages.json
+++ b/pages.json
@@ -524,6 +524,13 @@
 			"style": {
 				"navigationBarTitleText": "鍑哄簱纭"
 			}
+		},
+		{
+			"path" : "pages/phyz/inStock/inStock",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍏ュ簱涓婃灦"
+			}
 		}
 
 	],
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 11fef82..7b28a66 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -91,8 +91,14 @@
 					<text>涓婃灦</text>
 				</navigator>
 			</view>
+			<view class="cu-item">
+				<navigator hover-class='none' url="/pages/phyz/inStock/inStock" navigateTo>
+					<view class="cuIcon-punch text-blue">
+					</view>
+					<text>鍏ュ簱涓婃灦</text>
+				</navigator>
+			</view>
 		</view>
-
 
 		<view class="padding flex flex-direction">
 			<view class="cu-btn bg-red margin-tb-sm lg round" @click="equit">閫�鍑虹櫥褰�</view>
diff --git a/pages/listing/disc.vue b/pages/listing/disc.vue
index 5cf8e53..bbd4641 100644
--- a/pages/listing/disc.vue
+++ b/pages/listing/disc.vue
@@ -217,8 +217,8 @@
 				const newArr = this.list.map(item => {
 					return {
 						...item,
-						anfme: item.anfme === null ? 0 : +item.anfme
-						// receiptQty: item.receiptQty === null ? 0 : +item.receiptQty
+						anfme: item.anfme === null ? 0 : + item.anfme,
+						receiptQty: item.anfme === null ? 0 : + item.anfme
 					};
 				});
 
diff --git a/pages/listing/labour.vue b/pages/listing/labour.vue
index 4e17f7f..6c7eeb2 100644
--- a/pages/listing/labour.vue
+++ b/pages/listing/labour.vue
@@ -89,13 +89,10 @@
 			<view class="title">搴撲綅鐮�</view>
 			<input placeholder="璇锋壂鎻忓簱浣嶇爜" v-model="locCode"></input>
 		</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" @click="confirm">涓婃灦</button>
 		</view>
-
 	</view>
 </template>
 
@@ -135,8 +132,9 @@
 					matnrCode: this.barcode
 				})
 				if (code === 200) {
-					const find = this.list.find(el => el.id === data.id);
-					!find && this.list.push(data)
+					// const find = this.list.find(el => el.id === data.id);
+					// !find &&
+					 this.list.push(data)
 				} else {
 					uni.showToast({
 						title: msg,
diff --git a/pages/phyz/inStock/inStock.vue b/pages/phyz/inStock/inStock.vue
new file mode 100644
index 0000000..ce7b76b
--- /dev/null
+++ b/pages/phyz/inStock/inStock.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="has-foot">
+		<form>
+			<view class="cu-form-group margin-top">
+				<view class="title">瀹瑰櫒缂栧彿</view>
+				<input placeholder="璇锋壂瀹瑰櫒缂栧彿" v-model="barcode"></input>
+				<text class='cuIcon-search text-blue' @click="search"></text>
+			</view>
+			<view class="cu-form-group margin-bottom">
+				<view class="title">鐩爣绔欑偣</view>
+				<uni-data-select v-model="value" :localdata="range" placement="bottom"
+					@change="selChange"></uni-data-select>
+			</view>
+			<view class="cu-form-group ">
+				<view class="title">鐩爣搴撲綅</view>
+				<input placeholder="璇烽�夋嫨鐩爣搴撲綅" v-model="curCode"></input>
+				<text class='cu-btn  bg-red tj' @click="open">鎺ㄨ崘</text>
+			</view>
+		</form>
+		<view class="cu-list det menu sm-border  padding">
+			<block v-for="(item, index) in list" :key="index">
+				<view class="cu-bar bg-white solid-bottom margin-top-sm">
+					<view class="action">
+						<view class="index">
+							{{index+1}}
+						</view>
+						<view class="text-blue">
+							{{`${item.maktx}`}}
+						</view>
+					</view>
+					<!-- 	<view class="action" >
+						<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.splrBatch}}</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>
+				<view class="cu-item">
+					<view class="content">
+						<text class="text-black">鏀惰揣鏁伴噺:</text>
+					</view>
+					<view class="action">
+						<text class="text-grey ">{{item.anfme}}</text>
+					</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" @click="confirm">涓婃灦</button>
+		</view>
+		<uni-popup ref="popup" class="cu-popup">
+			<view class="popup-content">
+				<view class="head">
+					<text>鎺ㄨ崘</text>
+					<text class='cuIcon-close text-red close' @click="close"></text>
+				</view>
+				<div class="body">
+					<view class="cu-list grid col-3 no-border">
+						<view class="item" v-for="el in locs">
+							<view class="cu-btn round  sm" :class="[el===curCode?'bg-blue':'line-blue']"
+								@click="itemChange(el)">{{el.text}}</view>
+						</view>
+					</view>
+				</div>
+<!-- 				<view class="cu-bar btn-group ">
+					<button class="cu-btn bg-blue shadow-blur" @click="popupSubmit">鎻愪氦</button>
+				</view> -->
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		request
+	} from '../../../common/request.js'
+	import {
+		mapState,
+		mapMutations,
+		mapActions,
+		mapGetters
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				barcode: '',
+				areaName: '',
+				locCode: '',
+				container: '',
+				list: [],
+				range: [],
+				locs: [],
+				curCode: '',
+				selectSite: '',
+			}
+		},
+		computed: {
+			...mapState('user', ['dynamicFields']),
+		},
+		mounted() {
+			this.getRece();
+			this.getLocs();
+			// this.whAreaId = uni.getStorageSync('whAreaId')
+			
+		},
+		methods: {
+			async search() {
+				const {
+					code,
+					data,
+					msg
+				} = await request(`/pakin/info/${this.barcode}`)
+				if (code === 200) {
+					this.list = data;
+					// this.range = data.locArea.locs.map(el => el.code)
+					// this.curCode = this.range[0]
+					// this.areaName = data.locArea.areaName
+				} else {
+					uni.showToast({
+						title: msg,
+						icon: "none",
+					})
+				}
+			},
+
+			remove(index) {
+				this.list.splice(index, 1);
+			},
+			clear() {
+				this.list = []
+				this.range = []
+				this.locs = []
+				this.curCode = ''
+				this.areaName = ''
+				this.barcode = ''
+			},
+
+			open() {
+				this.$refs.popup.open()
+			},
+
+			close() {
+				this.$refs.popup.close()
+			},
+
+			popupSubmit() {
+				this.$refs.popup.close()
+			},
+			itemChange(el) {
+				this.$refs.popup.close()
+				this.curCode = el.text
+			},
+			
+			selChange(e) {
+				this.selectSite = e
+			},
+
+			async confirm() {
+				const {
+					code,
+					data,
+					msg
+				} = await request(`/pakin/task/`
+					, {
+						site: this.selectSite,
+						locCode: this.curCode,
+						barcode: this.barcode
+					}
+				)
+				if (code === 200) {
+					uni.showToast({
+						title: '涓婃灦鎴愬姛'
+					})
+					this.clear()
+				} else {
+					uni.showToast({
+						title: msg,
+						icon: "none",
+					})
+				}
+			},
+			async getRece() {
+				const {
+					code,
+					data,
+					msg
+				} = await request('/inStock/sites', {}, 'get')
+				if (code === 200) {
+					this.range = data.map(item => ({
+						value: item.id,
+						text: item.name + " -- " + item.site
+					}));
+				}
+			},
+			async getLocs() {
+				const {
+					code,
+					data,
+					msg
+				} = await request('/locs/list', {}, 'get')
+				if (code === 200) {
+					
+					this.locs = data.map(item => ({
+						value: item.id,
+						text: item.code
+					}));
+				}
+			},
+
+		}
+	}
+</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;
+
+	}
+
+	.item {
+		position: relative;
+		display: flex;
+		min-height: 80upx;
+		align-items: center;
+	}
+
+	.uni-file-picker {
+		width: 100%;
+		margin-bottom: 10px;
+	}
+
+	.uni-select__selector {
+		z-index: 999;
+	}
+
+	.tj {
+		height: auto;
+		padding: 6px 8px;
+		display: inline-block;
+		border-radius: 6px;
+	}
+
+	.item {
+		display: flex;
+		justify-content: center;
+	}
+
+	.item .cu-btn {
+		font-size: 26upx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/rece/other.vue b/pages/rece/other.vue
index 487b710..3166479 100644
--- a/pages/rece/other.vue
+++ b/pages/rece/other.vue
@@ -60,9 +60,6 @@
 							<text class="text-black">瀹炴椂搴撳瓨: <text class="text-grey ">{{item.stockQty}}</text></text>
 						</view>
 					</view>
-
-
-
 					<view class="cu-item">
 						<view class="content">
 							<text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -71,7 +68,6 @@
 							<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.purUnit}}</text></text>
@@ -80,7 +76,6 @@
 							<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
 						</view>
 					</view>
-
 					<view class="cu-item">
 						<view class="content">
 							<text class="black">璁″垝鏀惰揣鏁伴噺:<text class="text-grey ">{{item.anfme}}</text></text>
@@ -90,9 +85,7 @@
 							<text class="black">宸叉敹璐ф暟閲�:<text class="text-grey ">{{item.qty}}</text></text>
 						</view>
 					</view>
-
 					<view class="cu-item">
-
 						<view class="content" v-if="!isconfirm">
 							<view class="cu-form-group padding-lr-0">
 								<view class="title text-blue"><text
@@ -104,7 +97,6 @@
 							<text class="text-black">鏀惰揣鏁伴噺:<text class="text-grey ">{{item.receiptQty}}</text></text>
 						</view>
 					</view>
-
 					<view class="cu-item">
 						<view class="content" v-if="!isconfirm">
 							<view class="cu-form-group padding-lr-0">
@@ -133,7 +125,6 @@
 							<text class="text-black">鐢熶骇鏃ユ湡:<text class="text-grey ">{{item.prodTime}}</text></text>
 						</view>
 					</view>
-
 					<view class="cu-item grid  col-1" v-if="!isconfirm">
 						<view v-for="el in dynamicFields" :key="el.id">
 							<view class="cu-form-group padding-lr-0">
@@ -142,16 +133,12 @@
 							</view>
 						</view>
 					</view>
-
 					<view class="cu-item grid  col-2" v-if="isconfirm">
 						<view class="item" v-for="el in dynamicFields" :key="el.id">
 							<text class="text-black">{{el.fieldsAlise}}:
 								<text class="text-grey ">{{item[el.fields]}}</text></text>
 						</view>
-
 					</view>
-
-
 				</view>
 			</block>
 		</view>
@@ -165,7 +152,6 @@
 			<uni-data-select v-model="whAreaId" :localdata="range" placement="top"
 				@change="selChange"></uni-data-select>
 		</view>
-
 
 		<view class="cu-bar btn-group foot" v-show="!isconfirm">
 			<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
@@ -263,7 +249,9 @@
 			prev() {
 				this.isconfirm = false
 			},
-			selChange(val) {
+			selChange(val) {
+				console.log('-------->')
+				console.log(val)
 				uni.setStorageSync('whAreaId', val)
 			},
 			async complete(id) {
@@ -322,7 +310,6 @@
 							icon: "none",
 						})
 					}
-
 				}
 			},
 			async getRece() {
@@ -334,7 +321,7 @@
 				if (code === 200) {
 					this.range = data.map(item => ({
 						value: item.id,
-						text: item.name
+						text: item.warehouseId$ + "-- " + item.name
 					}));
 				}
 			},

--
Gitblit v1.9.1