From 7de2184943783c4a7775689334ea3600824bebfd Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Thu, 4 Dec 2025 08:36:59 +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 --- .../component/pleasetake/common/carditem.vue | 1 + .../pleasetake/component/requestform.vue | 12 +- .../pleasetake/component/returnorder.vue | 1021 +++++++++++++++++ .../pleasetake/component/takehomep.vue | 8 +- .../component/pleasetake/takehome.vue | 4 +- pages/procurement/components/carditem.vue | 5 + .../warehouse/procurement/picking/caigou.png | Bin 0 -> 922 bytes unpackage/dist/dev/.nvue/pages/camera.js | 2 +- unpackage/dist/dev/.nvue/pages/fullcamera.js | 2 +- 9 files changed, 1042 insertions(+), 13 deletions(-) create mode 100644 pages/NursingNew/component/pleasetake/component/returnorder.vue create mode 100644 static/index/warehouse/procurement/picking/caigou.png diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue index 81f7738..2d2563c 100644 --- a/pages/NursingNew/component/pleasetake/common/carditem.vue +++ b/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{ caigouobj.value.scrollleft = 0 },20) diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue index 9fd91cf..ba4486e 100644 --- a/pages/NursingNew/component/pleasetake/component/requestform.vue +++ b/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 }) diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue new file mode 100644 index 0000000..b0ec3c7 --- /dev/null +++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue @@ -0,0 +1,1021 @@ + + + + + \ No newline at end of file diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue index 6009394..855626b 100644 --- a/pages/NursingNew/component/pleasetake/component/takehomep.vue +++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue @@ -25,13 +25,13 @@ - + 请领单 - + 回退单 @@ -271,8 +271,8 @@ classication.value.config(); } const emit = defineEmits(['changePageNumber']) // 也可以用类型签名（见下面） - const changePage = () => { - emit('changePageNumber', 1) + const changePage = (index:number) => { + emit('changePageNumber', index) } diff --git a/pages/NursingNew/component/pleasetake/takehome.vue b/pages/NursingNew/component/pleasetake/takehome.vue index 51f61aa..a8460b0 100644 --- a/pages/NursingNew/component/pleasetake/takehome.vue +++ b/pages/NursingNew/component/pleasetake/takehome.vue @@ -15,8 +15,8 @@ - + @@ -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({ diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue index 215319f..6f526bc 100644 --- a/pages/procurement/components/carditem.vue +++ b/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{ 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) => { diff --git a/static/index/warehouse/procurement/picking/caigou.png b/static/index/warehouse/procurement/picking/caigou.png new file mode 100644 index 0000000000000000000000000000000000000000..b41c31b0b7ea090dfa40fcccd1f21890694a916f GIT binary patch literal 922 zcmV;L17-Y)P)Px&R7pfZR7gwJmQQHhRS?I&^Rf+FcNJC-mWT!{hzDCdi0NIhs5vEXcH2lGhz%$n znuB`K!-AJWQ3SEHIoKSGCT})GBI2P1BlggqDq`p#L~^iN476yHZMNC`#!UGI)?d=> zCcjAVU3TF&Z$9&#nK$ndc4^Traq<5Ed+*;NqCo(i0PX^C02IJ?&bfET$H#weHG@qR z4-O9Q86F;9W@ZDPi5(j(xwi`7aS^#yE|*=oT#hyiVneWPoSB(f&oO1_EH8WdaH&yksd_Mod$jHc2GKh8Hfq{YS;^N{Z00+&Oh&~P> z3^DWh)gWF_)ni0-RaJ?IH2!@Lz+nJSipVT8&jNTNhW!HIIT87*5xx%0%%=dn0pMEz zuZhS_+tAzF+vS|QxJmlX6$*t{tSn~3%nuXMr>c5{h$MtiYzDpqAe+nO_9j!r%m;|b z9OP9sGPUN+Id?sTaC)PlnAvJgBJwYh8!5K>AZgfYw?srq?Q3b< zF4UAV^E`muw!z-}mx$;q0G2vCzu$|#ffYer>e>*D?Odi~MK$;m%cgEvced~UA*_RIR9ZB@MhpjxZd z_DxMq&8G%8X|CS@JQmwrvpFv!HV@LLnwi@(nao2=OG}!~W=-+k(a}-sVykaEfIk4N z%+1YpOixeOcdWUX+1n&-P<~BBo^EKad@h%(C+2&4#idf|sVItGT?47=Y^72;+hm+> z3B1#ngq`EoXY~%=PAfLsn_d#$`!9&-sH%QmsZ{z?+)UPVp8$9Zz`5jwvhF_a>+35l zFE86`u>(L2z)#k#8$9mr7n7B$4S+S?g8*)~wY5DnHa7PArY{it7{gBjFvWIMwzKSo wV%d9p?fKLcydBC`_cVQ1Z`EO|_PYlD2frk@E+RSJKmY&$07*qoM6N<$f=#Tr2><{9 literal 0 HcmV?d00001 diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js index 04100f2..12310ff 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 c959abe..dd59bdc 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 };