From d673754a708fd2d3a59d1f22729fe43653612ace Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 8 Nov 2023 22:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=98=E7=9B=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compoment/BasicContainer/BasicContainer.vue | 2 +- config/host.js | 4 +- manifest.json | 4 +- pages.json | 22 +- pages/index/index.vue | 242 +- pages/login/login.vue | 4 +- pagesHome/pages/DownGoods/DownGoods.vue | 7 +- pagesHome/pages/MergeTray/MergeTray.vue | 87 +- .../OrderSortingDetail/OrderSortingDetail.vue | 13 +- pagesHome/pages/PeopleScanUp/PeopleScanUp.vue | 4 +- pagesHome/pages/Relocation/Relocation.vue | 6 +- pagesHome/pages/RemoveTray/RemoveTray.vue | 21 +- pagesHome/pages/ScanUp/ScanUp.vue | 4 +- pagesHome/pages/StockUplist/StockUplist.vue | 2 +- .../pages/createAddServe/createAddServe.vue | 10 +- .../loadingRetention/loadingRetention.vue | 2 +- pagesHome/pages/scansorting/scansorting.vue | 6 +- pagesHome/pages/setbarcode/setbarcode.vue | 2 +- pagesHome/pages/signinScan/signinScan.vue | 5 +- .../pages/checkTaskList/checkTaskList.vue | 67 +- pagesTask/pages/contracts/contracts.vue | 16 +- pagesTask/pages/dynamicCheck/dynamicCheck.vue | 63 +- .../storageLocationCheckDetails.vue | 25 +- .../trayCheckDetails/trayCheckDetails.vue | 22 +- .../OrderSortingDetail/OrderSortingDetail.css | 2 +- .../pagesHome/pages/RemoveTray/RemoveTray.css | 2 +- .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 14061 ++++++++-------- unpackage/dist/dev/app-plus/manifest.json | 16 +- .../pagesHome/pages/MergeTray/MergeTray.css | 29 +- .../OrderSortingDetail/OrderSortingDetail.css | 2 +- .../pagesHome/pages/RemoveTray/RemoveTray.css | 8 +- utils/request.js | 46 +- utils/utils.js | 7 + 34 files changed, 7459 insertions(+), 7358 deletions(-) diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue index 69d7b16..0d88721 100644 --- a/compoment/BasicContainer/BasicContainer.vue +++ b/compoment/BasicContainer/BasicContainer.vue @@ -51,7 +51,7 @@ if (isEnd === undefined) isEnd = ref(false) // 下拉刷新请求页面 - const pullDownRefreshInitPage = props.option.pullDownRefreshInitPage || function () { } + const pullDownRefreshInitPage = props.option.pullDownRefreshInitPage || function () { console.log('刷新'); } // 触底加载请求页面 const reachBottomInitPage = props.option.reachBottomInitPage || function () { } diff --git a/config/host.js b/config/host.js index 41fe80d..54652f3 100644 --- a/config/host.js +++ b/config/host.js @@ -4,7 +4,7 @@ * 测试域名 * */ //测试域名 -// const devhost = 'http://test.api.huitongys.com/' +const devhost = 'http://test.api.huitongys.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy @@ -12,7 +12,7 @@ // tjj // const devhost = 'http://192.168.10.29:13000/' // cyz -const devhost = 'http://192.168.10.75:8777/' +// const devhost = 'http://192.168.10.75:8777/' // 正式 // const devhost = 'http://h5uapi.huitongys.com/' // cg diff --git a/manifest.json b/manifest.json index 0ad3f1b..fe54035 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "货无忧", "appid" : "__UNI__EB22F37", "description" : "", - "versionName" : "1.0.19", - "versionCode" : 1019, + "versionName" : "1.0.24", + "versionCode" : 1024, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 0eed8cf..eca5871 100644 --- a/pages.json +++ b/pages.json @@ -1,9 +1,9 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path": "pages/index/index", + "path": "pages/login/login", "style": { - "navigationBarTitleText": "工作台", + "navigationBarTitleText": "登录", "enablePullDownRefresh": true, "onReachBottomDistance": 1, "navigationStyle": "custom", @@ -17,11 +17,12 @@ } } } + }, { - "path": "pages/login/login", + "path": "pages/index/index", "style": { - "navigationBarTitleText": "登录", + "navigationBarTitleText": "工作台", "enablePullDownRefresh": true, "onReachBottomDistance": 1, "navigationStyle": "custom", @@ -35,7 +36,6 @@ } } } - }, { "path": "pages/user/user", @@ -1272,12 +1272,12 @@ // "selectedIconPath": "/static/TabberIcon/icon3check.png", // "text": "报表" // }, - // { - // "pagePath": "pages/news/news", - // "iconPath": "/static/TabberIcon/icon4.png", - // "selectedIconPath": "/static/TabberIcon/icon4check.png", - // "text": "消息" - // }, + { + "pagePath": "pages/news/news", + "iconPath": "/static/TabberIcon/icon4.png", + "selectedIconPath": "/static/TabberIcon/icon4check.png", + "text": "消息" + }, { "pagePath": "pages/user/user", "iconPath": "/static/TabberIcon/icon5.png", diff --git a/pages/index/index.vue b/pages/index/index.vue index 8606c1c..6d1b07e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -42,126 +42,126 @@ import { inject, reactive, toRefs, watchEffect, ref } from "vue"; import utils from '../../utils/utils'; const tip = ref(null) - // let details = reactive({ tablist: [] }); - let details = reactive({ - tablist: [ - { - type: 1, - name: '工作台', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '订单查询', - router: '/pagesHome/pages/orderInquiry/orderInquiry', - }, - ] - }, - { - type: 1, - name: '库内', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '分拣打托', - router: '/pagesHome/pages/scansorting/scansorting', - }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '订单分拣', - // router: '/pagesHome/pages/ordersorting/ordersorting', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '库存品分拣', - // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', - // }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '扫码上架', - router: '/pagesHome/pages/ScanUpType/ScanUpType', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '手动上架', - router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '移库', - router: '/pagesHome/pages/RelocationType/RelocationType', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '滞留', - router: '/pagesHome/pages/Retention/Retention', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '合托', - router: '/pagesHome/pages/MergeTray/MergeTray', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '下架', - router: '/pagesHome/pages/DownGoodsType/DownGoodsType', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '空置托盘', - router: '/pagesHome/pages/RemoveTray/RemoveTray', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '复核', - router: '/pagesHome/pages/Check/Check', - }, - ] - }, - { - type: 1, - name: '出库', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '拣货扫描', - router: '/pagesHome/pages/pickingScan/pickingScan', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '自提扫描', - router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan', - }, - ] - }, - { - type: 1, - name: '配送', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '装车扫描', - router: '/pagesHome/pages/LoadingScan/LoadingScan', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '签收扫描', - router: '/pagesHome/pages/signinScan/signinScan', - }, - ] - }, - { - type: 1, - name: '离线上传', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '离线上传', - router: '/pagesHome/pages/OfflineUpload/OfflineUpload', - }, - ] - }, - ] - }) + let details = reactive({ tablist: [] }); + // let details = reactive({ + // tablist: [ + // { + // type: 1, + // name: '工作台', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '订单查询', + // router: '/pagesHome/pages/orderInquiry/orderInquiry', + // }, + // ] + // }, + // { + // type: 1, + // name: '库内', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '分拣打托', + // router: '/pagesHome/pages/scansorting/scansorting', + // }, + // // { + // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // // name: '订单分拣', + // // router: '/pagesHome/pages/ordersorting/ordersorting', + // // }, + // // { + // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // // name: '库存品分拣', + // // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', + // // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '扫码上架', + // router: '/pagesHome/pages/ScanUpType/ScanUpType', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '手动上架', + // router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '移库', + // router: '/pagesHome/pages/RelocationType/RelocationType', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '滞留', + // router: '/pagesHome/pages/Retention/Retention', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '合托', + // router: '/pagesHome/pages/MergeTray/MergeTray', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '下架', + // router: '/pagesHome/pages/DownGoodsType/DownGoodsType', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '空置托盘', + // router: '/pagesHome/pages/RemoveTray/RemoveTray', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '复核', + // router: '/pagesHome/pages/Check/Check', + // }, + // ] + // }, + // { + // type: 1, + // name: '出库', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '拣货扫描', + // router: '/pagesHome/pages/pickingScan/pickingScan', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '自提扫描', + // router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan', + // }, + // ] + // }, + // { + // type: 1, + // name: '配送', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '装车扫描', + // router: '/pagesHome/pages/LoadingScan/LoadingScan', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '签收扫描', + // router: '/pagesHome/pages/signinScan/signinScan', + // }, + // ] + // }, + // { + // type: 1, + // name: '离线上传', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '离线上传', + // router: '/pagesHome/pages/OfflineUpload/OfflineUpload', + // }, + // ] + // }, + // ] + // }) function gopathpage(path : string) { uni.navigateTo({ @@ -177,6 +177,7 @@ } let res = await appMenuroutes({}) console.log(res, '-------------'); + console.log('刷新后') if (res.code == 200) { //读取并处理缓存图标并把菜单写入缓存 getimgcache(res.data[0]) @@ -376,6 +377,7 @@ }) async function getimgcache(list) { let maxarr = [] + if (!list) return for (let item of list.children) { let arr = { type: 1, diff --git a/pages/login/login.vue b/pages/login/login.vue index 00aadb6..ddeb5b8 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -74,7 +74,6 @@ // import { storeToRefs } from 'pinia'; const userStore = useUserStore() const { HANDLE_ACCTOKEN, HANDLE_REFTOKEN, HANDLE_USERINFO } = userStore - let tip = ref(null) let details = reactive({ tenantId: '', @@ -86,6 +85,9 @@ checkitem: {}, }) const tiplists = ref(null) + // 蓝牙列表 + const bluetoothList = utils.initbl() + console.log('bluetoothList :>> ', bluetoothList); onLoad(() => { let users = <{ password : string; tenantId : string; username : string }>uni.getStorageSync('loginuser') if (users) { diff --git a/pagesHome/pages/DownGoods/DownGoods.vue b/pagesHome/pages/DownGoods/DownGoods.vue index 5cf03d8..1520522 100644 --- a/pagesHome/pages/DownGoods/DownGoods.vue +++ b/pagesHome/pages/DownGoods/DownGoods.vue @@ -64,7 +64,8 @@ - 托盘码:{{details.resdata.trayCode}} + 托盘码:{{details.resdata.trayCode || '' + `(${details.resdata.trayName || ''})`}} + @@ -116,7 +117,7 @@ - 托盘码:{{item?.trayCode}} + 托盘码:{{item?.trayCode + `(${item?.trayName})`}} @@ -160,7 +163,8 @@ data: {}, orderList: [], zeroList: [], - stockList: [] + stockList: [], + pageInfo: {} }) onLoad(() => { utils.ttsspke('请扫描或输入需要空置的托盘') @@ -198,6 +202,7 @@ if (!data) return console.log('res', res); // details.datalist = res.data?.list + details.pageInfo = data // 定制品 details.orderList = data.packageList // 零担 @@ -292,8 +297,8 @@ } const { scancode, - statetype, - datalist + datalist, + pageInfo } = toRefs(details) @@ -334,14 +339,14 @@ .topbos { display: flex; flex-direction: column; + background-color: #ffffff; + padding: 26upx 32upx; >.srview { display: flex; align-items: center; - padding: 26upx 32upx; box-sizing: border-box; - background-color: #ffffff; - margin-bottom: 4upx; + // margin-bottom: 4upx; .sbm { width: 150upx; @@ -375,6 +380,10 @@ } } } + + .taryInfo { + font-size: 28upx; + } } .flbuts { diff --git a/pagesHome/pages/ScanUp/ScanUp.vue b/pagesHome/pages/ScanUp/ScanUp.vue index 1a1dbb5..08a261e 100644 --- a/pagesHome/pages/ScanUp/ScanUp.vue +++ b/pagesHome/pages/ScanUp/ScanUp.vue @@ -68,7 +68,7 @@