From 607c18b1c60b5b4395ed65e42f3265f2fa528560 Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Mon, 24 Nov 2025 09:28:40 +0800 Subject: [PATCH 1/2] =?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/components/equiment.vue | 184 ------------------------ pages/Warehouse/picking.vue | 20 --- pages/procurement/materialcar.vue | 7 +- 3 files changed, 3 insertions(+), 208 deletions(-) delete mode 100644 pages/Warehouse/components/equiment.vue diff --git a/pages/Warehouse/components/equiment.vue b/pages/Warehouse/components/equiment.vue deleted file mode 100644 index f5b0573..0000000 --- a/pages/Warehouse/components/equiment.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - - diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index 8a9d064..42bf38c 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -1065,25 +1065,6 @@ - - - @@ -1096,7 +1077,6 @@ import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import calendar from '@/component/public/calendar.vue' import superpicker from '@/component/public/superpicker.vue' - import equiment from './components/equiment.vue'; import nomessageimge from '@/pages/procurement/components/nomessage.vue'; import tanchuang from '@/pages/procurement/components/tanchuang.vue'; diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue index 1ac713f..654a225 100644 --- a/pages/procurement/materialcar.vue +++ b/pages/procurement/materialcar.vue @@ -38,8 +38,8 @@ - - + + @@ -58,7 +58,7 @@ import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import {eddShoppingCartList, queryShoppingCartList, getGwcMaterialTreeData, queryNuInfoByNuId, updateKfstatus,deleteQgInfoById,emptiedQgInfo ,queryWlInfoByWlId,generatedPurchaseOrder,generatedPurchaseViewOrder } from './api/lunpan.js' import carlist from './components/carlist.vue'; - import equiment from './components/equiment.vue'; + import tanchuang from './components/tanchuang.vue'; import classification from './components/classification.vue' import defaultr from './components/default.vue' import calculator from './components/calculator.vue' @@ -103,7 +103,6 @@ item.zk = false; item.scrollleft = 0; }) - console.log(res.result.records) InvoicingList.value.push(...res.result.records); status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore'; setout.value = (res.result.total == InvoicingList.value.length ? false : true) From 4d54274ee3582be0a458887adc86ffd15b72eadd Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Mon, 24 Nov 2025 14:08:19 +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 --- pages/procurement/components/carlist.vue | 4 +++- pages/procurement/components/classification.vue | 7 ++++--- pages/procurement/material.vue | 7 +++++-- pages/procurement/materialcar.vue | 9 +++++++-- pages/procurement/purchaseorder.vue | 7 +++++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue index af63771..e85e9c9 100644 --- a/pages/procurement/components/carlist.vue +++ b/pages/procurement/components/carlist.vue @@ -426,7 +426,7 @@ align-items: center; view { - width: 5.5vw; + min-width: 5.5vw; height: 1.8vw; border-radius: 0.9vw; border: 1px solid #D2D2D2; @@ -437,6 +437,7 @@ font-weight: 400; font-size: 1vw; color: #555555; + padding: 0 0.5vw; } } @@ -444,6 +445,7 @@ width: 9vw; height: 8vw; margin: 1vw auto 0; + border-radius: 1.1vw; } } } diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue index 8459d4f..f4fa0fb 100644 --- a/pages/procurement/components/classification.vue +++ b/pages/procurement/components/classification.vue @@ -56,7 +56,7 @@ - 重置 + 重置 确定 （{{num>99?'99+':num}}件物料） @@ -213,13 +213,14 @@ const qingkong = () => { if (gysidnum.value > -1) { gysidnum.value = -1; - getTreelnum() + getTreelnum(); } } defineExpose({ typescroll, config, - qingkong + qingkong, + getTreelnum }) diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue index 541834f..0bea2e2 100644 --- a/pages/procurement/material.vue +++ b/pages/procurement/material.vue @@ -169,7 +169,11 @@ serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/'; }) onShow(()=>{ - config() + shoppcar(); + getWaringMaterial(); + nextTick(()=>{ + chongzhi() + }) }) const Material = ref([]) const getWaringMaterial=()=>{ @@ -193,7 +197,6 @@ shoppcar(); queryInvo(); getWaringMaterial() - shoppcar(); } const carnum = ref(0) diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue index 654a225..7d34a41 100644 --- a/pages/procurement/materialcar.vue +++ b/pages/procurement/materialcar.vue @@ -80,7 +80,10 @@ const InvoicingList = ref([]) const status = ref('loading') const open = ref(0) - onLoad(()=>{ + onShow(()=>{ + nextTick(()=>{ + chongzhi(); + }) queryInvo() }) const classication = ref>() @@ -153,7 +156,7 @@ if(res.success){ form.pageNo=1; InvoicingList.value = []; - queryInvo() + chongzhi() } open.value = 0; // uni.showToast({ @@ -179,6 +182,8 @@ if(res.success){ InvoicingList.value.splice(delobj.value.index,1); open.value = 0; + status.value = InvoicingList.value.length == 0 ? 'nomore' : 'loadmore'; + classication.value.getTreelnum() } },800) diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue index 607ab58..d2b2e48 100644 --- a/pages/procurement/purchaseorder.vue +++ b/pages/procurement/purchaseorder.vue @@ -450,12 +450,14 @@ const middletarget = ref(0); const plzinfo = reactive({ + nuId: uni.getStorageSync('nuId'), pageNo: 1, pageSize: 10, canpull: true, cgdParamInfo: "" }) const mobanplzinfo = { + nuId: uni.getStorageSync('nuId'), pageNo: 1, pageSize: 10, canpull: true, @@ -490,6 +492,7 @@ form.suppliers = e.suppliers; form.cgdId = e.cgdId; form.pageNo = 1; + middletarget.value = 0; InvoicingList.value = []; queryInvo(); ification.value = false @@ -518,6 +521,9 @@ } const lefttarget = ref(0); const clickLeftMenu = (index : any, item : object) => { + if(lefttarget.value!=index){ + middletarget.value = 0; + } let num = Math.ceil((index + 1)) leftscrolltop.value = (num - 2) * 186; lefttarget.value = index; @@ -1071,6 +1077,7 @@ height: 270rpx; margin-left: 2vw; margin-top: 5vw; + border-radius: 1vw; } .left-tags {