From 355e2d27d8d108c096799b00a6b6040ac6402b7e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 17 May 2024 23:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/user.js | 28 + compoment/MyInput/MyInput.vue | 271 +++ config/host.js | 8 +- interfaces/pagesHome/SelfPickupDetails.ts | 2 + main.js | 3 + manifest.json | 6 +- pages.json | 31 +- pages/index/index.vue | 65 +- pages/login/login.vue | 7 +- pagesHome/pages/CustomerSign/CustomerSign.vue | 2 +- .../pages/PickUpLotList/PickUpLotList.vue | 13 +- .../pages/PickingScanList/PickingScanList.vue | 5 + .../PreStoragePackage/PreStoragePackage.vue | 422 ++++ .../SelfPickupDetails/SelfPickupDetails.vue | 57 +- .../StockUplistByZero/StockUplistByZero.vue | 9 +- .../StowageListDetails/StowageListDetails.vue | 35 +- .../VehicleArrivalDetails.vue | 57 +- pagesHome/pages/billsList/billsList.vue | 6 +- pagesHome/pages/onLoadByScan/onLoadByScan.vue | 15 +- .../onLoadOrderDetails/onLoadOrderDetails.vue | 37 +- .../pages/signOrderScan/signOrderScan.vue | 8 +- .../pages/PickingScanList/PickingScanList.css | 2 +- .../SelfPickupDetails/SelfPickupDetails.css | 2 +- .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 1800 +++++++++++------ unpackage/dist/dev/app-plus/app.css | 115 ++ unpackage/dist/dev/app-plus/manifest.json | 12 +- .../dist/dev/app-plus/pages/login/login.css | 4 +- unpackage/dist/dev/mp-weixin/api/user.js | 980 +++++---- unpackage/dist/dev/mp-weixin/common/vendor.js | 12 +- unpackage/dist/dev/mp-weixin/config/host.js | 2 +- .../dist/dev/mp-weixin/pages/index/index.js | 212 +- .../SelfPickupDetails/SelfPickupDetails.js | 92 +- .../SelfPickupDetails/SelfPickupDetails.wxml | 2 +- .../SelfPickupDetails/SelfPickupDetails.wxss | 179 +- .../pages/signOrderScan/signOrderScan.js | 13 +- .../pages/signOrderScan/signOrderScan.wxml | 2 +- .../dist/dev/mp-weixin/project.config.json | 8 +- unpackage/dist/dev/mp-weixin/utils/request.js | 55 +- utils/request.js | 2 +- 40 files changed, 3346 insertions(+), 1239 deletions(-) create mode 100644 compoment/MyInput/MyInput.vue create mode 100644 pagesHome/pages/PreStoragePackage/PreStoragePackage.vue diff --git a/api/user.js b/api/user.js index eb56388..51e9424 100644 --- a/api/user.js +++ b/api/user.js @@ -3229,4 +3229,32 @@ export function postFindFinanceList(data, loadingObj = {}, canCancel = false) { loadingObj, canCancel ); +} + +/** + * 通过预约单号搜索已入库或未入库数据 + */ +export function postBusinessPreOrderList(data, loadingObj = {}, canCancel = false) { + return request({ + url: `logpm-distribution/app/businessPreOrder/list`, + method: "post", + data + }, + loadingObj, + canCancel + ); +} + +/** + * 扫描包条码入库 + */ +export function postBusinessPreOrderscanOrderPackageCode(data, loadingObj = {}, canCancel = false) { + return request({ + url: `logpm-distribution/app/businessPreOrder/scanOrderPackageCode`, + method: "post", + data + }, + loadingObj, + canCancel + ); } \ No newline at end of file diff --git a/compoment/MyInput/MyInput.vue b/compoment/MyInput/MyInput.vue new file mode 100644 index 0000000..b9a20c3 --- /dev/null +++ b/compoment/MyInput/MyInput.vue @@ -0,0 +1,271 @@ + + + + + \ No newline at end of file diff --git a/config/host.js b/config/host.js index 9088917..2c432e2 100644 --- a/config/host.js +++ b/config/host.js @@ -4,7 +4,7 @@ * 测试域名 * */ //测试域名s -// const devhost = 'http://test.api.huo5you.com/' +const devhost = 'http://test.api.huo5you.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy @@ -12,7 +12,7 @@ // xiaohei // const devhost = 'http://192.168.3.18:13000/' // tjj -const devhost = 'http://192.168.3.14:13000/' +// const devhost = 'http://192.168.3.14:13000/' // cyz // const devhost = 'http://192.168.6.169:9777/' // const devhost = 'http://192.168.6.141:8777/' @@ -26,8 +26,8 @@ const devhost = 'http://192.168.3.14:13000/' * 正式域名 * */ // const prohost = 'http://h5uapi.huitongys.com/' -const prohost = 'https://h5uapi.huitongys.com/' // 小程序 -// const prohost = 'http://test.api.huo5you.com/' +// const prohost = 'https://h5uapi.huitongys.com/' // 小程序 +const prohost = 'http://test.api.huo5you.com/' /** * 图片域名 * */ diff --git a/interfaces/pagesHome/SelfPickupDetails.ts b/interfaces/pagesHome/SelfPickupDetails.ts index 6b4ae82..5970b9b 100644 --- a/interfaces/pagesHome/SelfPickupDetails.ts +++ b/interfaces/pagesHome/SelfPickupDetails.ts @@ -55,4 +55,6 @@ export interface pagedetailType { stockList : any; /** 滚动区高度 */ scrollHeight : string + /** 扫描的码值 */ + scanOrderPackageCode : string } \ No newline at end of file diff --git a/main.js b/main.js index 9c20862..dba67ad 100644 --- a/main.js +++ b/main.js @@ -31,6 +31,8 @@ import PullDownBox from '@/compoment/PullDownBox/PullDownBox.vue'; import MyTree from '@/compoment/MyTree/MyTree.vue' /** 复选框 */ import CheckBox from '@/compoment/CheckBox/CheckBox.vue' +/** 输入框组件 */ +import MyInput from '@/compoment/MyInput/MyInput'; import saomiao1 from '@/compoment/saomiao1.vue' import saomiao2 from '@/compoment/saomiao2.vue' import saomiao3 from '@/compoment/saomiao3.vue' @@ -63,6 +65,7 @@ export function createApp() { .component('PullDownBox', PullDownBox) .component('MyTree', MyTree) .component('CheckBox', CheckBox) + .component('MyInput', MyInput) uni.$u.config.unit = 'rpx' return { diff --git a/manifest.json b/manifest.json index d821c19..0881bbe 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "货无忧", + "name" : "货无忧测试版", "appid" : "__UNI__EB22F37", "description" : "", - "versionName" : "1.1.31", - "versionCode" : 1131, + "versionName" : "1.1.28", + "versionCode" : 1128, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 664fbc9..aa21f3b 100644 --- a/pages.json +++ b/pages.json @@ -362,6 +362,25 @@ } } + }, + { + "path": "pages/PreStoragePackage/PreStoragePackage", + "style": { + "navigationBarTitleText": "预入库包件", + "enablePullDownRefresh": true, + "onReachBottomDistance": 1, + "navigationStyle": "custom", + "app-plus": { + "animationDuration": 300, + "animationType": "zoom-fade-out", + "pullToRefresh": { + "support": true, + "color": "#d3832a", //小圈圈的颜色 + "style": "circle" //小圈圈的样式 + } + } + } + }, { "path": "pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray", @@ -1771,12 +1790,12 @@ // "selectedIconPath": "/static/TabberIcon/icon3check.png", // "text": "报表" // }, - { - "pagePath": "pages/news/news", - "iconPath": "/static/TabberIcon/icon4.png", - "selectedIconPath": "/static/TabberIcon/icon4check.png", - "text": "消息" - }, + // { + // "pagePath": "pages/news/news", + // "iconPath": "/static/TabberIcon/icon4.png", + // "selectedIconPath": "/static/TabberIcon/icon4check.png", + // "text": "消息" + // }, { "pagePath": "pages/user/user", "iconPath": "/static/TabberIcon/icon5.png", diff --git a/pages/index/index.vue b/pages/index/index.vue index 5bb1d80..8239920 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -48,27 +48,27 @@ name: '工作台', minilist: [ { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231016/440a01005f8333bcc76c1254a1d35570.png', name: '订单查询', router: '/pagesHome/pages/orderInquiry/orderInquiry', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png', name: '运单查询', router: '/pagesHome/pages/waybillInquiry/waybillInquiry', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png', name: '库位查询', router: '/pagesHome/pages/storageInquiry/storageInquiry', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png', name: '托盘查询', router: '/pagesHome/pages/trayInquiry/trayInquiry', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png', name: '库存品查询', router: '/pagesHome/pages/inventoryInquiry/inventoryInquiry', }, @@ -78,7 +78,7 @@ router: '/pagesHome/pages/MaterialMaintenance/MaterialMaintenance', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240320/d22bc792f9deff3f106aafc590ec14fb.png', name: '库位列表', router: '/pagesHome/pages/StorageLocationList/StorageLocationList', }, @@ -94,20 +94,25 @@ name: '入库', minilist: [ { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240429/14451e54503266f168edf3651f2ab798.png', name: '码板打托', router: '/pagesHome/pages/codePlateBracket/codePlateBracket', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png', name: '入库扫描', router: '/pagesHome/pages/TranNumber/TranNumber', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240429/49254333c9c5c7aed6e9c8aab89c5998.png', name: '到车入库', router: '/pagesHome/pages/ArrivalList/ArrivalList', }, + { + icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png', + name: '预入库包件', + router: '/pagesHome/pages/PreStoragePackage/PreStoragePackage', + }, ] }, { @@ -115,7 +120,7 @@ name: '库内', minilist: [ { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/e2604b3c97ee6001f367df87e3d0fdd1.png', name: '分拣打托', router: '/pagesHome/pages/scansorting/scansorting', }, @@ -130,47 +135,47 @@ // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', // }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/03add918888d36ce0d566da120510840.png', name: '扫码上架', router: '/pagesHome/pages/ScanUpType/ScanUpType', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7ca70b84ebf6a2f72e74300725132c.png', name: '手动上架', router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7e477dd35483ca7628567c609657fc.png', name: '移库', router: '/pagesHome/pages/RelocationType/RelocationType', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png', name: '滞留', router: '/pagesHome/pages/Retention/Retention', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/ce45bb522069f1fd154ca964e66069c2.png', name: '合托', router: '/pagesHome/pages/MergeTray/MergeTray', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/91403695005c2c65ea2c9d4ddadac9c3.png', name: '下架', router: '/pagesHome/pages/DownGoodsType/DownGoodsType', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png', name: '空置托盘', router: '/pagesHome/pages/RemoveTray/RemoveTray', }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '复核', + // router: '/pagesHome/pages/Check/Check', + // }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '复核', - router: '/pagesHome/pages/Check/Check', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231217/5d3a466a54b62a60cfb9dc53b0f6ded1.png', name: '托盘数据同步', router: '/pagesHome/pages/SearchTray/SearchTray', }, @@ -181,22 +186,22 @@ name: '出库', minilist: [ { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/b58252914de56c0e3da1bdc75ac51c07.png', name: '拣货扫描', router: '/pagesHome/pages/pickingScan/pickingScan', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/7a9648ffdefd77f7ab8bb7861a2473e7.png', name: '自提扫描', router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240429/e5562240ca21316b21306d17f9394abc.png', name: '配载装车', router: '/pagesHome/pages/StowageList/StowageList', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240429/d58281e6ba1845f313d85a119107e260.png', name: '中转装车', router: '/pagesHome/pages/RelayScanList/RelayScanList', }, @@ -207,17 +212,17 @@ name: '配送', minilist: [ { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/1a9bbc8c842b8b7ef555d6cd79d421be.png', name: '装车扫描', router: '/pagesHome/pages/LoadingScan/LoadingScan', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20231012/6956f6950cfc291e01c038ea5e13f984.png', name: '签收扫描', router: '/pagesHome/pages/signinScan/signinScan', }, { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + icon: 'http://47.108.51.143:9000/basic/upload/20240429/16a9b462df1546f2fa6159df00ade62e.png', name: '直发商家签收', router: '/pagesHome/pages/directGoMarket/directGoMarket', }, diff --git a/pages/login/login.vue b/pages/login/login.vue index 84060eb..cdca857 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -12,18 +12,21 @@ 公司编号 + 用户账号 + 登录密码 + @@ -515,10 +518,10 @@ background: #F4F8FB; border-radius: 8upx; opacity: 1; - padding: 10upx; + padding: 10upx 0; padding-left: 20upx; box-sizing: border-box; - font-size: 24upx; + font-size: 24upx !important; font-weight: 400; color: #AFB4BA; display: flex; diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue index 8129a18..ccfa714 100644 --- a/pagesHome/pages/CustomerSign/CustomerSign.vue +++ b/pagesHome/pages/CustomerSign/CustomerSign.vue @@ -428,7 +428,7 @@ icon: 'none' }) // #ifdef APP - utils.ttsspke('成功签收' + item.reservationNum + '件') + utils.ttsspke(item.reservationNum + '件') // #endif initpage() } diff --git a/pagesHome/pages/PickUpLotList/PickUpLotList.vue b/pagesHome/pages/PickUpLotList/PickUpLotList.vue index 95bb604..f51f7ce 100644 --- a/pagesHome/pages/PickUpLotList/PickUpLotList.vue +++ b/pagesHome/pages/PickUpLotList/PickUpLotList.vue @@ -70,7 +70,7 @@ + + + + \ No newline at end of file diff --git a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue index 19addf0..60f336b 100644 --- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue +++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue @@ -187,7 +187,9 @@ orderList: [], stockList: [], /** 滚动区高度 */ - scrollHeight: '45vh' + scrollHeight: '45vh', + /** 扫描的码值 */ + scanOrderPackageCode: '' }) const tiplists = ref(null) const basicContainer = ref(null) @@ -221,6 +223,8 @@ uni.$off('scancodedate') }) */ function showsdqs() { + if (details.planNum <= details.signedNum) return utils.handleToast('提货计划已完成') + tiplists.value.setdetails({ isshow: true, tipstate: 1, @@ -228,6 +232,7 @@ placeholder: '请输入扫描的码', inputtext: '', success: (detail) => { + if (!detail.inputtext && detail.inputtext !== 0) return utils.handleToast('请输入码值') details.scancode = detail.inputtext sacn() tiplists.value.setdetails({ isshow: false }) @@ -302,6 +307,32 @@ try { // 标签页为3时, 不支持扫描 if (details.orderCode === 3) return + + if (details.planNum <= details.signedNum) return utils.handleToast('提货计划已完成') + + let content = '' + let haveData = false + + for (let i = 0; i < details.orderList.length; i++) { + const item = details.orderList[i] + + if (content) break + + if (details.scancode !== item.orderPackageCode) continue + haveData = true + if (item.scanStatus === 2) { + content = '包件已扫描'; + + const _value = details.orderList.splice(i, 1) + details.orderList.unshift(_value[0]) + } + break; + } + + + if (!haveData) return utils.handleToast('码值错误, 不在本计划内') + if (content) return utils.handleToast(content) + let data = { id: details.billLadingId, coding: details.scancode, @@ -311,6 +342,7 @@ console.log(res); if (res.code == 200) { details.isscan = true + details.scanOrderPackageCode = data.coding initpage() } else if (res.code === 3001) { @@ -340,9 +372,26 @@ billLadingId: details.billLadingId, orderCode: details.orderCode } - let response = await billLadingdetailList(data,) - if (response.code !== 200) return - details.orderList = response.data.list || [] + let response = await billLadingdetailList(data) + const { code, data: { list } } = response + console.log('response :>> ', response); + if (code !== 200 || !list) return + + + const _arr = [] + const scanArr = [] + + for (let i = 0; i < list.length; i++) { + const item = list[i] + + if (item.scanStatus === 1) _arr.push(item) + else if (item.orderPackageCode === details.scanOrderPackageCode) _arr.unshift(item) + else scanArr.push(item) + } + + details.scanOrderPackageCode = '' + + details.orderList = [..._arr, ...scanArr] details.consignee = response.data.consignee details.pickUpPlate = response.data.pickUpPlate details.carTypeStr = response.data.carTypeStr diff --git a/pagesHome/pages/StockUplistByZero/StockUplistByZero.vue b/pagesHome/pages/StockUplistByZero/StockUplistByZero.vue index 312eccc..9f330f6 100644 --- a/pagesHome/pages/StockUplistByZero/StockUplistByZero.vue +++ b/pagesHome/pages/StockUplistByZero/StockUplistByZero.vue @@ -31,7 +31,7 @@ - +