diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0f781eb --- /dev/null +++ b/.gitignore @@ -0,0 +1,31 @@ +.DS_Store +/unpackage +node_modules +/uni_modules +/dist +/tests/e2e/videos/ +/tests/e2e/screenshots/ + +# local env files +.env.local +.env.*.local + +# log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# lock files +package-lock.json + +yarn.lock + +# editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw* +.history/ diff --git a/compoment/tiplist/tiplist.vue b/compoment/tiplist/tiplist.vue index 6cd0f0c..a180abc 100644 --- a/compoment/tiplist/tiplist.vue +++ b/compoment/tiplist/tiplist.vue @@ -40,6 +40,7 @@ + 请上传照片(上门照，货物堆放照，签收照，易碎品贵重物品，家配照): @@ -49,6 +50,26 @@ + @@ -150,6 +171,10 @@ \ No newline at end of file diff --git a/pages/user/user.vue b/pages/user/user.vue index 866471f..9d92ddd 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -62,7 +62,7 @@ function removeall() { const res = uni.getStorageInfoSync(); res.keys.map(item=>{ - if(item=='loginuser'||item=='HistoryDate'){ + if(item=='loginuser'||item=='HistoryDate'||item=='setip'){ return } uni.removeStorageSync(item) diff --git a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue index 90f3727..68e2de4 100644 --- a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue +++ b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue @@ -106,7 +106,8 @@ onUnload } from '@dcloudio/uni-app' import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue' - import { computed, reactive, ref, toRefs } from "vue"; + import { computed, inject, reactive, ref, toRefs, watchEffect } from "vue"; + const utils=inject('utils') as any let details = reactive({ schanvalue: '', typearr: [ @@ -150,6 +151,7 @@ onHide(()=>{ uni.$off('scancodedate') }) + const loadingNub=computed(()=>{ let num=0 details.datalist.map(item=>{ @@ -159,6 +161,12 @@ }) return num }) + watchEffect(()=>{ + if(loadingNub.value!=0){ + console.log(loadingNub.value+'件') + utils.ttsspke(loadingNub.value+'件') + } + }) function showsdqs(){ tiplists.value.setdetails({ isshow:true, diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue index b7e2d53..339af6f 100644 --- a/pagesHome/pages/CustomerSign/CustomerSign.vue +++ b/pagesHome/pages/CustomerSign/CustomerSign.vue @@ -67,7 +67,7 @@ 上传签收图片 - 设置服务费 + 设置增值服务 批量签收 @@ -111,7 +111,8 @@ }) function gosetorice(item){ uni.navigateTo({ - url:'/pagesHome/pages/SetPrice/SetPrice' + url:'/pagesHome/pages/SetPrice/SetPrice?reservationId='+details.id + +'&item='+JSON.stringify(item) }) } const signNub=computed(()=>{ diff --git a/pagesHome/pages/DownGoods/DownGoods.vue b/pagesHome/pages/DownGoods/DownGoods.vue index f01e953..02dbff7 100644 --- a/pagesHome/pages/DownGoods/DownGoods.vue +++ b/pagesHome/pages/DownGoods/DownGoods.vue @@ -614,7 +614,7 @@ } .scvbw{ width: 100%; - height: 360upx; + height: 450upx; margin-top: 30upx; .scboxitem{ display: flex; diff --git a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue index 0736002..2e39f2e 100644 --- a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue +++ b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue @@ -192,10 +192,12 @@ trayCode:details.trayCode } let res=await warehouseTrayTypeorderScanTrayCode(data) - console.log(res,'resresresres'); + console.log(res.data,'resresresres'); if(res.code==200){ - details.datelist=res.data.data.list - details.detauser=res.data.data + if(res.data.isHasData==1){ + details.datelist=res.data.data.list + details.detauser=res.data.data + } }else { uni.showToast({ title:res.msg, diff --git a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue index 362b15e..7c6808f 100644 --- a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue +++ b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue @@ -569,7 +569,7 @@ } .scvbw{ width: 100%; - height: 360upx; + height: 450upx; margin-top: 30upx; .scboxitem{ display: flex; diff --git a/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue b/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue index 0266fe7..6a7644c 100644 --- a/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue +++ b/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue @@ -610,7 +610,7 @@ } .scvbw{ width: 100%; - height: 360upx; + height: 450upx; margin-top: 30upx; .scboxitem{ display: flex; diff --git a/pagesHome/pages/ScanUp/ScanUp.vue b/pagesHome/pages/ScanUp/ScanUp.vue index 31c3774..1df8314 100644 --- a/pagesHome/pages/ScanUp/ScanUp.vue +++ b/pagesHome/pages/ScanUp/ScanUp.vue @@ -186,16 +186,16 @@ }else if(Number(details.upshelfScanType)==3){ details.uplistarr=fn2(details.uplistarr,'orderPackageCode') }else if(Number(details.upshelfScanType)==4){ - details.uplistarr=fn2(details.uplistarr,'trayCode') + // details.uplistarr=fn2(details.uplistarr,'orderCode') } }) onLoad((op)=>{ details.upshelfScanType=op.type - // details.scancode='1696446315573116938' + // details.scancode='1669964381355732993' // scandata() // setTimeout(()=>{ - // details.scancode='HT20230800003' + // details.scancode='HTCQ000007' // scandata() // },1500) // setTimeout(()=>{ diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue index 342d16e..8b41e6f 100644 --- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue +++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue @@ -7,19 +7,23 @@ 订单总数 - {{details.orderNum}} + {{details.orderNum||0}} 齐套数 - {{details.completeNum}} + {{details.completeNum||0}} 自提件数 - {{details.planNum}} + {{details.planNum||0}} 签收件数 - {{details.signedNum}} + {{details.signedNum||0}} + + + 库存品数 + {{details.inventoryNub||0}} @@ -44,7 +48,10 @@ - 订单编号：{{item.orderCode}} + + 订单编号： + {{item.orderSelfNumbering}} + 配送数：{{item.planNum}} @@ -112,6 +119,7 @@ completeNum:'', planNum:'', signedNum:'', + inventoryNub:'', scancode:'', }) const tiplists=ref(null) @@ -119,6 +127,9 @@ details.billLadingId=op.billLadingId initpage() // details.scancode='TESTCodeBJ2308030001' + + }) + onShow(()=>{ uni.$on('scancodedate', function(code) { if (code) { console.log(code); @@ -127,6 +138,9 @@ } }) }) + onHide(()=>{ + uni.$off('scancodedate') + }) function showsdqs(){ tiplists.value.setdetails({ isshow:true, @@ -181,6 +195,7 @@ details.orderNum=response.data.orderNum details.completeNum=response.data.completeNum details.planNum=response.data.planNum + details.inventoryNub=response.data.inventoryNub details.signedNum=response.data.signedNum }else if(details.orderType==2){ let date={ diff --git a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue index 1a835ff..3745e54 100644 --- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue +++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue @@ -130,6 +130,8 @@ details.billLadingId=op.billLadingId initpage() // details.scancode='1686568463442280450' + }) + onShow(()=>{ uni.$on('scancodedate', function(code) { if (code) { console.log(code); @@ -138,6 +140,9 @@ } }) }) + onHide(()=>{ + uni.$off('scancodedate') + }) function showsdqs(){ tiplists.value.setdetails({ isshow:true, diff --git a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue index 93b277b..aa56c54 100644 --- a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue +++ b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue @@ -68,6 +68,10 @@ 签收件数 {{item.signedNum}} + + 库存品数 + {{item.inventoryNub}} + @@ -254,16 +258,22 @@ &:nth-of-type(2) { >view:nth-of-type(2) { - color: #3AD8BC; + color: #0086F1; } } &:nth-of-type(3) { + >view:nth-of-type(2) { + color: #3AD8BC; + } + } + + &:nth-of-type(4) { >view:nth-of-type(2) { color: #FA8C16; } } - + >view:nth-of-type(1) { font-size: 28upx; font-weight: 400; diff --git a/pagesHome/pages/SetPrice/SetPrice.vue b/pagesHome/pages/SetPrice/SetPrice.vue index 710dd1f..1d45194 100644 --- a/pagesHome/pages/SetPrice/SetPrice.vue +++ b/pagesHome/pages/SetPrice/SetPrice.vue @@ -1,15 +1,272 @@ diff --git a/pagesHome/pages/createAddServe/createAddServe.vue b/pagesHome/pages/createAddServe/createAddServe.vue new file mode 100644 index 0000000..de4233e --- /dev/null +++ b/pagesHome/pages/createAddServe/createAddServe.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/pagesHome/pages/inventoryenter/inventoryenter.vue b/pagesHome/pages/inventoryenter/inventoryenter.vue index ba86319..a754cf1 100644 --- a/pagesHome/pages/inventoryenter/inventoryenter.vue +++ b/pagesHome/pages/inventoryenter/inventoryenter.vue @@ -119,7 +119,7 @@ {{item.sku}} - + 数量： @@ -776,7 +776,7 @@ } .scvbw{ width: 100%; - height: 360upx; + height: 450upx; margin-top: 30upx; .scboxitem{ display: flex; diff --git a/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue b/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue index 137945d..9723dff 100644 --- a/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue +++ b/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue @@ -142,10 +142,15 @@ }else{ if(Number(details.pageType)==1&&res.data.data.type==3){ uni.navigateTo({ - url:'/pagesHome/pages/inventoryDetail/inventoryDetail?trayCode=' + url:'/pagesHome/pages/inventoryenter/inventoryenter?trayCode=' +details.scancode+'&trayType=' +res.data.data.trayType }) + // uni.navigateTo({ + // url:'/pagesHome/pages/inventoryDetail/inventoryDetail?trayCode=' + // +details.scancode+'&trayType=' + // +res.data.data.trayType + // }) }else if(Number(details.pageType)==2&&res.data.data.type==4){ uni.navigateTo({ url:'/pagesHome/pages/inventoryenter/inventoryenter?trayCode=' @@ -153,6 +158,12 @@ +res.data.data.trayType }) }else if(Number(details.pageType)==2&&res.data.data.type==3){ + uni.navigateTo({ + url:'/pagesHome/pages/inventoryenter/inventoryenter?trayCode=' + +details.scancode+'&trayType=' + +res.data.data.trayType + }) + return uni.showToast({ title:'库存品扫描分拣使用托盘码', icon:'none' @@ -161,6 +172,12 @@ utils.ttsspke('库存品扫描分拣使用托盘码') // #endif }else if(Number(details.pageType)==1&&res.data.data.type==4){ + uni.navigateTo({ + url:'/pagesHome/pages/inventoryenter/inventoryenter?trayCode=' + +details.scancode+'&trayType=' + +res.data.data.trayType + }) + return uni.showToast({ title:'库存品人工分拣使用托盘码', icon:'none' @@ -169,6 +186,12 @@ utils.ttsspke('库存品人工分拣使用托盘码') // #endif }else if(res.data.data.type==1||res.data.data.type==2){ + uni.navigateTo({ + url:'/pagesHome/pages/inventoryenter/inventoryenter?trayCode=' + +details.scancode+'&trayType=' + +res.data.data.trayType + }) + return uni.showToast({ title:'定制品分拣使用托盘码', icon:'none' diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue index 1925b66..7ac53cb 100644 --- a/pagesHome/pages/pickingScan/pickingScan.vue +++ b/pagesHome/pages/pickingScan/pickingScan.vue @@ -75,7 +75,7 @@ - + @@ -140,6 +140,7 @@ }) function init(){ details.currentPage=1 + details.dataList=[] initpage() } function jiazai(){ @@ -193,7 +194,7 @@ } function setstate(state:number){ details.status=state - initpage() + init() } function submitsuccess(){ tip.value.setdetails({ @@ -262,6 +263,9 @@ margin-bottom: 20upx; padding-top: 20upx; border-radius: 8upx; + >view:nth-last-child(1){ + border-bottom: none !important; + } .topbox{ display: flex; flex-direction: column; diff --git a/pagesHome/pages/scansorting/scansorting.vue b/pagesHome/pages/scansorting/scansorting.vue index 226f0d8..549a497 100644 --- a/pagesHome/pages/scansorting/scansorting.vue +++ b/pagesHome/pages/scansorting/scansorting.vue @@ -132,13 +132,13 @@ console.log(res.data); if(!res.data.isHasData){ + uni.setStorageSync('trayCodeType',res.data.data) uni.navigateTo({ url:'/pagesHome/pages/ScanSortingType/ScanSortingType?type=' +details.pageType +'&trayCode=' +details.scancode }) - uni.setStorageSync('trayCodeType',res.data.data) }else{ if(Number(details.pageType)==1&&res.data.data.type==1){ uni.navigateTo({ diff --git a/pagesHome/pages/setbarcode/setbarcode.vue b/pagesHome/pages/setbarcode/setbarcode.vue index e4d4da4..7b9c9c4 100644 --- a/pagesHome/pages/setbarcode/setbarcode.vue +++ b/pagesHome/pages/setbarcode/setbarcode.vue @@ -19,14 +19,15 @@ - 采集原包条码 + 采集原包条码 + 扫描打印包条 新生成包码 - 序号：{{index}} + 序号：{{index+1}} 作业时间：2001-12-10 @@ -54,6 +55,7 @@ } from '@/api/user.js' import { detailType } from '@/interfaces/pagesHome/setbarcode' import { reactive, ref, toRefs,inject } from "vue"; + const utils=inject('utils') as any let details=reactive({ items:{}, reservationId:'', @@ -61,7 +63,10 @@ printlist:[], packageNum:0, goodsAreaName:'', - stockupId:'' + stockupId:'', + stockPrint:1, + customer:'', + deliveryAddress:'', }) const tips=ref(null) // const tiplists=ref(null) @@ -70,7 +75,7 @@ details.items=JSON.parse(op.item) details.reservationId=op.reservationId details.goodsAreaName=op.goodsAreaName - scandata('1231') + // scandata('1231') uni.$on('scancodedate', function(code) { if (code) { console.log(code); @@ -99,14 +104,26 @@ } }) } + function setstockPrint(values){ + details.stockPrint=values + if(values==1){ + utils.ttsspke('请扫描原有包条码') + }else{ + utils.ttsspke('请扫描打印的包条码') + } + + } async function initpage(){ let data={ orderStatus:2, reservationId:details.reservationId, - stockListId:details.items.stockListId + stockListId:details.items.stockListId, + stockupId:details.stockupId } let response=await distributionStockuporderInfo(data) details.codelist=response.data.stockList + details.customer=response.data.customer + details.deliveryAddress=response.data.deliveryAddress } function showmd(){ tips.value.setdetails({ @@ -174,43 +191,42 @@ } }) } - function print(item){ + function print(item:string){ // #ifdef APP - const util=(inject('utils') as any) - // let text='! 0 200 200 500 1\r\n' - // text+='SETBOLD 2\r\n' - // text+=`T 56 0 0 0 OPLYA成都市230700015YA7\r\n` - // text+='LINE 0 50 420 50 3\r\n' - // text+=`T 55 0 0 60 客户\r\n` - // text+='LINE 40 50 40 110 3\r\n' - // text+=`T 55 0 50 60 客户名称\r\n` - // text+='LINE 40 80 420 80 3\r\n' - // text+=`T 55 0 50 90 四川成都龙泉驿西河镇\r\n` - // text+='LINE 0 110 420 110 3\r\n' - // text+=`T 55 0 0 120 物料\r\n` - // text+='LINE 40 110 40 140 3\r\n' - // text+=`T 55 0 60 120 物料名称31\r\n` - // text+='LINE 0 140 420 140 3\r\n' - // text+='B QR 150 150 M 2 U 4\r\n' - // text+='MA,123141515215212\r\n' - // text+='ENDQR\r\n' - // text+=`T 55 0 140 260 123141515215212\r\n` - // text+='PRINT\r\n' - - + // const util=(inject('utils') as any) let text='! 0 200 200 500 1\r\n' text+='SETBOLD 2\r\n' - text+='B QR 80 40 M 2 U 8\r\n' + text+=`T 56 0 0 0 ${item}\r\n` + text+='LINE 0 50 420 50 3\r\n' + text+=`T 55 0 0 60 客户\r\n` + text+='LINE 40 50 40 110 3\r\n' + text+=`T 55 0 50 60 ${details.customer}\r\n` + text+='LINE 40 80 420 80 3\r\n' + text+=`T 55 0 50 90 ${details.deliveryAddress}\r\n` + text+='LINE 0 110 420 110 3\r\n' + text+=`T 55 0 0 120 物料\r\n` + text+='LINE 40 110 40 140 3\r\n' + text+=`T 55 0 60 120 ${details.items.materialName}\r\n` + text+='LINE 0 140 420 140 3\r\n' + text+='B QR 150 150 M 2 U 4\r\n' text+=`MA,${item}\r\n` text+='ENDQR\r\n' - text+=`T 56 0 15 280 ${item}\r\n` text+='PRINT\r\n' - let sylist=util.initbl() + + + // let text='! 0 200 200 500 1\r\n' + // text+='SETBOLD 2\r\n' + // text+='B QR 80 40 M 2 U 8\r\n' + // text+=`MA,${item}\r\n` + // text+='ENDQR\r\n' + // text+=`T 56 0 15 280 ${item}\r\n` + // text+='PRINT\r\n' + let sylist=utils.initbl() console.log(sylist); sylist.map(item=>{ console.log(item); if(item.uuids){ - util.getbl(item,text) + utils.getbl(item,text) } }) // #endif @@ -222,8 +238,10 @@ packetBarCode:code, stockupArea:details.goodsAreaName, reservationId:details.reservationId, - stockupId:details.stockupId + stockupId:details.stockupId, + stockPrint:details.stockPrint } + // utils.ttsspke('stockPrint是'+details.stockPrint) let res=await distributionStockupstockupScan(data) console.log(res); if(res.code==200){ diff --git a/pagesHome/static/editorder.png b/pagesHome/static/editorder.png new file mode 100644 index 0000000..5d0b3f2 Binary files /dev/null and b/pagesHome/static/editorder.png differ diff --git a/pagesHome/static/nocheckblue.png b/pagesHome/static/nocheckblue.png new file mode 100644 index 0000000..6b367ca Binary files /dev/null and b/pagesHome/static/nocheckblue.png differ diff --git a/pagesHome/static/yescheckblue.png b/pagesHome/static/yescheckblue.png new file mode 100644 index 0000000..3397cde Binary files /dev/null and b/pagesHome/static/yescheckblue.png differ diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 5b3a576..341811b 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -1776,7 +1776,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -1790,7 +1790,7 @@ if (uni.restoreGlobal) { /* STYLE */ ); } - const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$g], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]); + const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$e], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]); const icons = { "uicon-level": "", "uicon-column-line": "", @@ -2144,7 +2144,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -2188,7 +2188,7 @@ if (uni.restoreGlobal) { /* CLASS */ ); } - const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$f], ["__scopeId", "data-v-ac70166d"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]); + const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$d], ["__scopeId", "data-v-ac70166d"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]); const props$1 = { props: { // 是否开启顶部安全区适配 @@ -2293,7 +2293,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_0$1); const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_1$1); return vue.openBlock(), vue.createElementBlock("view", { class: "u-navbar" }, [ @@ -2405,7 +2405,7 @@ if (uni.restoreGlobal) { ) ]); } - const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$e], ["__scopeId", "data-v-f631659b"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]); + const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$c], ["__scopeId", "data-v-f631659b"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]); function getDevtoolsGlobalHook() { return getTarget().__VUE_DEVTOOLS_GLOBAL_HOOK__; } @@ -3651,13 +3651,13 @@ if (uni.restoreGlobal) { formatAppLog("log", "at utils/utils.js:172", "引擎初始化成功"); TTSSpeech.setSpeed(100); TTSSpeech.getInstallTTS((res) => { - formatAppLog("log", "at utils/utils.js:176", JSON.stringify(res)); + formatAppLog("log", "at utils/utils.js:175", JSON.stringify(res)); let flage = false; res.forEach((v) => { if (v.name == "com.iflytek.speechcloud") { flage = true; } - formatAppLog("log", "at utils/utils.js:182", v.label + "： " + v.name); + formatAppLog("log", "at utils/utils.js:181", v.label + "： " + v.name); }); if (!flage) { uni.showModal({ @@ -3693,12 +3693,12 @@ if (uni.restoreGlobal) { } }); } else { - formatAppLog("log", "at utils/utils.js:227", "引擎初始化失败"); + formatAppLog("log", "at utils/utils.js:226", "引擎初始化失败"); } }, "com.iflytek.speechcloud"); }, ttsspke: (text) => { - formatAppLog("log", "at utils/utils.js:232", "语音播报"); + formatAppLog("log", "at utils/utils.js:231", "语音播报"); if (!text) { return; } @@ -3909,7 +3909,7 @@ if (uni.restoreGlobal) { }; }; const base64 = new Base64(); - const devhost = "http://test.api.huitongys.com/"; + const devhost = "http://192.168.10.75:8777/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; @@ -4216,9 +4216,15 @@ if (uni.restoreGlobal) { header["Tenant-Id"] = params.data.tenantId; params.data.password = hexMD5(params.data.password); } + let urlhd = ""; + if (uni.getStorageSync("setip")) { + urlhd = uni.getStorageSync("setip"); + } else { + urlhd = host; + } function req() { uni.request({ - url: host + params.url, + url: urlhd + params.url, data: params.data, method: params.method, // dataType: "json", @@ -4270,7 +4276,7 @@ if (uni.restoreGlobal) { utils.ttsspke("连接服务器失败"); } }).catch((err) => { - formatAppLog("log", "at utils/request.js:105", err); + formatAppLog("log", "at utils/request.js:110", err); api.error("请检查是否连接到无线网络"); utils.ttsspke("请检查是否连接到无线网络"); uni.hideLoading(); @@ -5143,7 +5149,7 @@ if (uni.restoreGlobal) { return; } let butres = await appbuttons({}); - formatAppLog("log", "at pages/index/index.vue:273", butres.data); + formatAppLog("log", "at pages/index/index.vue:275", butres.data); let qxan = []; butres.data.map((item) => { item.children.map((ite) => { @@ -5533,11 +5539,63 @@ if (uni.restoreGlobal) { } }); const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["__file", "F:/物流/logPm/pages/user/user.vue"]]); - const _sfc_main$$ = {}; - function _sfc_render$d(_ctx, _cache) { - return null; - } - const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["render", _sfc_render$d], ["__file", "F:/物流/logPm/pages/news/news.vue"]]); + const _sfc_main$$ = /* @__PURE__ */ vue.defineComponent({ + __name: "news", + setup(__props) { + let iptis = vue.ref("http://192.168.10.12:1086/"); + if (uni.getStorageSync("setip")) { + iptis.value = uni.getStorageSync("setip"); + } + function submitip() { + if (iptis.value) { + uni.setStorageSync("setip", iptis.value); + uni.showToast({ + title: "设置成功", + icon: "success" + }); + } else { + uni.showToast({ + title: "请输入ip", + icon: "none" + }); + } + } + return (_ctx, _cache) => { + return vue.openBlock(), vue.createElementBlock( + vue.Fragment, + null, + [ + vue.createElementVNode("view", { class: "titles" }, "切换环境"), + vue.createElementVNode("view", { class: "mabxose" }, [ + vue.createElementVNode("view", { class: "titl" }, "请输入需要设置的IP环境"), + vue.createElementVNode("view", { class: "titl" }, "例：http://192.168.10.12:1086/"), + vue.createElementVNode("view", { class: "inps" }, [ + vue.withDirectives(vue.createElementVNode( + "input", + { + placeholder: "请输入ip环境", + "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(iptis) ? iptis.value = $event : iptis = $event) + }, + null, + 512 + /* NEED_PATCH */ + ), [ + [vue.vModelText, vue.unref(iptis)] + ]) + ]), + vue.createElementVNode("view", { + class: "buts", + onClick: submitip + }, "确认") + ]) + ], + 64 + /* STABLE_FRAGMENT */ + ); + }; + } + }); + const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__file", "F:/物流/logPm/pages/news/news.vue"]]); const _sfc_main$_ = /* @__PURE__ */ vue.defineComponent({ __name: "taskList", setup(__props) { @@ -6906,7 +6964,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -7147,7 +7205,7 @@ if (uni.restoreGlobal) { /* HYDRATE_EVENTS */ ); } - const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["render", _sfc_render$c], ["__scopeId", "data-v-665735f1"], ["__file", "F:/物流/logPm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]); + const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["render", _sfc_render$b], ["__scopeId", "data-v-665735f1"], ["__file", "F:/物流/logPm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]); const _sfc_main$X = /* @__PURE__ */ vue.defineComponent({ __name: "pickingScan", setup(__props) { @@ -7186,6 +7244,7 @@ if (uni.restoreGlobal) { }); function init() { details.currentPage = 1; + details.dataList = []; initpage(); } function jiazai() { @@ -7227,7 +7286,7 @@ if (uni.restoreGlobal) { } function setstate(state) { details.status = state; - initpage(); + init(); } const { datatime, dataList, show, status } = vue.toRefs(details); return (_ctx, _cache) => { @@ -7425,12 +7484,15 @@ if (uni.restoreGlobal) { ]) ]) ]), - vue.createElementVNode("view", { class: "bts" }, [ + Number(item.stockupStatus) != 40 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + class: "bts" + }, [ vue.createCommentVNode(' \r\n 备货完成\r\n '), vue.createElementVNode("view", { onClick: ($event) => gostockuplist(item) }, " 去备货 ", 8, ["onClick"]) - ]) + ])) : vue.createCommentVNode("v-if", true) ]); }), 256 @@ -7483,7 +7545,7 @@ if (uni.restoreGlobal) { details.show = !details.show; } function onConfirm(e) { - formatAppLog("log", "at pagesHome/pages/SelfPickupScan/SelfPickupScan.vue:107", e); + formatAppLog("log", "at pagesHome/pages/SelfPickupScan/SelfPickupScan.vue:111", e); date2.value[0] = e.startDate; date2.value[1] = e.endDate; details.datatime = date2.value[0] + " 至 " + date2.value[1]; @@ -7706,6 +7768,16 @@ if (uni.restoreGlobal) { 1 /* TEXT */ ) + ]), + vue.createElementVNode("view", null, [ + vue.createElementVNode("view", null, "库存品数"), + vue.createElementVNode( + "view", + null, + vue.toDisplayString(item.inventoryNub), + 1 + /* TEXT */ + ) ]) ]) ]), @@ -8911,7 +8983,7 @@ if (uni.restoreGlobal) { }); const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__file", "F:/物流/logPm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]); const _sfc_main$S = {}; - function _sfc_render$b(_ctx, _cache) { + function _sfc_render$a(_ctx, _cache) { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); return vue.openBlock(), vue.createElementBlock( vue.Fragment, @@ -8932,7 +9004,7 @@ if (uni.restoreGlobal) { /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */ ); } - const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["render", _sfc_render$b], ["__file", "F:/物流/logPm/pagesHome/pages/DownScan/DownScan.vue"]]); + const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["render", _sfc_render$a], ["__file", "F:/物流/logPm/pagesHome/pages/DownScan/DownScan.vue"]]); const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({ __name: "signinScan", setup(__props) { @@ -9382,7 +9454,7 @@ if (uni.restoreGlobal) { beforeDestroy() { } }; - function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -9494,7 +9566,7 @@ if (uni.restoreGlobal) { /* STYLE */ ); } - const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["render", _sfc_render$a], ["__scopeId", "data-v-7a3666ce"], ["__file", "F:/物流/logPm/compoment/cus-selects-fan/cus-selects-fan.vue"]]); + const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["render", _sfc_render$9], ["__scopeId", "data-v-7a3666ce"], ["__file", "F:/物流/logPm/compoment/cus-selects-fan/cus-selects-fan.vue"]]); const _sfc_main$P = /* @__PURE__ */ vue.defineComponent({ __name: "SelfPScanList", setup(__props) { @@ -9523,20 +9595,26 @@ if (uni.restoreGlobal) { completeNum: "", planNum: "", signedNum: "", + inventoryNub: "", scancode: "" }); const tiplists = vue.ref(null); onLoad((op) => { details.billLadingId = op.billLadingId; initpage(); + }); + onShow(() => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:124", code2); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:135", code2); details.scancode = code2; sacn(); } }); }); + onHide(() => { + uni.$off("scancodedate"); + }); function showsdqs() { tiplists.value.setdetails({ isshow: true, @@ -9564,7 +9642,7 @@ if (uni.restoreGlobal) { type: details.orderType == 1 ? "2" : "1" }; let res = await billLadingscan(data); - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:157", res); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:171", res); if (res.code == 200) { uni.showToast({ title: res.msg, @@ -9591,6 +9669,7 @@ if (uni.restoreGlobal) { details.orderNum = response.data.orderNum; details.completeNum = response.data.completeNum; details.planNum = response.data.planNum; + details.inventoryNub = response.data.inventoryNub; details.signedNum = response.data.signedNum; } else if (details.orderType == 2) { let date2 = { @@ -9624,7 +9703,7 @@ if (uni.restoreGlobal) { if (item.value == e) { details.schanvalue = item.label; details.orderStatus = item.value; - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:222", details.schanvalue); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:237", details.schanvalue); } }); } @@ -9653,7 +9732,7 @@ if (uni.restoreGlobal) { vue.createElementVNode( "view", null, - vue.toDisplayString(vue.unref(details).orderNum), + vue.toDisplayString(vue.unref(details).orderNum || 0), 1 /* TEXT */ ) @@ -9663,7 +9742,7 @@ if (uni.restoreGlobal) { vue.createElementVNode( "view", null, - vue.toDisplayString(vue.unref(details).completeNum), + vue.toDisplayString(vue.unref(details).completeNum || 0), 1 /* TEXT */ ) @@ -9673,7 +9752,7 @@ if (uni.restoreGlobal) { vue.createElementVNode( "view", null, - vue.toDisplayString(vue.unref(details).planNum), + vue.toDisplayString(vue.unref(details).planNum || 0), 1 /* TEXT */ ) @@ -9683,7 +9762,17 @@ if (uni.restoreGlobal) { vue.createElementVNode( "view", null, - vue.toDisplayString(vue.unref(details).signedNum), + vue.toDisplayString(vue.unref(details).signedNum || 0), + 1 + /* TEXT */ + ) + ]), + vue.createElementVNode("view", null, [ + vue.createElementVNode("view", null, "库存品数"), + vue.createElementVNode( + "view", + null, + vue.toDisplayString(vue.unref(details).inventoryNub || 0), 1 /* TEXT */ ) @@ -9766,7 +9855,7 @@ if (uni.restoreGlobal) { vue.createElementVNode("view", null, [ vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单编号："), vue.createTextVNode( - vue.toDisplayString(item.orderCode), + " " + vue.toDisplayString(item.orderSelfNumbering), 1 /* TEXT */ ) @@ -10046,7 +10135,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -10060,7 +10149,7 @@ if (uni.restoreGlobal) { /* CLASS, STYLE */ ); } - const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$9], ["__scopeId", "data-v-bf970acd"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]); + const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$8], ["__scopeId", "data-v-bf970acd"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]); const _sfc_main$N = { name: "TableCheckbox", emits: ["checkboxSelected"], @@ -10126,7 +10215,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock("view", { class: "uni-table-checkbox", onClick: _cache[0] || (_cache[0] = (...args) => $options.selected && $options.selected(...args)) @@ -10150,7 +10239,7 @@ if (uni.restoreGlobal) { ])) ]); } - const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_render$8], ["__scopeId", "data-v-25e435b1"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]); + const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_render$7], ["__scopeId", "data-v-25e435b1"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]); const _sfc_main$M = { name: "uniTr", components: { tableCheckbox }, @@ -10238,7 +10327,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) { const _component_table_checkbox = vue.resolveComponent("table-checkbox"); return vue.openBlock(), vue.createElementBlock("view", { class: "uni-table-tr" }, [ $data.selection === "selection" ? (vue.openBlock(), vue.createElementBlock( @@ -10261,7 +10350,7 @@ if (uni.restoreGlobal) { vue.renderSlot(_ctx.$slots, "default", {}, void 0, true) ]); } - const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["render", _sfc_render$7], ["__scopeId", "data-v-b48b3e32"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]); + const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["render", _sfc_render$6], ["__scopeId", "data-v-b48b3e32"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]); const _sfc_main$L = { name: "uniTd", options: { @@ -10311,7 +10400,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( vue.Fragment, null, @@ -10334,7 +10423,7 @@ if (uni.restoreGlobal) { /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */ ); } - const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["render", _sfc_render$6], ["__scopeId", "data-v-edae4802"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]); + const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["render", _sfc_render$5], ["__scopeId", "data-v-edae4802"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]); const _sfc_main$K = { name: "uniTable", options: { @@ -10576,7 +10665,7 @@ if (uni.restoreGlobal) { } } }; - function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -10626,7 +10715,7 @@ if (uni.restoreGlobal) { /* CLASS */ ); } - const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["render", _sfc_render$5], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]); + const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["render", _sfc_render$4], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]); const _sfc_main$J = /* @__PURE__ */ vue.defineComponent({ __name: "SelfPickupDetails", setup(__props) { @@ -10664,14 +10753,19 @@ if (uni.restoreGlobal) { onLoad((op) => { details.billLadingId = op.billLadingId; initpage(); + }); + onShow(() => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:135", code2); + formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:137", code2); details.scancode = code2; sacn(); } }); }); + onHide(() => { + uni.$off("scancodedate"); + }); function showsdqs() { tiplists.value.setdetails({ isshow: true, @@ -10699,7 +10793,7 @@ if (uni.restoreGlobal) { type: details.orderType == 1 ? "2" : "1" }; let res = await billLadingscan(data); - formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:168", res); + formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:173", res); if (res.code == 200) { uni.showToast({ title: res.msg, @@ -10753,7 +10847,7 @@ if (uni.restoreGlobal) { if (item.value == e) { details.schanvalue = item.label; details.orderStatus = item.value; - formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:230", details.schanvalue); + formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:235", details.schanvalue); } }); } @@ -11544,6 +11638,7 @@ if (uni.restoreGlobal) { const _sfc_main$H = /* @__PURE__ */ vue.defineComponent({ __name: "CustomerOrdersDetails", setup(__props) { + const utils2 = vue.inject("utils"); let details = vue.reactive({ schanvalue: "", typearr: [ @@ -11577,7 +11672,7 @@ if (uni.restoreGlobal) { onShow(() => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:143", code2); + formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:144", code2); details.scancode = code2; scandata(); } @@ -11596,6 +11691,12 @@ if (uni.restoreGlobal) { }); return num; }); + vue.watchEffect(() => { + if (loadingNub.value != 0) { + formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:166", loadingNub.value + "件"); + utils2.ttsspke(loadingNub.value + "件"); + } + }); function showsdqs() { tiplists.value.setdetails({ isshow: true, @@ -11640,7 +11741,7 @@ if (uni.restoreGlobal) { if (item.value == e) { details.schanvalue = item.label; details.orderType = item.value; - formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:206", details.schanvalue); + formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:214", details.schanvalue); } }); } @@ -11658,7 +11759,7 @@ if (uni.restoreGlobal) { barcode: details.scancode }; let res = await deliveryloadingscan(data); - formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:226", res); + formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:234", res); if (res.code == 200) { uni.showToast({ title: res.msg, @@ -11679,7 +11780,7 @@ if (uni.restoreGlobal) { barcode: details.scancode }; let res = await deliveryloadinginventory(data); - formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:248", res); + formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:256", res); if (res.code == 200) { uni.showToast({ title: res.msg, @@ -12390,7 +12491,7 @@ if (uni.restoreGlobal) { }); function gosetorice(item) { uni.navigateTo({ - url: "/pagesHome/pages/SetPrice/SetPrice" + url: "/pagesHome/pages/SetPrice/SetPrice?reservationId=" + details.id + "&item=" + JSON.stringify(item) }); } const signNub = vue.computed(() => { @@ -12454,7 +12555,7 @@ if (uni.restoreGlobal) { driverRemarks: detail.inputtext }; let res2 = await signforsignforack(data2); - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:184", res2); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:185", res2); if (res2.code == 200) { uni.showToast({ title: res2.msg, @@ -12494,7 +12595,7 @@ if (uni.restoreGlobal) { driverRemarks: detail.inputtext }; let res = await signforoneclick(data); - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:225", res); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:226", res); if (res.code == 200) { uni.showToast({ title: "批量签收成功", @@ -12518,15 +12619,15 @@ if (uni.restoreGlobal) { }); } function getLocation(item) { - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:250", "getLocation-------"); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:251", "getLocation-------"); uni.getLocation({ type: "wgs84", geocode: true, isHighAccuracy: true, success: async function(res) { - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:256", JSON.stringify(res)); - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:259", "当前位置的经度：" + res.longitude); - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:260", "当前位置的纬度：" + res.latitude); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:257", JSON.stringify(res)); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:260", "当前位置的经度：" + res.longitude); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:261", "当前位置的纬度：" + res.latitude); let data = { deliveryId: details.id, reservationId: item.id, @@ -12534,7 +12635,7 @@ if (uni.restoreGlobal) { positioningAdr: "" }; let response = await signforpositioning(data); - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:268", response); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:269", response); if (response.code == 200) { uni.showToast({ title: "定位打卡成功", @@ -12553,7 +12654,7 @@ if (uni.restoreGlobal) { title: err.errMsg, icon: "none" }); - formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:287", err); + formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:288", err); } }); } @@ -12753,9 +12854,9 @@ if (uni.restoreGlobal) { }, "上传签收图片", 8, ["onClick"]) ]), vue.createElementVNode("view", { - onClick: ($event) => gosetorice(), + onClick: ($event) => gosetorice(item), class: "mabut" - }, " 设置服务费 ", 8, ["onClick"]), + }, " 设置增值服务 ", 8, ["onClick"]), vue.unref(authbuts).indexOf("批量签收") != -1 && item.deliveryStatus != "完成配送" ? (vue.openBlock(), vue.createElementBlock("view", { key: 0, class: "mabut", @@ -13790,6 +13891,7 @@ if (uni.restoreGlobal) { const _sfc_main$C = /* @__PURE__ */ vue.defineComponent({ __name: "setbarcode", setup(__props) { + const utils2 = vue.inject("utils"); let details = vue.reactive({ items: {}, reservationId: "", @@ -13797,7 +13899,10 @@ if (uni.restoreGlobal) { printlist: [], packageNum: 0, goodsAreaName: "", - stockupId: "" + stockupId: "", + stockPrint: 1, + customer: "", + deliveryAddress: "" }); const tips2 = vue.ref(null); onLoad((op) => { @@ -13805,23 +13910,33 @@ if (uni.restoreGlobal) { details.items = JSON.parse(op.item); details.reservationId = op.reservationId; details.goodsAreaName = op.goodsAreaName; - scandata("1231"); uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:76", code2); + formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:81", code2); scandata(code2); } }); initpage(); }); + function setstockPrint(values) { + details.stockPrint = values; + if (values == 1) { + utils2.ttsspke("请扫描原有包条码"); + } else { + utils2.ttsspke("请扫描打印的包条码"); + } + } async function initpage() { let data = { orderStatus: 2, reservationId: details.reservationId, - stockListId: details.items.stockListId + stockListId: details.items.stockListId, + stockupId: details.stockupId }; let response = await distributionStockuporderInfo(data); details.codelist = response.data.stockList; + details.customer = response.data.customer; + details.deliveryAddress = response.data.deliveryAddress; } function showmd() { tips2.value.setdetails({ @@ -13830,7 +13945,7 @@ if (uni.restoreGlobal) { tipstate: 1, placeholder: "请输入需要生成的包条码数量", success: (deta) => { - formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:118", deta); + formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:135", deta); details.packageNum = deta.inputtext; if (Number(details.packageNum) > Number(details.items.planNum)) { uni.showToast({ @@ -13857,7 +13972,7 @@ if (uni.restoreGlobal) { packageNum: details.packageNum }; let response = await distributionStockupstockupStockListPackageCode(data); - formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:146", response); + formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:163", response); details.printlist = response.data; tips2.value.setdetails({ title: "请选择要打印的包条", @@ -13888,22 +14003,37 @@ if (uni.restoreGlobal) { }); } function print(item) { - const util = vue.inject("utils"); let text = "! 0 200 200 500 1\r\n"; text += "SETBOLD 2\r\n"; - text += "B QR 80 40 M 2 U 8\r\n"; + text += `T 56 0 0 0 ${item}\r +`; + text += "LINE 0 50 420 50 3\r\n"; + text += `T 55 0 0 60 客户\r +`; + text += "LINE 40 50 40 110 3\r\n"; + text += `T 55 0 50 60 ${details.customer}\r +`; + text += "LINE 40 80 420 80 3\r\n"; + text += `T 55 0 50 90 ${details.deliveryAddress}\r +`; + text += "LINE 0 110 420 110 3\r\n"; + text += `T 55 0 0 120 物料\r +`; + text += "LINE 40 110 40 140 3\r\n"; + text += `T 55 0 60 120 ${details.items.materialName}\r +`; + text += "LINE 0 140 420 140 3\r\n"; + text += "B QR 150 150 M 2 U 4\r\n"; text += `MA,${item}\r `; text += "ENDQR\r\n"; - text += `T 56 0 15 280 ${item}\r -`; text += "PRINT\r\n"; - let sylist = util.initbl(); - formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:209", sylist); + let sylist = utils2.initbl(); + formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:225", sylist); sylist.map((item2) => { - formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:211", item2); + formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:227", item2); if (item2.uuids) { - util.getbl(item2, text); + utils2.getbl(item2, text); } }); } @@ -13914,10 +14044,11 @@ if (uni.restoreGlobal) { packetBarCode: code2, stockupArea: details.goodsAreaName, reservationId: details.reservationId, - stockupId: details.stockupId + stockupId: details.stockupId, + stockPrint: details.stockPrint }; let res = await distributionStockupstockupScan(data); - formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:228", res); + formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:246", res); if (res.code == 200) { uni.showToast({ title: res.msg, @@ -14019,7 +14150,13 @@ if (uni.restoreGlobal) { ]) ]), vue.createElementVNode("view", { class: "butsbx" }, [ - vue.unref(items).unpack == 0 ? (vue.openBlock(), vue.createElementBlock("view", { key: 0 }, "采集原包条码")) : vue.createCommentVNode("v-if", true), + vue.unref(items).unpack == 0 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + onClick: _cache[0] || (_cache[0] = ($event) => setstockPrint(1)) + }, "采集原包条码")) : vue.createCommentVNode("v-if", true), + vue.createElementVNode("view", { + onClick: _cache[1] || (_cache[1] = ($event) => setstockPrint(2)) + }, "扫描打印包条"), vue.createElementVNode("view", { onClick: showmd }, "新生成包码") ]), vue.createElementVNode("scroll-view", { @@ -14036,7 +14173,7 @@ if (uni.restoreGlobal) { vue.createElementVNode( "view", null, - "序号：" + vue.toDisplayString(index2), + "序号：" + vue.toDisplayString(index2 + 1), 1 /* TEXT */ ), @@ -14872,7 +15009,7 @@ if (uni.restoreGlobal) { }); const PagesHomePagesScansortingScansorting = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "F:/物流/logPm/pagesHome/pages/scansorting/scansorting.vue"]]); const _sfc_main$w = {}; - function _sfc_render$4(_ctx, _cache) { + function _sfc_render$3(_ctx, _cache) { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); return vue.openBlock(), vue.createElementBlock( vue.Fragment, @@ -14894,7 +15031,7 @@ if (uni.restoreGlobal) { /* STABLE_FRAGMENT */ ); } - const PagesHomePagesPeopleSortingPeopleSorting = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["render", _sfc_render$4], ["__file", "F:/物流/logPm/pagesHome/pages/peopleSorting/peopleSorting.vue"]]); + const PagesHomePagesPeopleSortingPeopleSorting = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["render", _sfc_render$3], ["__file", "F:/物流/logPm/pagesHome/pages/peopleSorting/peopleSorting.vue"]]); const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({ __name: "OrderSortingDetail", setup(__props) { @@ -16687,11 +16824,11 @@ if (uni.restoreGlobal) { vue.unref(showstate) != 0 ? (vue.openBlock(), vue.createElementBlock("view", { key: 0, class: "tanchuangbg", - onClick: _cache[5] || (_cache[5] = ($event) => setshowstate(0)) + onClick: _cache[6] || (_cache[6] = ($event) => setshowstate(0)) }, [ vue.createElementVNode("view", { class: "inputbox", - onClick: _cache[4] || (_cache[4] = vue.withModifiers(() => { + onClick: _cache[5] || (_cache[5] = vue.withModifiers(() => { }, ["stop", "prevent"])) }, [ vue.createElementVNode("view", { class: "inputscan" }, [ @@ -16791,7 +16928,11 @@ if (uni.restoreGlobal) { ) ]) ]), - vue.createElementVNode("view", { class: "rksu" }, [ + vue.createElementVNode("view", { + class: "rksu", + onClick: _cache[3] || (_cache[3] = vue.withModifiers(() => { + }, ["stop", "prevent"])) + }, [ vue.createElementVNode("view", null, [ vue.createElementVNode("view", null, "数量："), vue.withDirectives(vue.createElementVNode( @@ -16847,7 +16988,7 @@ if (uni.restoreGlobal) { vue.createElementVNode("view", { class: "btx" }, [ vue.createElementVNode("view", { class: "cancel", - onClick: _cache[3] || (_cache[3] = ($event) => setshowstate(0)) + onClick: _cache[4] || (_cache[4] = ($event) => setshowstate(0)) }, "取消"), vue.createElementVNode("view", { class: "confirm", @@ -16938,30 +17079,27 @@ if (uni.restoreGlobal) { } else { if (Number(details.pageType) == 1 && res.data.data.type == 3) { uni.navigateTo({ - url: "/pagesHome/pages/inventoryDetail/inventoryDetail?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); } else if (Number(details.pageType) == 2 && res.data.data.type == 4) { uni.navigateTo({ url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); } else if (Number(details.pageType) == 2 && res.data.data.type == 3) { - uni.showToast({ - title: "库存品扫描分拣使用托盘码", - icon: "none" + uni.navigateTo({ + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); - utils.ttsspke("库存品扫描分拣使用托盘码"); + return; } else if (Number(details.pageType) == 1 && res.data.data.type == 4) { - uni.showToast({ - title: "库存品人工分拣使用托盘码", - icon: "none" + uni.navigateTo({ + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); - utils.ttsspke("库存品人工分拣使用托盘码"); + return; } else if (res.data.data.type == 1 || res.data.data.type == 2) { - uni.showToast({ - title: "定制品分拣使用托盘码", - icon: "none" + uni.navigateTo({ + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); - utils.ttsspke("定制品分拣使用托盘码"); + return; } } } @@ -16993,7 +17131,7 @@ if (uni.restoreGlobal) { details.show = !details.show; } function onConfirm(e) { - formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:219", e); + formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:242", e); date2.value[0] = e.startDate; date2.value[1] = e.endDate; details.datatime = date2.value[0] + " 至 " + date2.value[1]; @@ -17571,9 +17709,8 @@ if (uni.restoreGlobal) { 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) == 4) + ; }); onLoad((op) => { details.upshelfScanType = op.type; @@ -21301,20 +21438,54 @@ if (uni.restoreGlobal) { } }); const PagesHomePagesDownGoodsDownGoods = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__file", "F:/物流/logPm/pagesHome/pages/DownGoods/DownGoods.vue"]]); - const _sfc_main$a = {}; - function _sfc_render$3(_ctx, _cache) { - const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); - return vue.openBlock(), vue.createBlock(_component_u_navbar, { - title: "设置服务费", - bgColor: "#D3832A", - leftIconColor: "#ffffff", - titleStyle: "color:#ffffff", - placeholder: "", - autoBack: true, - leftIconSize: "35" - }); - } - const PagesHomePagesSetPriceSetPrice = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["render", _sfc_render$3], ["__file", "F:/物流/logPm/pagesHome/pages/SetPrice/SetPrice.vue"]]); + const _sfc_main$a = /* @__PURE__ */ vue.defineComponent({ + __name: "SetPrice", + setup(__props) { + let details = vue.reactive({ + reservationId: "", + items: {} + }); + onLoad((op) => { + details.reservationId = op.reservationId; + details.items = op.item; + }); + return (_ctx, _cache) => { + const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); + return vue.openBlock(), vue.createElementBlock( + vue.Fragment, + null, + [ + vue.createVNode(_component_u_navbar, { + title: "增值服务", + bgColor: "#D3832A", + leftIconColor: "#ffffff", + titleStyle: "color:#ffffff", + placeholder: "", + autoBack: true, + leftIconSize: "35" + }), + vue.createElementVNode("view", { class: "bgcolo" }), + vue.createElementVNode("view", { class: "card_use" }, [ + vue.createElementVNode("view", { class: "card_top" }, [ + vue.createElementVNode("view", null, [ + vue.createElementVNode("view", null, "客户"), + vue.createElementVNode("view", null, "张磊") + ]), + vue.createElementVNode("view", null, [ + vue.createElementVNode("view", null, "签收状态"), + vue.createElementVNode("view", { style: { "color": "#0086F1" } }, "配送中") + ]) + ]), + vue.createElementVNode("view", { class: "card-content" }) + ]) + ], + 64 + /* STABLE_FRAGMENT */ + ); + }; + } + }); + const PagesHomePagesSetPriceSetPrice = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "F:/物流/logPm/pagesHome/pages/SetPrice/SetPrice.vue"]]); const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({ __name: "RemoveTray", setup(__props) { @@ -25276,6 +25447,7 @@ if (uni.restoreGlobal) { vue.createCommentVNode(` \r {{content||'提示内容模板'}}\r `), + vue.createElementVNode("view", { class: "tpstitl" }, "请上传照片(上门照，货物堆放照，签收照，易碎品贵重物品，家配照):"), vue.createElementVNode("view", { class: "imgbx" }, [ (vue.openBlock(true), vue.createElementBlock( vue.Fragment, @@ -25299,6 +25471,7 @@ if (uni.restoreGlobal) { vue.createElementVNode("image", { src: "/static/add.png" }) ])) : vue.createCommentVNode("v-if", true) ]), + vue.createCommentVNode(' 货物堆放照:\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 易碎品贵重物品:\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n '), vue.createElementVNode("view", { class: "inputbx" }, [ vue.withDirectives(vue.createElementVNode("input", { "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => vue.isRef(inputtext) ? inputtext.value = $event : null), diff --git a/unpackage/dist/dev/app-plus/app.css b/unpackage/dist/dev/app-plus/app.css index b951df1..3a19886 100644 --- a/unpackage/dist/dev/app-plus/app.css +++ b/unpackage/dist/dev/app-plus/app.css @@ -686,6 +686,10 @@ body { /* 垂直间距 */ /* 透明度 */ /* 文章场景相关 */ +.tpstitl[data-v-a3a2f036] { + font-size: 0.8125rem; + width: 17.1875rem; +} .maboxbg[data-v-a3a2f036] { width: 100%; height: 100%; @@ -723,11 +727,11 @@ body { width: 17.1875rem; display: grid; grid-template-columns: 33% 33% 33%; - margin-top: 0.9375rem; + margin-top: 0.625rem; } .modtips .imgbx > uni-view[data-v-a3a2f036] { - width: 4.6875rem; - height: 4.6875rem; + width: 4.0625rem; + height: 4.0625rem; padding: 0.3125rem; box-sizing: border-box; border: 0.03125rem solid #e6e6e6; diff --git a/unpackage/dist/dev/app-plus/pages/news/news.css b/unpackage/dist/dev/app-plus/pages/news/news.css index e69de29..4025f32 100644 --- a/unpackage/dist/dev/app-plus/pages/news/news.css +++ b/unpackage/dist/dev/app-plus/pages/news/news.css @@ -0,0 +1,70 @@ +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + * + */ +/** + * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 + */ +/* 颜色变量 */ +/* 行为相关颜色 */ +/* 文字基本颜色 */ +/* 背景颜色 */ +/* 边框颜色 */ +/* 尺寸变量 */ +/* 文字尺寸 */ +/* 图片尺寸 */ +/* Border Radius */ +/* 水平间距 */ +/* 垂直间距 */ +/* 透明度 */ +/* 文章场景相关 */ +.titles { + position: absolute; + left: 50%; + top: 2.1875rem; + transform: translate(-50%); + font-size: 1.125rem; + font-weight: 400; + color: #D3832A; + z-index: 5; +} +.mabxose { + margin: auto; + margin-top: 4.6875rem; + width: 17.5rem; + padding: 0.625rem; + background-color: #f0e6dc; + border-radius: 0.3125rem; +} +.mabxose .titl { + color: #D3832A; +} +.mabxose .inps { + width: 15.625rem; + height: 1.875rem; + border: 0.03125rem solid #cfcfcf; + display: flex; + align-items: center; + justify-content: flex-start; + margin-top: 0.625rem; +} +.mabxose .inps > uni-input { + flex: 1; +} +.mabxose .buts { + background-color: #D3832A; + color: #fff; + display: flex; + align-items: center; + justify-content: center; + width: 7.5rem; + height: 2.5rem; + border-radius: 0.3125rem; + margin: auto; + margin-top: 0.625rem; +} \ No newline at end of file diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/DownGoods/DownGoods.css b/unpackage/dist/dev/app-plus/pagesHome/pages/DownGoods/DownGoods.css index 5de378f..9a2ffc6 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/DownGoods/DownGoods.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/DownGoods/DownGoods.css @@ -289,7 +289,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat } .tanchuangbg .inputbox .scvbw { width: 100%; - height: 11.25rem; + height: 14.0625rem; margin-top: 0.9375rem; } .tanchuangbg .inputbox .scvbw .scboxitem { diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleScanUp/PeopleScanUp.css b/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleScanUp/PeopleScanUp.css index f20e07e..48af58d 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleScanUp/PeopleScanUp.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleScanUp/PeopleScanUp.css @@ -289,7 +289,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat } .tanchuangbg .inputbox .scvbw { width: 100%; - height: 11.25rem; + height: 14.0625rem; margin-top: 0.9375rem; } .tanchuangbg .inputbox .scvbw .scboxitem { diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.css b/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.css index 1bdc760..a2e4088 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.css @@ -399,7 +399,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat } .tanchuangbg .inputbox .scvbw[data-v-e9f42dec] { width: 100%; - height: 11.25rem; + height: 14.0625rem; margin-top: 0.9375rem; } .tanchuangbg .inputbox .scvbw .scboxitem[data-v-e9f42dec] { diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css index e60dbb4..f9bb6c6 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css @@ -591,9 +591,12 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat color: #092C4D; } .scvbx .mabxslist > .item > .headtop > .liebs > uni-view:nth-of-type(2) > uni-view:nth-of-type(2) { - color: #3AD8BC; + color: #0086F1; } .scvbx .mabxslist > .item > .headtop > .liebs > uni-view:nth-of-type(3) > uni-view:nth-of-type(2) { + color: #3AD8BC; +} +.scvbx .mabxslist > .item > .headtop > .liebs > uni-view:nth-of-type(4) > uni-view:nth-of-type(2) { color: #FA8C16; } .scvbx .mabxslist > .item > .headtop > .liebs > uni-view > uni-view:nth-of-type(1) { diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/SetPrice/SetPrice.css b/unpackage/dist/dev/app-plus/pagesHome/pages/SetPrice/SetPrice.css index 6b84931..191497d 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/SetPrice/SetPrice.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SetPrice/SetPrice.css @@ -199,4 +199,76 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat .u-navbar__content__right__text[data-v-f631659b] { font-size: 15px; margin-left: 3px; +} +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + * + */ +/** + * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 + */ +/* 颜色变量 */ +/* 行为相关颜色 */ +/* 文字基本颜色 */ +/* 背景颜色 */ +/* 边框颜色 */ +/* 尺寸变量 */ +/* 文字尺寸 */ +/* 图片尺寸 */ +/* Border Radius */ +/* 水平间距 */ +/* 垂直间距 */ +/* 透明度 */ +/* 文章场景相关 */ +.bgcolo { + width: 23.4375rem; + height: 6.25rem; + background: linear-gradient(180deg, #D3832A 0%, rgba(211, 131, 42, 0) 100%); + border-radius: 0 0 0 0; + opacity: 1; + position: absolute; + left: 0; +} +.card_use { + width: 21.4375rem; + height: 8.75rem; + background: #FFFFFF; + border-radius: 0.5rem; + position: relative; + margin: auto; + margin-top: 1.25rem; + padding: 0.8125rem 0.6875rem; + box-sizing: border-box; +} +.card_use .card_top { + display: flex; + align-items: center; +} +.card_use .card_top > uni-view { + width: 50%; + display: flex; + align-items: center; +} +.card_use .card_top > uni-view > uni-view:nth-of-type(1) { + font-size: 1rem; + font-weight: 400; + color: #8D97A3; + margin-right: 0.9375rem; +} +.card_use .card_top > uni-view > uni-view:nth-of-type(2) { + font-size: 1rem; + font-weight: 500; + color: #092C4D; +} +.card_use .card-content { + width: 20rem; + height: 5rem; + background: #F5F7FB; + border-radius: 0.25rem; + margin-top: 0.75rem; } \ No newline at end of file diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/inventoryenter/inventoryenter.css b/unpackage/dist/dev/app-plus/pagesHome/pages/inventoryenter/inventoryenter.css index ed55aa1..385dedb 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/inventoryenter/inventoryenter.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/inventoryenter/inventoryenter.css @@ -607,7 +607,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat } .tanchuangbg .inputbox .scvbw { width: 100%; - height: 11.25rem; + height: 14.0625rem; margin-top: 0.9375rem; } .tanchuangbg .inputbox .scvbw .scboxitem { diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/pickingScan/pickingScan.css b/unpackage/dist/dev/app-plus/pagesHome/pages/pickingScan/pickingScan.css index 352561b..35b5420 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/pickingScan/pickingScan.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/pickingScan/pickingScan.css @@ -567,6 +567,9 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat padding-top: 0.625rem; border-radius: 0.25rem; } +.sccv .mabx > uni-view > uni-view:nth-last-child(1) { + border-bottom: none !important; +} .sccv .mabx > uni-view .topbox { display: flex; flex-direction: column; diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index d431b02..ee53df3 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -61,6 +61,7 @@ if (!Math) { "./pagesHome/pages/SetPrice/SetPrice.js"; "./pagesHome/pages/RemoveTray/RemoveTray.js"; "./pagesHome/pages/Check/Check.js"; + "./pagesHome/pages/createAddServe/createAddServe.js"; } const _sfc_main = { setup() { diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json index 5e5f540..4ff98ea 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -56,7 +56,8 @@ "pages/DownGoods/DownGoods", "pages/SetPrice/SetPrice", "pages/RemoveTray/RemoveTray", - "pages/Check/Check" + "pages/Check/Check", + "pages/createAddServe/createAddServe" ] } ], diff --git a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml index 84eb84e..6da12fc 100644 --- a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml +++ b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml @@ -1 +1 @@ -{{c}}{{h}}{{j}}{{n}}{{item.b}}{{q}}{{s}}{{x}}{{G}}{{I}} \ No newline at end of file +{{c}}{{h}}{{j}}{{n}}{{item.b}}{{q}}{{s}}{{x}}请上传照片(上门照，货物堆放照，签收照，易碎品贵重物品，家配照):{{G}}{{I}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss index f318f3b..72e6525 100644 --- a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss +++ b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss @@ -23,6 +23,10 @@ /* 垂直间距 */ /* 透明度 */ /* 文章场景相关 */ +.tpstitl { + font-size: 26rpx; + width: 550rpx; +} .maboxbg { width: 100%; height: 100%; @@ -60,11 +64,11 @@ width: 550rpx; display: grid; grid-template-columns: 33% 33% 33%; - margin-top: 30rpx; + margin-top: 20rpx; } .modtips .imgbx > view { - width: 150rpx; - height: 150rpx; + width: 130rpx; + height: 130rpx; padding: 10rpx; box-sizing: border-box; border: 1rpx solid #e6e6e6; diff --git a/unpackage/dist/dev/mp-weixin/config/host.js b/unpackage/dist/dev/mp-weixin/config/host.js index eaca1cd..d07f03a 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://test.api.huitongys.com/"; +const devhost = "http://192.168.10.29:13000/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; diff --git a/unpackage/dist/dev/mp-weixin/pages/news/news.js b/unpackage/dist/dev/mp-weixin/pages/news/news.js index c015e0a..1a39fd0 100644 --- a/unpackage/dist/dev/mp-weixin/pages/news/news.js +++ b/unpackage/dist/dev/mp-weixin/pages/news/news.js @@ -1,8 +1,34 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); -const _sfc_main = {}; -function _sfc_render(_ctx, _cache) { - return {}; -} -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/物流/logPm/pages/news/news.vue"]]); +const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ + __name: "news", + setup(__props) { + let iptis = common_vendor.ref("http://192.168.10.12:1086/"); + if (common_vendor.index.getStorageSync("setip")) { + iptis.value = common_vendor.index.getStorageSync("setip"); + } + function submitip() { + if (iptis.value) { + common_vendor.index.setStorageSync("setip", iptis.value); + common_vendor.index.showToast({ + title: "设置成功", + icon: "success" + }); + } else { + common_vendor.index.showToast({ + title: "请输入ip", + icon: "none" + }); + } + } + return (_ctx, _cache) => { + return { + a: common_vendor.unref(iptis), + b: common_vendor.o(($event) => common_vendor.isRef(iptis) ? iptis.value = $event.detail.value : iptis = $event.detail.value), + c: common_vendor.o(submitip) + }; + }; + } +}); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "F:/物流/logPm/pages/news/news.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/news/news.wxml b/unpackage/dist/dev/mp-weixin/pages/news/news.wxml index e69de29..08fd606 100644 --- a/unpackage/dist/dev/mp-weixin/pages/news/news.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/news/news.wxml @@ -0,0 +1 @@ +切换环境请输入需要设置的IP环境例：http://192.168.10.12:1086/确认 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/news/news.wxss b/unpackage/dist/dev/mp-weixin/pages/news/news.wxss index e69de29..ff1fb16 100644 --- a/unpackage/dist/dev/mp-weixin/pages/news/news.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/news/news.wxss @@ -0,0 +1,70 @@ +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + * + */ +/** + * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 + */ +/* 颜色变量 */ +/* 行为相关颜色 */ +/* 文字基本颜色 */ +/* 背景颜色 */ +/* 边框颜色 */ +/* 尺寸变量 */ +/* 文字尺寸 */ +/* 图片尺寸 */ +/* Border Radius */ +/* 水平间距 */ +/* 垂直间距 */ +/* 透明度 */ +/* 文章场景相关 */ +.titles { + position: absolute; + left: 50%; + top: 70rpx; + transform: translate(-50%); + font-size: 36rpx; + font-weight: 400; + color: #D3832A; + z-index: 5; +} +.mabxose { + margin: auto; + margin-top: 150rpx; + width: 560rpx; + padding: 20rpx; + background-color: #f0e6dc; + border-radius: 10rpx; +} +.mabxose .titl { + color: #D3832A; +} +.mabxose .inps { + width: 500rpx; + height: 60rpx; + border: 1rpx solid #cfcfcf; + display: flex; + align-items: center; + justify-content: flex-start; + margin-top: 20rpx; +} +.mabxose .inps > input { + flex: 1; +} +.mabxose .buts { + background-color: #D3832A; + color: #fff; + display: flex; + align-items: center; + justify-content: center; + width: 240rpx; + height: 80rpx; + border-radius: 10rpx; + margin: auto; + margin-top: 20rpx; +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/user/user.js b/unpackage/dist/dev/mp-weixin/pages/user/user.js index b473fb1..8d8db2b 100644 --- a/unpackage/dist/dev/mp-weixin/pages/user/user.js +++ b/unpackage/dist/dev/mp-weixin/pages/user/user.js @@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ function removeall() { const res = common_vendor.index.getStorageInfoSync(); res.keys.map((item) => { - if (item == "loginuser" || item == "HistoryDate") { + if (item == "loginuser" || item == "HistoryDate" || item == "setip") { return; } common_vendor.index.removeStorageSync(item); 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 6ccd14f..057dfba 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js @@ -22,6 +22,7 @@ const cusSelects = () => "../../../compoment/cus-selects-fan/cus-selects-fan.js" const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "CustomerOrdersDetails", setup(__props) { + const utils = common_vendor.inject("utils"); let details = common_vendor.reactive({ schanvalue: "", typearr: [ @@ -74,6 +75,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }); return num; }); + common_vendor.watchEffect(() => { + if (loadingNub.value != 0) { + console.log(loadingNub.value + "件"); + utils.ttsspke(loadingNub.value + "件"); + } + }); function showsdqs() { tiplists.value.setdetails({ isshow: true, 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 408a5e1..abf2bbe 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js @@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }); function gosetorice(item) { common_vendor.index.navigateTo({ - url: "/pagesHome/pages/SetPrice/SetPrice" + url: "/pagesHome/pages/SetPrice/SetPrice?reservationId=" + details.id + "&item=" + JSON.stringify(item) }); } const signNub = common_vendor.computed(() => { @@ -245,7 +245,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ k: common_vendor.o(($event) => getLocation(item)), l: common_vendor.o(($event) => gosinorderscan(item)), m: common_vendor.o(($event) => uplodimg(item)), - n: common_vendor.o(($event) => gosetorice()), + n: common_vendor.o(($event) => gosetorice(item)), o: common_vendor.unref(authbuts).indexOf("批量签收") != -1 && item.deliveryStatus != "完成配送" }, common_vendor.unref(authbuts).indexOf("批量签收") != -1 && item.deliveryStatus != "完成配送" ? { p: common_vendor.o(($event) => allclick(item)) 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 7f4a52f..07fe795 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}}客户：{{item.a}} {{item.b}}{{item.d}}订单总数{{item.e}}配送件数{{item.f}}扫描件数{{item.g}} 备注：{{item.h}}{{item.i}}签到扫描上传签收图片 设置服务费 批量签收 \ No newline at end of file +配车类型：{{b}}配车状态：{{c}}车牌号：{{d}}司机：{{e}}装卸班组：{{f}}备货是否完成：{{g}}配送客户数{{h}}订单总数{{i}}配送件数{{j}}签收件数{{k}}客户：{{item.a}} {{item.b}}{{item.d}}订单总数{{item.e}}配送件数{{item.f}}扫描件数{{item.g}} 备注：{{item.h}}{{item.i}}签到扫描上传签收图片 设置增值服务 批量签收 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.wxss index d63857e..f9c1e5c 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.wxss @@ -87,7 +87,7 @@ } .tanchuangbg .inputbox .scvbw { width: 100%; - height: 360rpx; + height: 450rpx; margin-top: 30rpx; } .tanchuangbg .inputbox .scvbw .scboxitem { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js index 99acd32..2133070 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js @@ -100,10 +100,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ trayCode: details.trayCode }; let res = await api_user.warehouseTrayTypeorderScanTrayCode(data); - console.log(res, "resresresres"); + console.log(res.data, "resresresres"); if (res.code == 200) { - details.datelist = res.data.data.list; - details.detauser = res.data.data; + if (res.data.isHasData == 1) { + details.datelist = res.data.data.list; + details.detauser = res.data.data; + } } else { common_vendor.index.showToast({ title: res.msg, diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxss index d71f97b..787d78a 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxss @@ -87,7 +87,7 @@ } .tanchuangbg .inputbox .scvbw { width: 100%; - height: 360rpx; + height: 450rpx; margin-top: 30rpx; } .tanchuangbg .inputbox .scvbw .scboxitem { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.wxss index 9a9ca19..7477280 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.wxss @@ -197,7 +197,7 @@ } .tanchuangbg .inputbox .scvbw.data-v-e9f42dec { width: 100%; - height: 360rpx; + height: 450rpx; margin-top: 30rpx; } .tanchuangbg .inputbox .scvbw .scboxitem.data-v-e9f42dec { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js index 9103fcf..1aac658 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js @@ -37,9 +37,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ 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) == 4) + ; }); common_vendor.onLoad((op) => { details.upshelfScanType = op.type; diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js index 18ba7b5..f59a3c7 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js @@ -47,12 +47,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ completeNum: "", planNum: "", signedNum: "", + inventoryNub: "", scancode: "" }); const tiplists = common_vendor.ref(null); common_vendor.onLoad((op) => { details.billLadingId = op.billLadingId; initpage(); + }); + common_vendor.onShow(() => { common_vendor.index.$on("scancodedate", function(code) { if (code) { console.log(code); @@ -61,6 +64,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } }); }); + common_vendor.onHide(() => { + common_vendor.index.$off("scancodedate"); + }); function showsdqs() { tiplists.value.setdetails({ isshow: true, @@ -115,6 +121,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.orderNum = response.data.orderNum; details.completeNum = response.data.completeNum; details.planNum = response.data.planNum; + details.inventoryNub = response.data.inventoryNub; details.signedNum = response.data.signedNum; } else if (details.orderType == 2) { let date = { @@ -164,12 +171,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ autoBack: true, leftIconSize: "35" }), - b: common_vendor.t(common_vendor.unref(details).orderNum), - c: common_vendor.t(common_vendor.unref(details).completeNum), - d: common_vendor.t(common_vendor.unref(details).planNum), - e: common_vendor.t(common_vendor.unref(details).signedNum), - f: common_vendor.o(checktype), - g: common_vendor.p({ + b: common_vendor.t(common_vendor.unref(details).orderNum || 0), + c: common_vendor.t(common_vendor.unref(details).completeNum || 0), + d: common_vendor.t(common_vendor.unref(details).planNum || 0), + e: common_vendor.t(common_vendor.unref(details).signedNum || 0), + f: common_vendor.t(common_vendor.unref(details).inventoryNub || 0), + g: common_vendor.o(checktype), + h: common_vendor.p({ data: common_vendor.unref(typearr), value: common_vendor.unref(schanvalue), placeholder: "全部", @@ -177,29 +185,29 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ size: "145", clearable: true }), - h: common_vendor.unref(orderCode), - i: common_vendor.o(($event) => common_vendor.isRef(orderCode) ? orderCode.value = $event.detail.value : null), - j: common_vendor.o(initpage), - k: common_vendor.n(common_vendor.unref(orderType) == 1 ? "xz" : ""), - l: common_vendor.o(($event) => setorderStatus(1)), - m: common_vendor.n(common_vendor.unref(orderType) == 2 ? "xz" : ""), - n: common_vendor.o(($event) => setorderStatus(2)), - o: common_vendor.unref(orderType) == 1 + i: common_vendor.unref(orderCode), + j: common_vendor.o(($event) => common_vendor.isRef(orderCode) ? orderCode.value = $event.detail.value : null), + k: common_vendor.o(initpage), + l: common_vendor.n(common_vendor.unref(orderType) == 1 ? "xz" : ""), + m: common_vendor.o(($event) => setorderStatus(1)), + n: common_vendor.n(common_vendor.unref(orderType) == 2 ? "xz" : ""), + o: common_vendor.o(($event) => setorderStatus(2)), + p: common_vendor.unref(orderType) == 1 }, common_vendor.unref(orderType) == 1 ? { - p: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => { + q: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => { return { - a: common_vendor.t(item.orderCode), + a: common_vendor.t(item.orderSelfNumbering), b: common_vendor.t(item.planNum), c: common_vendor.t(item.signedNum), d: common_vendor.t(item.orderStatusStr), e: common_vendor.n(item.orderStatusStr == "齐套" ? "tip tp1" : item.orderStatusStr == "部分扫" ? "tip tp3" : "tip tp2") }; }), - q: common_vendor.o(showsdqs) + r: common_vendor.o(showsdqs) } : {}, { - r: common_vendor.unref(orderType) == 2 + s: common_vendor.unref(orderType) == 2 }, common_vendor.unref(orderType) == 2 ? { - s: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => { + t: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => { return { a: common_vendor.t(item.sku), b: common_vendor.t(item.descriptionGoods), @@ -208,9 +216,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ e: common_vendor.t(item.quantity) }; }), - t: common_vendor.o(showsdqs) + v: common_vendor.o(showsdqs) } : {}, { - v: common_vendor.sr(tiplists, "52919ca0-2", { + w: common_vendor.sr(tiplists, "52919ca0-2", { "k": "tiplists" }) }); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml index ada87a6..fa48afd 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml @@ -1 +1 @@ -订单总数{{b}}齐套数{{c}}自提件数{{d}}签收件数{{e}}齐套状态查询定制品库存品订单编号：{{item.a}}配送数：{{item.b}}已扫码数：{{item.c}}{{item.d}}SKU：{{item.a}}物品：{{item.b}}规格：{{item.c}}单位：{{item.d}}自提数：{{item.e}} \ No newline at end of file +订单总数{{b}}齐套数{{c}}自提件数{{d}}签收件数{{e}}库存品数{{f}}齐套状态查询定制品库存品订单编号： {{item.a}}配送数：{{item.b}}已扫码数：{{item.c}}{{item.d}}SKU：{{item.a}}物品：{{item.b}}规格：{{item.c}}单位：{{item.d}}自提数：{{item.e}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js index 2319a70..e88f427 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js @@ -64,6 +64,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ common_vendor.onLoad((op) => { details.billLadingId = op.billLadingId; initpage(); + }); + common_vendor.onShow(() => { common_vendor.index.$on("scancodedate", function(code) { if (code) { console.log(code); @@ -72,6 +74,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } }); }); + common_vendor.onHide(() => { + common_vendor.index.$off("scancodedate"); + }); function showsdqs() { tiplists.value.setdetails({ isshow: true, diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js index c597868..b28f3ca 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js @@ -138,8 +138,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ g: common_vendor.t(item.orderNum), h: common_vendor.t(item.planNum), i: common_vendor.t(item.signedNum), - j: common_vendor.o(($event) => goselscandetails(item)), - k: common_vendor.o(($event) => goselscan(item)) + j: common_vendor.t(item.inventoryNub), + k: common_vendor.o(($event) => goselscandetails(item)), + l: common_vendor.o(($event) => goselscan(item)) }; }), l: common_vendor.o(jiazai), diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxml index 5366fa3..b510a72 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxml @@ -1 +1 @@ -自提日期： 查询 配车类型：{{item.a}}配车状态：{{item.b}}车牌号：{{item.c}}司机：{{item.d}}装御班组：A班组 备货是否完成：是 制单时间：{{item.e}}任务时间：{{item.f}}订单总数{{item.g}}自提件数{{item.h}}签收件数{{item.i}}明细扫描扫描 \ No newline at end of file +自提日期： 查询 配车类型：{{item.a}}配车状态：{{item.b}}车牌号：{{item.c}}司机：{{item.d}}装御班组：A班组 备货是否完成：是 制单时间：{{item.e}}任务时间：{{item.f}}订单总数{{item.g}}自提件数{{item.h}}签收件数{{item.i}}库存品数{{item.j}}明细扫描扫描 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxss index d0840c4..4fca962 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.wxss @@ -95,9 +95,12 @@ color: #092C4D; } .scvbx .mabxslist > .item > .headtop > .liebs > view:nth-of-type(2) > view:nth-of-type(2) { - color: #3AD8BC; + color: #0086F1; } .scvbx .mabxslist > .item > .headtop > .liebs > view:nth-of-type(3) > view:nth-of-type(2) { + color: #3AD8BC; +} +.scvbx .mabxslist > .item > .headtop > .liebs > view:nth-of-type(4) > view:nth-of-type(2) { color: #FA8C16; } .scvbx .mabxslist > .item > .headtop > .liebs > view > view:nth-of-type(1) { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.js index f16db05..03f2a6f 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.js @@ -1,6 +1,5 @@ "use strict"; const common_vendor = require("../../../common/vendor.js"); -const _sfc_main = {}; if (!Array) { const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar"); _easycom_u_navbar2(); @@ -9,18 +8,50 @@ const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-na if (!Math) { _easycom_u_navbar(); } -function _sfc_render(_ctx, _cache) { - return { - a: common_vendor.p({ - title: "设置服务费", - bgColor: "#D3832A", - leftIconColor: "#ffffff", - titleStyle: "color:#ffffff", - placeholder: true, - autoBack: true, - leftIconSize: "35" - }) - }; -} -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/物流/logPm/pagesHome/pages/SetPrice/SetPrice.vue"]]); +const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ + __name: "SetPrice", + setup(__props) { + let details = common_vendor.reactive({ + reservationId: "", + items: {} + }); + common_vendor.onLoad((op) => { + details.reservationId = op.reservationId; + details.items = op.item; + }); + function goValueaddedServicePage() { + common_vendor.index.navigateTo({ + url: "/pagesHome/pages/createAddServe/createAddServe?id=" + details.reservationId + }); + } + function goaddserve() { + common_vendor.index.navigateTo({ + url: "/pagesHome/pages/createAddServe/createAddServe" + }); + } + return (_ctx, _cache) => { + return { + a: common_vendor.p({ + title: "增值服务", + bgColor: "#D3832A", + leftIconColor: "#ffffff", + titleStyle: "color:#ffffff", + placeholder: true, + autoBack: true, + leftIconSize: "35" + }), + b: common_vendor.f(3, (item, k0, i0) => { + return { + a: common_vendor.f(3, (item2, k1, i1) => { + return {}; + }) + }; + }), + c: common_vendor.o(goValueaddedServicePage), + d: common_vendor.o(goaddserve) + }; + }; + } +}); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "F:/物流/logPm/pagesHome/pages/SetPrice/SetPrice.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxml index bcd2ca3..0a3115f 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxml @@ -1 +1 @@ - \ No newline at end of file +客户张磊签收状态配送中订单总数25配送件数10扫描件数5超区145km126元 订单列表 货物名称：HTLQ洗衣机C201订单号：HTLQ北碚区20230931001订单号：HTLQ北碚区20230931001 增加增值服务 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxss index e69de29..f591f4a 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.wxss @@ -0,0 +1,195 @@ +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + * + */ +/** + * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 + */ +/* 颜色变量 */ +/* 行为相关颜色 */ +/* 文字基本颜色 */ +/* 背景颜色 */ +/* 边框颜色 */ +/* 尺寸变量 */ +/* 文字尺寸 */ +/* 图片尺寸 */ +/* Border Radius */ +/* 水平间距 */ +/* 垂直间距 */ +/* 透明度 */ +/* 文章场景相关 */ +.butadd { + width: 686rpx; + height: 100rpx; + background: #D3832A; + border-radius: 16rpx; + display: flex; + align-items: center; + justify-content: center; + margin: auto; + margin-top: 30rpx; + font-size: 32rpx; + font-weight: 400; + color: #FFFFFF; +} +.bgcolo { + width: 750rpx; + height: 200rpx; + background: linear-gradient(180deg, #D3832A 0%, rgba(211, 131, 42, 0) 100%); + border-radius: 0rpx 0rpx 0rpx 0rpx; + opacity: 1; + position: absolute; + left: 0; +} +.card_use { + width: 686rpx; + height: 280rpx; + background: #FFFFFF; + border-radius: 16rpx; + position: relative; + margin: auto; + margin-top: 40rpx; + padding: 26rpx 22rpx; + box-sizing: border-box; +} +.card_use .card_top { + display: flex; + align-items: center; +} +.card_use .card_top > view { + width: 50%; + display: flex; + align-items: center; +} +.card_use .card_top > view > view:nth-of-type(1) { + font-size: 32rpx; + font-weight: 400; + color: #8D97A3; + margin-right: 30rpx; +} +.card_use .card_top > view > view:nth-of-type(2) { + font-size: 32rpx; + font-weight: 500; + color: #092C4D; +} +.card_use .card-content { + width: 640rpx; + height: 160rpx; + background: #F5F7FB; + border-radius: 8rpx; + margin-top: 24rpx; + display: flex; + align-items: center; + justify-content: space-around; +} +.card_use .card-content > view { + display: flex; + flex-direction: column; + align-items: center; +} +.card_use .card-content > view > view:nth-of-type(1) { + font-size: 28rpx; + font-weight: 400; + color: #020B18; +} +.card_use .card-content > view > view:nth-of-type(2) { + font-size: 36rpx; + font-weight: 400; + color: #178AF2; + margin-top: 20rpx; +} +.scvs { + width: 100%; + height: 52vh; + margin-top: 15px; +} +.scvs .maboxsw .itemboxs { + width: 686rpx; + background: #FFFFFF; + border-radius: 16rpx; + margin: auto; + box-sizing: border-box; + margin-bottom: 16rpx; +} +.scvs .maboxsw .itemboxs:nth-last-child(1) { + margin-bottom: 0; +} +.scvs .maboxsw .itemboxs .topdivs { + width: 100%; + height: 88rpx; + background: linear-gradient(133deg, rgba(250, 140, 22, 0.2) 0%, rgba(250, 140, 22, 0) 100%); + opacity: 1; + display: flex; + align-items: center; + justify-content: space-between; + padding: 20rpx 30rpx; + box-sizing: border-box; + border-radius: 16rpx 16rpx 0 0; +} +.scvs .maboxsw .itemboxs .topdivs > image { + width: 40rpx; + height: 40rpx; +} +.scvs .maboxsw .itemboxs .topdivs > view { + display: flex; + align-items: center; + font-size: 28rpx; +} +.scvs .maboxsw .itemboxs .topdivs > view > view:nth-of-type(1) { + width: 96rpx; + height: 48rpx; + background: #FA8C16; + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; + border-radius: 6rpx; + margin-right: 20rpx; +} +.scvs .maboxsw .itemboxs .topdivs > view > view:nth-of-type(2) { + font-size: 28rpx; + font-weight: 400; + color: #8D97A3; + border-right: 1rpx solid #8D97A3; + padding-right: 12rpx; +} +.scvs .maboxsw .itemboxs .topdivs > view > view:nth-of-type(3) { + font-size: 28rpx; + font-weight: 400; + color: #F8544B; + margin-left: 12rpx; +} +.scvs .maboxsw .itemboxs .titlor { + font-size: 34rpx; + font-weight: 600; + color: #092C4D; + padding: 20rpx 32rpx; + box-sizing: border-box; +} +.scvs .maboxsw .itemboxs .orderlists { + display: flex; + flex-direction: column; + width: 630rpx; + margin: auto; +} +.scvs .maboxsw .itemboxs .orderlists > .minitem { + display: flex; + flex-direction: column; + border-bottom: 1rpx solid #EEEEEE; + padding-bottom: 30rpx; + padding-top: 20rpx; +} +.scvs .maboxsw .itemboxs .orderlists > .minitem:nth-last-child(1) { + border-bottom: none; +} +.scvs .maboxsw .itemboxs .orderlists > .minitem > view { + font-size: 28rpx; + font-weight: 400; + color: #092C4D; + margin-bottom: 10rpx; +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.js index bfee4b2..7af68a1 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.js @@ -267,16 +267,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }), n: common_vendor.unref(maknumber), o: common_vendor.o(($event) => common_vendor.isRef(maknumber) ? maknumber.value = $event.detail.value : null), - p: common_vendor.o(($event) => setshowstate(0)), - q: common_vendor.o(confirmlur), - r: common_vendor.o(() => { + p: common_vendor.o(() => { }), - s: common_vendor.o(($event) => setshowstate(0)) + q: common_vendor.o(($event) => setshowstate(0)), + r: common_vendor.o(confirmlur), + s: common_vendor.o(() => { + }), + t: common_vendor.o(($event) => setshowstate(0)) } : {}, { - t: common_vendor.sr(tip, "33d02520-1", { + v: common_vendor.sr(tip, "33d02520-1", { "k": "tip" }), - v: common_vendor.sr(tiplists, "33d02520-2", { + w: common_vendor.sr(tiplists, "33d02520-2", { "k": "tiplists" }) }); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxml index aaed750..062659c 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxml @@ -1 +1 @@ -{{b}}托盘码{{c}}托盘件数{{d}}商场名称{{f}}打托方式 录入库存品 {{item.a}}物料名称：{{item.c}}SKU：{{item.d}}物料单位：{{item.e}}{{item.f}}在库数{{item.g}}已扫搜索物料编码：{{item.a}}物料名称：{{item.b}}物料单位：{{item.c}}包装数量：{{item.d}}在库数：{{item.e}}{{item.f}}SKU：{{item.g}}数量：库位码：{{ite.b}}托盘码：{{ite.d}}取消确认 \ No newline at end of file +{{b}}托盘码{{c}}托盘件数{{d}}商场名称{{f}}打托方式 录入库存品 {{item.a}}物料名称：{{item.c}}SKU：{{item.d}}物料单位：{{item.e}}{{item.f}}在库数{{item.g}}已扫搜索物料编码：{{item.a}}物料名称：{{item.b}}物料单位：{{item.c}}包装数量：{{item.d}}在库数：{{item.e}}{{item.f}}SKU：{{item.g}}数量：库位码：{{ite.b}}托盘码：{{ite.d}}取消确认 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxss index 39b4e32..2669927 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.wxss @@ -405,7 +405,7 @@ } .tanchuangbg .inputbox .scvbw { width: 100%; - height: 360rpx; + height: 450rpx; margin-top: 30rpx; } .tanchuangbg .inputbox .scvbw .scboxitem { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js index 6d5c7b8..6a42011 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js @@ -75,27 +75,27 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } else { if (Number(details.pageType) == 1 && res.data.data.type == 3) { common_vendor.index.navigateTo({ - url: "/pagesHome/pages/inventoryDetail/inventoryDetail?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); } else if (Number(details.pageType) == 2 && res.data.data.type == 4) { common_vendor.index.navigateTo({ url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); } else if (Number(details.pageType) == 2 && res.data.data.type == 3) { - common_vendor.index.showToast({ - title: "库存品扫描分拣使用托盘码", - icon: "none" + common_vendor.index.navigateTo({ + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); + return; } else if (Number(details.pageType) == 1 && res.data.data.type == 4) { - common_vendor.index.showToast({ - title: "库存品人工分拣使用托盘码", - icon: "none" + common_vendor.index.navigateTo({ + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); + return; } else if (res.data.data.type == 1 || res.data.data.type == 2) { - common_vendor.index.showToast({ - title: "定制品分拣使用托盘码", - icon: "none" + common_vendor.index.navigateTo({ + url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType }); + return; } } } diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js index b00de7e..e9ec680 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js @@ -59,6 +59,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }); function init() { details.currentPage = 1; + details.dataList = []; initpage(); } function jiazai() { @@ -100,7 +101,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } function setstate(state) { details.status = state; - initpage(); + init(); } const { datatime, dataList, show, status } = common_vendor.toRefs(details); return (_ctx, _cache) => { @@ -140,7 +141,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ m: common_vendor.n(common_vendor.unref(status) == 1 ? "xz" : ""), n: common_vendor.o(($event) => setstate(1)), o: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => { - return { + return common_vendor.e({ a: common_vendor.t(item.typeServiceStr), b: common_vendor.t(item.stockupStatusStr), c: common_vendor.t(item.customer), @@ -151,8 +152,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ h: common_vendor.t(item.planNum), i: common_vendor.t(item.realNum), j: common_vendor.t(item.inventoryNub), - k: common_vendor.o(($event) => gostockuplist(item)) - }; + k: Number(item.stockupStatus) != 40 + }, Number(item.stockupStatus) != 40 ? { + l: common_vendor.o(($event) => gostockuplist(item)) + } : {}); }), p: common_vendor.o(jiazai), q: common_vendor.sr(tip, "7babdaae-3", { diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxml index b4d9c0b..4891df4 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxml @@ -1 +1 @@ -拣货日期： 查询 未完成完成配车类型：{{item.a}}备货是否完成：{{item.b}}客户：{{item.c}}备货区域：{{item.d}}库位：{{item.e}}托盘：{{item.f}}订单总数{{item.g}}计划备货件数{{item.h}}备货件数{{item.i}}库存品数{{item.j}} 去备货 \ No newline at end of file +拣货日期： 查询 未完成完成配车类型：{{item.a}}备货是否完成：{{item.b}}客户：{{item.c}}备货区域：{{item.d}}库位：{{item.e}}托盘：{{item.f}}订单总数{{item.g}}计划备货件数{{item.h}}备货件数{{item.i}}库存品数{{item.j}} 去备货 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxss index 9956823..65ea733 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxss +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.wxss @@ -71,6 +71,9 @@ padding-top: 20rpx; border-radius: 8rpx; } +.sccv .mabx > view > view:nth-last-child(1) { + border-bottom: none !important; +} .sccv .mabx > view .topbox { display: flex; flex-direction: column; 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 f911ae5..f95e694 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js @@ -66,10 +66,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } console.log(res.data); if (!res.data.isHasData) { + common_vendor.index.setStorageSync("trayCodeType", res.data.data); common_vendor.index.navigateTo({ url: "/pagesHome/pages/ScanSortingType/ScanSortingType?type=" + details.pageType + "&trayCode=" + details.scancode }); - common_vendor.index.setStorageSync("trayCodeType", res.data.data); } else { if (Number(details.pageType) == 1 && res.data.data.type == 1) { common_vendor.index.navigateTo({ 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 e9e39bc..eb7ff56 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js @@ -21,6 +21,7 @@ if (!Math) { const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "setbarcode", setup(__props) { + const utils = common_vendor.inject("utils"); let details = common_vendor.reactive({ items: {}, reservationId: "", @@ -28,7 +29,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ printlist: [], packageNum: 0, goodsAreaName: "", - stockupId: "" + stockupId: "", + stockPrint: 1, + customer: "", + deliveryAddress: "" }); const tips = common_vendor.ref(null); common_vendor.onLoad((op) => { @@ -36,7 +40,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.items = JSON.parse(op.item); details.reservationId = op.reservationId; details.goodsAreaName = op.goodsAreaName; - scandata("1231"); common_vendor.index.$on("scancodedate", function(code) { if (code) { console.log(code); @@ -45,14 +48,25 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }); initpage(); }); + function setstockPrint(values) { + details.stockPrint = values; + if (values == 1) { + utils.ttsspke("请扫描原有包条码"); + } else { + utils.ttsspke("请扫描打印的包条码"); + } + } async function initpage() { let data = { orderStatus: 2, reservationId: details.reservationId, - stockListId: details.items.stockListId + stockListId: details.items.stockListId, + stockupId: details.stockupId }; let response = await api_user.distributionStockuporderInfo(data); details.codelist = response.data.stockList; + details.customer = response.data.customer; + details.deliveryAddress = response.data.deliveryAddress; } function showmd() { tips.value.setdetails({ @@ -127,7 +141,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ packetBarCode: code, stockupArea: details.goodsAreaName, reservationId: details.reservationId, - stockupId: details.stockupId + stockupId: details.stockupId, + stockPrint: details.stockPrint }; let res = await api_user.distributionStockupstockupScan(data); console.log(res); @@ -163,15 +178,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ f: common_vendor.t(common_vendor.unref(items).planNum), g: common_vendor.t(common_vendor.unref(items).cargoUnit), h: common_vendor.unref(items).unpack == 0 - }, common_vendor.unref(items).unpack == 0 ? {} : {}, { - i: common_vendor.o(showmd), - j: common_vendor.f(common_vendor.unref(codelist), (item, index, i0) => { + }, common_vendor.unref(items).unpack == 0 ? { + i: common_vendor.o(($event) => setstockPrint(1)) + } : {}, { + j: common_vendor.o(($event) => setstockPrint(2)), + k: common_vendor.o(showmd), + l: common_vendor.f(common_vendor.unref(codelist), (item, index, i0) => { return { - a: common_vendor.t(index), + a: common_vendor.t(index + 1), b: common_vendor.t(item.packageCode) }; }), - k: common_vendor.sr(tips, "420736b0-1", { + m: common_vendor.sr(tips, "420736b0-1", { "k": "tips" }) }); 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 c4b471d..2cb6d85 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 @@ -货位：{{b}}物品：{{c}}SKU：{{d}}规格：{{e}}计划数量：{{f}}单位：{{g}}采集原包条码新生成包码序号：{{item.a}}作业时间：2001-12-10包条码：{{item.b}} \ No newline at end of file +货位：{{b}}物品：{{c}}SKU：{{d}}规格：{{e}}计划数量：{{f}}单位：{{g}}采集原包条码扫描打印包条新生成包码序号：{{item.a}}作业时间：2001-12-10包条码：{{item.b}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/utils/request.js b/unpackage/dist/dev/mp-weixin/utils/request.js index 1258838..5536843 100644 --- a/unpackage/dist/dev/mp-weixin/utils/request.js +++ b/unpackage/dist/dev/mp-weixin/utils/request.js @@ -31,9 +31,15 @@ const service = (params) => { header["Tenant-Id"] = params.data.tenantId; params.data.password = utils_md5.hexMD5(params.data.password); } + let urlhd = ""; + if (common_vendor.index.getStorageSync("setip")) { + urlhd = common_vendor.index.getStorageSync("setip"); + } else { + urlhd = config_host.host; + } function req() { common_vendor.index.request({ - url: config_host.host + params.url, + url: urlhd + params.url, data: params.data, method: params.method, // dataType: "json", diff --git a/utils/request.js b/utils/request.js index 65c2b94..72d9bb4 100644 --- a/utils/request.js +++ b/utils/request.js @@ -37,10 +37,15 @@ const service = (params) => { // title:'请求中', // mask:true // }) - + let urlhd='' + if(uni.getStorageSync('setip')){ + urlhd=uni.getStorageSync('setip') + }else{ + urlhd=host + } function req(){ uni.request({ - url: host+params.url, + url: urlhd+params.url, data: params.data, method: params.method, // dataType: "json", diff --git a/utils/utils.js b/utils/utils.js index c587bc9..c957825 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -170,7 +170,6 @@ const utils={ TTSSpeech.init((status) => { if(status === 0){ console.log('引擎初始化成功') - // TTSSpeech.speak({ text:'1我311的的' }); TTSSpeech.setSpeed(100) TTSSpeech.getInstallTTS(res => { console.log(JSON.stringify(res));