From aa0540dfbf382f9d252fcd4af3b7eff083488af6 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 20 Nov 2025 13:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/procurement/components/carditem.vue |  2 +-
 pages/procurement/components/carlist.vue  |  2 +-
 pages/procurement/components/purorder.vue |  7 ++++++-
 pages/procurement/material.vue            | 24 +++++++++++++++++------
 pages/procurement/materialcar.vue         |  2 +-
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index 17ad4ce..02721ed 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -21,7 +21,7 @@
 								<view>{{v.materialName}}</view><text>{{v.materialNo}}</text>
 							</view>
 							<view>
-								<text> 规格型号: {{v.specificationModel}}</text>
+								<text  style="white-space: nowrap;"> 规格型号: {{v.specificationModel}}</text>
 							</view>
 							<view>
 								<text v-if="v.multiUnitType=='1'">采购单价: ￥{{v.oneUnitPrice}} </text>
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index 1b85d55..e738049 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -26,7 +26,7 @@
 								<view>{{v.wlName}}</view><text>{{v.wlMaterialNo}}</text>
 							</view>
 							<view>
-								<text> 规格型号: {{v.wlSpecificationModel}}</text>
+								<text style="white-space: nowrap;"> 规格型号: {{v.wlSpecificationModel}}</text>
 							</view>
 							<view>
 								<text>采购单价: ￥{{v.referenceUnitPrice}}</text>
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index 83ad825..34054e7 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -380,6 +380,7 @@
 			
 								&:nth-child(1) {
 									text-align: left;
+									
 								}
 			
 								&:nth-child(2),&:nth-child(3),&:nth-child(4) {
@@ -421,6 +422,7 @@
 							height: 2vw;
 							margin-top: 1vw;
 							white-space: nowrap;
+							flex: auto;
 							>view {
 								width: 13vw;
 								height: 2vw;
@@ -433,15 +435,18 @@
 							}
 			
 							text {
-								width: 6vw;
+								min-width: 3vw;
 								font-weight: 300;
 								font-size: 1.4vw;
 								color: #222222;
 								white-space: nowrap;
+								text-align: right;
 								.q{
 									color: #555555;
 									font-size: 1.6vw;
 									font-weight: 800;
+									width: 100%;
+									text-align: right;
 								}
 							}
 						}
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 1ec46b0..85e81a3 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="serchs">
 			<view class="ipt">
-				<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" />
+				<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"  @confirm="search()"/>
 				<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
 					@click="search(0)"></image>
 			</view>
@@ -13,6 +13,10 @@
 				<image src="/static/index/procurement/sx.png" mode="aspectFill"></image>
 				筛选
 			</view>
+			<view class="shx" @click="chongzhi">
+				<image src="/static/index/procurement/sx.png" mode="aspectFill"></image>
+				重置
+			</view>
 			<view class="back" @click="uni.navigateBack()">
 				<image src="/static/index/procurement/bk.png" mode="aspectFill"></image>
 				返回
@@ -109,7 +113,7 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue';
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent,inject} from 'vue';
 	import { queryInvoicingList,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calculator from './components/calculator.vue'
@@ -155,7 +159,12 @@
 		medicationId: '',
 		wlParamInfo: '',
 		isWaring: 1
-	})
+	}) 
+	const parentMethod = inject('typescroll','qingkong');
+	const chongzhi=()=>{
+		typescroll(1,-1,{});
+		qingkong()
+	}
 	onLoad(() => {
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
 	})
@@ -698,16 +707,17 @@
 	}
 
 	.serchs {
-		width:64vw;
+		width:62vw;
 		height: 3.3vw;
 		border-radius: 1.6vw;
 		display: flex;
 		align-items: center;
 		margin-top: 0.7vw;
+		position: relative;
 		.ipt {
 			display: flex;
 			align-items: center;
-			width: 30vw;
+			width: 22vw;
 			background: #E2E4E9;
 			border-radius: 1.65vw;
 			height: 3.3vw;
@@ -739,7 +749,9 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			margin-left:5.5vw;
+			position: absolute;
+			right: 0.5vw;
+			top: 0.2vw;
 			image {
 				width: 1.5vw;
 				height: 1.3vw;
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 7390812..9468a6c 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -3,7 +3,7 @@
 		<view class="serchs">
 			<view class="leftbtn">
 				<view class="ipt">
-					<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" />
+					<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"  @confirm="search()"/>
 					<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
 						@click="search(0)"></image>
 				</view>