diff --git a/pages.json b/pages.json index 0d6b517..981822b 100644 --- a/pages.json +++ b/pages.json @@ -212,6 +212,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/procurement/outbound", + "style" : + { + "navigationBarTitleText" : "" + } } // { diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue index 07bfaec..8f9743a 100644 --- a/pages/Warehouse/Warehouse.vue +++ b/pages/Warehouse/Warehouse.vue @@ -20,8 +20,8 @@ - + {{v}} @@ -34,7 +34,6 @@ - @@ -59,106 +58,86 @@ }, }); const housedex = ref(-1); - + const lastTap = ref(0) + const DOUBLE_TAP_DELAY = 300; + const setout = ref(null) const housactive = (index : number) => { - console.log("点击哪个了",index) - if (index > 5) { return } - if(housedex.value == index){ - if (housedex.value == 0) { - navurl.value = 'pages/Warehouse/paymoney' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 1) { - navurl.value = 'pages/procurement/material' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 2) { - navurl.value = 'pages/Warehouse/picking' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 3) { - navurl.value = 'pages/Warehouse/finish' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - return - } housedex.value = index; - // console.log("index", index) - // 只有中心的四个有动画.....所以点不到监控室 - if (index === 5) { - uni.navigateTo({ - url: "/pages/watch/full" - }) - } + const now = Date.now() + if (now - lastTap.value < DOUBLE_TAP_DELAY) { + // 双击成立 + clearTimeout(setout.value) + if (index == 0) { + navurl.value = 'pages/Warehouse/paymoney' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 1) { + navurl.value = 'pages/procurement/material' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 2) { + navurl.value = 'pages/Warehouse/picking' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 3) { + navurl.value = 'pages/Warehouse/finish' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index === 5) { + uni.navigateTo({ + url: "/pages/watch/full" + }) + } + if (index ==6) { + navurl.value = 'pages/procurement/outbound?code=0' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index ==7) { + navurl.value = 'pages/procurement/outbound?code=1' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + // 重置,避免多次触发 + lastTap.value = 0 + } else { + setout.value = setTimeout(()=>{ + console.log("点击哪个了",index) + if (index === 5) { + uni.navigateTo({ + url: "/pages/watch/full" + }) + } + + },DOUBLE_TAP_DELAY) + // 记录本次时间,等待下次点击 + lastTap.value = now + } + } onMounted(() => { housedex.value = 1 }) const navurl = ref(''); - const movecard = (type : number) => { - // console.log(type,housedex.value) - switch (type) { - case 0: - // 上 - housedex.value > 0 ? housedex.value-- : housedex.value = 3 - break; - case 1: - housedex.value > 2 ? housedex.value = 0 : housedex.value++ - // → - break; - case 2: - housedex.value > 2 ? housedex.value = 0 : housedex.value++ - // 下 - break; - case 3: - housedex.value > 0 ? housedex.value-- : housedex.value = 3 - // ← - break; - case 4: - // 确定 - // console.log('选中' + housedex.value) - if (housedex.value == 1) { - navurl.value = 'pages/Warehouse/procurement' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 2) { - navurl.value = 'pages/Warehouse/picking' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (housedex.value == 3) { - navurl.value = 'pages/Warehouse/finish' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - // uni.navigateTo({ - // url: '/' + navurl.value - // }) - break; - case 5: - // 返回 - uni.navigateBack() - break; - - default: - break; - } - } const onlyjump = (index : number) => { console.log("点击了哪个图标", index) - if (index > 5) { return } + if (index > 5) { + navurl.value = 'pages/Warehouse/finish' + uni.navigateTo({ + url: '/' + navurl.value + }) + return + } if (index < 4) { housedex.value = index; } @@ -512,6 +491,14 @@ top: 24vw; right: 6vw; } + .annotation7 { + top: 62vh; + left: 40vw; + } + .annotation8 { + top: 5vh; + left: 28vw; + } // title .annotation { diff --git a/pages/Warehouse/api/lunpan.js b/pages/Warehouse/api/lunpan.js index 62cc4a9..93b9388 100644 --- a/pages/Warehouse/api/lunpan.js +++ b/pages/Warehouse/api/lunpan.js @@ -175,4 +175,37 @@ export const pickingInfo = (params) => { method: 'post', data: params }) -} \ No newline at end of file +} + +//(业务)查询随行单照片集合 +export const querySxdList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/querySxdList`, + method: 'get', + data: params + }) +} +//(业务)查询随行单照片集合 +export const addSxd = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addSxd`, + method: 'post', + data: params + }) +} + +export const queryJhzpList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryJhzpList`, + method: 'get', + data: params + }) +} +// (业务)采购单拣货记录 +export const queryPickingRecordList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryPickingRecordList`, + method: 'get', + data: params + }) +} diff --git a/pages/Warehouse/components/equiment.vue b/pages/Warehouse/components/equiment.vue index cfd9567..f5b0573 100644 --- a/pages/Warehouse/components/equiment.vue +++ b/pages/Warehouse/components/equiment.vue @@ -90,6 +90,7 @@ z-index: 21; padding: 0 10%; z-index: 999; + border: 1px solid #999; } .zhezhao { position: fixed; diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index c4877f9..2deecb6 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -333,20 +333,21 @@ 采购单号: - 10120251024012 + {{plsbuy[lefttarget]?.cgdNo}} - - - + + + 上传时间: - 2025.10.11 10:12:56 + {{item.createTime}} @@ -354,13 +355,37 @@ 上传人: - 赵晓璇 + {{item.createBy}} + + + + + + + + + + 上传时间: + + + {{item.createTime}} + + + + + 上传人: + + + {{item.createBy}} - + + + + + @@ -907,7 +936,7 @@ - 留置针敷贴(医用... + {{showvalue.wlName}} @@ -915,31 +944,31 @@ - 100 + {{showvalue.purchaseQuantity}} - - 片 + {{showvalue.wlUnits}} - + + style=" display: inline-block;width: 45%;height: 180rpx;background-color: #F9F9F9;border-radius: 30rpx;margin-right: 2%;margin-top: 20rpx;padding: 0 30rpx;color: #888888;" + v-for="(item,index) in lhjlarr" :key="index"> 拣货数量: - 20 + {{item.crkNum}} - 片 + {{showvalue.wlUnits}} - {{ index?`销账`:`入库` }} + {{ item.crkStatus_dictText}} @@ -947,14 +976,14 @@ 采购单价: - ¥1.50 + ¥{{item.oldPrice}} 拣货人: - 梁嘉豪 + {{item.createBy}} @@ -962,26 +991,27 @@ 到货单价: - - ¥1.50 + ¥{{item.newPrice}} - 2025.10.03 10:10:30 + {{item.createTime}} - - 点击加载更多 + 上划加载更多 + 已加载全部~ + 加载中~ - + @@ -1055,12 +1085,13 @@ + + + diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js index 12310ff..04100f2 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 dd59bdc..c959abe 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 };