diff --git a/api/user.js b/api/user.js index 1d239c7..bef7d62 100644 --- a/api/user.js +++ b/api/user.js @@ -1883,4 +1883,28 @@ export function $_retentionTrayScan(data) { method: "post", data }); +} + +/** + * 配载列表 + * @param {Object} data + */ +export function postCarsLoadPageList(data) { + return request({ + url: `logpm-trunkline/api/carsLoad/carsLoadPageList`, + method: "post", + data + }); +} + +/** + * 配载列表 + * @param {Object} data + */ +export function postFindCarsLoadingDetail(data) { + return request({ + url: `logpm-trunkline/api/carsLoad/findCarsLoadingDetail`, + method: "post", + data + }); } \ No newline at end of file diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue index 8826490..b876206 100644 --- a/compoment/BasicContainer/BasicContainer.vue +++ b/compoment/BasicContainer/BasicContainer.vue @@ -102,14 +102,14 @@ // 下拉刷新 - onPullDownRefresh(() => { - const timer = setTimeout(async () => { + onPullDownRefresh(async () => { + await pullDownRefreshInitPage() + const timer = setTimeout(() => { // 触发下拉回调 - await pullDownRefreshInitPage() uni.stopPullDownRefresh() // 清除定时器 clearTimeout(timer) - }, 500) + }, 300) }) // 触发下拉刷新 diff --git a/config/host.js b/config/host.js index b356ce1..86a45e4 100644 --- a/config/host.js +++ b/config/host.js @@ -4,11 +4,11 @@ * 测试域名 * */ //测试域名 -const devhost = 'http://test.api.huitongys.com/' +// const devhost = 'http://test.api.huitongys.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy -// const devhost = 'http://192.168.10.48:8888/' +const devhost = 'http://192.168.10.48:13000/' // tjj // const devhost = 'http://192.168.10.25:13000/' // cyz diff --git a/manifest.json b/manifest.json index 571a212..5135a05 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "货无忧", - "appid" : "__UNI__FC20B18", + "appid" : "__UNI__EB22F37", "description" : "", - "versionName" : "1.0.31", - "versionCode" : 1031, + "versionName" : "1.0.32", + "versionCode" : 1032, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 6c1f713..bf18fdc 100644 --- a/pages.json +++ b/pages.json @@ -134,6 +134,63 @@ } } + }, + { + "path": "pages/StowageList/StowageList", + "style": { + "navigationBarTitleText": "配载装车", + "enablePullDownRefresh": true, + "onReachBottomDistance": 1, + "navigationStyle": "custom", + "app-plus": { + "animationDuration": 300, + "animationType": "zoom-fade-out", + "pullToRefresh": { + "support": true, + "color": "#d3832a", //小圈圈的颜色 + "style": "circle" //小圈圈的样式 + } + } + } + + }, + { + "path": "pages/StowageListDetails/StowageListDetails", + "style": { + "navigationBarTitleText": "配载按件装车", + "enablePullDownRefresh": true, + "onReachBottomDistance": 1, + "navigationStyle": "custom", + "app-plus": { + "animationDuration": 300, + "animationType": "zoom-fade-out", + "pullToRefresh": { + "support": true, + "color": "#d3832a", //小圈圈的颜色 + "style": "circle" //小圈圈的样式 + } + } + } + + }, + { + "path": "pages/RelayScanList/RelayScanList", + "style": { + "navigationBarTitleText": "中转装车", + "enablePullDownRefresh": true, + "onReachBottomDistance": 1, + "navigationStyle": "custom", + "app-plus": { + "animationDuration": 300, + "animationType": "zoom-fade-out", + "pullToRefresh": { + "support": true, + "color": "#d3832a", //小圈圈的颜色 + "style": "circle" //小圈圈的样式 + } + } + } + }, { "path": "pages/codePlateBracket/codePlateBracket", @@ -1310,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 25b53f9..c7cf203 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -144,6 +144,16 @@ 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', + }, ] }, { diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue index d65af4b..c1c61c4 100644 --- a/pagesHome/pages/CustomerSign/CustomerSign.vue +++ b/pagesHome/pages/CustomerSign/CustomerSign.vue @@ -79,9 +79,9 @@ 签收扫描 上传签收图片 - + 批量签收 diff --git a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue index 891334c..1a08272 100644 --- a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue +++ b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue @@ -128,6 +128,7 @@ 总包数：{{item.totalNumber}} + 上架数：{{item.enterNum}} @@ -216,6 +217,7 @@ 总包数：{{item.totalNum}} + 上架数：{{item.stockNum}} - 入库数： - + 上架数： + @@ -427,10 +429,8 @@ 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) { @@ -521,7 +521,7 @@ // }) } }) - details.uplistarr = fn2(details.uplistarr, 'orderCode') + details.uplistarr = fn2(details.uplistarr, 'materialCode,incomingBatch') details.showstate = 0 details.codelist = [] details.waybillCode = '' @@ -627,21 +627,6 @@ } // 关闭loading uni.hideLoading() - console.log('res上架 :>> ', res); - if (res.code == 200) { - uni.showToast({ - title: '上架成功', - icon: 'none' - }) - details.uplistarr = [] - details.scancode = details.allocationId - scandata() - } else { - uni.showToast({ - title: '上架失败', - icon: 'error' - }) - } tip.value.setisshow(false) }, cancel: () => { @@ -663,27 +648,45 @@ details.checkstate = state } //去重 - function fn2(tempArr, fnname) { + function fn2(tempArr, fnname : string) { + // 根据筛选条件组成的数组 + 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 - } + /* 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; }; diff --git a/pagesHome/pages/PickingScanList/PickingScanList.vue b/pagesHome/pages/PickingScanList/PickingScanList.vue index b1a1d50..9b10113 100644 --- a/pagesHome/pages/PickingScanList/PickingScanList.vue +++ b/pagesHome/pages/PickingScanList/PickingScanList.vue @@ -33,9 +33,13 @@ 订单总数 {{item.orderNum}} + + 库存品数量 + {{item.inventoryNub || 0}} + 计划件数 - {{item.planNum}} + {{item.planNum + item.inventoryNub}} 已备数量 @@ -190,7 +194,12 @@ } let response = await 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 } diff --git a/pagesHome/pages/RelayScanList/RelayScanList.vue b/pagesHome/pages/RelayScanList/RelayScanList.vue new file mode 100644 index 0000000..14bf246 --- /dev/null +++ b/pagesHome/pages/RelayScanList/RelayScanList.vue @@ -0,0 +1,478 @@ + + + + + \ No newline at end of file diff --git a/pagesHome/pages/StockUplist/StockUplist.vue b/pagesHome/pages/StockUplist/StockUplist.vue index 4e21514..49be59f 100644 --- a/pagesHome/pages/StockUplist/StockUplist.vue +++ b/pagesHome/pages/StockUplist/StockUplist.vue @@ -271,11 +271,11 @@ console.log('details.orderStatus :>> ', details.orderStatus); details.user.consignee = response.data?.consignee details.user.goodsAreaName = response.data?.goodsAreaName - details.user.planNum = response.data?.planNum - details.user.scanNum = response.data?.scanNum details.orderList = response.data?.orderList || [] details.stockList = response.data?.stockList || [] if (details.orderStatus === 3) details.zeroOrderList = response.data?.orderList || [] + details.user.planNum = response.data?.planNum + details.user.scanNum = response.data?.scanNum details.isscan = false return null } @@ -321,6 +321,16 @@ basicContainer.value.startPullDownRefresh() } async function goBarCode(item : any) { + if (!item.allocationList || item.allocationList.length === 0) { + // #ifdef APP + utils.ttsspke('该库存品没有上架数据') + // #endif + uni.showToast({ + title: '该库存品没有上架数据', + icon: 'none' + }) + return + } console.log('item :>> ', item); const _allocationList = item.allocationList.map(val => val.name) console.log('_allocationList :>> ', _allocationList); diff --git a/pagesHome/pages/StowageList/StowageList.vue b/pagesHome/pages/StowageList/StowageList.vue new file mode 100644 index 0000000..1346e37 --- /dev/null +++ b/pagesHome/pages/StowageList/StowageList.vue @@ -0,0 +1,481 @@ + + + + + \ No newline at end of file diff --git a/pagesHome/pages/StowageListDetails/StowageListDetails.vue b/pagesHome/pages/StowageListDetails/StowageListDetails.vue new file mode 100644 index 0000000..be402a0 --- /dev/null +++ b/pagesHome/pages/StowageListDetails/StowageListDetails.vue @@ -0,0 +1,700 @@ + + + + + \ No newline at end of file diff --git a/pagesHome/pages/createAddServe/createAddServe.vue b/pagesHome/pages/createAddServe/createAddServe.vue index dc456ce..237bd36 100644 --- a/pagesHome/pages/createAddServe/createAddServe.vue +++ b/pagesHome/pages/createAddServe/createAddServe.vue @@ -389,6 +389,11 @@ return response } function showlist() { + if (details.addvalueType) return uni.showToast({ + title: '不能修改增值类型', + icon: 'none' + }) + let list = [] details.priceType.map(item => { list.push(item.typename) diff --git a/pagesHome/pages/loadingRetention/loadingRetention.vue b/pagesHome/pages/loadingRetention/loadingRetention.vue index 9a0ae91..908186f 100644 --- a/pagesHome/pages/loadingRetention/loadingRetention.vue +++ b/pagesHome/pages/loadingRetention/loadingRetention.vue @@ -16,7 +16,7 @@ 备货是否完成：{{items.isstock}} - + 滞留数 {{scannedNumber}} @@ -54,6 +54,32 @@ + + + 设置零担物料数量 + + + + 物料名称:{{item.materialName}} + + + 物料总数:{{item.maxQuantity}} + + + + 物料数量: + + + + + + + 确定 + 取消 + + @@ -64,20 +90,26 @@ - 类型 类型 + {{item.conditions==1?'定制品':item.conditions==2?'库存品':'暂无信息'}} - 包条码{{item.orderPackageCode}} + + 包条码 + {{item.orderPackageCode}} - 订单自编号{{item.orderCode}} + + + 订单自编号 + {{item.orderCode}} - 预约单号{{item.reservationCode}} + + 预约单号 + {{item.reservationCode}} @@ -96,19 +128,23 @@ 类型{{item.conditions==1?'定制品':item.conditions==2?'库存品':'暂无信息'}} + :class="{ 'type1':item.conditions==1,'type2':item.conditions==2,'type3': item.conditions==3 }">{{item.conditions==1?'定制品':item.conditions==2?'库存品':item.conditions==3?'零担':'暂无信息'}} - 包条码{{item.orderPackageCode}} + + 包条码 + {{item.orderPackageCode?item.orderPackageCode:'暂无数据'}} - 订单自编号{{item.orderCode}} + + 订单自编号 + {{item.orderCode}} - 预约单号{{item.reservationCode}} + + 预约单号 + {{item.reservationCode}} @@ -122,24 +158,25 @@ - - - - - 托盘码{{item[0].trayCode}} + + 托盘码 + {{item[0].trayCode}} - 托盘名称{{item[0].trayName?item[0].trayName:'暂无名称'}} + + 托盘名称 + {{item[0].trayName?item[0].trayName:'暂无名称'}} - 托盘数量{{item.length}} + + 托盘数量 + {{item.length}} @@ -151,20 +188,23 @@ 类型{{items.conditions==1?'定制品':items.conditions==2?'库存品':'暂无信息'}} + :class="{ 'type1':items.conditions==1,'type2':item.conditions==2,'type3': items.conditions==3 }">{{items.conditions==1?'定制品':items.conditions==2?'库存品':items.conditions==3?'零担':'暂无信息'}} - 包条码{{items.orderPackageCode}} + + 包条码 + {{items.orderPackageCode}} - 订单自编号{{items.orderCode}} + + 订单自编号 + {{items.orderCode}} - 预约单号{{items.reservationCode}} + + 预约单号 + {{items.reservationCode}} @@ -206,8 +246,6 @@