diff --git a/App.vue b/App.vue index 98a75d5..6d0912a 100644 --- a/App.vue +++ b/App.vue @@ -63,4 +63,11 @@ :root { --subjectColor: #d3832a; } + + /* #ifdef MP-WEIXIN */ + page { + --subjectColor: #d3832a; + } + + /* #endif */ \ No newline at end of file diff --git a/api/user.js b/api/user.js index c0988b8..16e4413 100644 --- a/api/user.js +++ b/api/user.js @@ -1934,7 +1934,7 @@ export function postFindCarsLoadingOrderDetail(data) { } /** - * 按件装车扫描 + * 按件装车扫描 -- 包件 * @param {Object} data */ export function postLoadingScan(data) { @@ -1945,6 +1945,18 @@ export function postLoadingScan(data) { }); } +/** + * 按件装车扫描 -- 托盘 + * @param {Object} data + */ +export function postLoadingTrayInfo(data) { + return request({ + url: `logpm-trunkline/api/carsLoad/loadingTrayInfo`, + method: "post", + data + }); +} + /** * 按件装车删除 * @param {Object} data diff --git a/pages.json b/pages.json index bf18fdc..c19299a 100644 --- a/pages.json +++ b/pages.json @@ -1367,12 +1367,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 c7cf203..5a2b286 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -330,7 +330,10 @@ uni.setStorageSync('authbuts', qxan) } onShow(() => { + // #ifdef APP updateApp() + // #endif + init() // print() @@ -442,6 +445,7 @@ // },3500) } + /** 检测程序更新 */ async function updateApp() { let version = await utils.getversion() // let version = { diff --git a/pages/user/user.vue b/pages/user/user.vue index 7651578..c30fbd1 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -81,10 +81,24 @@ { icon: '/static/usericon3.png', name: '系统设置', type: 3 }, { icon: '/static/usericon4.png', name: '安全设置', type: 4 }, { icon: '/static/usericon5.png', name: '关于我们', type: 5 }, - { icon: '/static/usericon6.png', name: '检测更新', type: 6 }, + // { icon: '/static/usericon6.png', name: '检测更新', type: 6 }, { icon: '/static/usericon7.png', name: '分享', type: 7 }, { icon: '/static/usericon8.png', name: '切换账号', type: 8 }, ]) + + // #ifdef APP + butlist.value = [ + { icon: '/static/usericon1.png', name: '通讯录', type: 1 }, + { icon: '/static/usericon2.png', name: '计件工资', type: 2 }, + { icon: '/static/usericon3.png', name: '系统设置', type: 3 }, + { icon: '/static/usericon4.png', name: '安全设置', type: 4 }, + { icon: '/static/usericon5.png', name: '关于我们', type: 5 }, + { icon: '/static/usericon6.png', name: '检测更新', type: 6 }, + { icon: '/static/usericon7.png', name: '分享', type: 7 }, + { icon: '/static/usericon8.png', name: '切换账号', type: 8 }, + ] + // #endif + let details = reactive({ showck: false, warehouseList: [], diff --git a/pagesHome/pages/StowageList/StowageList.vue b/pagesHome/pages/StowageList/StowageList.vue index 63f4686..7cfdfee 100644 --- a/pagesHome/pages/StowageList/StowageList.vue +++ b/pagesHome/pages/StowageList/StowageList.vue @@ -73,7 +73,7 @@ - + 整托装车 @@ -220,9 +220,16 @@ details.show = false console.log(details.datatime); } + /** 按件装车 */ function gostockuplist(item : any) { uni.navigateTo({ - url: '/pagesHome/pages/StowageListDetails/StowageListDetails?id=' + item.id + url: '/pagesHome/pages/StowageListDetails/StowageListDetails?id=' + item.id + '&type=' + 1 + }) + } + /** 按托装车 */ + function gostockuplistBytray(item : any) { + uni.navigateTo({ + url: '/pagesHome/pages/StowageListDetails/StowageListDetails?id=' + item.id + '&type=' + 2 }) } function cleartime() { diff --git a/pagesHome/pages/StowageListDetails/StowageListDetails.vue b/pagesHome/pages/StowageListDetails/StowageListDetails.vue index d3a27b2..38d7dd8 100644 --- a/pagesHome/pages/StowageListDetails/StowageListDetails.vue +++ b/pagesHome/pages/StowageListDetails/StowageListDetails.vue @@ -40,147 +40,155 @@ - - - 定制品 - - - 零担 - - - 异常 + + @@ -206,6 +214,42 @@ + + + + + + 零担: + + + + + + 订单号: {{item.associationValue}} + + + + 在库数: {{item.num}} + + + + + + + + 定制品: + + + + + 包条码：{{item.associationValue}} + 数量：{{item.num}} + + + + + @@ -218,7 +262,8 @@ postFindCarsLoadingOrderDetail, postLoadingScan, postRemoveCarsLoadScan, - postLoadingZero + postLoadingZero, + postLoadingTrayInfo } from '@/api/user.js' import { onLoad, @@ -238,9 +283,9 @@ haveData: true, async pullDownRefreshInitPage() { details.datalist = [] + // initpage() return await initpage() }, - }) let details = reactive({ @@ -272,7 +317,14 @@ zero: [], pageInfo: {}, // 零担详情装车列表 - zeroList: [] + zeroList: [], + /** 页面类型 1: 按件装车 2: 整托装车 */ + pageType: 1, + /** 整托渲染列表 */ + trayInfo: { + zeroList: [], + packageList: [] + } }) // 获取组件实例 @@ -282,8 +334,14 @@ /** 零担装车 */ const ZeroStowage = ref() + /** 整托装车 */ + const TrayStowage = ref() + onLoad((op) => { details.loadId = op.id + details.pageType = op.type + + option.title = Number(op.type) === 2 ? '配载整托装车' : '配载按件装车' }) function goorderdetail(item) { uni.navigateTo({ @@ -332,8 +390,8 @@ }) } - /** 请求页面数据 */ - async function initpage() { + /** 请求页面 -- 按件装车 */ + const initPageByOrder = async () => { try { const response = await postFindCarsLoadingDetail({ loadId: details.loadId @@ -348,6 +406,19 @@ details.pageInfo.zeroList : details.pageInfo.exceptionList } + } catch (e) { + //TODO handle the exception + } finally { + return null + } + } + + /** 请求页面数据 */ + async function initpage() { + try { + // 按件请求页面 + await initPageByOrder() + // else { } } catch (err) { console.log('err :>> ', err); //TODO handle the exception @@ -385,17 +456,53 @@ details.pageInfo.exceptionList } + /** 扫描包件 */ + const scanOrder = async () => { + const submitData = { + orderPackageCode: details.scancode, + loadId: details.loadId + } + const res = await postLoadingScan(submitData) + return res + } + + /** 扫描托盘 */ + const scanTray = async () => { + const submitData = { + trayCode: details.scancode, + loadId: details.loadId + } + const res = await postLoadingTrayInfo(submitData) + const { code, data } = res + if (code !== 200) return res + details.trayInfo = data + // 通过Promise控制进程 + return new Promise((resolve, reject) => { + TrayStowage.value.setDetails({ + title: '整托装车', + showPopUp: true, + success() { + + + // 结束Promise状态 + resolve(null) + }, + close() { + // 结束Promise状态, 并关闭弹窗 + reject() + TrayStowage.value.details.showPopUp = false + } + }) + }) + // return res + } /** 扫描接口 * */ async function scandata() { try { - const submitData = { - orderPackageCode: details.scancode, - loadId: details.loadId - } - const res = await postLoadingScan(submitData) - console.log('res :>> ', res); + if (Number(details.pageType === 1)) await scanOrder() + else await scanTray() } catch (err) { console.log('err :>> ', err); //TODO handle the exception @@ -840,6 +947,6 @@ padding: 10upx 20upx; border: 1upx solid #aaa; border-radius: 10upx; - margin: 10upx 0 20upx; + margin: 5upx 0 20upx; } \ No newline at end of file diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js index 666059f..5b0fa09 100644 --- a/unpackage/dist/dev/app-plus/app-config-service.js +++ b/unpackage/dist/dev/app-plus/app-config-service.js @@ -1,8 +1,8 @@ ;(function(){ let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[]; - const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"货无忧","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"3.95","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#df8926","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"/static/TabberIcon/icon1.png","selectedIconPath":"/static/TabberIcon/icon1check.png","text":"工作台"},{"pagePath":"pages/taskList/taskList","iconPath":"/static/TabberIcon/icon2.png","selectedIconPath":"/static/TabberIcon/icon2check.png","text":"任务"},{"pagePath":"pages/user/user","iconPath":"/static/TabberIcon/icon5.png","selectedIconPath":"/static/TabberIcon/icon5check.png","text":"我的"}],"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}}; - const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":0,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"工作台","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/user","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"我的","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/news/news","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"消息","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/taskList/taskList","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/reportForms/reportForms","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"报表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/pickingScan/pickingScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"拣货扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StowageList/StowageList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配载装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StowageListDetails/StowageListDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配载按件装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelayScanList/RelayScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"中转装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/codePlateBracket/codePlateBracket","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"码板打托","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ArrivalList/ArrivalList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"到车列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupScan/SelfPickupScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingScan/LoadingScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"装车扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/loadingRetention/loadingRetention","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"装车滞留","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplist/StockUplist","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplistScandetails/StockUplistScandetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货列表扫码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownScan/DownScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signinScan/signinScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPScanList/SelfPScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupDetails/SelfPickupDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingDetails/LoadingDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配车明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配送客户扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerSign/CustomerSign","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户签收","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signOrderScan/signOrderScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SignDetailScan/SignDetailScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/setbarcode/setbarcode","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配置包条码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OfflineUpload/OfflineUpload","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"离线上传","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/createTask/createTask","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"创建任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ordersorting/ordersorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/lnventorysorting/lnventorysorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/scansorting/scansorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/peopleSorting/peopleSorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OrderSortingDetail/OrderSortingDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"继续分拣列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanSortingType/ScanSortingType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryType/inventoryType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品类型","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryDetail/inventoryDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描列表详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryDetailList/inventoryDetailList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描详情明细","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryenter/inventoryenter","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品录入","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/lnventorysortinglist/lnventorysortinglist","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"分拣列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanUpType/ScanUpType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanUp/ScanUp","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelocationType/RelocationType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Relocation/Relocation","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleScanUpType/PeopleScanUpType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleScanUp/PeopleScanUp","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PickingScanList/PickingScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"拣货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Retention/Retention","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"滞留","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MergeTray/MergeTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"合托","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MergeTrayDetails/MergeTrayDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"合并托盘","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownGoodsType/DownGoodsType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownGoods/DownGoods","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SetPrice/SetPrice","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"设置服务费","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RemoveTray/RemoveTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"空置托盘","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Check/Check","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"复核","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/createAddServe/createAddServe","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"创建增值服务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderDetail/orderDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelocationAllocationId/RelocationAllocationId","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库库位","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderDetails/orderDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderInquiry/orderInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户托盘扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUpListZero/StockUpListZero","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货零担列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/about/about","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"关于我们","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/systemSettings/systemSettings","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"系统设置","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/dynamicCheck/dynamicCheck","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"盘点任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/checkTaskList/checkTaskList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"盘点任务列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"随机盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库位盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/trayCheckDetails/trayCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"托盘盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/contracts/contracts","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"按合同号盘点","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute)); + const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"货无忧","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"3.95","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#df8926","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"/static/TabberIcon/icon1.png","selectedIconPath":"/static/TabberIcon/icon1check.png","text":"工作台"},{"pagePath":"pages/taskList/taskList","iconPath":"/static/TabberIcon/icon2.png","selectedIconPath":"/static/TabberIcon/icon2check.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","selectedIconPath":"/static/TabberIcon/icon5check.png","text":"我的"}],"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}}; + const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":0,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"工作台","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/user","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"我的","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/news/news","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"消息","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/taskList/taskList","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/reportForms/reportForms","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"报表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/pickingScan/pickingScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"拣货扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StowageList/StowageList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配载装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StowageListDetails/StowageListDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配载按件装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelayScanList/RelayScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"中转装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/codePlateBracket/codePlateBracket","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"码板打托","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ArrivalList/ArrivalList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"到车列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupScan/SelfPickupScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingScan/LoadingScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"装车扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/loadingRetention/loadingRetention","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"装车滞留","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplist/StockUplist","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplistScandetails/StockUplistScandetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货列表扫码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownScan/DownScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signinScan/signinScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPScanList/SelfPScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupDetails/SelfPickupDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingDetails/LoadingDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配车明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配送客户扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerSign/CustomerSign","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户签收","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signOrderScan/signOrderScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SignDetailScan/SignDetailScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/setbarcode/setbarcode","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配置包条码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OfflineUpload/OfflineUpload","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"离线上传","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/createTask/createTask","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"创建任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ordersorting/ordersorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/lnventorysorting/lnventorysorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/scansorting/scansorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/peopleSorting/peopleSorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OrderSortingDetail/OrderSortingDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"继续分拣列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanSortingType/ScanSortingType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryType/inventoryType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品类型","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryDetail/inventoryDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描列表详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryDetailList/inventoryDetailList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描详情明细","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryenter/inventoryenter","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品录入","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/lnventorysortinglist/lnventorysortinglist","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"分拣列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanUpType/ScanUpType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanUp/ScanUp","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelocationType/RelocationType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Relocation/Relocation","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleScanUpType/PeopleScanUpType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleScanUp/PeopleScanUp","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PickingScanList/PickingScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"拣货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Retention/Retention","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"滞留","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MergeTray/MergeTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"合托","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MergeTrayDetails/MergeTrayDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"合并托盘","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownGoodsType/DownGoodsType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownGoods/DownGoods","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SetPrice/SetPrice","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"设置服务费","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RemoveTray/RemoveTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"空置托盘","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Check/Check","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"复核","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/createAddServe/createAddServe","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"创建增值服务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderDetail/orderDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelocationAllocationId/RelocationAllocationId","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库库位","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderDetails/orderDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderInquiry/orderInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户托盘扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUpListZero/StockUpListZero","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货零担列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/about/about","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"关于我们","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/systemSettings/systemSettings","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"系统设置","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/dynamicCheck/dynamicCheck","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"盘点任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/checkTaskList/checkTaskList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"盘点任务列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"随机盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库位盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/trayCheckDetails/trayCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"托盘盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/contracts/contracts","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"按合同号盘点","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute)); __uniConfig.styles=[];//styles __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index c6d526d..39cd820 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -3288,6 +3288,13 @@ if (uni.restoreGlobal) { data }); } + function postLoadingTrayInfo(data) { + return service({ + url: `logpm-trunkline/api/carsLoad/loadingTrayInfo`, + method: "post", + data + }); + } function postRemoveCarsLoadScan(data) { return service({ url: `logpm-trunkline/api/carsLoad/removeCarsLoadScan`, @@ -3295,6 +3302,13 @@ if (uni.restoreGlobal) { data }); } + function postLoadingZero(data) { + return service({ + url: `logpm-trunkline/api/carsLoad/loadingZero`, + method: "post", + data + }); + } var isVue2 = false; function set(target, key, val) { if (Array.isArray(target)) { @@ -7906,7 +7920,7 @@ This will fail in production if not fixed.`); maxarr.push(arr); } details.tablist = maxarr; - formatAppLog("log", "at pages/index/index.vue:427", details.tablist); + formatAppLog("log", "at pages/index/index.vue:430", details.tablist); } async function updateApp() { let version2 = await utils.getversion(); @@ -7915,12 +7929,12 @@ This will fail in production if not fixed.`); versionCode: version2.version.split(".").join(""), versionType: version2.pkName.indexOf("test") != -1 ? "1" : version2.pkName.indexOf("bate") != -1 ? "2" : "3" }; - formatAppLog("log", "at pages/index/index.vue:456", "data", data); + formatAppLog("log", "at pages/index/index.vue:460", "data", data); let response = await AppPdaversiondetail(data); - formatAppLog("log", "at pages/index/index.vue:458", "response :>> ", response); + formatAppLog("log", "at pages/index/index.vue:462", "response :>> ", response); if (response.code == 200 && response.data) { - formatAppLog("log", "at pages/index/index.vue:460", response.data); - formatAppLog("log", "at pages/index/index.vue:461", "有可更新包"); + formatAppLog("log", "at pages/index/index.vue:464", response.data); + formatAppLog("log", "at pages/index/index.vue:465", "有可更新包"); if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) { utils.updatefile1(response.data.link); } else { @@ -8038,10 +8052,20 @@ This will fail in production if not fixed.`); { icon: "/static/usericon3.png", name: "系统设置", type: 3 }, { icon: "/static/usericon4.png", name: "安全设置", type: 4 }, { icon: "/static/usericon5.png", name: "关于我们", type: 5 }, - { icon: "/static/usericon6.png", name: "检测更新", type: 6 }, + // { icon: '/static/usericon6.png', name: '检测更新', type: 6 }, { icon: "/static/usericon7.png", name: "分享", type: 7 }, { icon: "/static/usericon8.png", name: "切换账号", type: 8 } ]); + butlist.value = [ + { icon: "/static/usericon1.png", name: "通讯录", type: 1 }, + { icon: "/static/usericon2.png", name: "计件工资", type: 2 }, + { icon: "/static/usericon3.png", name: "系统设置", type: 3 }, + { icon: "/static/usericon4.png", name: "安全设置", type: 4 }, + { icon: "/static/usericon5.png", name: "关于我们", type: 5 }, + { icon: "/static/usericon6.png", name: "检测更新", type: 6 }, + { icon: "/static/usericon7.png", name: "分享", type: 7 }, + { icon: "/static/usericon8.png", name: "切换账号", type: 8 } + ]; let details = vue.reactive({ showck: false, warehouseList: [], @@ -8085,7 +8109,7 @@ This will fail in production if not fixed.`); } async function showwhselist() { let res = await getMyWarehouseList({}); - formatAppLog("log", "at pages/user/user.vue:140", res.data); + formatAppLog("log", "at pages/user/user.vue:154", res.data); details.warehouseList = res.data; details.showck = true; } @@ -8117,24 +8141,24 @@ This will fail in production if not fixed.`); uni.reLaunch({ url: "/pages/login/login" }); - formatAppLog("log", "at pages/user/user.vue:176", res.currentSize); - formatAppLog("log", "at pages/user/user.vue:177", String(res.limitSize)); + formatAppLog("log", "at pages/user/user.vue:190", res.currentSize); + formatAppLog("log", "at pages/user/user.vue:191", String(res.limitSize)); } async function updateApp() { let version2 = await utils.getversion(); - formatAppLog("log", "at pages/user/user.vue:186", "version 版本>>>>", version2); + formatAppLog("log", "at pages/user/user.vue:200", "version 版本>>>>", version2); let data = { betenantCode: uni.getStorageSync("userinfo").tenant_id, versionCode: version2.version.split(".").join(""), versionType: version2.pkName.indexOf("test") != -1 ? "1" : version2.pkName.indexOf("bate") != -1 ? "2" : "3" }; - formatAppLog("log", "at pages/user/user.vue:192", "data>>>>", data); + formatAppLog("log", "at pages/user/user.vue:206", "data>>>>", data); let response = await AppPdaversiondetail(data); - formatAppLog("log", "at pages/user/user.vue:194", "123 :>> ", 123); - formatAppLog("log", "at pages/user/user.vue:195", "response :>> ", response); + formatAppLog("log", "at pages/user/user.vue:208", "123 :>> ", 123); + formatAppLog("log", "at pages/user/user.vue:209", "response :>> ", response); if (response.code == 200 && response.data && Object.keys(response.data).length !== 0) { - formatAppLog("log", "at pages/user/user.vue:197", "res.data", response.data); - formatAppLog("log", "at pages/user/user.vue:198", "有可更新包"); + formatAppLog("log", "at pages/user/user.vue:211", "res.data", response.data); + formatAppLog("log", "at pages/user/user.vue:212", "有可更新包"); if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) { utils.updatefile1(response.data.link); } else { @@ -10571,8 +10595,13 @@ This will fail in production if not fixed.`); } } function gostockuplist(item) { - uni.reLaunch({ - url: "/pagesHome/pages/StowageListDetails/StowageListDetails?id=" + item.id + uni.navigateTo({ + url: "/pagesHome/pages/StowageListDetails/StowageListDetails?id=" + item.id + "&type=1" + }); + } + function gostockuplistBytray(item) { + uni.navigateTo({ + url: "/pagesHome/pages/StowageListDetails/StowageListDetails?id=" + item.id + "&type=2" }); } function cleartime() { @@ -10776,7 +10805,7 @@ This will fail in production if not fixed.`); class: "bts" }, [ vue.createElementVNode("view", { - onClick: ($event) => gostockuplist(item) + onClick: ($event) => gostockuplistBytray(item) }, " 整托装车 ", 8, ["onClick"]), vue.createElementVNode("view", { onClick: ($event) => gostockuplist(item) @@ -10885,13 +10914,25 @@ This will fail in production if not fixed.`); isscan: false, order: [], zero: [], - pageInfo: {} + pageInfo: {}, + // 零担详情装车列表 + zeroList: [], + /** 页面类型 1: 按件装车 2: 整托装车 */ + pageType: 1, + /** 整托渲染列表 */ + trayInfo: { + zeroList: [], + packageList: [] + } }); const tiplists = vue.ref(null); const basicContainer = vue.ref(null); const ZeroStowage = vue.ref(); + const TrayStowage = vue.ref(); onLoad((op) => { details.loadId = op.id; + details.pageType = op.type; + option.title = Number(op.type) === 2 ? "配载整托装车" : "配载按件装车"; }); function goorderdetail(item) { uni.navigateTo({ @@ -10902,7 +10943,7 @@ This will fail in production if not fixed.`); uni.$off("scancodedate"); uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:256", "code", code2); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:356", "code", code2); details.scancode = code2; details.isscan = true; scandata(); @@ -10931,19 +10972,27 @@ This will fail in production if not fixed.`); } }); } - async function initpage() { + const initPageByOrder = async () => { try { const response = await postFindCarsLoadingDetail({ loadId: details.loadId }); const { code: code2, data } = response; - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:300", "response :>> ", response); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:400", "response :>> ", response); if (code2 === 200) { details.pageInfo = data; details.datalist = details.orderStatus === 1 ? details.pageInfo.loadScanOrderList : details.orderStatus === 2 ? details.pageInfo.zeroList : details.pageInfo.exceptionList; } + } catch (e) { + } finally { + return null; + } + }; + async function initpage() { + try { + await initPageByOrder(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:310", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:423", "err :>> ", err); } finally { return null; } @@ -10954,36 +11003,95 @@ This will fail in production if not fixed.`); details.orderStatus = state; details.datalist = details.orderStatus === 1 ? details.pageInfo.loadScanOrderList : details.orderStatus === 2 ? details.pageInfo.zeroList : details.pageInfo.exceptionList; } + const scanOrder = async () => { + const submitData = { + orderPackageCode: details.scancode, + loadId: details.loadId + }; + const res = await postLoadingScan(submitData); + return res; + }; + const scanTray = async () => { + const submitData = { + trayCode: details.scancode, + loadId: details.loadId + }; + const res = await postLoadingTrayInfo(submitData); + const { code: code2, data } = res; + if (code2 !== 200) + return res; + details.trayInfo = data; + return new Promise((resolve, reject) => { + TrayStowage.value.setDetails({ + title: "整托装车", + showPopUp: true, + success() { + resolve(null); + }, + close() { + reject(); + TrayStowage.value.details.showPopUp = false; + } + }); + }); + }; async function scandata() { try { - const submitData = { - orderPackageCode: details.scancode, - loadId: details.loadId - }; - const res = await postLoadingScan(submitData); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:356", "res :>> ", res); + if (Number(details.pageType === 1)) + await scanOrder(); + else + await scanTray(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:358", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:507", "err :>> ", err); } finally { basicContainer.value.startPullDownRefresh(); } } - const handleShowZeroStowage = (_item) => { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:368", "item :>> ", _item); + const handleShowZeroStowage = async (_item) => { + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:517", "item :>> ", _item); + details.zeroList = []; const submitData = { loadId: details.loadId, orderCode: _item.orderCode }; - const res = postFindLoadScanWaybillDetailList(submitData); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:374", "ZeroStowage :>> ", ZeroStowage); + const res = await postFindLoadScanWaybillDetailList(submitData); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:525", "ZeroStowage :>> ", ZeroStowage); + if (res.code !== 200) + return; + details.zeroList = res.data; + for (let item of details.zeroList) { + item.enterNum = 0; + } ZeroStowage.value.setDetails({ title: "零担装车", - showPopUp: true + showPopUp: true, + async success() { + try { + uni.showLoading({ + mask: true + }); + const submitData2 = { + waybillNo: _item.waybillNo, + loadId: details.loadId, + productInfoList: [] + }; + details.zeroList.forEach((val) => { + if (val.enterNum > 0) { + submitData2.productInfoList.push(val); + } + }); + const res2 = await postLoadingZero(submitData2); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:555", "res :>> ", res2); + } catch (e) { + } finally { + uni.hideLoading(); + } + } }); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:379", " res :>> ", res); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:564", " res :>> ", res); }; const handleDetails = async (item, index2, type) => { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:386", "item :>> ", item); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:571", "item :>> ", item); if (details.listcheckindex == index2) { details.listcheckindex = -1; } else { @@ -10997,8 +11105,8 @@ This will fail in production if not fixed.`); if (res.code !== 200) return; item.distributionAppParcelListVOS = res.data; - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:401", "item.distributionAppParcelListVOS :>> ", item.distributionAppParcelListVOS); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:402", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:586", "item.distributionAppParcelListVOS :>> ", item.distributionAppParcelListVOS); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:587", "res :>> ", res); } catch (e) { } finally { uni.hideLoading(); @@ -11018,6 +11126,9 @@ This will fail in production if not fixed.`); basicContainer.value.startPullDownRefresh(); } }; + const leftClick = () => { + uni.navigateBack(); + }; const { listcheckindex, inputtxt, orderStatus, schanvalue, typearr, items, datalist } = vue.toRefs(details); return (_ctx, _cache) => { const _component_BasicContainer = vue.resolveComponent("BasicContainer"); @@ -11031,7 +11142,8 @@ This will fail in production if not fixed.`); vue.createVNode(_component_BasicContainer, { ref_key: "basicContainer", ref: basicContainer, - option + option, + leftClick }, { head: vue.withCtx(() => [ vue.createElementVNode("view", { class: "hdtp" }, [ @@ -11116,7 +11228,10 @@ This will fail in production if not fixed.`); ) ]) ]), - vue.createElementVNode("view", { class: "tabtip" }, [ + Number(vue.unref(details).pageType) === 1 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + class: "tabtip" + }, [ vue.createElementVNode("view", { onClick: _cache[0] || (_cache[0] = ($event) => setorderStatus(1)) }, [ @@ -11156,7 +11271,7 @@ This will fail in production if not fixed.`); /* CLASS */ ) ]) - ]) + ])) : vue.createCommentVNode("v-if", true) ]), body: vue.withCtx(() => [ vue.createElementVNode( @@ -11170,7 +11285,11 @@ This will fail in production if not fixed.`); }) }, [ - vue.createElementVNode("view", { class: "mabx" }, [ + vue.createCommentVNode(" 按件装车 "), + Number(vue.unref(details).pageType) === 1 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + class: "mabx" + }, [ (vue.openBlock(true), vue.createElementBlock( vue.Fragment, null, @@ -11269,12 +11388,13 @@ This will fail in production if not fixed.`); 1 /* TEXT */ ), - vue.createElementVNode("view", { - class: "w100", - onClick: vue.withModifiers(($event) => handleDelete(ite, 1), ["stop"]) - }, [ - vue.createElementVNode("view", { class: "button" }, "删除") - ], 8, ["onClick"]) + vue.createElementVNode("view", { class: "w100" }, [ + vue.createElementVNode("view", { class: "" }), + vue.createElementVNode("view", { + onClick: vue.withModifiers(($event) => handleDelete(ite, 1), ["stop"]), + class: "button abnormalBtn" + }, "删除", 8, ["onClick"]) + ]) ]); }), 128 @@ -11350,10 +11470,63 @@ This will fail in production if not fixed.`); onClick: vue.withModifiers(($event) => handleShowZeroStowage(item), ["stop"]) }, " 零担装车 ", 8, ["onClick"]) ]), + vue.unref(listcheckindex) == index2 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + class: "xialaxz" + }, [ + (vue.openBlock(true), vue.createElementBlock( + vue.Fragment, + null, + vue.renderList(item.distributionAppParcelListVOS, (ite) => { + return vue.openBlock(), vue.createElementBlock("view", { + key: ite, + class: "box" + }, [ + vue.createElementVNode( + "view", + null, + "物料名称：" + vue.toDisplayString(ite.scanCode), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + null, + "数量：" + vue.toDisplayString(ite.num), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + null, + "托盘名称：" + vue.toDisplayString(ite.trayName), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + null, + "托盘码：" + vue.toDisplayString(ite.trayCode), + 1 + /* TEXT */ + ), + vue.createElementVNode("view", { class: "w100 flex-c-sb" }, [ + vue.createElementVNode("view", { class: "" }), + vue.createElementVNode("view", { + class: "button abnormalBtn", + onClick: vue.withModifiers(($event) => handleDelete(ite, 1), ["stop"]) + }, "删除", 8, ["onClick"]) + ]) + ]); + }), + 128 + /* KEYED_FRAGMENT */ + )) + ])) : vue.createCommentVNode("v-if", true), item.complete ? (vue.openBlock(), vue.createElementBlock( "view", { - key: 0, + key: 1, class: vue.normalizeClass(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3") }, vue.toDisplayString(item.complete), @@ -11364,73 +11537,81 @@ This will fail in production if not fixed.`); ], 64 /* STABLE_FRAGMENT */ - )) : vue.unref(orderStatus) == 3 ? (vue.openBlock(), vue.createElementBlock("view", { - key: 2, - class: "itec", - onClick: ($event) => _ctx.checkphon(item, index2) - }, [ - vue.createElementVNode("view", { class: "contenbx1" }, [ - vue.createElementVNode("view", null, [ - vue.createElementVNode("text", { - style: { "color": "#90A0AF" }, - onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"]) - }, "订单编号：", 8, ["onClick"]), - vue.createTextVNode( - vue.toDisplayString(item.orderCode), - 1 - /* TEXT */ - ) - ]) - ]), - vue.createElementVNode("view", { class: "contenbx1" }, [ - vue.createElementVNode("view", null, [ - vue.createElementVNode("text", { - style: { "color": "#90A0AF" }, - onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"]) - }, "运单号：", 8, ["onClick"]), - vue.createTextVNode( - vue.toDisplayString(item.waybillNo), - 1 - /* TEXT */ - ) - ]) - ]), - vue.createElementVNode("view", { class: "contenbx1" }, [ - vue.createElementVNode("view", null, [ - vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "码值："), - vue.createTextVNode( - vue.toDisplayString(item.scanCode || 0), - 1 - /* TEXT */ - ) - ]), - vue.createElementVNode("view", null, [ - vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装车数量："), - vue.createTextVNode( - vue.toDisplayString(item.loadingNum || 0), - 1 - /* TEXT */ - ) - ]) - ]), - vue.createElementVNode("view", { class: "flex-c-sb" }, [ - vue.createElementVNode("view", { class: "" }), + )) : vue.unref(orderStatus) == 3 ? (vue.openBlock(), vue.createElementBlock( + vue.Fragment, + { key: 2 }, + [ + vue.createCommentVNode(" 异常 "), vue.createElementVNode("view", { - class: "button", - onClick: vue.withModifiers(($event) => handleDelete(item, 3), ["stop"]) - }, " 删除 ", 8, ["onClick"]) - ]), - item.complete ? (vue.openBlock(), vue.createElementBlock( - "view", - { - key: 0, - class: vue.normalizeClass(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3") - }, - vue.toDisplayString(item.complete), - 3 - /* TEXT, CLASS */ - )) : vue.createCommentVNode("v-if", true) - ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true) + class: "itec", + onClick: ($event) => _ctx.checkphon(item, index2) + }, [ + vue.createElementVNode("view", { class: "contenbx1" }, [ + vue.createElementVNode("view", null, [ + vue.createElementVNode("text", { + style: { "color": "#90A0AF" }, + onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"]) + }, "订单编号：", 8, ["onClick"]), + vue.createTextVNode( + vue.toDisplayString(item.orderCode), + 1 + /* TEXT */ + ) + ]) + ]), + vue.createElementVNode("view", { class: "contenbx1" }, [ + vue.createElementVNode("view", null, [ + vue.createElementVNode("text", { + style: { "color": "#90A0AF" }, + onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"]) + }, "运单号：", 8, ["onClick"]), + vue.createTextVNode( + vue.toDisplayString(item.waybillNo), + 1 + /* TEXT */ + ) + ]) + ]), + vue.createElementVNode("view", { class: "contenbx1" }, [ + vue.createElementVNode("view", null, [ + vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "码值："), + vue.createTextVNode( + vue.toDisplayString(item.scanCode || 0), + 1 + /* TEXT */ + ) + ]), + vue.createElementVNode("view", null, [ + vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装车数量："), + vue.createTextVNode( + vue.toDisplayString(item.loadingNum || 0), + 1 + /* TEXT */ + ) + ]) + ]), + vue.createElementVNode("view", { class: "flex-c-sb" }, [ + vue.createElementVNode("view", { class: "" }), + vue.createElementVNode("view", { + class: "button", + onClick: vue.withModifiers(($event) => handleDelete(item, 3), ["stop"]) + }, " 删除 ", 8, ["onClick"]) + ]), + item.complete ? (vue.openBlock(), vue.createElementBlock( + "view", + { + key: 0, + class: vue.normalizeClass(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3") + }, + vue.toDisplayString(item.complete), + 3 + /* TEXT, CLASS */ + )) : vue.createCommentVNode("v-if", true) + ], 8, ["onClick"]) + ], + 64 + /* STABLE_FRAGMENT */ + )) : vue.createCommentVNode("v-if", true) ], 64 /* STABLE_FRAGMENT */ @@ -11439,7 +11620,8 @@ This will fail in production if not fixed.`); 128 /* KEYED_FRAGMENT */ )) - ]) + ])) : vue.createCommentVNode("v-if", true), + vue.createCommentVNode(" 整托装车 ") ], 32 /* HYDRATE_EVENTS */ @@ -11465,7 +11647,141 @@ This will fail in production if not fixed.`); ref_key: "ZeroStowage", ref: ZeroStowage }, - null, + { + default: vue.withCtx(() => [ + vue.createElementVNode("scroll-view", { + style: { "height": "30vh" }, + "scroll-y": "true" + }, [ + (vue.openBlock(true), vue.createElementBlock( + vue.Fragment, + null, + vue.renderList(vue.unref(details).zeroList, (item) => { + return vue.openBlock(), vue.createElementBlock("view", { + key: item, + class: "" + }, [ + vue.createElementVNode("view", { class: "flex-c-sb" }, [ + vue.createElementVNode( + "view", + { class: "" }, + " 产品名称: " + vue.toDisplayString(item.productName), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + { class: "" }, + " 在库数: " + vue.toDisplayString(item.totalNum), + 1 + /* TEXT */ + ) + ]), + vue.withDirectives(vue.createElementVNode("input", { + class: "input", + "onUpdate:modelValue": ($event) => item.enterNum = $event, + type: "number" + }, null, 8, ["onUpdate:modelValue"]), [ + [vue.vModelText, item.enterNum] + ]) + ]); + }), + 128 + /* KEYED_FRAGMENT */ + )) + ]) + ]), + _: 1 + /* STABLE */ + }, + 512 + /* NEED_PATCH */ + ), + vue.createCommentVNode(" 整托装车 "), + vue.createVNode( + _component_PopUp, + { + ref_key: "TrayStowage", + ref: TrayStowage + }, + { + default: vue.withCtx(() => [ + vue.createElementVNode("scroll-view", { + style: { "height": "30vh" }, + "scroll-y": "true" + }, [ + vue.createElementVNode("view", { class: "" }, " 零担: "), + (vue.openBlock(true), vue.createElementBlock( + vue.Fragment, + null, + vue.renderList(vue.unref(details).trayInfo.zeroList, (item) => { + return vue.openBlock(), vue.createElementBlock("view", { + key: item, + class: "" + }, [ + vue.createElementVNode("view", { class: "flex-c-sb" }, [ + vue.createElementVNode( + "view", + { class: "" }, + " 订单号: " + vue.toDisplayString(item.associationValue), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + { class: "" }, + " 在库数: " + vue.toDisplayString(item.num), + 1 + /* TEXT */ + ) + ]), + vue.withDirectives(vue.createElementVNode("input", { + class: "input", + "onUpdate:modelValue": ($event) => item.enterNum = $event, + type: "number" + }, null, 8, ["onUpdate:modelValue"]), [ + [vue.vModelText, item.enterNum] + ]) + ]); + }), + 128 + /* KEYED_FRAGMENT */ + )), + vue.createElementVNode("view", { class: "" }, " 定制品: "), + (vue.openBlock(true), vue.createElementBlock( + vue.Fragment, + null, + vue.renderList(vue.unref(details).trayInfo.packageList, (item) => { + return vue.openBlock(), vue.createElementBlock("view", { + key: item, + class: "" + }, [ + vue.createElementVNode("view", { class: "flex-c-sb" }, [ + vue.createElementVNode( + "view", + null, + "包条码：" + vue.toDisplayString(item.associationValue), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + null, + "数量：" + vue.toDisplayString(item.num), + 1 + /* TEXT */ + ) + ]) + ]); + }), + 128 + /* KEYED_FRAGMENT */ + )) + ]) + ]), + _: 1 + /* STABLE */ + }, 512 /* NEED_PATCH */ ), @@ -11479,7 +11795,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStowageListDetailsStowageListDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__file", "D:/worksp/logpm/pagesHome/pages/StowageListDetails/StowageListDetails.vue"]]); + const PagesHomePagesStowageListDetailsStowageListDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__scopeId", "data-v-66cbfd20"], ["__file", "D:/worksp/logpm/pagesHome/pages/StowageListDetails/StowageListDetails.vue"]]); const _sfc_main$1u = /* @__PURE__ */ vue.defineComponent({ __name: "RelayScanList", setup(__props) { diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 81166a6..cbc75f1 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -220,6 +220,12 @@ "selectedIconPath": "/static/TabberIcon/icon2check.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/unpackage/dist/dev/mp-weixin/api/user.js b/unpackage/dist/dev/mp-weixin/api/user.js index 91401ec..3781c36 100644 --- a/unpackage/dist/dev/mp-weixin/api/user.js +++ b/unpackage/dist/dev/mp-weixin/api/user.js @@ -219,6 +219,13 @@ function signforwrapIn(data) { }); } function signforinventory(data) { + return utils_request.service({ + url: `logpm-distribution/app/signfor/inventory`, + method: "get", + data + }); +} +function deliveryInventory(data) { return utils_request.service({ url: `logpm-distribution/app/delivery/inventory`, method: "get", @@ -981,6 +988,55 @@ function $_retentionTrayScan(data) { data }); } +function postCarsLoadPageList(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/carsLoadPageList`, + method: "post", + data + }); +} +function postFindCarsLoadingDetail(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/findCarsLoadingDetail`, + method: "post", + data + }); +} +function postFindLoadScanWaybillDetailList(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/findLoadScanWaybillDetailList`, + method: "post", + data + }); +} +function postFindCarsLoadingOrderDetail(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/findCarsLoadingOrderDetail`, + method: "post", + data + }); +} +function postLoadingScan(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/loadingScan`, + method: "post", + data + }); +} +function postRemoveCarsLoadScan(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/removeCarsLoadScan`, + method: "post", + data + }); +} +function postLoadingZero(data) { + return utils_request.service({ + url: `logpm-trunkline/api/carsLoad/loadingZero`, + method: "post", + data + }); +} exports.$_initRetentionList = $_initRetentionList; exports.$_retentionScan = $_retentionScan; exports.$_retentionTrayScan = $_retentionTrayScan; @@ -1006,6 +1062,7 @@ exports.billLadingpageList = billLadingpageList; exports.billLadingscan = billLadingscan; exports.billLadingzeroBillBatch = billLadingzeroBillBatch; exports.billLadingzeroBillData = billLadingzeroBillData; +exports.deliveryInventory = deliveryInventory; exports.deliveryZeroLoading = deliveryZeroLoading; exports.deliverycustom = deliverycustom; exports.deliveryloadinginventory = deliveryloadinginventory; @@ -1046,6 +1103,13 @@ exports.pcontractQuestDetailList = pcontractQuestDetailList; exports.pgetContractList = pgetContractList; exports.pgetgetMaterialName = pgetgetMaterialName; exports.postAbnormalTruckLoading = postAbnormalTruckLoading; +exports.postCarsLoadPageList = postCarsLoadPageList; +exports.postFindCarsLoadingDetail = postFindCarsLoadingDetail; +exports.postFindCarsLoadingOrderDetail = postFindCarsLoadingOrderDetail; +exports.postFindLoadScanWaybillDetailList = postFindLoadScanWaybillDetailList; +exports.postLoadingScan = postLoadingScan; +exports.postLoadingZero = postLoadingZero; +exports.postRemoveCarsLoadScan = postRemoveCarsLoadScan; exports.postWarehouseTaskAddDataInfo = postWarehouseTaskAddDataInfo; exports.postWarehouseTaskSelectPackageInfo = postWarehouseTaskSelectPackageInfo; exports.postZeroStockUp = postZeroStockUp; diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index 58a3322..daf2628 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -16,6 +16,11 @@ if (!Math) { "./pages/taskList/taskList.js"; "./pages/reportForms/reportForms.js"; "./pagesHome/pages/pickingScan/pickingScan.js"; + "./pagesHome/pages/StowageList/StowageList.js"; + "./pagesHome/pages/StowageListDetails/StowageListDetails.js"; + "./pagesHome/pages/RelayScanList/RelayScanList.js"; + "./pagesHome/pages/codePlateBracket/codePlateBracket.js"; + "./pagesHome/pages/ArrivalList/ArrivalList.js"; "./pagesHome/pages/SelfPickupScan/SelfPickupScan.js"; "./pagesHome/pages/LoadingScan/LoadingScan.js"; "./pagesHome/pages/loadingRetention/loadingRetention.js"; diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json index eac69ef..fab2522 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -12,6 +12,11 @@ "root": "pagesHome", "pages": [ "pages/pickingScan/pickingScan", + "pages/StowageList/StowageList", + "pages/StowageListDetails/StowageListDetails", + "pages/RelayScanList/RelayScanList", + "pages/codePlateBracket/codePlateBracket", + "pages/ArrivalList/ArrivalList", "pages/SelfPickupScan/SelfPickupScan", "pages/LoadingScan/LoadingScan", "pages/loadingRetention/loadingRetention", @@ -109,12 +114,6 @@ "selectedIconPath": "/static/TabberIcon/icon2check.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/unpackage/dist/dev/mp-weixin/app.wxss b/unpackage/dist/dev/mp-weixin/app.wxss index 74a1326..a4bf747 100644 --- a/unpackage/dist/dev/mp-weixin/app.wxss +++ b/unpackage/dist/dev/mp-weixin/app.wxss @@ -580,4 +580,10 @@ page { .golink { color: #0086F1 !important; text-decoration: underline; +} +:root { + --subjectColor: #d3832a; +} +page { + --subjectColor: #d3832a; }page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}[data-c-h="true"]{display: none !important;} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 6654145..84ebf3f 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -1254,10 +1254,10 @@ function populateParameters(fromRes, toRes) { let _SDKVersion = SDKVersion; const hostLanguage = language.replace(/_/g, "-"); const parameters = { - appId: "__UNI__FC20B18", + appId: "__UNI__EB22F37", appName: "货无忧", - appVersion: "1.0.31", - appVersionCode: 1031, + appVersion: "1.0.32", + appVersionCode: 1032, appLanguage: getAppLanguage(hostLanguage), uniCompileVersion: "3.95", uniRuntimeVersion: "3.95", @@ -1398,10 +1398,10 @@ const getAppBaseInfo = { hostName: _hostName, hostSDKVersion: SDKVersion, hostTheme: theme, - appId: "__UNI__FC20B18", + appId: "__UNI__EB22F37", appName: "货无忧", - appVersion: "1.0.31", - appVersionCode: 1031, + appVersion: "1.0.32", + appVersionCode: 1032, appLanguage: getAppLanguage(hostLanguage) })); } diff --git a/unpackage/dist/dev/mp-weixin/config/host.js b/unpackage/dist/dev/mp-weixin/config/host.js index f2193dc..ddfeb51 100644 --- a/unpackage/dist/dev/mp-weixin/config/host.js +++ b/unpackage/dist/dev/mp-weixin/config/host.js @@ -1,5 +1,5 @@ "use strict"; -const devhost = "http://192.168.10.200:13000/"; +const devhost = "http://192.168.10.48:13000/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js index 9b62288..e14e4f7 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js @@ -2,7 +2,6 @@ const common_vendor = require("../../common/vendor.js"); const api_user = require("../../api/user.js"); const utils_cacheimg = require("../../utils/cacheimg.js"); -const utils_utils = require("../../utils/utils.js"); require("../../utils/request.js"); require("../../store/index.js"); require("../../utils/functions.js"); @@ -23,7 +22,156 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "index", setup(__props) { const tip = common_vendor.ref(null); - let details = common_vendor.reactive({ tablist: [] }); + let details = common_vendor.reactive({ + tablist: [ + { + type: 1, + name: "工作台", + minilist: [ + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "订单查询", + router: "/pagesHome/pages/orderInquiry/orderInquiry" + } + ] + }, + { + type: 1, + name: "入库", + minilist: [ + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "码板打托", + router: "/pagesHome/pages/codePlateBracket/codePlateBracket" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "入库扫描", + router: "/pagesHome/pages/orderInquiry/orderInquiry" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "到车入库", + router: "/pagesHome/pages/ArrivalList/ArrivalList" + } + ] + }, + { + type: 1, + name: "库内", + minilist: [ + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "分拣打托", + router: "/pagesHome/pages/scansorting/scansorting" + }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '订单分拣', + // router: '/pagesHome/pages/ordersorting/ordersorting', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '库存品分拣', + // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', + // }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "扫码上架", + router: "/pagesHome/pages/ScanUpType/ScanUpType" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "手动上架", + router: "/pagesHome/pages/PeopleScanUpType/PeopleScanUpType" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "移库", + router: "/pagesHome/pages/RelocationType/RelocationType" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "滞留", + router: "/pagesHome/pages/Retention/Retention" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "合托", + router: "/pagesHome/pages/MergeTray/MergeTray" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "下架", + router: "/pagesHome/pages/DownGoodsType/DownGoodsType" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "空置托盘", + router: "/pagesHome/pages/RemoveTray/RemoveTray" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "复核", + router: "/pagesHome/pages/Check/Check" + } + ] + }, + { + type: 1, + name: "出库", + minilist: [ + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "拣货扫描", + router: "/pagesHome/pages/pickingScan/pickingScan" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "自提扫描", + router: "/pagesHome/pages/SelfPickupScan/SelfPickupScan" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "配载装车", + router: "/pagesHome/pages/StowageList/StowageList" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "中转装车", + router: "/pagesHome/pages/RelayScanList/RelayScanList" + } + ] + }, + { + type: 1, + name: "配送", + minilist: [ + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "装车扫描", + router: "/pagesHome/pages/LoadingScan/LoadingScan" + }, + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "签收扫描", + router: "/pagesHome/pages/signinScan/signinScan" + } + ] + }, + { + type: 1, + name: "离线上传", + minilist: [ + { + icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", + name: "离线上传", + router: "/pagesHome/pages/OfflineUpload/OfflineUpload" + } + ] + } + ] + }); function gopathpage(path) { common_vendor.index.navigateTo({ url: path @@ -64,7 +212,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ common_vendor.index.setStorageSync("authbuts", qxan); } common_vendor.onShow(() => { - updateApp(); init(); }); common_vendor.onLoad(() => { @@ -110,48 +257,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.tablist = maxarr; console.log(details.tablist); } - async function updateApp() { - let version = await utils_utils.utils.getversion(); - let data = { - betenantCode: common_vendor.index.getStorageSync("userinfo").tenant_id, - versionCode: version.version.split(".").join(""), - versionType: version.pkName.indexOf("test") != -1 ? "1" : version.pkName.indexOf("bate") != -1 ? "2" : "3" - }; - console.log("data", data); - let response = await api_user.AppPdaversiondetail(data); - console.log("response :>> ", response); - if (response.code == 200 && response.data) { - console.log(response.data); - console.log("有可更新包"); - if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) { - utils_utils.utils.updatefile1(response.data.link); - } else { - tip.value.setdetails({ - title: "提示", - content: "检测到有新版本，请问是否更新？", - confirmTxt: "更新", - isshow: true, - isshowcancel: true, - success: async () => { - utils_utils.utils.updatefile(response.data.link); - tip.value.setisshow(false); - }, - cancel: () => { - tip.value.setisshow(false); - if (response.data.isUpdates == "2") { - plus.runtime.quit(); - } - }, - close: () => { - tip.value.setisshow(false); - if (response.data.isUpdates == "2") { - plus.runtime.quit(); - } - } - }); - } - } - } const { tablist } = common_vendor.toRefs(details); return (_ctx, _cache) => { return { diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss index 98a42af..27c27a5 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss @@ -26,30 +26,28 @@ .mabox { display: flex; flex-direction: column; - padding: 20rpx 0; box-sizing: border-box; width: 686rpx; margin: auto; background-color: #ffffff; - margin-bottom: 20rpx; + margin-bottom: 10rpx; margin-top: 10rpx; border-radius: 10rpx; box-shadow: 0rpx 2rpx 10rpx 0rpx #e2e2e380; } .mabox .boxtitl { - font-size: 34rpx; + font-size: 30rpx; font-weight: 500; margin-bottom: 10rpx; border-bottom: 1rpx solid #EEEEEE; - padding: 0rpx 20rpx; - padding-bottom: 20rpx; + padding: 20rpx; color: #092C4D; } .mabox .minboxlist { display: flex; flex-wrap: wrap; align-items: center; - padding-top: 10rpx; + padding: 10rpx 0; } .mabox .minboxlist > view { width: 25%; diff --git a/unpackage/dist/dev/mp-weixin/pages/user/user.js b/unpackage/dist/dev/mp-weixin/pages/user/user.js index bfd8de6..7f3da41 100644 --- a/unpackage/dist/dev/mp-weixin/pages/user/user.js +++ b/unpackage/dist/dev/mp-weixin/pages/user/user.js @@ -27,7 +27,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ { icon: "/static/usericon3.png", name: "系统设置", type: 3 }, { icon: "/static/usericon4.png", name: "安全设置", type: 4 }, { icon: "/static/usericon5.png", name: "关于我们", type: 5 }, - { icon: "/static/usericon6.png", name: "检测更新", type: 6 }, + // { icon: '/static/usericon6.png', name: '检测更新', type: 6 }, { icon: "/static/usericon7.png", name: "分享", type: 7 }, { icon: "/static/usericon8.png", name: "切换账号", type: 8 } ]); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js index 791f6a2..5dd210a 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js @@ -111,7 +111,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ completecode: details.orderType, orderCode: details.inputtxt }; - let response1 = await api_user.signforinventory(data); + let response1 = await api_user.deliveryInventory(data); details.stock.data = response1.data || []; }); const loadingNub = common_vendor.computed(() => { @@ -120,6 +120,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ num += details.order.data.reduce((curr, item) => curr + item.loadingNub, 0); if (details.zero.data) num += details.zero.data.reduce((curr, item) => curr + item.loadingNub, 0); + console.log("details.stock.data :>> ", details.stock.data); if (details.stock.data) num += details.stock.data.reduce((curr, item) => { if (item.loadingStatusName !== "未装车") @@ -177,6 +178,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ try { const response = await api_user.deliveryorder(submitData); const { data } = response; + if (response.code !== 200) + return; details.zero.data = []; details.order.data = []; data.forEach((val) => { @@ -191,9 +194,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ async function initPageStock(submitData) { try { details.stock.data = []; - const response = await api_user.signforinventory(submitData); + const response = await api_user.deliveryInventory(submitData); const { data } = response; - details.stock.data = data; + if (response.code !== 200) + return; + details.stock.data = data || []; return response; } catch (err) { console.log("err :>> ", err); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js index 35705e8..9ae860f 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js @@ -81,6 +81,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ console.log("details.imgList :>> ", details.imgList); } } + function gosetorice(item) { + common_vendor.index.navigateTo({ + url: "/pagesHome/pages/SetPrice/SetPrice?reservationId=" + details.id + "&item=" + JSON.stringify(item) + }); + } const signNub = common_vendor.computed(() => { let num = 0; details.datalist.map((item) => { @@ -358,9 +363,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ m: common_vendor.o(($event) => getLocation(item)), n: common_vendor.o(($event) => gosinorderscan(item)), o: common_vendor.o(($event) => uplodimg(item)), - p: common_vendor.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送" + p: common_vendor.o(($event) => gosetorice(item)), + q: common_vendor.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送" }, common_vendor.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送" ? { - q: common_vendor.o(($event) => allclick(item)) + r: common_vendor.o(($event) => allclick(item)) } : {}); }), n: common_vendor.sr(tiplists, "1f112ba4-1", { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml index 6d9279d..c0b6edd 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml @@ -1 +1 @@ -配车类型：{{b}}配车状态：{{c}}车牌号：{{d}}司机：{{e}}装卸班组：{{f}}备货是否完成：{{g}}配送客户数{{h}}订单总数{{i}}计划件数{{j}}装车数量{{k}}签收件数{{l}}客户：{{item.a}} {{item.b}}{{item.d}}订单总数{{item.e}}配送件数{{item.f}}扫描件数{{item.g}} 客户电话: {{item.h}} 客户地址: {{item.i}} 备注：{{item.j}}{{item.k}}签收扫描上传签收图片 批量签收 \ No newline at end of file +配车类型：{{b}}配车状态：{{c}}车牌号：{{d}}司机：{{e}}装卸班组：{{f}}备货是否完成：{{g}}配送客户数{{h}}订单总数{{i}}计划件数{{j}}装车数量{{k}}签收件数{{l}}客户：{{item.a}} {{item.b}}{{item.d}}订单总数{{item.e}}配送件数{{item.f}}扫描件数{{item.g}} 客户电话: {{item.h}} 客户地址: {{item.i}} 备注：{{item.j}}{{item.k}}签收扫描上传签收图片 设置增值服务 批量签收 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js index a363eb7..8568324 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js @@ -71,10 +71,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ common_vendor.watchEffect(() => { if (Number(details.upshelfScanType) == 1 || Number(details.upshelfScanType) == 2) { details.uplistarr = fn2(details.uplistarr, "orderCode"); - } else if (Number(details.upshelfScanType) == 3) { - details.uplistarr = fn2(details.uplistarr, "orderPackageCode"); - } else if (Number(details.upshelfScanType) == 4) { - details.uplistarr = fn2(details.uplistarr, "trayCode"); + } else if (Number(details.upshelfScanType) == 3 || Number(details.upshelfScanType) == 4) { + details.uplistarr = fn2(details.uplistarr, "materialCode,incomingBatch"); } }); function goorderdetail(item) { @@ -159,7 +157,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.uplistarr.push(item); } }); - details.uplistarr = fn2(details.uplistarr, "orderCode"); + details.uplistarr = fn2(details.uplistarr, "materialCode,incomingBatch"); details.showstate = 0; details.codelist = []; details.waybillCode = ""; @@ -167,35 +165,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ function setshowstate(state) { details.showstate = state; } - async function scandata() { - var _a; - if (details.scancode[0] === "T") { - common_vendor.index.showToast({ - title: "请扫描库位码", - icon: "none" - }); - return; - } - let data = { - allocationId: details.scancode - }; - let res = await api_user.warehouseUpdownTypeupShelfScanAllocation(data); - console.log(res); - if (res.code == 200) { - details.reqobj = res.data; - const _positionArr = details.reqobj.allocationTitle.split("-"); - details.reqobj.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列"; - details.allocationId = res.data.allocationId; - details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || []; - console.log("details.pageName.slice(0, details.pageName.length - 3) :>> ", details.pageName); - utils_utils.utils.ttsspke("请输入" + details.pageName.slice(0, details.pageName.length - 2)); - } else { - common_vendor.index.showToast({ - title: res.msg, - icon: "none" - }); - } - } function uplist() { if (details.uplistarr.length == 0) { let content = ""; @@ -228,7 +197,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ mask: true, title: "上架中" }); - let res; details.uplistarr.map((item) => { if (item.enterNum > item.totalNumber) { item.enterNum = item.totalNumber; @@ -239,30 +207,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ allocationId: details.allocationId, upShelfZeroOrderList: details.uplistarr }; - res = await api_user.warehouseUpdownTypeupShelfZeroOrder(data); + await api_user.warehouseUpdownTypeupShelfZeroOrder(data); } else if (Number(details.upshelfScanType) == 3 || Number(details.upshelfScanType) == 4) { let data = { allocationId: details.allocationId, upShelfStockList: details.uplistarr }; - res = await api_user.warehouseUpdownTypeupShelfStockList(data); + await api_user.warehouseUpdownTypeupShelfStockList(data); } common_vendor.index.hideLoading(); - console.log("res上架 :>> ", res); - if (res.code == 200) { - common_vendor.index.showToast({ - title: "上架成功", - icon: "none" - }); - details.uplistarr = []; - details.scancode = details.allocationId; - scandata(); - } else { - common_vendor.index.showToast({ - title: "上架失败", - icon: "error" - }); - } tip.value.setisshow(false); }, cancel: () => { @@ -284,26 +237,32 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.checkstate = state; } function fn2(tempArr, fnname) { + const _fnnameArr = fnname.split(","); + console.log("_fnnameArr :>> ", _fnnameArr); + console.log("tempArr :>> ", tempArr); let result = []; tempArr.map((item) => { if (result.length == 0) { item.enterNum = Number(item.enterNum); result.push(item); } else { - let ckindex = -1; - result.map((ite, index) => { - if (ite[fnname] == item[fnname]) { - ckindex = index; - } + const _ckindex = result.findIndex((ite) => { + return _fnnameArr.every((key) => { + console.log("key :>> ", key); + console.log("ite[key] == item[key] :>> ", ite[key] == item[key]); + return ite[key] == item[key]; + }); }); - if (ckindex != -1) { - result[ckindex].enterNum += Number(item.enterNum); + console.log("_ckindex :>> ", _ckindex); + if (_ckindex != -1) { + result[_ckindex].enterNum += Number(item.enterNum); } else { item.enterNum = Number(item.enterNum); result.push(item); } } }); + console.log("result :>> ", result); return result; } let isClick = null; @@ -390,7 +349,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } : {}, { j: item.goodsType === 2, m: item.goodsType === 3, - r: common_vendor.t(item.totalNumber) + r: common_vendor.t(item.totalNumber), + s: common_vendor.t(item.enterNum) }); }) } : {}, { @@ -424,9 +384,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } : {}, { j: item.goodsType === 2, m: item.goodsType === 3, - s: common_vendor.t(item.totalNum) + s: common_vendor.t(item.totalNum), + t: common_vendor.t(item.stockNum) }, Number(common_vendor.unref(details).upshelfScanType) != 3 ? { - t: item.totalNum == item.shelfNum ? "/pagesHome/static/qitao.png" : "/pagesHome/static/weiqitao.png" + v: item.totalNum == item.shelfNum ? "/pagesHome/static/qitao.png" : "/pagesHome/static/weiqitao.png" } : {}); }), s: Number(common_vendor.unref(details).upshelfScanType) != 3 diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxml index b8dc9f1..ce4f63f 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxml @@ -1 +1 @@ -请直接扫描库位码{{b}}仓库名称{{c}}仓库区域{{d}}订单总数{{e}}订单单数{{f}}库存品总数{{g}}库存品数{{h}}待上架数据库位数据库位托盘包条码：{{item.b}}订单号：{{item.d}}服务号：{{item.g}}订单号：{{item.h}}运单号：{{item.k}}订单号：{{item.l}}物料编码：{{item.n}}物料名称：{{item.o}}订单号：{{item.p}}批次号：{{item.q}}总包数：{{item.r}}包条码：{{item.b}}订单号：{{item.d}}服务号：{{item.g}}订单号：{{item.h}}运单号：{{item.k}}订单号：{{item.l}}物料编码：{{item.n}}物料名称：{{item.o}}订单号：{{item.p}}商场名称：{{item.q}}批次号：{{item.r}}总包数：{{item.s}}托盘码：{{v}}扫码包数：{{w}}{{x}}上架{{D}}搜索物料编码：{{item.a}}物料名称：{{item.b}}订单号：{{item.c}}剩余件数：{{item.d}}件总件数：{{item.e}}件物料编码：{{item.f}}物料名称：{{item.g}}批次号：{{item.h}}入库数：库位： {{ite.b}}{{ite.d}}托盘码：{{ite.e}}数量：{{ite.f}}取消确认 \ No newline at end of file +请直接扫描库位码{{b}}仓库名称{{c}}仓库区域{{d}}订单总数{{e}}订单单数{{f}}库存品总数{{g}}库存品数{{h}}待上架数据库位数据库位托盘包条码：{{item.b}}订单号：{{item.d}}服务号：{{item.g}}订单号：{{item.h}}运单号：{{item.k}}订单号：{{item.l}}物料编码：{{item.n}}物料名称：{{item.o}}订单号：{{item.p}}批次号：{{item.q}}总包数：{{item.r}}上架数：{{item.s}}包条码：{{item.b}}订单号：{{item.d}}服务号：{{item.g}}订单号：{{item.h}}运单号：{{item.k}}订单号：{{item.l}}物料编码：{{item.n}}物料名称：{{item.o}}订单号：{{item.p}}商场名称：{{item.q}}批次号：{{item.r}}总包数：{{item.s}}上架数：{{item.t}}托盘码：{{v}}扫码包数：{{w}}{{x}}上架{{D}}搜索物料编码：{{item.a}}物料名称：{{item.b}}订单号：{{item.c}}剩余件数：{{item.d}}件总件数：{{item.e}}件物料编码：{{item.f}}物料名称：{{item.g}}批次号：{{item.h}}上架数：库位： {{ite.b}}{{ite.d}}托盘码：{{ite.e}}数量：{{ite.f}}取消确认 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js index 99cbd6c..52bcf06 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js @@ -105,7 +105,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ let response = await api_user.distributionStockuppageListClient(data); if (response.code !== 200) return; - details.datalist = response.data.orderList; + details.datalist = []; + if (response.data && response.data.orderList) + details.datalist = response.data.orderList.map((val) => { + val.inventoryNub = val.inventoryNub !== 0 ? val.inventoryNub : 0; + val.planNum = val.planNum !== 0 ? val.planNum : 0; + return val; + }); details.items = response.data; } function goCustomerOrdersDetails(item) { @@ -134,10 +140,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ b: common_vendor.t(item.stockupStatusStr), c: common_vendor.t(item.typeServiceStr), d: common_vendor.t(item.orderNum), - e: common_vendor.t(item.planNum), - f: common_vendor.t(item.stockupNum || 0), - g: common_vendor.o(($event) => goCustomerOrdersDetails(item), item), - h: item + e: common_vendor.t(item.inventoryNub || 0), + f: common_vendor.t(item.planNum + item.inventoryNub), + g: common_vendor.t(item.stockupNum || 0), + h: common_vendor.o(($event) => goCustomerOrdersDetails(item), item), + i: item }; }) } : {}, { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml index 7aa0a0f..e3b1938 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml @@ -1 +1 @@ -备货区域：{{a}}备货编码：{{c}}备货状态：{{d}}备货类型：{{e}} 客户：{{item.a}}备货是否完成：{{item.b}}备货类型：{{item.c}}订单总数{{item.d}}计划件数{{item.e}}已备数量{{item.f}} \ No newline at end of file +备货区域：{{a}}备货编码：{{c}}备货状态：{{d}}备货类型：{{e}} 客户：{{item.a}}备货是否完成：{{item.b}}备货类型：{{item.c}}订单总数{{item.d}}库存品数量{{item.e}}计划件数{{item.f}}已备数量{{item.g}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js index 51b7a04..8692705 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js @@ -94,12 +94,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ console.log("details.orderStatus :>> ", details.orderStatus); details.user.consignee = (_a = response.data) == null ? void 0 : _a.consignee; details.user.goodsAreaName = (_b = response.data) == null ? void 0 : _b.goodsAreaName; - details.user.planNum = (_c = response.data) == null ? void 0 : _c.planNum; - details.user.scanNum = (_d = response.data) == null ? void 0 : _d.scanNum; - details.orderList = (_e = response.data) == null ? void 0 : _e.orderList; - details.stockList = (_f = response.data) == null ? void 0 : _f.stockList; + details.orderList = ((_c = response.data) == null ? void 0 : _c.orderList) || []; + details.stockList = ((_d = response.data) == null ? void 0 : _d.stockList) || []; if (details.orderStatus === 3) - details.zeroOrderList = (_g = response.data) == null ? void 0 : _g.orderList; + details.zeroOrderList = ((_e = response.data) == null ? void 0 : _e.orderList) || []; + details.user.planNum = (_f = response.data) == null ? void 0 : _f.planNum; + details.user.scanNum = (_g = response.data) == null ? void 0 : _g.scanNum; details.isscan = false; return null; } @@ -126,6 +126,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ basicContainer.value.startPullDownRefresh(); } async function goBarCode(item) { + if (!item.allocationList || item.allocationList.length === 0) { + common_vendor.index.showToast({ + title: "该库存品没有上架数据", + icon: "none" + }); + return; + } console.log("item :>> ", item); const _allocationList = item.allocationList.map((val) => val.name); console.log("_allocationList :>> ", _allocationList); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js index 308c45d..d826f35 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js @@ -1,7 +1,6 @@ "use strict"; const common_vendor = require("../../../common/vendor.js"); const api_user = require("../../../api/user.js"); -const utils_utils = require("../../../utils/utils.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); require("../../../utils/request.js"); require("../../../store/index.js"); @@ -129,7 +128,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ return; console.log("res", res); if (Number(res.data.isHasData) === 0) { - utils_utils.utils.ttsspke("请选择分拣方式"); common_vendor.index.setStorageSync("trayCodeType", res.data.data); common_vendor.index.navigateTo({ url: "/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=" + details.scancode diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js index 06df0d8..178600d 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js @@ -13,8 +13,9 @@ require("../../../utils/md5.js"); if (!Array) { const _component_BasicContainer = common_vendor.resolveComponent("BasicContainer"); const _component_tiplist = common_vendor.resolveComponent("tiplist"); + const _component_PopUp = common_vendor.resolveComponent("PopUp"); const _component_BluetoothList = common_vendor.resolveComponent("BluetoothList"); - (_component_BasicContainer + _component_tiplist + _component_BluetoothList)(); + (_component_BasicContainer + _component_tiplist + _component_PopUp + _component_BluetoothList)(); } const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "setbarcode", @@ -29,7 +30,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ reservationId: "", codelist: [], printlist: [], - packageNum: 0, goodsAreaName: "", allocationId: "", positionCode: "", @@ -38,10 +38,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ customer: "", deliveryAddress: "", completeStact: false, - orderpackgedetails: {} + orderpackgedetails: {}, + /** 新增包条数量 */ + packageNum: 0 }); const tips = common_vendor.ref(null); const basicContainer = common_vendor.ref(null); + const popUp_AddPrint = common_vendor.ref(null); + const popUp_Edit = common_vendor.ref(null); const option = { title: "配置包条码", haveData: true, @@ -60,7 +64,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ if (op.completeStact == "true") { details.completeStact = true; } - console.log("111111111111111111111111111111111111111111"); }); common_vendor.onShow(() => { const timer = setTimeout(() => { @@ -69,6 +72,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }, 200); }); function setstockPrint(values) { + if (Number(details.items.planNum) === details.codelist.length) { + common_vendor.index.showToast({ + title: "扫描完毕", + icon: "none" + }); + return; + } details.stockPrint = values; if (values == 1) { utils.ttsspke("请扫描原有包条码"); @@ -97,33 +107,42 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ console.log(">>>>111111:", response); } function showmd() { - tips.value.setdetails({ - list: details.printlist, - isshow: true, - tipstate: 1, - placeholder: "请输入需要生成的包条码数量", - success: (deta) => { - console.log(deta); - details.packageNum = deta.inputtext; - if (Number(details.packageNum) > Number(details.items.planNum)) { + const _maxNum = Number(details.items.planNum) - details.codelist.length; + if (_maxNum === 0) { + common_vendor.index.showToast({ + title: "没有可用数量", + icon: "none" + }); + utils.ttsspke("没有可用数量"); + return; + } + popUp_AddPrint.value.setDetails({ + title: "生成包条数量", + showPopUp: true, + success() { + details.packageNum = Number(details.packageNum); + if (details.packageNum > _maxNum) { common_vendor.index.showToast({ title: "不能大于计划数量，请重新输入", icon: "none" }); - tips.value.setdetails({ inputtext: "" }); return; } + if (details.packageNum <= 0) { + common_vendor.index.showToast({ + title: "数量必须大于0，请重新输入", + icon: "none" + }); + } ctokListpackage(); - }, - cancel: (details2) => { - tips.value.setdetails({ isshow: false }); - }, - close: (details2) => { - tips.value.setdetails({ isshow: false }); } }); } async function ctokListpackage() { + common_vendor.index.showLoading({ + mask: true, + title: "数据请求中" + }); let data = { reservationId: details.reservationId, stockListId: details.items.stockListId, @@ -133,14 +152,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ cargoNumber: details.items.cargoNumber }; let response = await api_user.distributionStockupstockupStockListPackageCode(data); + common_vendor.index.hideLoading(); if (response.code !== 200) return; + popUp_AddPrint.value.details.showPopUp = false; console.log(response); details.printlist = response.data; let checklist = []; response.data.map((item, index) => { checklist.push(index); }); + console.log("tips :>> ", tips); tips.value.setdetails({ title: "请选择要打印的包条", tipstate: 2, @@ -148,6 +170,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ checklist, inputtext: "", confirmTxt: "打印", + isshow: true, success: (deta) => { if (deta.checklist.length == 0) { common_vendor.index.showToast({ @@ -177,13 +200,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ f: common_vendor.t(common_vendor.unref(items).planNum), g: common_vendor.t(common_vendor.unref(codelist).length), h: common_vendor.o(($event) => setstockPrint(1)), - i: common_vendor.o(($event) => setstockPrint(0)), + i: common_vendor.o(($event) => setstockPrint(2)), j: common_vendor.o(showmd), k: common_vendor.f(common_vendor.unref(codelist), (item, index, i0) => { return { a: common_vendor.t(index + 1), b: common_vendor.t(item.createTime), - c: common_vendor.t(item.packageCode) + c: common_vendor.t(item.code), + d: common_vendor.t(item.incomingBatch) }; }), l: common_vendor.sr(basicContainer, "592c6178-0", { @@ -195,7 +219,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ n: common_vendor.sr(tips, "592c6178-1", { "k": "tips" }), - o: common_vendor.sr(bluetoothList, "592c6178-2", { + o: common_vendor.t(Number(common_vendor.unref(details).items.planNum)), + p: common_vendor.t(Number(common_vendor.unref(details).items.planNum) - common_vendor.unref(details).codelist.length), + q: common_vendor.unref(details).packageNum, + r: common_vendor.o(($event) => common_vendor.unref(details).packageNum = $event.detail.value), + s: common_vendor.sr(popUp_AddPrint, "592c6178-2", { + "k": "popUp_AddPrint" + }), + t: common_vendor.sr(popUp_Edit, "592c6178-3", { + "k": "popUp_Edit" + }), + v: common_vendor.sr(bluetoothList, "592c6178-4", { "k": "bluetoothList" }) }; diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml index df8755e..6241a78 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml @@ -1 +1 @@ -物品：{{a}}货位：{{b}}SKU：{{c}}规格：{{d}}单位：{{e}}计划数量：{{f}}已扫数量：{{g}}采集原包条码扫描打印包条新生成包码序号：{{item.a}}作业时间：{{item.b}}包条码：{{item.c}} \ No newline at end of file +物品：{{a}}货位：{{b}}SKU：{{c}}规格：{{d}}单位：{{e}}计划数量：{{f}}已扫数量：{{g}}采集原包条码扫描打印包条新生成包码序号：{{item.a}}作业时间：{{item.b}}包条码：{{item.c}}批次号：{{item.d}} 计划件数: {{o}} 可用数量: {{p}} 检测当前批次和计划批次不同，是否切换批次 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxss index 2322331..0161dcc 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxss @@ -89,8 +89,6 @@ justify-content: center; border: 2rpx solid #D3832A; color: #D3832A; -} -.butsbx > view:nth-of-type(2) { margin-left: 20rpx; } .head { @@ -119,4 +117,14 @@ } .head > .type1 > view > view:nth-of-type(1) { flex: 1; +} +.popUpInput { + border: 3rpx solid #ccc; + margin-top: 10rpx; + border-radius: 5rpx; + padding: 5rpx 10rpx; +} +.popUp_Edit_text { + font-size: 28rpx; + color: #f00; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js index fb62bb0..448648b 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js @@ -97,11 +97,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ return; details.zeroArr = []; details.orderArr = []; - response.data.records.forEach((val) => { - if (val.isZero === "1") - return details.zeroArr.push(val); - details.orderArr.push(val); - }); + if (response.data && response.data.records) + response.data.records.forEach((val) => { + if (val.isZero === "1") + return details.zeroArr.push(val); + details.orderArr.push(val); + }); let response1 = await api_user.signforinventory(data); if (response1.code !== 200) return; diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js index 636012b..9506b0d 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js @@ -36,6 +36,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ taskTime_start: "", taskTime_end: "", datalist: [], + orderList: [], + stockList: [], current: 1, size: 5, checkstate: 1 @@ -96,7 +98,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ return; console.log("response :>> ", response); if (details.current == 1) { - details.datalist = response.data.records; + if (details.checkstate === data.type) { + details.datalist = response.data.records; + } } else { if (response.data.records.lngth == 0) { common_vendor.index.showToast({ @@ -106,7 +110,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.current--; return; } - details.datalist = details.datalist.concat(response.data.records); + if (details.checkstate === data.type) { + details.datalist = details.datalist.concat(response.data.records); + } } return; }