From 377be81c95a6b01fb6dcf649deeb25474c34a433 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 20 Nov 2025 16:37:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Warehouse/picking.vue                 | 13 ++++++++-----
 pages/procurement/components/calculator.vue | 13 ++++++++++---
 pages/procurement/purchaseorder.vue         | 13 ++++++++-----
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index f080e59..3004981 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -803,17 +803,19 @@
 				<view class="right-bottom" v-show="!typechange">
 					<view class="right-bottom-left">
 						<image class="left-img"
-							:src="showvalue?.materialImg?serverUrl + showvalue?.materialImg : '/static/zhiniaoku.png'"
+							:src="showvalue?.materialImg?serverUrl + showvalue?.materialImg : '/static/index/warehouse/procurement/k.png'"
 							mode="aspectFill"></image>
 
 						<view class="left-tags">
 							<view class="tags-one" v-if="showvalue.categoryId_dictText">
 								{{showvalue.categoryId_dictText}}
 							</view>
-							<view class="tags-one" v-if="showvalue.typeId_dictText">{{showvalue.typeId_dictText}}</view>
-							<!-- <view class="tags-one" v-if="showvalue.medicationId_dictText">
+							<view class="tags-one" v-if="showvalue.typeId_dictText">
+								{{showvalue.typeId_dictText}}
+							</view>
+							<view class="tags-one" v-if="showvalue.medicationId_dictText">
 								{{showvalue.medicationId_dictText}}
-							</view> -->
+							</view>
 						</view>
 					</view>
 					<view class="right-bottom-right">
@@ -1472,7 +1474,7 @@
 	}
 	const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,]
 	const clickmiddle = (index : number) => {
-		// console.log(showvalue.value)
+		console.log(showvalue.value)
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		showvalue.value.jianhuobtn = false;
@@ -2604,6 +2606,7 @@
 			height: 100%;
 			width: 30%;
 			padding-left: 30rpx;
+			padding-top: 30rpx;
 
 			.left-img {
 				width: 250rpx;
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index abf3a04..221320e 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -182,7 +182,8 @@
 				cgdwflag.value = false;
 				type.value = {};
 				sx.value = false;
-				gysidnum.value = 0
+				gysidnum.value = 0;
+				isZero.value = false;
 			}
 	})
 	const jssl=()=>{
@@ -216,7 +217,7 @@
 	const calculatorArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, "AC", 0, "AE"];
 	const stringShow = ref("0000");
 	const relNumber = ref(0);
-	// const isZero = ref(false);
+	const isZero = ref(false);
 	const clickKuai = (item : any, index : number) => {
 		blueNumber.value = index;
 		setTimeout(() => {
@@ -234,7 +235,13 @@
 			cy()
 			return
 		}
-
+		if(isZero.value == false){
+			isZero.value = true;
+			relNumber.value = item;
+			stringShow.value = toFixed4ByPadStart(relNumber.value);
+			cy()
+			return
+		}
 		if (digitCountByString(relNumber.value) > 3) {
 
 		} else {
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index d1c82c6..010efee 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -94,7 +94,7 @@
 									<view class="" :style="Number(v.status)>0?{color: `#1083F8`}:{}">
 										拣货
 									</view>
-									<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy">
+									<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy ">
 										{{ "[ " + v.jhBy + " ]" }}
 									</view>
 								</view>
@@ -123,7 +123,7 @@
 									<view class="" :style="Number(v.status)>1?{color: `#1083F8`}:{}">
 										完结
 									</view>
-									<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy">
+									<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.wjBy ">
 										{{ "[ " + v.wjBy + " ]" }}
 									</view>
 								</view>
@@ -935,6 +935,7 @@
 							.middle-img {
 								width: 150rpx;
 								height: 150rpx;
+								margin: 0.3vw 0 0 0.15vw;
 							}
 
 							.middle-right {
@@ -1002,11 +1003,13 @@
 		.right-bottom-left {
 			height: 100%;
 			width: 30%;
-			padding-left: 30rpx;
+			padding-left: 55rpx;
 
 			.left-img {
-				width: 300rpx;
-				height: 300rpx;
+				width: 270rpx;
+				height: 270rpx;
+				margin-left: 2vw;
+				margin-top: 5vw;
 			}
 
 			.left-tags {

From 7da72d6f6487ce664d809366ad140468583d9c83 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 20 Nov 2025 17:09:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8B=E7=8F=AD=E6=8F=90=E4=B8=80?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/procurement/purchaseorder.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index 010efee..3bb3177 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -504,7 +504,7 @@
 	const form = reactive({
 		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
-		pageSize: 9,
+		pageSize: -1,
 		categoryId: '',
 		typeId: '',
 		medicationId: '',
@@ -529,12 +529,12 @@
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		Object.assign(form, mobanform)
-
+		form.pageSize = -1;
 	}
 	const InvoicingList = ref([])
 	const queryInvo = () => {
 		queryCgdInfoList(form).then(res => {
-			// console.log(res.result.records)
+			console.log(res.result.records,form)
 			InvoicingList.value = [];
 			InvoicingList.value.push(...res.result.records);
 			clickmiddle(middletarget.value);