From ce54831b94e87f426633c5ac311dde5e5f355ccf Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 7 Nov 2023 17:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Etoken=E6=97=A0=E6=84=9F?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/user.js | 12 + compoment/BasicContainer/BasicContainer.vue | 2 +- config/host.js | 4 +- interfaces/pagesHome/SelfPickupDetails.ts | 43 +- pages/index/index.vue | 240 +- .../CustomerOrdersDetails.vue | 1 + pagesHome/pages/CustomerSign/CustomerSign.vue | 9 +- .../DeliveryCustomerScan.vue | 1 + pagesHome/pages/DownGoods/DownGoods.vue | 5 +- .../pages/LoadingDetails/LoadingDetails.vue | 210 +- pagesHome/pages/LoadingScan/LoadingScan.vue | 3 + .../MergeTrayDetails/MergeTrayDetails.vue | 1 + .../OrderSortingDetail/OrderSortingDetail.vue | 7 +- .../OrderSortingDetailList.vue | 1 + pagesHome/pages/PeopleScanUp/PeopleScanUp.vue | 3 +- .../PeopleSortingDetail.vue | 2 + .../pages/PickingScanList/PickingScanList.vue | 1 + .../pages/SelfPScanList/SelfPScanList.vue | 9 +- .../SelfPickupDetails/SelfPickupDetails.vue | 20 +- .../pages/SelfPickupScan/SelfPickupScan.vue | 1 + pagesHome/pages/SetPrice/SetPrice.vue | 1 + .../pages/SignDetailScan/SignDetailScan.vue | 175 +- .../pages/StockUpListZero/StockUpListZero.vue | 1 + pagesHome/pages/StockUplist/StockUplist.vue | 39 +- .../StockUplistScandetails.vue | 1 + .../pages/createAddServe/createAddServe.vue | 1 + .../pages/inventoryDetail/inventoryDetail.vue | 210 +- .../pages/inventoryenter/inventoryenter.vue | 3 + .../lnventorysortinglist.vue | 2 +- .../loadingRetention/loadingRetention.vue | 3 +- pagesHome/pages/orderDetails/orderDetails.vue | 1 + pagesHome/pages/orderInquiry/orderInquiry.vue | 1 + pagesHome/pages/pickingScan/pickingScan.vue | 3 +- pagesHome/pages/scansorting/scansorting.vue | 10 +- pagesHome/pages/setbarcode/setbarcode.vue | 2 + .../pages/signOrderScan/signOrderScan.vue | 7 + pagesHome/pages/signinScan/signinScan.vue | 1 + pagesTask/pages/contracts/contracts.vue | 1 + pagesTask/pages/dynamicCheck/dynamicCheck.vue | 44 +- .../trayCheckDetails/trayCheckDetails.vue | 5 +- store/index.js | 12 +- unpackage/dist/dev/app-plus/app-service.js | 1921 ++++++++++------- unpackage/dist/dev/app-plus/manifest.json | 4 +- utils/request.js | 283 ++- utils/requestA.js | 178 ++ 45 files changed, 2118 insertions(+), 1366 deletions(-) create mode 100644 utils/requestA.js diff --git a/api/user.js b/api/user.js index a502268..ef4df6f 100644 --- a/api/user.js +++ b/api/user.js @@ -302,6 +302,18 @@ export function signforpage(data) { data }); } +/** + * 签收数据 + * @param {Object} data + */ +export function signforSignNum(data) { + + return request({ + url: `logpm-distribution/app/signfor/signNum`, + method: "get", + data + }); +} /** * 客户列表 * @param {Object} data diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue index 5b5976a..69d7b16 100644 --- a/compoment/BasicContainer/BasicContainer.vue +++ b/compoment/BasicContainer/BasicContainer.vue @@ -58,7 +58,7 @@ // 初始化执行 onLoad(() => { // 初始化刷新 - uni.startPullDownRefresh() + // uni.startPullDownRefresh() }) // 添加防抖函数 diff --git a/config/host.js b/config/host.js index d99eb61..41fe80d 100644 --- a/config/host.js +++ b/config/host.js @@ -12,9 +12,9 @@ // tjj // const devhost = 'http://192.168.10.29:13000/' // cyz -// const devhost = 'http://192.168.10.75:8777/' +const devhost = 'http://192.168.10.75:8777/' // 正式 -const devhost = 'http://h5uapi.huitongys.com/' +// const devhost = 'http://h5uapi.huitongys.com/' // cg // const devhost='http://192.168.10.200:8888/' /** diff --git a/interfaces/pagesHome/SelfPickupDetails.ts b/interfaces/pagesHome/SelfPickupDetails.ts index 0b2edc5..fb01150 100644 --- a/interfaces/pagesHome/SelfPickupDetails.ts +++ b/interfaces/pagesHome/SelfPickupDetails.ts @@ -1,53 +1,56 @@ -export interface pagedetailType{ +export interface pagedetailType { /**筛选状态中文 * */ - schanvalue:string; + schanvalue : string; /**可筛选状态 * */ - typearr:{ - value:number; - label:string; + typearr : { + value : number; + label : string; }[]; /**订单状态 * */ - orderStatus:number; - - orderType:number; + orderStatus : number; + + orderType : number; /**订单自编码，用户输入的 * */ // orderSelfNumbering:string; /**返回的数据列表 * */ - dataList:any; + dataList : any; /**自提订单id * */ - billLadingId:string|number; - orderCode?:string|number; + billLadingId : string | number; + orderCode ?: string | number; /**配车类型 * */ - carTypeStr:string; + carTypeStr : string; /**车牌号 * */ - pickUpPlate:string; + pickUpPlate : string; /**司机（提货人） * */ - consignee:string; + consignee : string; /**计划订单总数 * */ - orderNum:number|string; + orderNum : number | string; /**计划签收总数 * */ - planNum:number|string; + planNum : number | string; /**完成订单总数 * */ - completeNum:number|string; + completeNum : number | string; /**完成签收总数 * */ - signedNum:number|string; + signedNum : number | string; /**扫描参数 * */ - scancode:string; + scancode : string; /**是否扫描 * */ - isscan:boolean; + isscan : boolean; + orderList : any; + zeroList : any; + stockList : any; } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 3907e7e..8606c1c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -42,126 +42,126 @@ import { inject, reactive, toRefs, watchEffect, ref } from "vue"; import utils from '../../utils/utils'; const tip = ref(null) - let details = reactive({ tablist: [] }); - // let details = 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/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', - // }, - // ] - // }, - // { - // 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', - // }, - // ] - // }, - // ] - // }) + // let details = reactive({ tablist: [] }); + let details = 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/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', + }, + ] + }, + { + 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 : string) { uni.navigateTo({ diff --git a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue index d0da1cd..756d3ad 100644 --- a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue +++ b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue @@ -256,6 +256,7 @@ // 零担和定制品 let response = null response = await deliveryorder(data) + if (response.code !== 200) return details.zero.data = [] details.order.data = [] if (response.data) { diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue index 259d1a7..3f069a7 100644 --- a/pagesHome/pages/CustomerSign/CustomerSign.vue +++ b/pagesHome/pages/CustomerSign/CustomerSign.vue @@ -93,7 +93,8 @@ signforUpdatePicture, signforpositioning, signforoneclick, - dictbizdictionary + dictbizdictionary, + signforSignNum } from '@/api/user.js' import { onLoad, @@ -206,6 +207,7 @@ id: details.id } let response = await signforcustom(data) + if (response.code !== 200) return const _arr = response.data.records // 加急客户 const _fastArr = [] @@ -230,6 +232,7 @@ let data = { reservationId: item.id, } + // 请求签收照片数据 let res = await signforprices(data) console.log('res>>>>>', res) let imglis = [], rearks = '' @@ -253,6 +256,10 @@ } } + // 请求签收数据 + const response = await signforSignNum({ ...data, id: details.id, }) + console.log('response :>> ', response); + console.log('tiplists :>> ', tiplists.value); tiplists.value.setdetails({ diff --git a/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue b/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue index ede5f3b..2ae36ae 100644 --- a/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue +++ b/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue @@ -216,6 +216,7 @@ id: details.id } let response = await deliverycustom(data) + if (response.code !== 200) return console.log('response', response) details.datalist = response.data.records } diff --git a/pagesHome/pages/DownGoods/DownGoods.vue b/pagesHome/pages/DownGoods/DownGoods.vue index 1ee8652..5cf03d8 100644 --- a/pagesHome/pages/DownGoods/DownGoods.vue +++ b/pagesHome/pages/DownGoods/DownGoods.vue @@ -324,8 +324,8 @@ } }) - onShow(async () => { - await initmarke() + onShow(() => { + initmarke() // app 适配 // #ifdef APP uni.$on('scancodedate', function (code) { @@ -370,6 +370,7 @@ warehouseCode: 'LQ' } let res = await warehouseTrayTypefindAllMarket(data) + if (res.code !== 200) return console.log(res.data); details.Marketlist = res.data } diff --git a/pagesHome/pages/LoadingDetails/LoadingDetails.vue b/pagesHome/pages/LoadingDetails/LoadingDetails.vue index 3da5398..921b175 100644 --- a/pagesHome/pages/LoadingDetails/LoadingDetails.vue +++ b/pagesHome/pages/LoadingDetails/LoadingDetails.vue @@ -1,9 +1,7 @@ + \ No newline at end of file diff --git a/pagesHome/pages/LoadingScan/LoadingScan.vue b/pagesHome/pages/LoadingScan/LoadingScan.vue index 5d41864..763e991 100644 --- a/pagesHome/pages/LoadingScan/LoadingScan.vue +++ b/pagesHome/pages/LoadingScan/LoadingScan.vue @@ -194,6 +194,7 @@ deliveryId: item.id } let res = await deliveryvehicle(data) + if (res.code !== 200) return if (res.data.length == 1) { let data = { deliveryId: item.id, @@ -300,6 +301,7 @@ } let response = await deliverypage(data) console.log(response); + if (response.code !== 200) return if (details.current == 1) { details.recordsList = response.data.records } else { @@ -441,6 +443,7 @@ deliveryId: item.id } let res = await deliveryvehicle(data) + if (res.code !== 200) return console.log(res); if (res.data.length == 1) { uni.setStorageSync('checkvehicle', res.data[0]) diff --git a/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue b/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue index ff74567..f5d364f 100644 --- a/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue +++ b/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue @@ -162,6 +162,7 @@ trayCode: trayCode.value } let res = await warehouseTrayTypescanTargetTrayCode(data) + if (res.code !== 200) return resdata.value = res.data } diff --git a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue index 81ae14a..17aec7d 100644 --- a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue +++ b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue @@ -463,6 +463,7 @@ orderCode: item.dataCode, } let res = await warehouseTrayTypedeleteOrderCode(data) + if (res.code !== 200) return console.log('res :>> ', res); initlist() tip.value.setisshow(false) @@ -739,6 +740,7 @@ } let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data) + if (response.code !== 200) return console.log(response); details.codelist = response.data details.codelist.map(item => { @@ -816,6 +818,7 @@ materialCode: details.stock.materialCode } let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data) + if (res.code !== 200) return // 筛选剩余数大于0的物料 details.stock.searchStockList = res.data.filter(val => val.quantityStock !== 0) } @@ -899,7 +902,9 @@ _arr.forEach((value, index) => { _position += 30 // 订单自编号 - orderListText += `T 55 0 10 ${_position} ${value.dataCode}\r\n` + if (value.isFleeing) orderListText += `T 55 0 10 ${_position} ${'(窜)' + value.dataCode}\r\n` + else orderListText += `T 55 0 10 ${_position} ${value.dataCode}\r\n` + // orderListText += `T 55 0 10 ${_position} ${value.dataCode}\r\n` // 总件数 orderListText += `T 55 0 300 ${_position} ${value.orderTotalNum}\r\n` // 在托件数 diff --git a/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue b/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue index ccd9db3..6068dc2 100644 --- a/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue +++ b/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue @@ -212,6 +212,7 @@ trayCode: details.trayCode, } let response = await warehouseTrayTypeorderDetail(data) + if (response.code !== 200) return details.list = response.data.parcelList details.detaobj = response.data let set = new Set() diff --git a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue index 1bb3f14..1377bcb 100644 --- a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue +++ b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue @@ -468,6 +468,7 @@ warehouseCode: 'LQ' } let res = await warehouseTrayTypefindAllMarket(data) + if (res.code !== 200) return console.log(res.data); details.Marketlist = res.data } @@ -488,7 +489,7 @@ } response = await warehouseUpdownTypegetStockByParam(data) } - + if (response.code !== 200) return console.log(response); details.codelist = response.data details.codelist.map(item => { diff --git a/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue b/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue index 5d69b79..f9c7f96 100644 --- a/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue +++ b/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue @@ -226,6 +226,7 @@ trayCode: details.trayCode } let response = await warehouseTrayTypezeroScanTrayCode(data) + if (response.code !== 200) return details.warehouseTray = response.data.data if (response?.data?.data?.list) { details.datalist = response?.data?.data?.list @@ -245,6 +246,7 @@ } let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data) console.log(response); + if (response.code !== 200) return details.codelist = response.data details.codelist.map(item => { item['number'] = 0 diff --git a/pagesHome/pages/PickingScanList/PickingScanList.vue b/pagesHome/pages/PickingScanList/PickingScanList.vue index d112890..190fabf 100644 --- a/pagesHome/pages/PickingScanList/PickingScanList.vue +++ b/pagesHome/pages/PickingScanList/PickingScanList.vue @@ -166,6 +166,7 @@ stockupId: details.id } let response = await distributionStockuppageListClient(data) + if (response.code !== 200) return details.datalist = response.data.orderList details.items = response.data } diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue index 5af24a1..2d895de 100644 --- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue +++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue @@ -213,6 +213,7 @@ orderCode: details.orderCode } let response = await billLadingorderList(data) + if (response.code !== 200) return details.datalist = response.data.list details.orderNum = response.data.orderNum details.completeNum = response.data.completeNum @@ -226,15 +227,19 @@ size: 10 } let response = await billLadinggetInventory(date) - details.datalist.map(item => { + if (res.code !== 200) return + + details.datalist = response.data.records + details.datalist.every(item => { if (item.esauInventoryNum == -1) { uni.showToast({ title: '物品备货未完成，请前往备货', icon: 'none' }) + return false } + return true }) - details.datalist = response.data.records // details.orderNum=response.data.orderNum // details.completeNum=response.data.completeNum // details.planNum=response.data.planNum diff --git a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue index 176ec88..b51d3ff 100644 --- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue +++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue @@ -158,6 +158,9 @@ signedNum: '', scancode: '', isscan: false, + zeroList: [], + orderList: [], + stockList: [] }) const tiplists = ref(null) onLoad((op) => { @@ -171,6 +174,7 @@ sacn() } }) + details.dataList = details.orderList initpage() }) function goorderdetail(item) { @@ -296,6 +300,7 @@ } async function initpage() { + details.dataList = [] console.log('获取数据') if (details.orderType == 1) { let data = { @@ -304,7 +309,8 @@ orderCode: details.orderCode } let response = await billLadingdetailList(data) - details.dataList = response.data.list + if (response.code !== 200) return + details.orderList = response.data.list details.consignee = response.data.consignee details.pickUpPlate = response.data.pickUpPlate details.carTypeStr = response.data.carTypeStr @@ -321,7 +327,8 @@ size: 10 } let response = await billLadinggetInventoryNum(data) - details.dataList = response.data.records + if (response.code !== 200) return + details.zeroList = response.data.records } else if (details.orderType == 3) { let data = { @@ -329,15 +336,16 @@ } const response = await billLadingzeroBillData(data) console.log('response :>> ', response); - const { code } = response - if (code === 200) { - details.dataList = response.data || [] - } + if (response.code !== 200) return + details.stockList = response.data || [] } } function setorderStatus(state : number) { details.orderType = state initpage() + if (state === 1) details.dataList = details.orderList + else if (state === 2) details.dataList = details.zeroList + else if (state === 3) details.dataList = details.stockList } function checktype(e) { if (e == '') { diff --git a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue index b376d1d..fca7030 100644 --- a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue +++ b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue @@ -145,6 +145,7 @@ pickUpTimeEnd: date.value[1], } let response = await billLadingpageList(data) + if (response.code !== 200) return // details.recordsList=response.data.records if (details.current == 1) { details.recordsList = response.data.records diff --git a/pagesHome/pages/SetPrice/SetPrice.vue b/pagesHome/pages/SetPrice/SetPrice.vue index 7c28445..fa08606 100644 --- a/pagesHome/pages/SetPrice/SetPrice.vue +++ b/pagesHome/pages/SetPrice/SetPrice.vue @@ -133,6 +133,7 @@ reservationId: details.items.id } let res = await addvalueaddvalueInfo(data) + if (res.code !== 200) return details.priceList = res.data } function goValueaddedServicePage(item : any) { diff --git a/pagesHome/pages/SignDetailScan/SignDetailScan.vue b/pagesHome/pages/SignDetailScan/SignDetailScan.vue index c891484..1deafa1 100644 --- a/pagesHome/pages/SignDetailScan/SignDetailScan.vue +++ b/pagesHome/pages/SignDetailScan/SignDetailScan.vue @@ -1,9 +1,7 @@