diff --git a/config/host.js b/config/host.js index 8d5f27a..2c432e2 100644 --- a/config/host.js +++ b/config/host.js @@ -4,7 +4,7 @@ * 测试域名 * */ //测试域名s -// const devhost = 'http://test.api.huo5you.com/' +const devhost = 'http://test.api.huo5you.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy @@ -12,7 +12,7 @@ // xiaohei // const devhost = 'http://192.168.3.18:13000/' // tjj -const devhost = 'http://192.168.3.14:13000/' +// const devhost = 'http://192.168.3.14:13000/' // cyz // const devhost = 'http://192.168.6.169:9777/' // const devhost = 'http://192.168.6.141:8777/' @@ -25,9 +25,9 @@ const devhost = 'http://192.168.3.14:13000/' /** * 正式域名 * */ -const prohost = 'http://h5uapi.huitongys.com/' +// const prohost = 'http://h5uapi.huitongys.com/' // const prohost = 'https://h5uapi.huitongys.com/' // 小程序 -// const prohost = 'http://test.api.huo5you.com/' +const prohost = 'http://test.api.huo5you.com/' /** * 图片域名 * */ diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue index 6b8a171..3e34b34 100644 --- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue +++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue @@ -342,7 +342,8 @@ try { console.log('item :>> ', item); let subdata = { - billLadingId: details.billLadingId + billLadingId: details.billLadingId, + stockArtieleld: item.id } // 获取订单内零担包件信息 const response = await billLadingzeroBillData(subdata) diff --git a/pagesTask/pages/checkTaskList/checkTaskList.vue b/pagesTask/pages/checkTaskList/checkTaskList.vue index 70eb07a..bc05a25 100644 --- a/pagesTask/pages/checkTaskList/checkTaskList.vue +++ b/pagesTask/pages/checkTaskList/checkTaskList.vue @@ -462,10 +462,10 @@ // }) if (code === 200 && data) { const info = { - trayCode: data[0].trayCode, + trayCode: data.trayCode, questId: details.id, - trayId: data[0].trayId, - type: data[0].goodsType, + trayId: data.trayId, + type: data.goodsType, marketName: details.marketName, questNum: details.questNum, pageType: details.pageType, diff --git a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue index d308714..445a20d 100644 --- a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue +++ b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue @@ -154,7 +154,7 @@ 物品名称: {{item.materialName || '暂无数据'}} - 数量: {{item.quantity || '暂无数据'}} + 数量: {{item.stockNum || '暂无数据'}} @@ -236,7 +236,7 @@ @@ -396,7 +396,7 @@ 在库数量: - + @@ -416,7 +416,7 @@ 数量: - + @@ -504,7 +504,7 @@ onLoad, onHide } from '@dcloudio/uni-app' - import { reactive, toRefs, ref, onMounted } from "vue"; + import { reactive, toRefs, ref, onMounted, nextTick } from "vue"; import utils from '@/utils/utils.js'; import { getWarehouseTaskgetTaskConInfo, @@ -704,7 +704,7 @@ }) - onShow(() => { + onShow(async () => { // #ifdef APP // 开启监听扫描 uni.$off('scancodedate') @@ -726,11 +726,8 @@ // #endif // 初始化请求页面数据 // initPage() - const timer = setTimeout(() => { - basicContainer.value.startPullDownRefresh() - // 清除定时器 - clearTimeout(timer) - }, 200) + await nextTick() + basicContainer.value.startPullDownRefresh() }) /** 请求页面数据 */ @@ -939,7 +936,7 @@ else if (code === 5001) { return } - else if (code !== 4000) { + else if (code === 5000) { details.addInfo.orderCode = '' details.stopScan = true // 手动录入新增 @@ -1065,7 +1062,7 @@ // 回显数据 details.addInfo.waybillNumber = item.waybillNumber details.addInfo.orderCode = item.orderCode - details.addInfo.quantity = item.quantity + details.addInfo.stockNum = item.stockNum details.addInfo.materialName = item.materialName popUp_AddZero.value.setDetails({ title: '修改零担信息', @@ -1079,7 +1076,7 @@ title: '请输入物料名称', icon: 'none' }) - const _number = Number(details.addInfo.quantity) + const _number = Number(details.addInfo.stockNum) if (_number !== _number || _number <= 0) return uni.showToast({ title: '数量为大于0的数字', icon: 'none' @@ -1087,7 +1084,7 @@ item.orderCode = details.addInfo.orderCode item.waybillNumber = details.addInfo.waybillNumber - item.quantity = _number + item.stockNum = _number item.materialName = details.addInfo.materialName item.stockNum = _number details.addInfo.orderCode = '' @@ -1674,7 +1671,7 @@ title: '请输入物料名称', icon: 'none' }) - const _number = Number(details.addInfo.quantity) + const _number = Number(details.addInfo.stockNum) if (_number !== _number || _number <= 0) return uni.showToast({ title: '数量为大于0的数字', icon: 'none' @@ -1742,7 +1739,7 @@ title: '请输入物料名称', icon: 'none' }) - const _number = Number(details.addInfo.quantity) + const _number = Number(details.addInfo.stockNum) if (_number !== _number || _number <= 0) return uni.showToast({ title: '数量为大于0的数字', icon: 'none' @@ -1902,10 +1899,10 @@ _item.allocationId = details.pageInfos.allocationId _item.positionCode = details.pageInfos.allocation // 当修改前和修改后的Id一样时, 删除修改后的 - if (_item.groundingAllocationId === _item.allocationId) { - delete _item.groundingAllocationId - delete _item.groundingPositionCode - } + // if (_item.groundingAllocationId === _item.allocationId) { + // delete _item.groundingAllocationId + // delete _item.groundingPositionCode + // } } else if (details.pageType === 4) { _item.trayCode = val.trayCode @@ -1960,7 +1957,7 @@ id: val.questDetailId, questId: details.pageInfos.questId, waybillNumber: val.waybillNumber, - quantity: val.quantity, + quantity: val.stockNum, materialName: val.materialName, materialCode: val.materialCode, orderCode: val.orderCode, @@ -1978,10 +1975,10 @@ _item.allocationId = details.pageInfos.allocationId _item.positionCode = details.pageInfos.allocation // 当修改前和修改后的Id一样时, 删除修改后的 - if (_item.groundingAllocationId === _item.allocationId) { - delete _item.groundingAllocationId - delete _item.groundingPositionCode - } + // if (_item.groundingAllocationId === _item.allocationId) { + // delete _item.groundingAllocationId + // delete _item.groundingPositionCode + // } } else if (details.pageType === 4) { _item.trayCode = val.trayCode diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js index 31cce8f..99fade1 100644 --- a/unpackage/dist/dev/app-plus/app-config-service.js +++ b/unpackage/dist/dev/app-plus/app-config-service.js @@ -1,7 +1,7 @@ ;(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":"4.07","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 __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":"4.08","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/billsList/billsList","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/PickUpLotList/PickUpLotList","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/TranNumber/TranNumber","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/onLoadByScan/onLoadByScan","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/onLoadOrderDetails/onLoadOrderDetails","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/VehicleArrivalDetails/VehicleArrivalDetails","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/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray","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/directGoMarket/directGoMarket","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/directGoMarketDetails/directGoMarketDetails","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/signPackageScan/signPackageScan","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/waybillInquiry/waybillInquiry","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/storageInquiry/storageInquiry","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/trayInquiry/trayInquiry","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/inventoryInquiry/inventoryInquiry","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/StorageLocationList/StorageLocationList","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/MaterialMaintenance/MaterialMaintenance","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":"pagesHome/pages/SearchTray/SearchTray","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/integral/integral","meta":{"enablePullDownRefresh":false,"onReachBottomDistance":1,"navigationBar":{"titleText":"积分指标","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/integralEdit/integralEdit","meta":{"enablePullDownRefresh":false,"onReachBottomDistance":1,"navigationBar":{"titleText":"指标编辑","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/integralMy/integralMy","meta":{"enablePullDownRefresh":false,"onReachBottomDistance":1,"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":"pagesUser/pages/securitySettings/securitySettings","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()})}}); diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index e294474..81f96a5 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -1769,7 +1769,7 @@ if (uni.restoreGlobal) { }; }; const Base64$1 = new Base64(); - const devhost = "http://192.168.3.14:13000/"; + const devhost = "http://192.168.3.12:13000/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; @@ -66558,10 +66558,10 @@ ${i3} const { code: code2, data } = res; if (code2 === 200 && data) { const info = { - trayCode: data[0].trayCode, + trayCode: data.trayCode, questId: details.id, - trayId: data[0].trayId, - type: data[0].goodsType, + trayId: data.trayId, + type: data.goodsType, marketName: details.marketName, questNum: details.questNum, pageType: details.pageType, @@ -67160,7 +67160,7 @@ ${i3} details.pageType = infos.pageType; details.pageInfos = infos; }); - onShow(() => { + onShow(async () => { uni.$off("scancodedate"); uni.$on("scancodedate", function(code2) { if (code2) { @@ -67173,17 +67173,15 @@ ${i3} scandata(); } }); - const timer = setTimeout(() => { - basicContainer.value.startPullDownRefresh(); - clearTimeout(timer); - }, 200); + await vue.nextTick(); + basicContainer.value.startPullDownRefresh(); }); async function initPage() { try { const orderRes = initOrder(); const stockRes = initStock(); const _promiseAll = Promise.all([orderRes, stockRes]); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:742", "_promiseAll :>> ", _promiseAll); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:739", "_promiseAll :>> ", _promiseAll); return _promiseAll; } catch (e2) { } @@ -67294,9 +67292,9 @@ ${i3} questNum: details.pageInfos.questNum }; const res = await postWarehouseTaskSelectPackageInfo(queryData); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:870", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:867", "res :>> ", res); const { code: code2, data } = res; - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:872", "code :>> ", code2); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:869", "code :>> ", code2); if (code2 === 200 && data && data.length !== 0) { data.forEach((val) => { if (details.pageType === 4 && val.trayCode) { @@ -67314,7 +67312,7 @@ ${i3} val.trayId = details.pageInfos.trayId; val.isChange = true; details.orderList.push(val); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:894", "val :>> ", val); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:891", "val :>> ", val); popUp_RemoveTary.value.details.showPopUp = false; utils.ttsspke(details.scanNum + "件"); } @@ -67349,7 +67347,7 @@ ${i3} return; } else if (code2 === 5001) { return; - } else if (code2 !== 4e3) { + } else if (code2 === 5e3) { details.addInfo.orderCode = ""; details.stopScan = true; popUp_Add.value.setDetails({ @@ -67397,7 +67395,7 @@ ${i3} }); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:993", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:990", "err :>> ", err); } finally { } } @@ -67462,7 +67460,7 @@ ${i3} return; details.addInfo.waybillNumber = item.waybillNumber; details.addInfo.orderCode = item.orderCode; - details.addInfo.quantity = item.quantity; + details.addInfo.stockNum = item.stockNum; details.addInfo.materialName = item.materialName; popUp_AddZero.value.setDetails({ title: "修改零担信息", @@ -67478,7 +67476,7 @@ ${i3} title: "请输入物料名称", icon: "none" }); - const _number = Number(details.addInfo.quantity); + const _number = Number(details.addInfo.stockNum); if (_number !== _number || _number <= 0) return uni.showToast({ title: "数量为大于0的数字", @@ -67486,7 +67484,7 @@ ${i3} }); item.orderCode = details.addInfo.orderCode; item.waybillNumber = details.addInfo.waybillNumber; - item.quantity = _number; + item.stockNum = _number; item.materialName = details.addInfo.materialName; item.stockNum = _number; details.addInfo.orderCode = ""; @@ -67500,7 +67498,7 @@ ${i3} }); }; const handleShowDetails = (item) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1106", "item :>> ", item); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1103", "item :>> ", item); details.detailsInfo = item; popUp_Details.value.setDetails({ title: "详情", @@ -67572,7 +67570,7 @@ ${i3} } }; const initState = (cargoName) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1201", "cargoName :>> ", cargoName); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1198", "cargoName :>> ", cargoName); if (details.tabBarCode === 1) { if (cargoName) { details.stateArr.forEach((val) => { @@ -67599,8 +67597,8 @@ ${i3} if (cargoName.stockNum || cargoName.wornNum || cargoName.lossNum || cargoName.noRepairNum || cargoName.deliveNum || cargoName.noReceivedNum) { details.stateArr.forEach((val) => { const _value = cargoName[val.name]; - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1236", "val.name :>> ", val.name); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1237", "_value :>> ", _value); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1233", "val.name :>> ", val.name); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1234", "_value :>> ", _value); if (_value > 0 && _value) val.value = _value; else @@ -67619,7 +67617,7 @@ ${i3} utils.ttsspke("取消当前操作"); }; const batchEditState = () => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1262", "修改"); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1259", "修改"); initState(); popUp_EditState.value.setDetails({ title: "状态修改", @@ -67643,7 +67641,7 @@ ${i3} utils.ttsspke("成功修改" + _number + "件"); popUp_EditState.value.details.showPopUp = false; details.showControl = false; - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1297", "111 :>> ", 111); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1294", "111 :>> ", 111); } }); }; @@ -67715,7 +67713,7 @@ ${i3} } }; const handleShowSelect = (index2) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1381", "222 :>> ", 222); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1378", "222 :>> ", 222); details.materialChooseIndex = index2 === details.materialChooseIndex ? 0 : index2; }; const handleChooseMaterial = (item) => { @@ -67857,7 +67855,7 @@ ${i3} if (_item.title === "破损" || _item.title === "不可修复") details.stateArr[0].value = 1; } else { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1573", "details.stateArr[0].value :>> ", details.stateArr[0].value); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1570", "details.stateArr[0].value :>> ", details.stateArr[0].value); if (_item.title === "在库") return; if (details.stateArr[0].value === 0 && _item.title === "破损" || details.stateArr[0].value === 0 && _item.title === "不可修复") @@ -67887,7 +67885,7 @@ ${i3} _item[val.name] = Number(val.value); }); } - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1605", "_item :>> ", _item); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1602", "_item :>> ", _item); if (_item.questStatus !== 1) details.scanNum++; _item.questStatus = 1; @@ -67947,7 +67945,7 @@ ${i3} title: "请输入物料名称", icon: "none" }); - const _number = Number(details.addInfo.quantity); + const _number = Number(details.addInfo.stockNum); if (_number !== _number || _number <= 0) return uni.showToast({ title: "数量为大于0的数字", @@ -68009,7 +68007,7 @@ ${i3} title: "请输入物料名称", icon: "none" }); - const _number = Number(details.addInfo.quantity); + const _number = Number(details.addInfo.stockNum); if (_number !== _number || _number <= 0) return uni.showToast({ title: "数量为大于0的数字", @@ -68106,7 +68104,7 @@ ${i3} if (Number(val.questStatus) !== 1) return; if (!val.isManuallyAdd && Number(val.cargoName) === 10) { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1867", "1 :>> ", 1); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1864", "1 :>> ", 1); submitData.questDetailIds.push(val.questDetailId); if (!val.isChange) return; @@ -68141,10 +68139,6 @@ ${i3} if (details.pageType === 2) { _item.allocationId = details.pageInfos.allocationId; _item.positionCode = details.pageInfos.allocation; - if (_item.groundingAllocationId === _item.allocationId) { - delete _item.groundingAllocationId; - delete _item.groundingPositionCode; - } } else if (details.pageType === 4) { _item.trayCode = val.trayCode; _item.trayId = val.trayId; @@ -68186,7 +68180,7 @@ ${i3} id: val.questDetailId, questId: details.pageInfos.questId, waybillNumber: val.waybillNumber, - quantity: val.quantity, + quantity: val.stockNum, materialName: val.materialName, materialCode: val.materialCode, orderCode: val.orderCode, @@ -68201,10 +68195,6 @@ ${i3} if (details.pageType === 2) { _item.allocationId = details.pageInfos.allocationId; _item.positionCode = details.pageInfos.allocation; - if (_item.groundingAllocationId === _item.allocationId) { - delete _item.groundingAllocationId; - delete _item.groundingPositionCode; - } } else if (details.pageType === 4) { _item.trayCode = val.trayCode; _item.trayId = val.trayId; @@ -68212,9 +68202,9 @@ ${i3} } submitData.questDetailList.push(_item); }); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1996", "submitData :>> ", submitData); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1993", "submitData :>> ", submitData); const res = await postWarehouseTaskAddDataInfo(submitData); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1998", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1995", "res :>> ", res); const { code: code2 } = res; if (code2 === 200) { utils.ttsspke("盘点成功"); @@ -68224,7 +68214,7 @@ ${i3} }, 1e3); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2009", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2006", "err :>> ", err); } finally { uni.hideLoading(); } @@ -68633,7 +68623,7 @@ ${i3} vue.createElementVNode( "view", null, - " 数量: " + vue.toDisplayString(item.quantity || "暂无数据"), + " 数量: " + vue.toDisplayString(item.stockNum || "暂无数据"), 1 /* TEXT */ ) @@ -68804,7 +68794,7 @@ ${i3} key: 0, class: "input", type: "number", - onBlur: ($event) => inputNum(item), + onBlur: () => inputNum(item), disabled: item.disabled, "onUpdate:modelValue": ($event) => item.value = $event }, null, 40, ["onBlur", "disabled", "onUpdate:modelValue"])), [ @@ -69210,7 +69200,7 @@ ${i3} "input", { class: "popUpInput", - "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => details.addInfo.quantity = $event), + "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => details.addInfo.stockNum = $event), type: "number", placeholder: "请输入在库数量" }, @@ -69218,7 +69208,7 @@ ${i3} 512 /* NEED_PATCH */ ), [ - [vue.vModelText, details.addInfo.quantity] + [vue.vModelText, details.addInfo.stockNum] ]) ]) ]), @@ -69294,7 +69284,7 @@ ${i3} "input", { class: "popUpInput", - "onUpdate:modelValue": _cache[22] || (_cache[22] = ($event) => details.addInfo.quantity = $event), + "onUpdate:modelValue": _cache[22] || (_cache[22] = ($event) => details.addInfo.stockNum = $event), type: "number", placeholder: "请输入数量" }, @@ -69302,7 +69292,7 @@ ${i3} 512 /* NEED_PATCH */ ), [ - [vue.vModelText, details.addInfo.quantity] + [vue.vModelText, details.addInfo.stockNum] ]) ]) ]), diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index f24a44f..9437e28 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -185,7 +185,7 @@ "uni-app": { "control": "uni-v3", "vueVersion": "3", - "compilerVersion": "4.07", + "compilerVersion": "4.08", "nvueCompiler": "uni-app", "renderer": "auto", "nvue": {