合并

pages/NursingNew/component/pleasetake/common/tijiao.vue

@@ -4,6 +4,11 @@
 			<view class="title">
 				请领详情
 			</view>
+			<view class="contect">
+				<view class="contect-ones">
+					请领区域：护理单元01
+				</view>
+			</view>
 		</view>
 
 		<view class="mengban" v-if="show" @click="() => emit('back')"></view>
@@ -103,4 +108,12 @@
 		font-weight: 600;
 		border-bottom: 2rpx solid #E5E5E5;
 	}
+	.contect{
+		margin: 4vh 0;
+		.contect-ones{
+			color: #888888;
+			width: 33%;
+			font-size: 30rpx;
+		}
+	}
 </style>

pages/NursingNew/component/pleasetake/component/requestform.vue

@@ -332,7 +332,7 @@
 	const firstgetqueryCgdList = () => {
 		queryQld(plzinfo).then((res : any) => {
 			transition.value = true;
-			console.log("kankan",plzinfo,res)
+			// console.log("kankan",plzinfo,res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
@@ -624,7 +624,7 @@
 
 			.left-menu-scroll {
 				margin-top: 3%;
-				height: 94%;
+				height: 91%;
 				width: 100%;
 				// position: relative;
 				// overflow: auto;

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -21,7 +21,7 @@
 		<view class="button-tilte">
 			回退单
 		</view>
-		<view class="right-button-father" v-if="rightarray.length || !rightdonghua">
+		<view class="right-button-father" v-if="!nomessageshow">
 			<view class="right-button" @click="badshow=true">
 				<image src="/static/index/warehouse/procurement/picking/bebad.png" />
 				<view>
@@ -220,11 +220,11 @@
 						</view>
 					</view>
 				</view>
-				
+				<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
+					style="width: 30%;height: 30%;position: absolute;">
+				</defaultr>
 			</scroll-view>
-			<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
+			
-				style="width: 30%;height: 30%;position: absolute;">
-			</defaultr>
 		</view>
 	</view>
 </template>
@@ -353,11 +353,12 @@
 				nomessageshow.value = true;
 				return
 			}
+		
 			cannomessage.value = false
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
-			console.log("入参", plzinfo)
+			// console.log("入参", plzinfo)
-			console.log("查看数组", res.result.records)
+			// console.log("查看数组", res.result.records)
 			alltotal.value = res.result.total
 
 			// console.log("请购单数据呢???", res)
@@ -647,12 +648,8 @@
 
 			.left-menu-scroll {
 				margin-bottom: 3%;
-				height: 94%;
+				height: 100%;
 				width: 100%;
-				// position: relative;
-				// overflow: auto;
-
-				// background-color: red;
 				.pls-card {
 					width: 98%;
 					height: 25.3vh;

pages/NursingNew/component/pleasetake/component/takehomep.vue

@@ -95,7 +95,7 @@
 			elderId:form.elderId
 		}
 		queryGwcInfo(obj).then(res=>{
-			console.log(res,obj)
+			// console.log(res,obj)
 			addMaterial.value = res.result
 		})
 	}
@@ -182,7 +182,7 @@
 	}
 	const objtake = ref({})
 	const comfig=(v,i,t)=>{
-		console.log(v,i,t)
+		// console.log(v,i,t)
 		switch (t){
 			case 0:
 				objtake.value = v;

pages/Warehouse/warehome.vue

@@ -4,7 +4,7 @@
 			<image class="all-home" src="/static/index/warehouse/newhome/setting.png" mode="aspectFit"></image>
 		</view>
 		<view class="right-title">
-			<image class="title-imge" src="/static/index/indeximage.png" mode="aspectFit"></image>
+			<image class="title-imge" src="/static/home.png" mode="aspectFit"></image>
 			<view class="title-font">
 				{{ uni.getStorageSync('nuName') }}
 			</view>
@@ -609,12 +609,13 @@
 		display: flex;
 		align-items: center;
 		.title-imge{
-			width: 2vw;
+			width: 1.8vw;
-			height: 2vw;
+			height: 1.8vw;
+			margin-right: 0.5vw;
 			// margin-top: -0.3vw;
 		}
 		.title-font{
-			font-size: 30rpx;
+			font-size: 32rpx;
 			// margin-left: 3vw;
 			font-weight: 600;
 			

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"  @confirm="search()"/>
+					<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"  @confirm="search(0)"/>
 					<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
 						@click="search(0)"></image>
 				</view>
@@ -250,6 +250,7 @@
 				return
 			}
 			generatedPurchaseViewOrder(caigouarr.value).then(res=>{
+				console.log("11111",caigouarr.value,res)
 				if(res.success){
 					generatedOrder.value = res.result;
 					caigouflag.value = true;