合并

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

@@ -100,6 +100,7 @@
 		let absy = Math.abs(y - pageY.value);
 		ones.value = true;
 		if (absy > 30 && absx+10<absy) {
+			caigouobj.value.scrollleft = 0.01
 			setTimeout(()=>{
 				caigouobj.value.scrollleft = 0
 			},20)

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

@@ -430,10 +430,10 @@
 	const zuofei = () => {
 
 		cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
-			// console.log('作废', res)
+			console.log('作废', res)
 			badshow.value = false
 			if(res.success){
-				
+				plsbuy.value[lefttarget.value] = res.result.result
 			}else{
 				plzinfo.pageNo = 1;
 				plzinfo.canpull = true;
@@ -447,7 +447,7 @@
 			
 			setTimeout(() => {
 				uni.showToast({
-					title: res.message,
+					title: res.success?res.result.message:res.message,
 					icon: 'none', // 'none' 表示不带图标
 					duration: 3000
 				})
@@ -463,10 +463,10 @@
 			nuId: uni.getStorageSync('nuId')
 		}
 		confirmReceipt(param).then((res : any) => {
-			console.log('收货', res)
+			console.log('收货', param,res)
 			shouhuoshow.value = false
 			if(res.success){
-				
+				plsbuy.value[lefttarget.value] = res.result.result
 			}else{
 				plzinfo.pageNo = 1;
 				leftscrolltop.value = 1
@@ -480,7 +480,7 @@
 			
 			setTimeout(() => {
 				uni.showToast({
-					title: res.message,
+					title: res.success?res.result.message:res.message,
 					icon: 'none', // 'none' 表示不带图标
 					duration: 3000
 				})

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

@@ -25,13 +25,13 @@
 			<view class="boxtwo flexend">
 				<view class="qlthbtn">
 					<image src="/static/index/requestform/ql0.png" mode="aspectFill"></image>
-					<view class="shx-font" @click="changePage()">
+					<view class="shx-font" @click="changePage(1)">
 						请领单
 					</view>
 				</view>
 				<view class="qlthbtn">
 					<image src="/static/index/requestform/ql1.png" mode="aspectFill"></image>
-					<view class="shx-font">
+					<view class="shx-font" @click="changePage(2)">
 						回退单
 					</view>
 				</view>
@@ -271,8 +271,8 @@
 		classication.value.config();
 	}
 	const emit = defineEmits(['changePageNumber']) // 也可以用类型签名（见下面）
-	const changePage = () => {
+	const changePage = (index:number) => {
-		emit('changePageNumber', 1) 
+		emit('changePageNumber', index) 
 	}
 </script>
 

pages/NursingNew/component/pleasetake/takehome.vue

@@ -15,8 +15,8 @@
 			</view>
 		</view>
 		<takehomep v-if="!hometype" @changePageNumber="changehometype" ></takehomep>
-		<!-- v-if是实际隐藏，isshow是控制动画 -->
 		<requestformView :isShow="hometype==1" />
+		<returnorder :isShow="hometype==2" />
 	</view>
 </template>
 
@@ -26,6 +26,8 @@
 	import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js'
 	import requestformView from './component/requestform.vue'
 	import takehomep from './component/takehomep.vue'
+	import returnorder from './component/returnorder.vue'
+	
 	const hometype = ref(0)
 	const transition = ref(false);
 	const props = defineProps({

pages/procurement/components/carditem.vue

@@ -111,14 +111,17 @@
 		solleft(v, i)
 	}
 	const handleTouchEnd = (event : any, v : any, i : number) => {
+		console.log('结束')
 		let y = event.changedTouches[0].pageY;
 		let x = event.changedTouches[0].pageX;
 		let absx = Math.abs(x - pageX.value)
 		let absy = Math.abs(y - pageY.value)
 		if (absy > 30 && absx+10<absy) {
+			v.scrollleft = 1
 			setTimeout(()=>{
 				v.scrollleft = 0
 			},20)
+			console.log("1")
 			return
 		}
 		if (absx < 10 && absy < 10) {
@@ -127,6 +130,7 @@
 					v.scrollleft = 0
 				 },20)
 			 }
+			 console.log("2")
 			return
 		}
 		caigouobj.value = v;
@@ -135,6 +139,7 @@
 		caigouobj.value.yj = false;
 		v.zk = x > pageX.value ? false : true;
 		v.scrollleft = v.zk ? 150 : 0;
+		
 	}
 	const solleft = (v : any, i : number) => { 
 		props.InvoicingList.forEach((item, k) => {

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
 };

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
 };