From 2529320d735ea400247036657f93823d15c5a10e Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 9 Dec 2025 15:21:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/procurement/materialcar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 9291bcc..3f22708 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -241,6 +241,7 @@
 				adfangdou.value = true;
 			})
 		}
+		
 		const caigouflag = ref(false)
 		const caigouarr = ref([])
 		const generatedOrder = ref([])

From a2e634674c336fbf90fb8882df62104a25d89b50 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 9 Dec 2025 16:06:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/pleasetake/common/carditem.vue  |  4 +--
 .../component/pleasetake/common/medetails.vue |  8 ++---
 .../component/pleasetake/common/takeing.vue   |  8 ++---
 .../pleasetake/component/requestform.vue      |  3 +-
 .../pleasetake/component/returnorder.vue      |  3 +-
 .../pleasetake/component/takehomep.vue        | 36 ++++++++++++++-----
 .../component/pleasetake/takehome.vue         | 10 +++---
 unpackage/dist/dev/.nvue/pages/camera.js      |  2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js  |  2 +-
 9 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 54ce088..27525d5 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -20,11 +20,11 @@
 						</view>
 						<view class="msitem guodu" >
 							<view>
-								<view>{{v.materialName}}</view>
+								<view>{{v?.materialName}}</view>
 							</view>
 							<view>
 								<text  style="white-space: nowrap;"> 规格型号: </text>
-								<view>{{v.specificationModel}}</view>
+								<view>{{v?.specificationModel}}</view>
 							</view>
 							<view>
 								<view>
diff --git a/pages/NursingNew/component/pleasetake/common/medetails.vue b/pages/NursingNew/component/pleasetake/common/medetails.vue
index 7963e45..01024d5 100644
--- a/pages/NursingNew/component/pleasetake/common/medetails.vue
+++ b/pages/NursingNew/component/pleasetake/common/medetails.vue
@@ -12,15 +12,15 @@
 					</view>
 				</view>
 				<view class="youcont">
-					<view>{{objtake.materialName}}</view>
+					<view>{{objtake?.materialName}}</view>
 					<view>
 						<view>
 							物料编码
-							<text>{{objtake.materialNo}}</text>
+							<text>{{objtake?.materialNo}}</text>
 						</view>
 						<view>
 							规格型号
-							<text style="white-space: nowrap;">{{objtake.specificationModel}}</text>
+							<text style="white-space: nowrap;">{{objtake?.specificationModel}}</text>
 						</view>
 					</view>
 					<view>
@@ -30,7 +30,7 @@
 						</view>
 						<view>
 							请领单位
-							<text>{{objtake.materialUnits}}</text>
+							<text>{{objtake?.materialUnits}}</text>
 						</view>
 						<view>
 							累计请领
diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue
index f56eab0..d2ff2a8 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -12,21 +12,21 @@
 							<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
 						</view>
 						<view class="youcont">
-							<view>{{objtake.materialName}}</view>
+							<view>{{objtake?.materialName}}</view>
 							<view>
 								<view>
 									物料编码
-									<text>{{objtake.materialNo}}</text>
+									<text>{{objtake?.materialNo}}</text>
 								</view>
 								<view>
 									请购单位
-									<text>{{objtake.materialUnits}}</text>
+									<text>{{objtake?.materialUnits}}</text>
 								</view>
 							</view>
 							<view>
 								<view>
 									规格型号
-									<text style="white-space: nowrap;">{{objtake.specificationModel}}</text>
+									<text style="white-space: nowrap;">{{objtake?.specificationModel}}</text>
 								</view>
 							</view>
 						</view>
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 751a24e..0fba9e2 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -221,8 +221,7 @@
 	import defaultr from '../common/default.vue'
 	const props = defineProps({
 		isShow: {
-			type: Boolean,
-			required: true,
+			type: Boolean 
 		},
 	});
 	const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"])
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 83e7062..5b43aca 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -170,8 +170,7 @@
 	import submits from '../common/submits.vue'
 	const props = defineProps({
 		isShow: {
-			type: Boolean,
-			required: true,
+			type: Boolean 
 		},
 	});
 	const openerror = ref(false)
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index a84dd8c..1aa3fd5 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view  v-if="isShow">
 		<view class="buttons-father">
 			<view class="boxtwo">
 				<view class="ipt">
@@ -79,6 +79,30 @@
 		typeId:'',
 		medicationId:''
 	})
+	const props = defineProps({
+		isShow: {
+			type: Boolean 
+		},
+	});
+	const transition = ref(false);
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			form.pageNo = 1;
+			listarr.value = [];
+			config()
+			wuliao() 
+			if (!oldVal && newVal) {
+				transition.value = false;
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
+	
+		}
+	)
 	const takeshow = ref(false)
 	const ification = ref(false)
 	const detaishow = ref(false)
@@ -89,10 +113,6 @@
 	const openerror = ref(false)
 	const errmsg = ref('')
 	const classication = ref<InstanceType<typeof ChildComponent>>()
-	onMounted(()=>{
-		config()
-		wuliao() 
-	})
 	const addMaterial = ref([])
 	const wuliao = () =>{
 		let obj = {
@@ -100,7 +120,7 @@
 			elderId:form.elderId
 		}
 		queryGwcInfo(obj).then(res=>{
-			// console.log(res,obj)
+			console.log(res)
 			addMaterial.value = res.result
 		})
 	}
@@ -108,6 +128,8 @@
 	const status = ref('loadmore')
 	const config = ()=>{
 		queryInvoicingList(form).then(res=>{
+			console.log(res)
+			console.log(form)
 			res.result.records.forEach(item=>{
 				item.zk = false;
 				item.scrollleft = 0;
@@ -148,10 +170,8 @@
 		subshow.value = true;
 	}
 	const adddel = (v)=>{
-		console.log(v)
 		listarr.value.forEach(item=>{
 			if(item.wlId == v.wlId){
-				console.log(item)
 				objtake.value = item
 			}
 		})
diff --git a/pages/NursingNew/component/pleasetake/takehome.vue b/pages/NursingNew/component/pleasetake/takehome.vue
index a8460b0..cdb4ba9 100644
--- a/pages/NursingNew/component/pleasetake/takehome.vue
+++ b/pages/NursingNew/component/pleasetake/takehome.vue
@@ -14,7 +14,7 @@
 				<view  v-if="hometype>0" @click="hometype=0">返回</view>
 			</view>
 		</view>
-		<takehomep v-if="!hometype" @changePageNumber="changehometype" ></takehomep>
+		<takehomep :isShow="hometype==0"  @changePageNumber="changehometype" ></takehomep>
 		<requestformView :isShow="hometype==1" />
 		<returnorder :isShow="hometype==2" />
 	</view>
@@ -28,14 +28,16 @@
 	import takehomep from './component/takehomep.vue'
 	import returnorder from './component/returnorder.vue'
 	
-	const hometype = ref(0)
+	const hometype = ref(-1)
 	const transition = ref(false);
 	const props = defineProps({
 		isShow: {
-			type: Boolean,
-			required: true,
+			type: Boolean 
 		},
 	});
+	onMounted(()=>{
+		hometype.value = 0;
+	})
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
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
 };