java_project
/
logpm
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增托盘信息

myd
qb 1 year ago
parent
ce54831b94
commit
d673754a70
34 changed files with 7459 additions and 7358 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      compoment/BasicContainer/BasicContainer.vue
  2. 4
      config/host.js
  3. 4
      manifest.json
  4. 22
      pages.json
  5. 242
      pages/index/index.vue
  6. 4
      pages/login/login.vue
  7. 7
      pagesHome/pages/DownGoods/DownGoods.vue
  8. 87
      pagesHome/pages/MergeTray/MergeTray.vue
  9. 13
      pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
  10. 4
      pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
  11. 6
      pagesHome/pages/Relocation/Relocation.vue
  12. 21
      pagesHome/pages/RemoveTray/RemoveTray.vue
  13. 4
      pagesHome/pages/ScanUp/ScanUp.vue
  14. 2
      pagesHome/pages/StockUplist/StockUplist.vue
  15. 10
      pagesHome/pages/createAddServe/createAddServe.vue
  16. 2
      pagesHome/pages/loadingRetention/loadingRetention.vue
  17. 6
      pagesHome/pages/scansorting/scansorting.vue
  18. 2
      pagesHome/pages/setbarcode/setbarcode.vue
  19. 5
      pagesHome/pages/signinScan/signinScan.vue
  20. 67
      pagesTask/pages/checkTaskList/checkTaskList.vue
  21. 16
      pagesTask/pages/contracts/contracts.vue
  22. 63
      pagesTask/pages/dynamicCheck/dynamicCheck.vue
  23. 25
      pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
  24. 22
      pagesTask/pages/trayCheckDetails/trayCheckDetails.vue
  25. 2
      unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
  26. 2
      unpackage/dist/build/app-plus/pagesHome/pages/RemoveTray/RemoveTray.css
  27. 4
      unpackage/dist/dev/app-plus/app-config-service.js
  28. 14061
      unpackage/dist/dev/app-plus/app-service.js
  29. 16
      unpackage/dist/dev/app-plus/manifest.json
  30. 29
      unpackage/dist/dev/app-plus/pagesHome/pages/MergeTray/MergeTray.css
  31. 2
      unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
  32. 8
      unpackage/dist/dev/app-plus/pagesHome/pages/RemoveTray/RemoveTray.css
  33. 46
      utils/request.js
  34. 7
      utils/utils.js

2
compoment/BasicContainer/BasicContainer.vue
Unescape View File

@ -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 () { }

4
config/host.js
Unescape View File

@ -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

4
manifest.json
Unescape View File

@ -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" : {

22
pages.json
Unescape View File

@ -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",

242
pages/index/index.vue
Unescape View File

@ -42,126 +42,126 @@
import { inject, reactive, toRefs, watchEffect, ref } from "vue";
import utils from '../../utils/utils';
const tip = ref(null)
// let details = reactive<listtype>({ tablist: [] });
let details = reactive<listtype>({
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<listtype>({ tablist: [] });
// let details = reactive<listtype>({
// 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,

4
pages/login/login.vue
Unescape View File

@ -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<detailsType>({
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) {

7
pagesHome/pages/DownGoods/DownGoods.vue
Unescape View File

@ -64,7 +64,8 @@
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>托盘码：{{details.resdata.trayCode}}</view>
<view>托盘码：{{details.resdata.trayCode || '' + `(${details.resdata.trayName || ''})`}}
</view>
</view>
</view>
<scroll-view scroll-y="true" class="scvorder" :style="{'--height':pageType=='1'?'60vh':pageType=='2'?'60vh':'65vh'}">
@ -116,7 +117,7 @@
</view>
<view class="topon2">
<image src="/pagesHome/static/checi.png"></image>
<view>托盘码：{{item?.trayCode}}</view>
<view>托盘码：{{item?.trayCode + `(${item?.trayName})`}}</view>
</view>
<!-- <view class="topon2" v-if="item?.positionCode">
<image src="/pagesHome/static/checi.png"></image>
@ -244,7 +245,7 @@
</view>
<view class="type1s">
<view>托盘信息：</view>
<view>{{item.trayCode}}</view>
<view>{{item.trayCode + `(${item.trayName})`}}</view>
</view>
<view class="rksu">
<view>

87
pagesHome/pages/MergeTray/MergeTray.vue
Unescape View File

@ -3,17 +3,27 @@
:autoBack="true" leftIconSize='35'></u-navbar>
<view class="topbos">
<view class="srview">
<view>解绑托盘码</view>
<view>
<input placeholder="请扫描或输入" v-model="mergeTray" @focus="setstate(1)" />
<view class="sbm" @click="scandata">确定</view>
<view class="box">
<view>解绑托盘码</view>
<view>
<input placeholder="请扫描或输入" v-model="mergeTray" @focus="setstate(1)" />
<view class="sbm" @click="scandata">确定</view>
</view>
</view>
<view class="">
托盘名称：{{beilist.trayName||''}}
</view>
</view>
<view class="srview">
<view>合并托盘码</view>
<view>
<input placeholder="请扫描或输入" v-model="newmergeTray" @focus="setstate(2)" />
<view class="sbm" @click="scandata">确定</view>
<view class="box">
<view>合并托盘码</view>
<view>
<input placeholder="请扫描或输入" v-model="newmergeTray" @focus="setstate(2)" />
<view class="sbm" @click="scandata">确定</view>
</view>
</view>
<view class="">
托盘名称：{{newbeilist.trayName||''}}
</view>
</view>
</view>
@ -164,18 +174,6 @@
renderList: []
})
onLoad((op) => {
// details.upshelfScanType = op.type
// details.scancode = 'HT20230800002'
// scandata()
// setTimeout(()=>{
// details.scantype=2
// details.scancode = 'HT20230800001'
// scandata()
// },2500)
// setTimeout(()=>{
// details.scancode='23072506670-2'
// scandata()
// },4500)
})
onShow(() => {
@ -549,12 +547,38 @@
flex-direction: column;
>.srview {
display: flex;
align-items: center;
padding: 26upx 32upx;
box-sizing: border-box;
background-color: #ffffff;
margin-bottom: 4upx;
font-size: 28upx;
.box {
display: flex;
align-items: center;
&:nth-last-child(1) {
margin-bottom: 0;
}
>view:nth-of-type(1) {
width: 190upx;
font-size: 28upx
}
>view:nth-of-type(2) {
font-size: 28upx;
flex: 1;
display: flex;
align-items: center;
>input {
flex: 1;
font-size: 28upx;
}
}
}
.sbm {
width: 150upx;
@ -567,26 +591,7 @@
border-radius: 10upx;
}
&:nth-last-child(1) {
margin-bottom: 0;
}
>view:nth-of-type(1) {
width: 190upx;
font-size: 28upx
}
>view:nth-of-type(2) {
font-size: 28upx;
flex: 1;
display: flex;
align-items: center;
>input {
flex: 1;
font-size: 28upx;
}
}
}
}
</style>

13
pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
Unescape View File

@ -590,10 +590,10 @@
console.log('details.scancode :>> ', details.scancode);
// 判定扫描包件状态是否正常或是否已打托
if (response.code !== 200 || code !== 200) return
if (code !== 200) return
if (details?.detauser?.trayNum && details?.detauser?.trayNum > 0) {
utils.ttsspke(details.detauser.trayNum + '件')
if (response.code === 200) utils.ttsspke(details.detauser.trayNum + '件')
const { data: { orderCode } } = response
// 查询被扫描的订单, 检测订单内的数量是否齐套
@ -927,7 +927,7 @@
text += 'SETBOLD 2\r\n'
text += 'T 56 0 10 0 打托清单\r\n'
text += 'B QR 300 0 M 2 U 4\r\n'
text += 'MA,123141515215212\r\n'
text += `MA,${data.trayCode}\r\n`
text += 'ENDQR\r\n'
text += `T 55 0 10 120 打印时间: ${time}\r\n`
text += `T 55 0 300 120 汇通龙泉\r\n`
@ -980,11 +980,14 @@
` */
let sylist = utils.initbl()
console.log(sylist);
sylist.map(item => {
sylist.every(item => {
// 循环链接蓝牙, 打印成功退出循环
console.log(item);
if (item.uuids) {
utils.getbl(item, text)
return false
}
return true
})
// #endif
tiplists.value.setdetails({ isshow: false })
@ -1326,7 +1329,7 @@
color: $subjectColor;
margin: auto;
margin-top: 20upx;
border: 1upx solid $subjectColor;
border: 3upx solid $subjectColor;
}
// 零担弹窗

4
pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
Unescape View File

@ -226,7 +226,7 @@
<view class="item1" v-if="checkstate==3&&reqobj.trayCode">
<view>
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>托盘码：{{reqobj.trayCode}}</view>
<view>托盘码：{{reqobj.trayCode + `(${reqobj.trayName})`}}</view>
</view>
<view>
<image src="/pagesHome/static/scanicon.png"></image>
@ -318,7 +318,7 @@
<text v-if="ite.areaName">{{ite.areaName}}</text>
<text v-if="ite.allocationName">{{'-'+ite.allocationName}}</text>
</view>
<view>托盘码：{{ite.trayCode}}</view>
<view>托盘码：{{ite.trayCode + `(${ite.trayName})`}}</view>
<view>数量：{{ite.num}}</view>
</view>
</view>

6
pagesHome/pages/Relocation/Relocation.vue
Unescape View File

@ -60,7 +60,7 @@
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>托盘码：{{item.trayCode}}</view>
<view>托盘码：{{item.trayCode + `(${item.trayName})`}}</view>
</view>
<view class="tpbx" @click.stop="goorderdetail(item)">
<image src="/pagesHome/static/kuweiicon.png"></image>
@ -80,7 +80,7 @@
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>托盘码：{{item.trayCode}}</view>
<view>托盘码：{{item.trayCode + `(${item.trayName})`}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
@ -104,7 +104,7 @@
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>托盘码：{{item.trayCode}}</view>
<view>托盘码：{{item.trayCode + `(${item.trayName})`}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>

21
pagesHome/pages/RemoveTray/RemoveTray.vue
Unescape View File

@ -9,6 +9,9 @@
<view class="sbm" @click="scandata">确定</view>
</view>
</view>
<view class="taryInfo">
托盘名称: {{pageInfo.trayName || ''}}
</view>
</view>
<!-- tabBar -->
@ -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)
</script>
@ -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 {

4
pagesHome/pages/ScanUp/ScanUp.vue
Unescape View File

@ -68,7 +68,7 @@
<template v-if="details.upshelfScanType === '4'&& details.renderList.length !==0">
<view v-show="details.checkstate === 1">
<view class="trayTab" style="display: flex; align-items: center; justify-content: space-between;">
<view>托盘码：{{details.renderList[0].trayCode}}</view>
<view>托盘码：{{details.renderList[0].trayName}}</view>
<!-- 求和 -- 托盘上所有包件的已扫数量 -->
<view>托盘已扫数量：{{details.renderList.reduce((curr, item)=>curr + item.shelfNum ,0)}}</view>
</view>
@ -164,7 +164,7 @@
<view class="item1" v-if="checkstate==3&&reqobj.trayCode">
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>托盘码：{{reqobj.trayCode}}</view>
<view>托盘码：{{reqobj.trayCode + `(${reqobj.trayName})`}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/scanicon.png"></image>

2
pagesHome/pages/StockUplist/StockUplist.vue
Unescape View File

@ -225,7 +225,7 @@
}
details.orderList = []
let response = await distributionStockuporderList(data)
if (response !== 200) return
if (response.code !== 200) return
console.log('response :>> ', response);
console.log('details.orderStatus :>> ', details.orderStatus);
details.user.consignee = response.data?.consignee

10
pagesHome/pages/createAddServe/createAddServe.vue
Unescape View File

@ -327,7 +327,10 @@
}
// 包件类型 -- 部分
if (details.typestate == 2) {
data.packageEntityList = details.scanpack
data.packageEntityList = details.scanpack.map(val => {
val.quantity = val.zeroQuantity
return val
})
} else {
data.packageEntityList.forEach(val => {
if (Number(val.conditions) === 3) {
@ -367,7 +370,10 @@
}
// 包件类型 -- 部分
if (details.typestate == 2) {
data.packageEntityList = details.scanpack
data.packageEntityList = details.scanpack.map(val => {
val.quantity = val.zeroQuantity
return val
})
} else {
data.packageEntityList.forEach(val => val.zeroQuantity = val.quantity)
}

2
pagesHome/pages/loadingRetention/loadingRetention.vue
Unescape View File

@ -318,7 +318,7 @@
.button_item {
padding: 10upx 30upx;
border: 1upx solid $subjectColor;
border: 3upx solid $subjectColor;
border-radius: 10upx;
color: $subjectColor;
}

6
pagesHome/pages/scansorting/scansorting.vue
Unescape View File

@ -239,7 +239,11 @@
url: '/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=' + details.scancode
})
} else {
uni.navigateTo({
url: '/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode='
+ res.data.data.trayCode + '&trayType='
+ res.data.data.trayType
})
}
}
async function initpage() {

2
pagesHome/pages/setbarcode/setbarcode.vue
Unescape View File

@ -145,7 +145,7 @@
status: details.completeStact ? 1 : 0
}
let response = await distributionStockuporderInfo(data)
if (response !== 200) return
if (response.code !== 200) return
details.codelist = response.data.stockList
details.customer = response.data.customer
details.deliveryAddress = response.data.deliveryAddress

5
pagesHome/pages/signinScan/signinScan.vue
Unescape View File

@ -186,7 +186,9 @@
type: details.checkstate
}
let response = await signforpage(data)
if (response !== 200) return
console.log('111 :>> ', 111);
if (response.code !== 200) return
console.log('response :>> ', response);
if (details.current == 1) {
details.datalist = response.data.records
} else {
@ -218,6 +220,7 @@
})
}
function goSignDetailScan(item) {
console.log('item :>> ', item);
uni.navigateTo({
url: '/pagesHome/pages/SignDetailScan/SignDetailScan?item=' + JSON.stringify(item)
})

67
pagesTask/pages/checkTaskList/checkTaskList.vue
Unescape View File

@ -176,7 +176,8 @@
renderList: [],
// 数据是否加载完毕
isEnd: false,
warehouseId: ''
warehouseId: '',
questNum: ''
})
const placeholder = ref('请输入')
const isDropdownOpen = ref(false) // 控制下拉选择列表的显示隐藏
@ -214,6 +215,7 @@
details.id = data.id
details.warehouseId = data.warehouseId
details.marketName = data.marketName
details.questNum = data.questNum
if (details.pageType === 3) {
infodata.value = data
@ -277,6 +279,7 @@
// 下拉刷新
onPullDownRefresh(() => {
console.log('111 :>> ', 111);
// 重置页码
details.page.current = 1
// 恢复结束状态
@ -294,25 +297,27 @@
async function initPage() {
try {
let res : any = null
uni.showLoading({
mask: true,
title: '数据加载中'
})
if (details.pageType === 1) return
if (details.pageType === 2) {
// 货位id
// type: 搜索的type, 1是手输, 2是扫描
res = await getWarehouseTaskAllocationList({
questId: details.id
...details.page,
questId: details.id,
questNum: details.questNum
})
}
else if (details.pageType === 3) {
pgetContractList({
res = await pgetContractList({
...details.page,
taskId: infodata.value.id,
warehouseId: infodata.value.warehouseId
}).then(res => {
if (res.code = 200 && res.data) {
details.renderList = res.data.records
}
// console.log(res.data.records);
// details.renderList=res.data.records
warehouseId: infodata.value.warehouseId,
questNum: details.questNum
})
}
@ -322,7 +327,9 @@
console.log('res :>> ', res);
const { code, data } = res
if (code === 200 && data) {
details.renderList = data
if (details.pageType === 3) {
details.renderList = res.data.records
} else details.renderList = data
if (data.length < details.page.size) details.isEnd = true
} else if (code === 3001) {
const msg = data.audio
@ -337,6 +344,7 @@
//TODO handle the exception
console.log('error :>> ', error);
} finally {
uni.hideLoading()
}
}
@ -344,7 +352,8 @@
console.log('details.id :>> ', details.id);
const submitData : any = {
...details.page,
taskId: details.id
taskId: details.id,
questNum: details.questNum
}
submitData.trayCode = details.scancode
console.log('submitData :>> ', submitData);
@ -366,12 +375,13 @@
if (details.pageType === 2) {
getWarehouseTaskAllocationDetailByStrip({
questId: details.id,
allocationId: details.scancode
allocationId: details.scancode,
questNum: details.questNum
}).then(res => {
console.log(res);
if (res.code != 403) {
uni.navigateTo({
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}`
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
})
}
})
@ -384,7 +394,8 @@
goodsType: selectedValue.value.value,
warehouseId: details.warehouseId,
type: '1',
code: details.scancode
code: details.scancode,
questNum: details.questNum
}).then(res => {
console.log(res, 'res===');
utils.ttsspke(res.audio)
@ -411,7 +422,8 @@
type: data[0].goodsType,
marketName: details.marketName,
// 是否阻止初始化请求
holdBackFirstPost: true
holdBackFirstPost: true,
questNum: details.questNum
}
console.log('info :>> ', info);
uni.navigateTo({
@ -431,12 +443,13 @@
const searchStorage = () => {
getWarehouseTaskAllocationDetailByStrip({
questId: details.id,
allocationId: details.scancode
allocationId: details.scancode,
questNum: details.questNum
}).then(res => {
console.log('res >>>>>>>>', res);
if (res.code !== 403) {
uni.navigateTo({
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}`
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
})
}
})
@ -447,12 +460,13 @@
console.log('val :>> ', val);
getWarehouseTaskAllocationDetailByStrip({
questId: details.id,
allocationId: val.allocationId
allocationId: val.allocationId,
questNum: details.questNum
}).then(res => {
console.log(res);
if (res.code != 403) {
uni.navigateTo({
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${val.allocationId}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}`
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${val.allocationId}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
})
}
})
@ -482,7 +496,8 @@
// 商城数组
marketName: details.marketName,
// 是否阻止初始化请求
holdBackFirstPost: false
holdBackFirstPost: false,
questNum: details.questNum
}
uni.navigateTo({
url: `/pagesTask/pages/trayCheckDetails/trayCheckDetails?info=${JSON.stringify(info)}`
@ -492,7 +507,7 @@
// 按合同号盘点,点击进入详情
const contract = (val) => {
uni.navigateTo({
url: `/pagesTask/pages/contracts/contracts?warehouseId=${details.warehouseId}&taskId=${details.id}&orderCode=${val.orderCode}&isInventory=${val.isInventory}&marketName=${JSON.stringify(details.marketName)}&martialCode=${val.martialCode}`
url: `/pagesTask/pages/contracts/contracts?warehouseId=${details.warehouseId}&taskId=${details.id}&orderCode=${val.orderCode}&isInventory=${val.isInventory}&marketName=${JSON.stringify(details.marketName)}&martialCode=${val.martialCode}&questNum=${details.questNum}`
})
}
// 按合同搜索按钮
@ -502,7 +517,8 @@
goodsType: selectedValue.value.value,
warehouseId: details.warehouseId,
type: '2',
incomingBatch: details.scancode
incomingBatch: details.scancode,
questNum: details.questNum
}).then(res => {
console.log(res, 'res===');
utils.ttsspke(res.audio)
@ -513,14 +529,13 @@
}
// 监听Input当输入框没有值重新渲染
const handleInputChange = () => {
console.log(details.searchText.taryText);
if (!details.scancode) {
pgetContractList({
taskId: infodata.value.id,
warehouseId: infodata.value.warehouseId,
questNum: details.questNum
}).then(res => {
if (res.code = 200 && res.data) {
details.renderList = res.data.records

16
pagesTask/pages/contracts/contracts.vue
Unescape View File

@ -253,9 +253,6 @@
import { ref, reactive, toRefs, watch } from "vue";
import {
getWarehouseTaskAllocationDetailByStrip,
getallocationDetailByZeroWaList,
getallocationDetailByStockList,
pcontractQuestDetailList,
getWarehouseUpdateQuestDetail,
postqueryupdateQuestDetailAllocation,
@ -380,7 +377,7 @@
// 合同类型
contract: '',
renderList: '',
isInventory: null
isInventory: null,
})
const {
@ -470,7 +467,8 @@
warehouseId: infos.value.warehouseId,
taskId: infos.value.taskId,
orderCode: infos.value.orderCode,
isInventory: infos.value.isInventory
isInventory: infos.value.isInventory,
questNum: infos.value.questNum
}
console.log('infos :>> ', infos);
@ -556,7 +554,7 @@
// 未入库
noReceivedNum: 0,
}]
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId })
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId, questNum: infos.value.questNum })
const { code, msg } = res
console.log('res :>> ', res);
if (code === 200) {
@ -624,7 +622,7 @@
// const res = getWarehouseUpdateQuestDetail({ ids })
// console.log('res :>> ', res);
try {
getWarehouseDeleteQuestDetail({ questDetailList, questId: infos.value.taskId }).then(res => {
getWarehouseDeleteQuestDetail({ questNum: infos.value.questNum, questDetailList, questId: infos.value.taskId }).then(res => {
initPage()
utils.ttsspke(res.msg)
})
@ -692,7 +690,7 @@
return
}
const questDetailList = arr.map(val => { return { id: val.questDetailId } })
const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: infos.value.taskId, questDetailList })
const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: infos.value.taskId, questDetailList, questNum: infos.value.questNum })
if (res.code === 200) {
Tjinfo()
}
@ -1010,6 +1008,7 @@
questTarget: 1,
questType: 3,
questId: infos.value.taskId,
questNum: infos.value.questNum
}
return submitData
}
@ -1042,6 +1041,7 @@
questTarget: 3,
questType: 3,
questId: infos.value.taskId,
questNum: infos.value.questNum
}
return submitData

63
pagesTask/pages/dynamicCheck/dynamicCheck.vue
Unescape View File

@ -104,29 +104,29 @@
// uni.startPullDownRefresh()
})
// 下拉刷新
onPullDownRefresh(async () => {
// 重置页码
details.page.current = 1
// 恢复结束状态
details.isEnd = false
// 清空渲染列表
details.renderList = []
const res = await initPage()
// if (res) {
const timer = setTimeout(() => {
// 关闭刷新动画
uni.stopPullDownRefresh()
clearTimeout(timer)
}, 500)
// }
// // 下拉刷新
/* onPullDownRefresh(async () => {
// 重置页码
details.page.current = 1
// 恢复结束状态
details.isEnd = false
// 清空渲染列表
details.renderList = []
const res = await initPage()
// if (res) {
const timer = setTimeout(() => {
// 关闭刷新动画
uni.stopPullDownRefresh()
clearTimeout(timer)
}, 500)
// }
}) */
onShow(() => {
initPage()
})
// onShow(() => {
// initPage()
// })
onMounted(() => {
basicContainer.value.startPullDownRefresh()
})
@ -138,15 +138,15 @@
const nowDate = new Date().getTime()
// 当目前时间小于开始时间时
// if (new Date(startTime).getTime() > nowDate) {
// // 语音提示
// utils.ttsspke('盘点时间未到')
// // 弹窗提示
// return uni.showToast({
// title: '盘点时间未到',
// icon: 'error'
// })
// }
if (new Date(startTime).getTime() > nowDate) {
// 语音提示
utils.ttsspke('盘点时间未到')
// 弹窗提示
return uni.showToast({
title: '盘点时间未到',
icon: 'error'
})
}
// 当目前时间大于结束时间时
if (new Date(endTime).getTime() < nowDate) {
@ -164,7 +164,8 @@
title: details.checkType[pageType],
id: item.id,
warehouseId: item.warehouseId,
marketName: item.marketName.split(',')
marketName: item.marketName.split(','),
questNum: item.questNum
}
}
uni.navigateTo({

25
pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
Unescape View File

@ -309,7 +309,8 @@
'',
'red'
],
marketName: []
marketName: [],
questNum: ''
})
// 定制品
@ -367,7 +368,7 @@
// 总数
allNum: '',
// 已盘点
finishNum: ''
finishNum: '',
})
const {
@ -399,8 +400,9 @@
onLoad((info) => {
details.allocationId = info.allocationId
details.questId = info.questId
console.log('info :>> ', info.marketName);
console.log('info :>> ', info);
details.marketName = JSON.parse(info.marketName)
details.questNum = info.questNum
})
// 开启监听扫描
@ -482,6 +484,7 @@
questId: details.questId,
allocationId: details.allocationId,
type: 1,
questNum: details.questNum
}
try {
@ -514,6 +517,7 @@
questId: details.questId,
allocationId: details.allocationId,
type: 2,
questNum: details.questNum
}
try {
@ -544,6 +548,7 @@
questId: details.questId,
allocationId: details.allocationId,
type: 3,
questNum: details.questNum
}
try {
@ -587,7 +592,7 @@
// 未入库
noReceivedNum: 0,
}]
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId })
const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId })
const { code, msg } = res
console.log('res :>> ', res);
if (code === 200) {
@ -671,7 +676,7 @@
// const res = getWarehouseUpdateQuestDetail({ ids })
// console.log('res :>> ', res);
try {
getWarehouseDeleteQuestDetail({ questDetailList, questId: details.questId }).then(res => {
getWarehouseDeleteQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then(res => {
initPage()
utils.ttsspke(res.msg)
})
@ -778,7 +783,7 @@
// 未入库
noReceivedNum: checkSectionList[4].value,
}]
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId })
const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId })
const { code } = res
if (code === 200) initPage()
tiplists.value.setdetails({ isshow: false })
@ -832,7 +837,7 @@
// 未入库
noReceivedNum: checkSectionList[4].value,
}]
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId })
const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId })
const { code } = res
if (code === 200) initPage()
tiplists.value.setdetails({ isshow: false })
@ -932,6 +937,7 @@
questTarget: 1,
questType: 2,
questId: details.questId,
questNum: details.questNum
}
return submitData
}
@ -955,6 +961,7 @@
questTarget: 3,
questType: 2,
questId: details.questId,
questNum: details.questNum
}
return submitData
@ -1015,7 +1022,7 @@
title: '更新中',
mask: true
})
getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId }).then(res => {
getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then(res => {
utils.ttsspke(res.msg)
initPage()
})
@ -1075,7 +1082,7 @@
return
}
const questDetailList = arr.map(val => { return { id: val.id } })
const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: details.questId, questDetailList })
const res = await postqueryupdateQuestDetailAllocation({ questNum: details.questNum, allocationId: details.scancode, questId: details.questId, questDetailList })
if (res.code === 200) {
initPage()
}

22
pagesTask/pages/trayCheckDetails/trayCheckDetails.vue
Unescape View File

@ -236,10 +236,10 @@
haveData: true,
async pullDownRefreshInitPage() {
console.log('下拉刷新')
if (details.holdBackFirstPost) return details.holdBackFirstPost = false
// if (details.holdBackFirstPost) return details.holdBackFirstPost = false
// 页面信息清空
details.renderList = []
console.log('首次')
// console.log('首次')
return await initPage()
},
reachBottomInitPage() {
@ -301,6 +301,7 @@
// 页面初始化执行回调
onLoad((data) => {
console.log('data :>> ', data);
details.pageInfo = JSON.parse(data.info)
info.trayCode = details.pageInfo.trayCode
info.goodsType = details.pageInfo.type
@ -372,6 +373,7 @@
const submitForm = {
taskId: details.pageInfo.taskId,
trayId: details.pageInfo.trayId,
questNum: details.pageInfo.questNum
}
const res = await getWarehousetrayListInfo(submitForm)
console.log('res :>> ', res);
@ -381,7 +383,7 @@
details.renderList = dataInfo.list
info.total = dataInfo.total
info.unTotal = dataInfo.unTotal
details.checkList = dataInfo.list.map(() => false)
if (dataInfo.list) details.checkList = dataInfo.list.map(() => false)
}
} catch (err) {
console.log('err :>> ', err);
@ -414,7 +416,7 @@
// 未入库
noReceivedNum: 0,
}]
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId })
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum })
const { code, msg } = res
console.log('res :>> ', res);
if (code === 200) {
@ -422,7 +424,7 @@
utils.ttsspke(msg)
}
} else {
const res = await postWarehouseTaskSelectPackageInfo({ orderPackageCode: details.scancode, questId: details.pageInfo.taskId })
const res = await postWarehouseTaskSelectPackageInfo({ orderPackageCode: details.scancode, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum })
console.log('res :>> ', res);
// grounding()
}
@ -455,7 +457,7 @@
const arr = details.renderList.filter(v => v.questStatus !== 3)
console.log('arr :>> ', arr);
const questDetailList = arr.map(val => { return { id: val.id } })
const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: details.pageInfo.taskId, questDetailList })
const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: details.pageInfo.taskId, questDetailList, questNum: details.pageInfo.questNum })
if (res.code === 200) {
details.showUpData = false
@ -503,7 +505,7 @@
// console.log('res :>> ', res);
console.log('111 :>> ', 111);
try {
getWarehouseDeleteQuestDetail({ questDetailList, questId: details.pageInfo.taskId }).then(res => {
getWarehouseDeleteQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum }).then(res => {
basicContainer.value.startPullDownRefresh()
})
} catch (e) {
@ -562,7 +564,7 @@
// const res = getWarehouseUpdateQuestDetail({ ids })
// console.log('res :>> ', res);
try {
getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId }).then(res => {
getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum }).then(res => {
basicContainer.value.startPullDownRefresh()
})
} catch (e) {
@ -658,7 +660,7 @@
// 未入库
noReceivedNum: checkSectionList[4].value,
}]
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId })
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum })
const { code } = res
if (code === 200) basicContainer.value.startPullDownRefresh()
tiplists.value.setdetails({ isshow: false })
@ -756,6 +758,7 @@
questTarget: 1,
questType: 4,
questId: details.pageInfo.taskId,
questNum: details.pageInfo.questNum
}
return submitData
@ -780,6 +783,7 @@
questTarget: 3,
questType: 4,
questId: details.pageInfo.taskId,
questNum: details.pageInfo.questNum
}
return submitData

2
unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pagesHome/pages/RemoveTray/RemoveTray.css vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/dev/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

14061
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

16
unpackage/dist/dev/app-plus/manifest.json vendored
Unescape View File

@ -7,8 +7,8 @@
"id": "__UNI__EB22F37",
"name": "货无忧",
"version": {
"name": "1.0.19",
"code": 1019
"name": "1.0.24",
"code": 1024
},
"description": "",
"developer": {
@ -220,6 +220,12 @@
"selectedIconPath": "/static/TabberIcon/icon2check.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",
@ -228,11 +234,7 @@
}
],
"selectedIndex": 0,
"shown": true,
"child": [
"lauchwebview"
],
"selected": 0
"shown": true
}
},
"launch_path": "__uniappview.html"

29
unpackage/dist/dev/app-plus/pagesHome/pages/MergeTray/MergeTray.css vendored
Unescape View File

@ -417,37 +417,40 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
flex-direction: column;
}
.topbos > .srview {
display: flex;
align-items: center;
padding: 0.8125rem 1rem;
box-sizing: border-box;
background-color: #ffffff;
margin-bottom: 0.125rem;
font-size: 0.875rem;
}
.topbos > .srview .sbm {
width: 4.6875rem;
height: 2rem;
.topbos > .srview .box {
display: flex;
align-items: center;
justify-content: center;
background-color: #D3832A;
color: #ffffff;
border-radius: 0.3125rem;
}
.topbos > .srview:nth-last-child(1) {
.topbos > .srview .box:nth-last-child(1) {
margin-bottom: 0;
}
.topbos > .srview > uni-view:nth-of-type(1) {
.topbos > .srview .box > uni-view:nth-of-type(1) {
width: 5.9375rem;
font-size: 0.875rem;
}
.topbos > .srview > uni-view:nth-of-type(2) {
.topbos > .srview .box > uni-view:nth-of-type(2) {
font-size: 0.875rem;
flex: 1;
display: flex;
align-items: center;
}
.topbos > .srview > uni-view:nth-of-type(2) > uni-input {
.topbos > .srview .box > uni-view:nth-of-type(2) > uni-input {
flex: 1;
font-size: 0.875rem;
}
.topbos > .srview .sbm {
width: 4.6875rem;
height: 2rem;
display: flex;
align-items: center;
justify-content: center;
background-color: #D3832A;
color: #ffffff;
border-radius: 0.3125rem;
}

2
unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css vendored
Unescape View File

@ -520,7 +520,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
color: #d3832a;
margin: auto;
margin-top: 0.625rem;
border: 0.03125rem solid #d3832a;
border: 0.09375rem solid #d3832a;
}
.tanchuangbg[data-v-ca2cce65] {
width: 100%;

8
unpackage/dist/dev/app-plus/pagesHome/pages/RemoveTray/RemoveTray.css vendored
Unescape View File

@ -256,14 +256,13 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
.topbos[data-v-8dd39525] {
display: flex;
flex-direction: column;
background-color: #ffffff;
padding: 0.8125rem 1rem;
}
.topbos > .srview[data-v-8dd39525] {
display: flex;
align-items: center;
padding: 0.8125rem 1rem;
box-sizing: border-box;
background-color: #ffffff;
margin-bottom: 0.125rem;
}
.topbos > .srview .sbm[data-v-8dd39525] {
width: 4.6875rem;
@ -292,6 +291,9 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
flex: 1;
font-size: 0.875rem;
}
.topbos .taryInfo[data-v-8dd39525] {
font-size: 0.875rem;
}
.flbuts[data-v-8dd39525] {
width: 10rem;
height: 2.75rem;

46
utils/request.js
Unescape View File

@ -20,6 +20,7 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
"grant_type": 'refresh_token',
'scope': 'all',
"refresh_token": user.refresh_token,
// "refresh_token": 123,
'tenantId': user.tenant_id
}
header['Content-Type'] = 'application/x-www-form-urlencoded'
@ -39,7 +40,27 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
uni.setStorageSync('userinfo', userinfo)
resolve(res)
} else {
reject(null)
// 刷新token失败, 退出登录
uni.reLaunch({
url: '/pages/login/login'
})
const res = uni.getStorageInfoSync();
res.keys.map(item => {
if (item == 'loginuser' || item == 'HistoryDate' || item == 'setip' || item ==
'checkname' || item.indexOf('IMAGE_CACHE_INFO') != -1) {
return
}
uni.removeStorageSync(item)
})
uni.reLaunch({
url: '/pages/login/login'
})
requestObj = {}
_isRefreshToken._isRefreshToken = null
functions.error('请登录')
reject({
code: 4000
})
}
}).catch((err) => {
@ -47,9 +68,19 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
uni.reLaunch({
url: '/pages/login/login'
})
uni.removeStorage({
key: 'access_token'
const res = uni.getStorageInfoSync();
res.keys.map(item => {
if (item == 'loginuser' || item == 'HistoryDate' || item == 'setip' || item ==
'checkname' || item.indexOf('IMAGE_CACHE_INFO') != -1) {
return
}
uni.removeStorageSync(item)
})
uni.reLaunch({
url: '/pages/login/login'
})
requestObj = {}
_isRefreshToken._isRefreshToken = null
functions.error('请登录')
reject(err)
})
@ -128,8 +159,6 @@ const HandleRequest = (params, key) => {
const request = uni.request(submitData)
console.log('request :>> ', request);
request.then(res => {
// console.log(res);
console.log('登录res :>> ', res);
@ -181,7 +210,7 @@ const HandleRequest = (params, key) => {
return
} else if (res.statusCode == 401) {
// 登录失败时
if (!refresh_token) {
if (!refresh_token && params.url.indexOf('blade-auth/oauth/token') != -1) {
return uni.showToast({
title: "登录失败",
icon: 'none'
@ -205,6 +234,8 @@ const HandleRequest = (params, key) => {
HandleRequest(requestObj[key], key).then((res) => {
relove(res)
})
}).catch(() => {
}).finally(() => {
// 关闭刷新token状态
_isRefreshToken._isRefreshToken = null
@ -237,7 +268,7 @@ const HandleRequest = (params, key) => {
/**
* 存储请求
*/
const requestObj = {}
let requestObj = {}
/**
* 是否正在进行刷新token
@ -259,7 +290,6 @@ const service = async (params) => {
console.log('_isRefreshToken :>> ', _isRefreshToken);
if (_isRefreshToken._isRefreshToken) {
await _isRefreshToken._isRefreshToken
console.log('213123 :>> ', 213123);
return HandleRequest(params, _key)
} else return HandleRequest(params, _key)

7
utils/utils.js
Unescape View File

@ -120,8 +120,13 @@ const utils = {
let BAdapter = BManager.getAdapter();
plus.android.importClass(BAdapter);
let lists = BAdapter.getBondedDevices();
// let aaa = BAdapter.getProfileConnectionState()
// console.log('aaa :>> ', aaa);
// console.log('lists :>> ', lists);
plus.android.importClass(lists);
let iterator = lists.iterator();
console.log('iterator :>> ', iterator);
plus.android.importClass(iterator);
while (iterator.hasNext()) {
let d = iterator.next();
@ -135,6 +140,8 @@ const utils = {
};
deviceList.push(temp);
}
// getProfileConnectionState
return deviceList
// #endif
},

Write Preview
Loading…
Cancel
Save