From a3c22918c2f63d4cdf7b3b44bc3eb4b1d7e5f641 Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Thu, 22 Jan 2026 14:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/Warehouse/index/component/index.vue | 12 ++++++------ pages/Warehouse/picking.vue | 6 +++--- pages/procurement/components/calculator.vue | 1 - pages/procurement/components/carlist.vue | 2 ++ pages/procurement/materialcar.vue | 14 +++++++++++--- unpackage/dist/dev/.nvue/pages/camera.js | 2 +- unpackage/dist/dev/.nvue/pages/fullcamera.js | 2 +- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue index f8fe72d..537a0f8 100644 --- a/pages/Warehouse/index/component/index.vue +++ b/pages/Warehouse/index/component/index.vue @@ -819,7 +819,8 @@ const emit = defineEmits(['swip']) const clickmenu = (index : number) => { menutarget.value = index - let data = filteredMenu(2)[index] + let data = filteredMenu(2)[index]; + console.log(data) uni.setStorageSync('nuId', data.nuId); uni.setStorageSync('nuName', data.nuName); uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null); @@ -836,6 +837,7 @@ nuId:nuId } queryCountByType(data).then(res=>{ + console.log(res) hldyobj.value = res.result }) } @@ -1025,17 +1027,15 @@ const getmenu = () => { queryPadPageList().then((res => { leftMenuArray.value = res.result.records; - // console.log(leftMenuArray.value) - filteredMenu(2).forEach((element : any, index : number) => { - // console.log(element.nuId , uni.getStorageSync('NUall').nuId,filteredMenu(2)) + let arr = filteredMenu(2); + arr.forEach((element : any, index : number) => { if (element.nuId == uni.getStorageSync('NUall').nuId) { menutarget.value = index; clickmenu(index) } if(element.readList==null){ element.flag = false - } - if(element.readList.length>0){ + }else if(element.readList.length>0){ element.readList.forEach(k=>{ if(k.type=='pdd'){ element.flag = true diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index 2bd51c9..cf7298d 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -654,7 +654,7 @@ {{v.status_dictText}} @@ -1512,7 +1512,7 @@ middletarget.value = index; showvalue.value = InvoicingList.value[index]; showvalue.value.jianhuobtn = false; - Invoiscroll.value = (index - 2) * 172; + Invoiscroll.value = (index - 1) * 172; if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) { showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl showvalue.value.num = showvalue.value.maxnum; @@ -2546,7 +2546,7 @@ margin-left: 5%; .middle-Y { - width: 98%; + width: 96%; height: 100%; margin-left: 2%; // margin-right: 2%; diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue index 45034d8..0b053b8 100644 --- a/pages/procurement/components/calculator.vue +++ b/pages/procurement/components/calculator.vue @@ -177,7 +177,6 @@ type.value = a.find(item=> item.unit == props.caigouobj.wlUnits ); - console.log(props.caigouobj.wlUnits,type.value) }else{ type.value = a.find(item=> item.multiUnitType == props.caigouobj.multiUnitType diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue index e701684..cf41fd4 100644 --- a/pages/procurement/components/carlist.vue +++ b/pages/procurement/components/carlist.vue @@ -136,6 +136,7 @@ let absy = Math.abs(y - pageY.value) if (absy > 30 && absx+10{ v.scrollleft = 0 },20) @@ -460,6 +461,7 @@ >image { width: 100%; height: 100%; + border-radius: 1.1vw; } } } diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue index 464a970..ff93a0b 100644 --- a/pages/procurement/materialcar.vue +++ b/pages/procurement/materialcar.vue @@ -120,7 +120,6 @@ } const addcartory =(e:any)=>{ - console.log(`eeeeeeeeeee`,e) caigouobj.value = e; addflag.value = true; @@ -173,7 +172,6 @@ const delindex =()=>{ let delstr = delobj.value.id; deleteQgInfoById(delstr).then(res=>{ - if(res.success){ uni.showToast({ icon:res.success?'success':'none', @@ -247,7 +245,17 @@ wlParamInfo:v.wlMaterialNo, } queryShoppingCartList(forms).then(res => { - let obj = res.result.records[0]; + let obj = {}; + if(res.result.records.length>1){ + res.result.records.forEach(item=>{ + if(item.id==v.id){ + obj = item + } + }) + }else{ + obj = res.result.records[0]; + } + InvoicingList.value.forEach((item,i)=>{ if(item.id == obj.id){ obj.flag = v.flag; diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js index cb24fb3..0f26729 100644 --- a/unpackage/dist/dev/.nvue/pages/camera.js +++ b/unpackage/dist/dev/.nvue/pages/camera.js @@ -570,7 +570,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 3c0ae68..aab70ef 100644 --- a/unpackage/dist/dev/.nvue/pages/fullcamera.js +++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js @@ -578,7 +578,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 };