From a032a01544a780494a2faa00959f8902f9116fa2 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Tue, 13 May 2025 17:18:07 +0800 Subject: [PATCH] 5.13 --- component/public/Drawer.vue | 15 +- component/storeroom/components/calculator.vue | 1 + component/storeroom/components/info.vue | 20 +- .../storeroom/drawer/calculator/index.vue | 310 ++++ component/storeroom/drawer/picking/index.vue | 683 +++++++ .../storeroom/drawer/pickingGood/index.vue | 1057 +++++++++++ component/storeroom/drawer/suixing/index.vue | 31 +- component/storeroom/index.vue | 7 +- component/storeroom/orders.vue | 91 +- manifest.json | 4 +- static/index/addphoto.png | Bin 0 -> 6020 bytes static/index/caigoubgc.png | Bin 0 -> 2590 bytes static/index/leftbluejiao.png | Bin 0 -> 1182 bytes static/index/leftjiao.png | Bin 0 -> 1008 bytes static/index/warehouseCard/bgcblueblue.png | Bin 0 -> 47178 bytes static/index/warehouseCard/bgcbluespec.png | Bin 0 -> 43566 bytes static/index/warehouseCard/bgcgreengreen.png | Bin 0 -> 31386 bytes static/index/warehouseCard/bgcgreenspec.png | Bin 0 -> 43291 bytes static/index/warehouseCard/bgcorange.png | Bin 0 -> 32461 bytes static/index/warehouseCard/bgcyellow.png | Bin 0 -> 32142 bytes unpackage/dist/build/app-plus/app-service.js | 2 +- unpackage/dist/build/app-plus/manifest.json | 4 +- .../build/app-plus/pages/Nursing/index.css | 2 +- .../app-plus/pages/Warehousing/index.css | 2 +- .../build/app-plus/static/index/addphoto.png | Bin 0 -> 6020 bytes .../build/app-plus/static/index/caigoubgc.png | Bin 0 -> 2590 bytes .../app-plus/static/index/leftbluejiao.png | Bin 0 -> 1182 bytes .../build/app-plus/static/index/leftjiao.png | Bin 0 -> 1008 bytes .../index/warehouseCard/bgcblueblue.png | Bin 0 -> 47178 bytes .../index/warehouseCard/bgcbluespec.png | Bin 0 -> 43566 bytes .../index/warehouseCard/bgcgreengreen.png | Bin 0 -> 31386 bytes .../index/warehouseCard/bgcgreenspec.png | Bin 0 -> 43291 bytes .../static/index/warehouseCard/bgcorange.png | Bin 0 -> 32461 bytes .../static/index/warehouseCard/bgcyellow.png | Bin 0 -> 32142 bytes unpackage/dist/dev/app-plus/app-service.js | 1591 ++++++++++++++--- unpackage/dist/dev/app-plus/manifest.json | 4 +- .../dev/app-plus/pages/Warehousing/index.css | 1039 +++++++++++ .../dev/app-plus/static/index/addphoto.png | Bin 0 -> 6020 bytes .../dev/app-plus/static/index/caigoubgc.png | Bin 0 -> 2590 bytes .../app-plus/static/index/leftbluejiao.png | Bin 0 -> 1182 bytes .../dev/app-plus/static/index/leftjiao.png | Bin 0 -> 1008 bytes .../index/warehouseCard/bgcblueblue.png | Bin 0 -> 47178 bytes .../index/warehouseCard/bgcbluespec.png | Bin 0 -> 43566 bytes .../index/warehouseCard/bgcgreengreen.png | Bin 0 -> 31386 bytes .../index/warehouseCard/bgcgreenspec.png | Bin 0 -> 43291 bytes .../static/index/warehouseCard/bgcorange.png | Bin 0 -> 32461 bytes .../static/index/warehouseCard/bgcyellow.png | Bin 0 -> 32142 bytes 47 files changed, 4601 insertions(+), 262 deletions(-) create mode 100644 component/storeroom/drawer/calculator/index.vue create mode 100644 component/storeroom/drawer/picking/index.vue create mode 100644 component/storeroom/drawer/pickingGood/index.vue create mode 100644 static/index/addphoto.png create mode 100644 static/index/caigoubgc.png create mode 100644 static/index/leftbluejiao.png create mode 100644 static/index/leftjiao.png create mode 100644 static/index/warehouseCard/bgcblueblue.png create mode 100644 static/index/warehouseCard/bgcbluespec.png create mode 100644 static/index/warehouseCard/bgcgreengreen.png create mode 100644 static/index/warehouseCard/bgcgreenspec.png create mode 100644 static/index/warehouseCard/bgcorange.png create mode 100644 static/index/warehouseCard/bgcyellow.png create mode 100644 unpackage/dist/build/app-plus/static/index/addphoto.png create mode 100644 unpackage/dist/build/app-plus/static/index/caigoubgc.png create mode 100644 unpackage/dist/build/app-plus/static/index/leftbluejiao.png create mode 100644 unpackage/dist/build/app-plus/static/index/leftjiao.png create mode 100644 unpackage/dist/build/app-plus/static/index/warehouseCard/bgcblueblue.png create mode 100644 unpackage/dist/build/app-plus/static/index/warehouseCard/bgcbluespec.png create mode 100644 unpackage/dist/build/app-plus/static/index/warehouseCard/bgcgreengreen.png create mode 100644 unpackage/dist/build/app-plus/static/index/warehouseCard/bgcgreenspec.png create mode 100644 unpackage/dist/build/app-plus/static/index/warehouseCard/bgcorange.png create mode 100644 unpackage/dist/build/app-plus/static/index/warehouseCard/bgcyellow.png create mode 100644 unpackage/dist/dev/app-plus/static/index/addphoto.png create mode 100644 unpackage/dist/dev/app-plus/static/index/caigoubgc.png create mode 100644 unpackage/dist/dev/app-plus/static/index/leftbluejiao.png create mode 100644 unpackage/dist/dev/app-plus/static/index/leftjiao.png create mode 100644 unpackage/dist/dev/app-plus/static/index/warehouseCard/bgcblueblue.png create mode 100644 unpackage/dist/dev/app-plus/static/index/warehouseCard/bgcbluespec.png create mode 100644 unpackage/dist/dev/app-plus/static/index/warehouseCard/bgcgreengreen.png create mode 100644 unpackage/dist/dev/app-plus/static/index/warehouseCard/bgcgreenspec.png create mode 100644 unpackage/dist/dev/app-plus/static/index/warehouseCard/bgcorange.png create mode 100644 unpackage/dist/dev/app-plus/static/index/warehouseCard/bgcyellow.png diff --git a/component/public/Drawer.vue b/component/public/Drawer.vue index e798a26..83bf33e 100644 --- a/component/public/Drawer.vue +++ b/component/public/Drawer.vue @@ -1,13 +1,13 @@ - \ No newline at end of file diff --git a/component/storeroom/drawer/picking/index.vue b/component/storeroom/drawer/picking/index.vue new file mode 100644 index 0000000..c87303d --- /dev/null +++ b/component/storeroom/drawer/picking/index.vue @@ -0,0 +1,683 @@ + + + + + + \ No newline at end of file diff --git a/component/storeroom/drawer/pickingGood/index.vue b/component/storeroom/drawer/pickingGood/index.vue new file mode 100644 index 0000000..0898b86 --- /dev/null +++ b/component/storeroom/drawer/pickingGood/index.vue @@ -0,0 +1,1057 @@ + + + + + + \ No newline at end of file diff --git a/component/storeroom/drawer/suixing/index.vue b/component/storeroom/drawer/suixing/index.vue index 774a68b..9bca452 100644 --- a/component/storeroom/drawer/suixing/index.vue +++ b/component/storeroom/drawer/suixing/index.vue @@ -71,12 +71,12 @@ - - + + - + - + 上传人: @@ -117,6 +117,7 @@ }); const postItems = ref(0); + const photoArray = ref([`https://img-s.msn.cn/tenant/amp/entityid/AA1ECZ6y.img?w=768&h=960&m=6&x=355&y=171&s=47&d=47`, `https://img-s.msn.cn/tenant/amp/entityid/AA1ECtEb.img?w=768&h=436&m=6&x=280&y=134&s=200&d=200`,"/static/index/addphoto.png"]) // const stateArray = ['已作废', '未确认', '已确认', '未完结', '待结账', '已结账']; // 初始化左侧菜单列表 const buttonList = ref([ @@ -124,6 +125,28 @@ { url: '/static/index/Warehousing/chongzhi.png', name: '重置' }, ]); + const chooseImages = () => { + uni.chooseImage({ + count: 9, // 最多可选9张 + sizeType: ['original', 'compressed'], // 原图或压缩图 + sourceType: ['album', 'camera'], // 从相册或相机 + success: (res) => { + photoArray.value.pop() + photoArray.value = [...photoArray.value, ...res.tempFilePaths]; + photoArray.value.push("/static/index/addphoto.png") + } + }); + }; + const openPhoto = (index : number) => { + if (index == photoArray.value.length - 1) { + chooseImages() + } else { + uni.previewImage({ + urls: photoArray.value.slice(0, -1), + current: photoArray.value[index], + }) + } + } // const emit = defineEmits(['opendetail']) const calendarchange = (e : any) => { stateTarget.value = e.result diff --git a/component/storeroom/index.vue b/component/storeroom/index.vue index 0fff84d..3ba4525 100644 --- a/component/storeroom/index.vue +++ b/component/storeroom/index.vue @@ -144,7 +144,7 @@ - + @@ -298,6 +298,7 @@ }, 100) } const openBuy = () => { + detailisopen.value=false plsBuyIsopen.value = true; plsBuyisopacity.value = false; setTimeout(() => { @@ -311,6 +312,7 @@ goshopdrawer.value.openDrawer(); } const clickgoback = () => { + detailisopen.value=false gobackdrawer.value.openDrawer(); } // 记录序列号 @@ -581,7 +583,7 @@ /* 添加毛玻璃效果 */ z-index: 999; - + overflow: hidden; .popup-detail-content-plsbuy { position: absolute; left: 350rpx; @@ -615,6 +617,7 @@ border-radius: 30rpx; box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1); transition: opacity 0.4s ease; + overflow: hidden; } } diff --git a/component/storeroom/orders.vue b/component/storeroom/orders.vue index ad785d8..c6cb88e 100644 --- a/component/storeroom/orders.vue +++ b/component/storeroom/orders.vue @@ -146,7 +146,8 @@ 结账 + v-show="item.cardType==3||item.cardType==2" + @click="pickingGoodclick"> 拣货 + - + + + + + + + +