From 7122a5377f605b08877e3f888b99fe39ad0f02ea Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Mon, 24 Nov 2025 14:31:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Warehouse/picking.vue                     | 3 ++-
 pages/procurement/components/carlist.vue        | 4 +++-
 pages/procurement/components/classification.vue | 2 +-
 pages/procurement/materialcar.vue               | 4 +---
 unpackage/dist/dev/.nvue/pages/camera.js        | 2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js    | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index a006720..2ff094c 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -2645,7 +2645,7 @@
 			}
 
 			.tags-one {
-				width: 130rpx;
+				min-width: 130rpx;
 				height: 60rpx;
 				display: flex;
 				justify-content: center;
@@ -2656,6 +2656,7 @@
 				margin-top: 10rpx;
 				font-size: 23rpx;
 				color: #555555;
+				padding: 0 0.5vw;
 			}
 		}
 
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index e85e9c9..bc17d21 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -29,7 +29,9 @@
 								<text style="white-space: nowrap;"> 规格型号: {{v.wlSpecificationModel}}</text>
 							</view>
 							<view>
-								<text>采购单价: ￥{{Number(v.referenceUnitPrice).toFixed(2) }}</text>
+								<text v-if="v.wlUnits == v.materialUnits">采购单价: ￥{{Number(v.unitPrice).toFixed(2) }}</text>
+								<text v-if="v.wlUnits == v.twoUnit">采购单价: ￥{{Number(v.twoUnitPrice).toFixed(2) }}</text>
+								<text v-if="v.wlUnits == v.oneUnit">采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2) }}</text>
 								<text>采购单位: {{v.wlUnits}}</text>
 							</view>
 							<view>
diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue
index f4fa0fb..ac0b37b 100644
--- a/pages/procurement/components/classification.vue
+++ b/pages/procurement/components/classification.vue
@@ -56,7 +56,7 @@
 
 			</view>
 			<view class="btnbotm">
-				<view class="bt" @click="typescroll(1,-1,{});qingkong();config()">重置</view>
+				<view class="bt" @click="typescroll(1,-1,{});qingkong()">重置</view>
 				<view class="bt qd" @click="config">确定 <text v-if="num>0">（{{num>99?'99+':num}}件物料）</text></view>
 			</view>
 		</view>
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 7d34a41..fbe1037 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -81,9 +81,6 @@
 	 const status = ref('loading')
 	 const open = ref(0)
 	 onShow(()=>{
-		 nextTick(()=>{
-			 chongzhi();
-		 })
 		 queryInvo()
 	 })
 	 const classication = ref<InstanceType<typeof ChildComponent>>()
@@ -106,6 +103,7 @@
 				item.zk = false;
 				item.scrollleft = 0;
 	 		})
+			console.log(res.result.records)
 	 		InvoicingList.value.push(...res.result.records);
 	 		status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
 			setout.value = (res.result.total == InvoicingList.value.length ? false : true)
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index dd59bdc..c959abe 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };