合并

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

@@ -28,7 +28,7 @@
 							<view>
 								<view>
 									规格型号
-									<text style="white-space: nowrap;width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text>
+									<text style="width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text>
 								</view>
 							</view>
 						</view>

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

@@ -88,7 +88,8 @@
 	const times = ref('')
 	const status = ref('loadmore')
 	onMounted(()=>{
-		times.value = uni.getStorageSync('NUall').elderInfo.checkinTime
+		// console.log("啥啊",uni.getStorageSync('NUall'))
+		times.value = uni.getStorageSync('NUall').elderInfo?.checkinTime
 	})
 	const wuobj = ref({})
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')

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

@@ -322,6 +322,7 @@
 	const rightinfolist = ()=>{
 		queryQldWlInfo({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((element : any) => {
 			rightarray.value = [];
+			console.log("kankan",element.result)
 			rightarray.value.push(...element.result)
 			rightdonghua.value = true;
 		})

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

@@ -176,6 +176,7 @@
 				item.zk = false;
 				item.scrollleft = 0;
 			})
+			console.log("?????",form,res.result.records)
 			listarr.value.push(...res.result.records)
 			status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
 		})

pages/procurement/common/takeing.vue

@@ -26,7 +26,7 @@
 							<view>
 								<view>
 									规格型号
-									<text style="white-space: nowrap;">{{objtake.materialInfo?.specificationModel}}</text>
+									<text style="width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake.materialInfo?.specificationModel}}</text>
 								</view>
 							</view>
 						</view>

pages/procurement/inventory.vue

@@ -271,8 +271,12 @@
 		
 		})
 	}
+	onShow(()=>{
+		chongzhi()
+		console.log("刷新了")
+	})
 	onMounted(() => {
-		firstgetqueryCgdList();
+		// firstgetqueryCgdList();
 		getSelectList();
 	})
 	type datetype = {

pages/procurement/retstock.vue

@@ -125,6 +125,7 @@
 		<view v-show="opendata" class="mengban" :style="opendata ?{background:`transparent`}:{}"
 			@click="opendata=false;">
 		</view>
+		<errorshow :show="openmessage" :font="errormessage" @close="openmessage=false"  />
 	</view>
 </template>
 
@@ -176,8 +177,11 @@
 			subshow.value = true;
 		})
 	}
+	const errormessage = ref("");
+	const openmessage = ref(false)
 	const tijiao = () => {
 		submitThd({ id: tharrlist.value[cardindex.value].id }).then(res => {
+			console.log("入库退货单",res)
 			if (res.success) {
 				subshow.value = false;
 				th(tharrlist.value[cardindex.value], cardindex.value)
@@ -185,10 +189,8 @@
 					cardcon(tharrlist.value[cardindex.value], cardindex.value);
 				}, 200)
 			} else {
-				uni.showToast({
-					icon: 'none',
-					title: res.message
-				})
+				errormessage.value = res.message;
+				openmessage.value = true
 			}
 		})
 	}