Browse Source

新增备货库位

dev
qb 11 months ago
parent
commit
b4c0c0b587
  1. 17
      api/user.js
  2. 8
      config/host.js
  3. 72
      interfaces/pagesHome/StockUplistScandetails.ts
  4. 4
      interfaces/pagesHome/setbarcode.ts
  5. 6
      manifest.json
  6. 21
      pagesHome/pages/ArrivalList/ArrivalList.vue
  7. 92
      pagesHome/pages/PickUpLotList/PickUpLotList.vue
  8. 167
      pagesHome/pages/PickingScanList/PickingScanList.vue
  9. 37
      pagesHome/pages/StockUplist/StockUplist.vue
  10. 222
      pagesHome/pages/StockUplistByZero/StockUplistByZero.vue
  11. 953
      pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
  12. 4
      pagesHome/pages/StowageListDetails/StowageListDetails.vue
  13. 12
      pagesHome/pages/setbarcode/setbarcode.vue
  14. 13
      pagesTask/pages/checkTaskList/checkTaskList.vue
  15. 18
      pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
  16. BIN
      unpackage/debug/android_debug.apk
  17. 2
      unpackage/dist/build/app-plus/pagesHome/pages/PickingScanList/PickingScanList.css
  18. 4
      unpackage/dist/dev/app-plus/app-config-service.js
  19. 1652
      unpackage/dist/dev/app-plus/app-service.js
  20. 10
      unpackage/dist/dev/app-plus/app.css
  21. 6
      unpackage/dist/dev/app-plus/manifest.json
  22. 4
      unpackage/dist/dev/app-plus/pagesHome/pages/PickingScanList/PickingScanList.css
  23. 1
      unpackage/dist/dev/app-plus/pagesHome/pages/StockUplist/StockUplist.css
  24. 35
      unpackage/dist/dev/mp-weixin/api/user.js
  25. 5
      unpackage/dist/dev/mp-weixin/app.js
  26. 3
      unpackage/dist/dev/mp-weixin/app.json
  27. 36
      unpackage/dist/dev/mp-weixin/app.wxss
  28. 22
      unpackage/dist/dev/mp-weixin/common/assets.js
  29. 344
      unpackage/dist/dev/mp-weixin/common/vendor.js
  30. 2
      unpackage/dist/dev/mp-weixin/compoment/saomiao1.js
  31. 2
      unpackage/dist/dev/mp-weixin/compoment/saomiao2.js
  32. 5
      unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js
  33. 4
      unpackage/dist/dev/mp-weixin/compoment/tips/tips.js
  34. 2
      unpackage/dist/dev/mp-weixin/config/host.js
  35. 17
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  36. 39
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  37. 4
      unpackage/dist/dev/mp-weixin/pages/user/user.js
  38. 20
      unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js
  39. 6
      unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js
  40. 4
      unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js
  41. 4
      unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.js
  42. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.js
  43. 20
      unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js
  44. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.wxml
  45. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.js
  46. 11
      unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.js
  47. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.wxml
  48. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js
  49. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml
  50. 102
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxss
  51. 6
      unpackage/dist/dev/mp-weixin/pagesHome/pages/Relocation/Relocation.js
  52. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/Retention/Retention.js
  53. 57
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js
  54. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
  55. 4
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js
  56. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.js
  57. 3
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.js
  58. 191
      unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js
  59. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.wxml
  60. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.wxss
  61. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryDetail/inventoryDetail.js
  62. 3
      unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.js
  63. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js
  64. 3
      unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js
  65. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js
  66. 1
      unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js
  67. 9
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
  68. 3
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js
  69. 11
      unpackage/dist/dev/mp-weixin/project.config.json
  70. 2
      unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-icon/u-icon.wxss
  71. 4
      unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-navbar/u-navbar.wxss
  72. 31
      unpackage/dist/dev/mp-weixin/utils/request.js
  73. 16
      unpackage/dist/dev/mp-weixin/utils/utils.js

17
api/user.js

@ -2964,7 +2964,7 @@ export function postDeliveryInfo(data, loadingObj = {}) {
} }
/** /**
* 获取运单 / 订单数据 * 获取库位列表
*/ */
export function postGoodsAllocation(data, loadingObj = {}) { export function postGoodsAllocation(data, loadingObj = {}) {
return request({ return request({
@ -2977,7 +2977,7 @@ export function postGoodsAllocation(data, loadingObj = {}) {
} }
/** /**
* 获取运单 / 订单数据 * 上传签收图片
*/ */
export function postUploadSignPhoto(data, loadingObj = {}) { export function postUploadSignPhoto(data, loadingObj = {}) {
return request({ return request({
@ -2987,4 +2987,17 @@ export function postUploadSignPhoto(data, loadingObj = {}) {
}, },
loadingObj loadingObj
); );
}
/**
* 查找备货库位
*/
export function postUpShelfScanAllocation(data, loadingObj = {}) {
return request({
url: `logpm-warehouse/api/warehouseUpdownStockupArea/upShelfScanAllocation`,
method: "post",
data
},
loadingObj
);
} }

8
config/host.js

@ -4,7 +4,7 @@
* 测试域名 * 测试域名
* */ * */
//测试域名s //测试域名s
// const devhost = 'http://test.api.huo5you.com/' const devhost = 'http://test.api.huo5you.com/'
// lmy // lmy
// const devhost = 'http://192.168.10.123:8889/' // const devhost = 'http://192.168.10.123:8889/'
// zhy // zhy
@ -12,7 +12,7 @@
// xiaohei // xiaohei
// const devhost = 'http://192.168.3.18:13000/' // const devhost = 'http://192.168.3.18:13000/'
// tjj // tjj
const devhost = 'http://192.168.3.14:13000/' // const devhost = 'http://192.168.3.14:13000/'
// cyz // cyz
// const devhost = 'http://192.168.6.169:9777/' // const devhost = 'http://192.168.6.169:9777/'
// const devhost = 'http://192.168.6.141:8777/' // const devhost = 'http://192.168.6.141:8777/'
@ -25,9 +25,9 @@ const devhost = 'http://192.168.3.14:13000/'
/** /**
* 正式域名 * 正式域名
* */ * */
// const prohost = 'http://h5uapi.huitongys.com/' const prohost = 'http://h5uapi.huitongys.com/'
// const prohost = 'https://h5uapi.huitongys.com/' // 小程序 // const prohost = 'https://h5uapi.huitongys.com/' // 小程序
const prohost = 'http://test.api.huo5you.com/' // const prohost = 'http://test.api.huo5you.com/'
/** /**
* 图片域名 * 图片域名
* */ * */

72
interfaces/pagesHome/StockUplistScandetails.ts

@ -1,86 +1,90 @@
export interface detailType{ export interface detailType {
/** /**
* */ * */
dataList:{ dataList : {
/** /**
* */ * */
orderCode:string|number; orderCode : string | number;
/** /**
* */ * */
packageBarCode:string|number; packageBarCode : string | number;
/** /**
* */ * */
goodsType?:string|number; goodsType ?: string | number;
/** /**
* */ * */
isScan?:string|number; isScan ?: string | number;
/** /**
* */ * */
isScanStr?:string; isScanStr ?: string;
/** /**
* */ * */
StockUp?:string|number; StockUp ?: string | number;
/** /**
* */ * */
materialName?:string materialName ?: string
}[]; }[];
/** ID /** ID
* */ * */
stockArticleId:string; stockArticleId : string;
/** /**
* */ * */
orderStatus:string; orderStatus : string;
/** ID /** ID
* */ * */
reservationId:string; reservationId : string;
/** ID /** ID
* */ * */
stockListId:string; stockListId : string;
/** /**
* */ * */
allocation:string; allocation : string;
/** /**
* */ * */
pallet:string; pallet : string;
/** /**
* */ * */
customer:string; customer : string;
/** /**
* */ * */
stockupArea:string; stockupArea : string;
/** /**
* */ * */
planNum:string|number; planNum : string | number;
/** /**
* */ * */
scanNum:string|number; scanNum : string | number;
/** /**
* */ * */
trays:string; trays : string;
/** /**
* */ * */
warehouseArea:string; warehouseArea : string;
/** /**
* */ * */
orderCode:string; orderCode : string;
/** /**
* */ * */
scancode:string; scancode : string;
/** id /** id
* */ * */
stockupId:string; stockupId : string;
/** /**
* */ * */
address:string; address : string;
/** /**
* */ * */
isscan:boolean; isscan : boolean;
/** ID /** ID
* */ * */
allocationId:string; allocationId : string;
/** /**
* */ * */
status:string|number; status : string | number;
typeService:number|string typeService : number | string
/** 备货库位ID */
stockupAllocationId : string
/** 备货库位名称 */
stockupAllocationName : string
} }

4
interfaces/pagesHome/setbarcode.ts

@ -38,4 +38,8 @@ export interface detailType {
orderpackgedetails : any; orderpackgedetails : any;
/** 商场名称 */ /** 商场名称 */
mallName : string mallName : string
/** 备货库位ID */
stockupAllocationId : string
/** 备货库位名称 */
stockupAllocationName : string
} }

6
manifest.json

@ -1,9 +1,9 @@
{ {
"name" : "货无忧测试版", "name" : "货无忧",
"appid" : "__UNI__EB22F37", "appid" : "__UNI__EB22F37",
"description" : "", "description" : "",
"versionName" : "1.1.27", "versionName" : "1.1.28",
"versionCode" : 1127, "versionCode" : 1128,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

21
pagesHome/pages/ArrivalList/ArrivalList.vue

@ -284,26 +284,7 @@
const date = ref<(string | number)[]>([]) const date = ref<(string | number)[]>([])
async function scandata() { async function scandata() {
let data = {
trayCode: details.scancode
}
let res = await warehouseTrayTypeorderScanTrayCode(data)
if (res.code !== 200) return
console.log('res', res);
if (Number(res.data.isHasData) === 0) {
utils.ttsspke('请选择分拣方式')
uni.setStorageSync('trayCodeType', res.data.data)
uni.navigateTo({
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() { async function initpage() {
try { try {

92
pagesHome/pages/PickUpLotList/PickUpLotList.vue

@ -2,64 +2,69 @@
<BasicContainer ref='basicContainer' :option="option"> <BasicContainer ref='basicContainer' :option="option">
<!-- 头部 --> <!-- 头部 -->
<template #head> <template #head>
<view class="header-container"> <view class="">
<!-- 顶部背景 --> <image class="header_bg" src="@/pagesHome/static/bgby.png"></image>
<view class="header">
<view class="search_row"> <view class="header-container">
<input placeholder="请输入包条码" v-model='details.searchText' type="text" name="" id=""> <!-- 顶部背景 -->
<view class="search_button" @click="handleSearch"> <view class="header">
确认 <view class="search_row">
<input placeholder="请输入包条码" v-model='details.searchText' type="text" name="" id="">
<view class="search_button" @click="handleSearch">
确认
</view>
</view> </view>
</view>
<view class="header_row"> <view class="header_row">
<view> <view>
托盘码{{details.pageInfo.trayCode || '暂无数据'}} 托盘码{{details.pageInfo.trayCode || '暂无数据'}}
</view> </view>
<view> <view>
托盘名称{{details.pageInfo.trayName || '暂无数据'}} 托盘名称{{details.pageInfo.trayName || '暂无数据'}}
</view>
</view> </view>
</view>
<view class="header_row"> <view class="header_row">
<view> <view>
打托方式{{details.pageInfo.pageName || '暂无数据'}} 打托方式{{details.pageInfo.pageName || '暂无数据'}}
</view> </view>
<view> <view>
名称{{details.detauser.name || '暂无数据'}} 名称{{details.detauser.name || '暂无数据'}}
</view>
</view> </view>
</view>
<view class="header_row"> <view class="header_row">
<view> <view>
订单在托数{{details.detauser.orderlNum || '暂无数据'}} 订单在托数{{details.detauser.orderlNum || '暂无数据'}}
</view> </view>
<view> <view>
订单总数{{details.detauser.orderTotalNum || '暂无数据'}} 订单总数{{details.detauser.orderTotalNum || '暂无数据'}}
</view>
</view> </view>
</view>
<view class="header_row"> <view class="header_row">
<view> <view>
路线{{details.pageInfo.lineNameTitle || '暂无数据'}} 路线{{details.pageInfo.lineNameTitle || '暂无数据'}}
</view>
</view> </view>
</view>
<view class="header_row"> <view class="header_row">
<view> <view>
批次号{{details.pageInfo.billladingCode || '暂无数据'}} 批次号{{details.pageInfo.billladingCode || '暂无数据'}}
</view>
</view> </view>
</view>
<view class="header_row"> <view class="header_row">
<view> <view>
备注{{details.detauser.remark || '暂无数据'}} 备注{{details.detauser.remark || '暂无数据'}}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
@ -340,6 +345,13 @@
position: relative; position: relative;
} }
//
.header_bg {
position: absolute;
width: 100%;
top: -20upx;
}
// //
.header { .header {
width: calc(100vw - 60upx); width: calc(100vw - 60upx);

167
pagesHome/pages/PickingScanList/PickingScanList.vue

@ -2,13 +2,18 @@
<BasicContainer ref="basicContainer" :option="option" :leftClick="backPreviousPage"> <BasicContainer ref="basicContainer" :option="option" :leftClick="backPreviousPage">
<template #head> <template #head>
<view class="hedtopt"> <view class="hedtopt">
<!-- <view class="topBox"> <view class="topBox">
<input type="text" v-model="details.searchValue" class="searchInput" placeholder="请输入库位名称" /> <input type="text" v-model="details.searchValue" class="searchInput" placeholder="请输入库位名称" />
<view class="button" @click="handleSearch">搜索</view> <view class="button" @click="handleSearch">搜索</view>
</view> --> </view>
<view class="typto"> <view class="typto">
<view>备货区域<text class="vibx" @click="showlist">{{items.stockupArea}}</text></view> <view class="align-center">
<!-- <view>备货区域{{items.stockupArea || '暂无数据'}}</view> --> <text>
备货区域
</text>
<!-- <text class="vibx">{{items.stockupArea}}</text> -->
<text class="vibx">{{details.stockUpStorageInfo.stockupAllocationName}}</text>
</view>
</view> </view>
<view class="typto"> <view class="typto">
<view>备货编码{{items.stockupCode}}</view> <view>备货编码{{items.stockupCode}}</view>
@ -74,16 +79,15 @@
<saomiao2 :ishidestop="scanState !== 0"></saomiao2> <saomiao2 :ishidestop="scanState !== 0"></saomiao2>
<!-- #endif --> <!-- #endif -->
<tiplist ref="tiplists"></tiplist> <tiplist ref="tiplists"></tiplist>
<tips ref="tips"></tips> <tips ref="tip"></tips>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { import {
distributionStockuppageListClient, distributionStockuppageListClient,
distributionStockupgetStockupArea,
distributionStockupupdateStockArea, distributionStockupupdateStockArea,
distributionInspectStockUpArea, distributionInspectStockUpArea,
distributionScanStockUpArea postUpShelfScanAllocation
} from '@/api/user.js' } from '@/api/user.js'
import { import {
onLoad, onLoad,
@ -122,13 +126,23 @@
authbuts: uni.getStorageSync('authbuts'), authbuts: uni.getStorageSync('authbuts'),
stockupArea: '', stockupArea: '',
/** 搜索框的值 */ /** 搜索框的值 */
searchValue: '' searchValue: '',
/** 备货库位信息 */
stockUpStorageInfo: {
/** 备货库位ID */
stockupAllocationId: '',
/** 备货库位名称 */
stockupAllocationName: ''
}
}) })
// const tips = ref(null) const tip = ref(null)
onLoad((op) => { onLoad((op) => {
details.id = op.id details.id = op.id
details.stockupArea = op.stockupArea details.stockupArea = op.stockupArea
// details.items=JSON.parse(op.item) // details.items=JSON.parse(op.item)
// #ifdef APP
utils.ttsspke('请扫描备货库位')
// #endif
}) })
onShow(async () => { onShow(async () => {
// initpage() // initpage()
@ -138,7 +152,7 @@
if (code) { if (code) {
console.log(code); console.log(code);
details.scancode = code details.scancode = code
// scandata() scandata()
} }
}) })
// #endif // #endif
@ -147,65 +161,6 @@
await nextTick() await nextTick()
basicContainer.value.startPullDownRefresh() basicContainer.value.startPullDownRefresh()
}) })
/* onHide(() => {
uni.$off('scancodedate')
}) */
async function showlist() {
// #ifdef APP
utils.ttsspke('请选择备货区')
// #endif
let list = []
const user = userInfo.value as any
let data = {
userId: user.user_id
}
let res = await distributionStockupgetStockupArea(data)
console.log(res);
if (res.code == 200) {
res.data.map(item => {
list.push(item.headline)
})
}
// return
tiplists.value.setdetails({
title: '请选择备货区域',
isshow: true,
tipstate: 2,
list,
checklist: [],
inputtext: '',
confirmTxt: '确认选择',
isonecheck: true,
success: async (deta) => {
// console.log(res.data[deta.checklist[0]].id);
if (deta.checklist.length == 0) {
uni.showToast({
title: '请选择备货区域',
icon: 'none'
})
return
}
let data = {
type: 2,
stockupId: details.id,
stockupAreaId: res.data[deta.checklist[0]].id,
stockupArea: res.data[deta.checklist[0]].headline,
}
let response = await distributionStockupupdateStockArea(data)
if (response.code == 200) {
//
basicContainer.value.startPullDownRefresh()
}
tiplists.value.setdetails({ isshow: false })
},
cancel: (details) => {
tiplists.value.setdetails({ isshow: false })
},
close: (details) => {
tiplists.value.setdetails({ isshow: false })
}
})
}
// //
async function initpage() { async function initpage() {
@ -224,64 +179,68 @@
} }
function goCustomerOrdersDetails(item) { function goCustomerOrdersDetails(item) {
if (!details.stockUpStorageInfo.stockupAllocationId) return utils.handleToast('请扫描备货库位')
uni.navigateTo({ uni.navigateTo({
url: '/pagesHome/pages/StockUplist/StockUplist?item=' url: '/pagesHome/pages/StockUplist/StockUplist?item='
+ JSON.stringify(item) + '&id=' + item.reservationId + JSON.stringify(item) + '&id=' + item.reservationId
+ '&stockupId=' + details.id + '&stockupId=' + details.id
+ '&stockupAllocationId=' + details.stockUpStorageInfo.stockupAllocationId
+ '&stockupAllocationName=' + details.stockUpStorageInfo.stockupAllocationName
}) })
} }
const { items, datalist } = toRefs(details) const { items, datalist } = toRefs(details)
// //
async function scandata() { async function scandata() {
const submitData = { stockUpAreaCode: details.scancode } if (details.stockUpStorageInfo.stockupAllocationId === details.scancode) return utils.handleToast('当前已在该备货区')
const res = await distributionScanStockUpArea(submitData)
const submitData = { allocationId: details.scancode }
const res = await postUpShelfScanAllocation(submitData)
const { code, data } = res const { code, data } = res
if (code !== 200) return if (code !== 200) return
tiplists.value.setdetails({
isshow: true, if (!data) return utils.handleToast('请扫描备货库位')
tipstate: 1,
tip.value.setdetails({
title: '是否切换备货区', title: '是否切换备货区',
placeholder: '是否切换备货区', content: `备货区:${data.qrCode}`,
inputtext: '', confirmTxt: '确认',
success: async (detail) => { isshow: true,
// details.scancode= isshowcancel: true,
let data = { success: async () => {
type: 1, details.stockUpStorageInfo.stockupAllocationId = data.id
stockupId: details.id, details.stockUpStorageInfo.stockupAllocationName = data.qrCode
stockupAreaCode: details.scancode
} utils.handleToast('切换成功')
let res = await distributionStockupupdateStockArea(data) tip.value.setisshow(false)
console.log("res", res);
if (res.code === 200) {
//
basicContainer.value.startPullDownRefresh()
}
tiplists.value.setdetails({ isshow: false })
}, },
cancel: () => { cancel: () => {
tiplists.value.setdetails({ isshow: false }) tip.value.setisshow(false)
}, },
close: () => { close: () => {
tiplists.value.setdetails({ isshow: false }) tip.value.setisshow(false)
} }
}) })
} }
/** 搜索 */ /** 搜索 */
const handleSearch = async () => { const handleSearch = async () => {
try { details.scancode = details.searchValue
uni.showLoading() scandata()
const submitData = { fragment: details.searchValue } // try {
const res = await distributionInspectStockUpArea(submitData) // uni.showLoading()
const { code, data } = res
console.log('data :>> ', data); // const submitData = { fragment: details.searchValue }
} catch (e) { // const res = await distributionInspectStockUpArea(submitData)
//TODO handle the exception // const { code, data } = res
} finally { // console.log('data :>> ', data);
uni.hideLoading() // } catch (e) {
} // //TODO handle the exception
// } finally {
// uni.hideLoading()
// }
} }
// //

37
pagesHome/pages/StockUplist/StockUplist.vue

@ -170,7 +170,6 @@
import { import {
distributionStockuporderList, distributionStockuporderList,
distributionStockupscanningCode, distributionStockupscanningCode,
distributionStockuplocationSelection,
postZeroStockUpData, postZeroStockUpData,
postZeroStockUp, postZeroStockUp,
distributionScanStockUpArea distributionScanStockUpArea
@ -226,11 +225,17 @@
/** 被选中的 */ /** 被选中的 */
chooseItem: {}, chooseItem: {},
scrollHeight: '', scrollHeight: '',
/** 备货库位ID */
stockupAllocationId: '',
/** 备货库位名称 */
stockupAllocationName: '',
}) })
onLoad((op) => { onLoad((op) => {
console.log('op :>> ', op); console.log('op :>> ', op);
details.reservationId = op.id details.reservationId = op.id
details.stockupId = op.stockupId details.stockupId = op.stockupId
details.stockupAllocationId = op.stockupAllocationId
details.stockupAllocationName = op.stockupAllocationName
details.items = JSON.parse(op.item) details.items = JSON.parse(op.item)
const _tts = ['定制品拣货', '库存品拣货', '零担拣货'] const _tts = ['定制品拣货', '库存品拣货', '零担拣货']
@ -244,6 +249,9 @@
console.log('code :>> ', code); console.log('code :>> ', code);
console.log(code); console.log(code);
details.scancode = code details.scancode = code
if (!details.stockupAllocationId) return utils.handleToast('备货库位异常, 请返回上一页进行扫描备货库位')
if (details.isChooseStorage) scanChooseStorage() if (details.isChooseStorage) scanChooseStorage()
if (details.isscan) scandata() if (details.isscan) scandata()
} }
@ -305,13 +313,18 @@
function godetails(item : any) { function godetails(item : any) {
uni.navigateTo({ uni.navigateTo({
url: '/pagesHome/pages/StockUplistScandetails/StockUplistScandetails?stockArticleId=' url: '/pagesHome/pages/StockUplistScandetails/StockUplistScandetails?stockArticleId='
+ (item.stockArticleId || '') + + (item.stockArticleId || '')
'&orderStatus=' + + '&orderStatus=' + details.orderStatus
details.orderStatus + '&reservationId=' + details.reservationId + + '&reservationId=' + details.reservationId
'&allocation=' + item.allocation + '&pallet=' + item.pallet + '&orderCode=' + item.orderCode + '&allocation=' + item.allocation
+ '&stockupId=' + details.stockupId + '&allocationId=' + item.allocationId + '&pallet=' + item.pallet
+ '&orderCode=' + item.orderCode
+ '&stockupId=' + details.stockupId
+ '&allocationId=' + item.allocationId
+ '&typeService=' + details.items.typeService + '&typeService=' + details.items.typeService
+ '&status=' + (item.completeStact ? '1' : '0') + '&status=' + (item.completeStact ? '1' : '0')
+ '&stockupAllocationId=' + details.stockupAllocationId
+ '&stockupAllocationName=' + details.stockupAllocationName
}) })
} }
@ -364,6 +377,8 @@
+ '&allocationId=' + item.allocationList[0].id + '&allocationId=' + item.allocationList[0].id
+ '&positionCode=' + item.allocationList[0].name + '&positionCode=' + item.allocationList[0].name
+ '&mallName=' + details.items.mallName + '&mallName=' + details.items.mallName
+ '&stockupAllocationId=' + details.stockupAllocationId
+ '&stockupAllocationName=' + details.stockupAllocationName
}) })
} }
details.isChooseStorage = true details.isChooseStorage = true
@ -398,6 +413,8 @@
+ '&allocationId=' + item.allocationList[_index].id + '&allocationId=' + item.allocationList[_index].id
+ '&positionCode=' + item.allocationList[_index].name + '&positionCode=' + item.allocationList[_index].name
+ '&mallName=' + details.items.mallName + '&mallName=' + details.items.mallName
+ '&stockupAllocationId=' + details.stockupAllocationId
+ '&stockupAllocationName=' + details.stockupAllocationName
}) })
details.isChooseStorage = false details.isChooseStorage = false
tiplists.value.setdetails({ isshow: false }) tiplists.value.setdetails({ isshow: false })
@ -440,7 +457,9 @@
stockupId: details.stockupId, stockupId: details.stockupId,
trayId: details.trayId, trayId: details.trayId,
reservationId: details.reservationId, reservationId: details.reservationId,
scanType: 1 scanType: 1,
stockupAllocationId: details.stockupAllocationId,
stockupAllocationName: details.stockupAllocationName
} }
let res = await distributionStockupscanningCode(data) let res = await distributionStockupscanningCode(data)
if (res.code !== 200) return if (res.code !== 200) return
@ -477,6 +496,8 @@
+ '&allocationId=' + _item.id + '&allocationId=' + _item.id
+ '&positionCode=' + _item.name + '&positionCode=' + _item.name
+ '&mallName=' + details.items.mallName + '&mallName=' + details.items.mallName
+ '&stockupAllocationId=' + details.stockupAllocationId
+ '&stockupAllocationName=' + details.stockupAllocationName
}) })
} }
@ -738,6 +759,8 @@
orderCode: item.orderCode, orderCode: item.orderCode,
stockArticleId: item.stockArticleId, stockArticleId: item.stockArticleId,
reservationId: details.reservationId, reservationId: details.reservationId,
stockupAllocationId: details.stockupAllocationId,
stockupAllocationName: details.stockupAllocationName
}) })
}) })
} }

222
pagesHome/pages/StockUplistByZero/StockUplistByZero.vue

@ -49,7 +49,8 @@
<template #content> <template #content>
<block v-for="(item, index) in details.allocationList" :key="item.allocationid"> <block v-for="(item, index) in details.allocationList" :key="item.allocationid">
<view :class="{mb20:index !== details.allocationList.length - 1, item_contariner: true}"> <view @click="()=>handleStockUpZero(item, 1)"
:class="{mb20:index !== details.allocationList.length - 1, item_contariner: true}">
<view class="flex-c-sb "> <view class="flex-c-sb ">
<view class=""> <view class="">
<text class="mr10">库位</text> <text class="mr10">库位</text>
@ -61,17 +62,6 @@
<text>{{item.num}}</text> <text>{{item.num}}</text>
</view> </view>
</view> </view>
<view class="mt20 flex">
<view>
备货数
</view>
<view class="flex1">
<InputNum v-model="item.scanNum" :maxNum="item.num"></InputNum>
</view>
</view>
</view> </view>
</block> </block>
</template> </template>
@ -97,7 +87,8 @@
<template #content> <template #content>
<block v-for="(item, index) in details.trayList" :key="item.allocationid"> <block v-for="(item, index) in details.trayList" :key="item.allocationid">
<view :class="{mb20:index !== details.trayList.length - 1, item_contariner: true}"> <view @click="()=>handleStockUpZero(item, 2)"
:class="{mb20:index !== details.trayList.length - 1, item_contariner: true}">
<view class="flex-c-sb "> <view class="flex-c-sb ">
<view class=""> <view class="">
<text class="mr10">托盘名称</text> <text class="mr10">托盘名称</text>
@ -109,17 +100,6 @@
<text>{{item.num}}</text> <text>{{item.num}}</text>
</view> </view>
</view> </view>
<view class="mt20 flex">
<view>
备货数
</view>
<view class="flex1">
<InputNum v-model="item.scanNum" :maxNum="item.num"></InputNum>
</view>
</view>
</view> </view>
</block> </block>
</template> </template>
@ -144,21 +124,23 @@
</template> </template>
<template #content> <template #content>
<view class="{ item_contariner: true}"> <view class="item_contariner" @click="()=>handleStockUpZero(details.other, 3)">
<view> <view>
<text class="mr10">在库数</text> <text class="mr10">在库数</text>
<text>{{details.other.num}}</text> <text>{{details.other.num}}</text>
</view> </view>
<view class="mt20 flex"> <!-- <view class="mt20 flex-c-c">
<view> <view>
备货数 备货数
</view> </view>
<view class="flex1"> <view class="flex1">
<InputNum v-model="details.other.scanNum" :maxNum="details.other.num"></InputNum> <InputNum v-model="details.other.scanNum" :maxNum="details.other.num"></InputNum>
</view> </view>
</view>
<view class="button">备货</view>
</view> -->
</view> </view>
</template> </template>
@ -174,9 +156,64 @@
<!-- #endif --> <!-- #endif -->
<BluetoothList ref="bluetoothList"></BluetoothList> <BluetoothList ref="bluetoothList"></BluetoothList>
<!-- 切换库位 --> <!-- 零担备货 -->
<PopUp ref="ChangeStorage"> <PopUp ref="StockUpZero">
<view class="PopUpTitle">请扫描库位码</view> <view class="pd10">
<!-- 库位 -->
<template v-if="details.type === 1">
<view class="item_contariner">
<view class="flex-c-sb">
<view class="">
<view class="mr10">库位</view>
<view>{{details.stockUpInfo.allocationName}}</view>
</view>
<view style="width: 35%;">
<view class="mr10">在库数</view>
<view>{{details.stockUpInfo.num}}</view>
</view>
</view>
</view>
</template>
<!-- 托盘 -->
<template v-if="details.type === 2">
<view class="item_contariner">
<view class="flex-c-sb ">
<view class="">
<view class="mr10">托盘名称</view>
<view>{{details.stockUpInfo.trayName}}</view>
</view>
<view style="width: 35%;">
<view class="mr10">在库数</view>
<view>{{details.stockUpInfo.num}}</view>
</view>
</view>
</view>
</template>
<!-- 其它 -->
<template v-if="details.type === 3">
<view class="item_contariner">
<view>
<text class="mr10">在库数</text>
<text>{{details.stockUpInfo.num}}</text>
</view>
</view>
</template>
<view class="mt20 flex-c-c">
<view>
备货数
</view>
<view class="flex1">
<InputNum v-model="details.stockUpInfo.scanNum" :maxNum="details.stockUpInfo.maxNum"></InputNum>
</view>
</view>
</view>
</PopUp> </PopUp>
</template> </template>
@ -184,10 +221,10 @@
import { import {
onLoad, onLoad,
onShow, onShow,
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import { import {
postZeroStockUpData postZeroStockUpData,
postZeroStockUp
} from '@/api/user.js' } from '@/api/user.js'
import { reactive, ref, onMounted, nextTick } from "vue"; import { reactive, ref, onMounted, nextTick } from "vue";
import useBluetoothStore from '@/store/useBluetoothStore.js'; import useBluetoothStore from '@/store/useBluetoothStore.js';
@ -202,7 +239,7 @@
const tiplists = ref(null) const tiplists = ref(null)
const basicContainer = ref(null) const basicContainer = ref(null)
/** 切换库位 */ /** 切换库位 */
const ChangeStorage = ref(null) const StockUpZero = ref(null)
// //
const option = { const option = {
title: '备货列表', title: '备货列表',
@ -224,7 +261,16 @@
/** 库位 */ /** 库位 */
allocationList: [], allocationList: [],
allocationTotal: 0, allocationTotal: 0,
data: {} as any /** 页面数据 */
data: {} as any,
/** 备货所在类型, 1 -- 库位, 2 -- 托盘, 3 -- 其它 */
type: 1 as 1 | 2 | 3,
/** 备货数据 */
stockUpInfo: {},
/** 备货库位ID */
stockupAllocationId: '',
/** 备货库位名称 */
stockupAllocationName: '',
}) })
const PullDownRef1 = ref() const PullDownRef1 = ref()
@ -234,6 +280,9 @@
onLoad((op) => { onLoad((op) => {
details.pageInfo = JSON.parse(op.info) details.pageInfo = JSON.parse(op.info)
console.log('details.pageInfo :>> ', details.pageInfo); console.log('details.pageInfo :>> ', details.pageInfo);
// #ifdef APP
utils.ttsspke('请选择零担进行备货')
// #endif
}) })
onShow(async () => { onShow(async () => {
// #ifdef APP // #ifdef APP
@ -252,14 +301,13 @@
basicContainer.value.startPullDownRefresh() basicContainer.value.startPullDownRefresh()
}) })
onMounted(async () => { onMounted(async () => {
await nextTick() await nextTick()
details.scrollHeight = await utils.getViewDistanceFormTop('.scvew') details.scrollHeight = await utils.getViewDistanceFormTop('.scvew')
}) })
async function initpage() { async function initpage() {
try { try {
const submitData = { const submitData = {
@ -295,6 +343,7 @@
} }
await nextTick() await nextTick()
//
PullDownRef1.value.handleShowPullDown(true) PullDownRef1.value.handleShowPullDown(true)
PullDownRef2.value.handleShowPullDown(true) PullDownRef2.value.handleShowPullDown(true)
PullDownRef3.value.handleShowPullDown(true) PullDownRef3.value.handleShowPullDown(true)
@ -350,51 +399,50 @@
// #endif // #endif
} }
/** /**
* 打印订单码 * type : 1 -- 库位, 2 -- 托盘, 3 -- 其它
*/ */
function printOrderCode(item) { const handleStockUpZero = (value : any, type : 1 | 2 | 3) => {
console.log('item :>> ', item); details.stockUpInfo = { ...value }
// return
// const _max = (details.data.planNum || 0) - (details.data.scanNum || 0)
tiplists.value.setdetails({
title: '生成订单编号二维码数量', console.log('details.stockUpInfo :>> ', details.stockUpInfo);
isshow: true,
tipstate: 1, details.stockUpInfo.maxNum = _max > details.stockUpInfo.num ? details.stockUpInfo.num : _max
// inpList, details.stockUpInfo.scanNum = 0
inputtext: 1,
confirmTxt: '确定生成', details.type = type
isonecheck: true,
success: async (deta) => { console.log('details.pageInfo :>> ', details.pageInfo);
//
const _inputValue = parseInt(deta.inputtext) StockUpZero.value.setDetails({
// title: '零担备货',
let _flag = true showPopUp: true,
if (_inputValue !== _inputValue) { success() {
uni.showToast({ const { scanNum, maxNum } = details.stockUpInfo as any
title: '请输入数字',
icon: 'none' if (scanNum > maxNum) return utils.handleToast('不能大于已备数量')
})
_flag = false const submitData : any = {
} else if (_inputValue <= 0) { num: scanNum,
uni.showToast({ orderId: details.data.orderId,
title: '数字必须大于零', orderCode: details.pageInfo.orderCode,
icon: 'none' stockupId: details.pageInfo.stockupId,
}) typeService: details.pageInfo.typeService,
_flag = false stockArticleId: details.pageInfo.stockArticleId,
reservationId: details.pageInfo.reservationId,
stockupAllocationId: details.pageInfo.stockupAllocationId,
stockupAllocationName: details.pageInfo.stockupAllocationName,
} }
// , 退
if (!_flag) return tiplists.value.setdetails({ isshow: false, success() { handlePrintZeroOrder(item, _inputValue) } }) console.log('submitData :>> ', submitData);
handlePrintZeroOrder(item, _inputValue) //
if (type === 1) submitData.allocationId = value.allocationid
tiplists.value.setdetails({ isshow: false }) else if (type === 2) submitData.trayId = value.trayId
},
cancel: (details) => { postZeroStockUp(submitData)
tiplists.value.setdetails({ isshow: false })
},
close: (details) => {
tiplists.value.setdetails({ isshow: false })
} }
}) })
} }
@ -462,11 +510,21 @@
:deep(.inputNum) { :deep(.inputNum) {
background: #f4f8fb; background: #f4f8fb;
border: none; border: none;
padding: 15upx 25upx;
border-radius: 10upx;
} }
.item_contariner { .item_contariner {
box-shadow: 0 0 10upx #acc; box-shadow: 0 0 15upx #acc;
padding: 10upx; padding: 20upx 15upx;
border-radius: 5upx; border-radius: 5upx;
} }
//
.button {
padding: 15upx 80upx;
background: var(--subjectColor);
color: #fff;
border-radius: 10upx;
}
</style> </style>

953
pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue

@ -1,473 +1,482 @@
<template> <template>
<!-- <u-navbar title="备货列表" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> --> <!-- <u-navbar title="备货列表" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
<BasicContainer ref="basicContainer" :option="option"> <BasicContainer ref="basicContainer" :option="option">
<template #head> <template #head>
<view class="head"> <view class="head">
<view class="type1"> <view class="type1">
<view> <view>
客户{{details.customer}} 客户{{details.customer}}
</view> </view>
<view> <view>
备货区域{{details.stockupArea}} 备货区域{{details.stockupArea}}
</view> </view>
</view> </view>
<view class="type1"> <view class="type1">
<view> <view>
计划件数{{details.planNum}} 计划件数{{details.planNum}}
</view> </view>
<view> <view>
扫描件数{{details.scanNum}} 扫描件数{{details.scanNum}}
</view> </view>
</view> </view>
<view class="type1"> <view class="type1">
<view> <view>
库位号{{details.warehouseArea}} 库位号{{details.warehouseArea}}
</view> </view>
<view> <view>
托盘码{{details.trays}} 托盘码{{details.trays}}
</view> </view>
</view> </view>
<!-- <view class="type1"> <!-- <view class="type1">
<view> <view>
容器件数300 容器件数300
</view> </view>
<view> <view>
计划件数300 计划件数300
</view> </view>
</view> --> </view> -->
<view class="type2"> <view class="type2">
<view> <view>
<!-- 完成件数1 --> <!-- 完成件数1 -->
</view> </view>
<!-- <view> <!-- <view>
<view>备货托盘</view> <view>备货托盘</view>
<view> <view>
绑定托盘 绑定托盘
</view> </view>
</view> --> </view> -->
</view> </view>
</view> </view>
</template> </template>
<template #body> <template #body>
<view class="butbox"> <view class="butbox">
<scroll-view scroll-y="true" class="scrollv"> <scroll-view scroll-y="true" class="scrollv">
<view class="mabxs"> <view class="mabxs">
<view class="ite" @click="showsdqs" v-for="item in dataList"> <view class="ite" @click="showsdqs" v-for="item in dataList">
<view> <view>
<view @click.stop="goorderdetail(item)">订单号{{item.orderCode}}</view> <view @click.stop="goorderdetail(item)">订单号{{item.orderCode}}</view>
<view>包条码{{item.packageBarCode}}</view> <view>包条码{{item.packageBarCode}}</view>
</view> </view>
<view> <view>
<view>货物类型{{item.goodsType==1?'定制品':''}}</view> <view>货物类型{{item.goodsType==1?'定制品':''}}</view>
<view>是否备货{{item.isScanStr}}</view> <view>是否备货{{item.isScanStr}}</view>
</view> </view>
<view style="flex: 1;"> <view style="flex: 1;">
<view style="flex: 1;">物料名称{{item.materialName}}</view> <view style="flex: 1;">物料名称{{item.materialName}}</view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="prtbut" @click="prinbut"> <view class="prtbut" @click="prinbut">
打印 打印
</view> </view>
</view> </view>
</template> </template>
</BasicContainer> </BasicContainer>
<u-navbar title="备货列表" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder <u-navbar title="备货列表" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
:autoBack="true" leftIconSize='35'></u-navbar> :autoBack="true" leftIconSize='35'></u-navbar>
<tiplist ref="tiplists"></tiplist> <tiplist ref="tiplists"></tiplist>
<BluetoothList ref="bluetoothList"></BluetoothList> <BluetoothList ref="bluetoothList"></BluetoothList>
<!-- #ifdef APP --> <!-- #ifdef APP -->
<saomiao2 :ishidestop="scanState !== 0"></saomiao2> <saomiao2 :ishidestop="scanState !== 0"></saomiao2>
<!-- #endif --> <!-- #endif -->
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { import {
onLoad, onLoad,
onShow, onShow,
onHide, onHide,
onUnload, onUnload,
onPullDownRefresh onPullDownRefresh
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import { distributionStockuporderInfo, distributionStockupstockupScan } from '@/api/user.js' import { distributionStockuporderInfo, distributionStockupstockupScan } from '@/api/user.js'
import { detailType } from '@/interfaces/pagesHome/StockUplistScandetails' import { detailType } from '@/interfaces/pagesHome/StockUplistScandetails'
import { reactive, ref, toRefs, inject } from "vue"; import { reactive, ref, toRefs, inject } from "vue";
import utils from '@/utils/utils'; import utils from '@/utils/utils';
import useBluetoothStore from '@/store/useBluetoothStore.js'; import useBluetoothStore from '@/store/useBluetoothStore.js';
import useSystemSettingsStore from '@/store/useSystemSettingsStore'; import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
const { scanState } = storeToRefs(useSystemSettingsStore()) const { scanState } = storeToRefs(useSystemSettingsStore())
// //
const bluetoothList = ref(null) const bluetoothList = ref(null)
const basicContainer = ref(null) const basicContainer = ref(null)
// Pinia // Pinia
const bluetoothStore = useBluetoothStore() const bluetoothStore = useBluetoothStore()
const { bluetoothInfo } = storeToRefs(bluetoothStore) const { bluetoothInfo } = storeToRefs(bluetoothStore)
const option = { const option = {
ttile: '备货列表', ttile: '备货列表',
haveData: true, haveData: true,
async pullDownRefreshInitPage() { async pullDownRefreshInitPage() {
console.log('1231 :>> ', 1231); console.log('1231 :>> ', 1231);
return await initpage() return await initpage()
} }
} }
let details = reactive<detailType>({ let details = reactive<detailType>({
dataList: [], dataList: [],
stockArticleId: '', stockArticleId: '',
orderStatus: '', orderStatus: '',
reservationId: '', reservationId: '',
stockListId: '', stockListId: '',
allocation: '', allocation: '',
pallet: '', pallet: '',
customer: '', customer: '',
stockupArea: '', stockupArea: '',
planNum: '', planNum: '',
scanNum: '', scanNum: '',
trays: '', trays: '',
warehouseArea: '', warehouseArea: '',
orderCode: '', orderCode: '',
scancode: '', scancode: '',
stockupId: '', stockupId: '',
address: '', address: '',
isscan: false, isscan: false,
allocationId: '', allocationId: '',
status: '', status: '',
typeService: '' typeService: '',
}) /** 备货库位ID */
const tiplists = ref(null) stockupAllocationId: '',
onLoad((op) => { /** 备货库位名称 */
stockupAllocationName: '',
})
details.stockArticleId = op.stockArticleId const tiplists = ref(null)
details.status = op.status onLoad((op) => {
details.stockupId = op.stockupId details.stockArticleId = op.stockArticleId
details.orderStatus = op.orderStatus details.status = op.status
details.reservationId = op.reservationId details.stockupId = op.stockupId
details.allocationId = op.allocationId details.orderStatus = op.orderStatus
// details.stockListId=op.stockListId details.reservationId = op.reservationId
details.allocation = op.allocation details.allocationId = op.allocationId
details.pallet = op.pallet // details.stockListId=op.stockListId
details.orderCode = op.orderCode details.allocation = op.allocation
details.typeService = op.typeService details.pallet = op.pallet
// #ifdef APP details.orderCode = op.orderCode
if (Number(details.status) === 0) utils.ttsspke('请按件备货') details.typeService = op.typeService
// #endif details.stockupAllocationId = op.stockupAllocationId
}) details.stockupAllocationName = op.stockupAllocationName
// #ifdef APP
onShow(() => { if (Number(details.status) === 0) utils.ttsspke('请按件备货')
// #ifdef APP // #endif
uni.$off('scancodedate') })
uni.$on('scancodedate', function (code) {
if (code) { onShow(() => {
console.log(code); // #ifdef APP
details.scancode = code uni.$off('scancodedate')
scandata() uni.$on('scancodedate', function (code) {
} if (code) {
}) +
// #endif console.log(code);
// details.scancode = code
const timer = setTimeout(() => { scandata()
basicContainer.value.startPullDownRefresh() }
clearTimeout(timer) })
}, 200) // #endif
}) //
const timer = setTimeout(() => {
/* onHide(() => { basicContainer.value.startPullDownRefresh()
uni.$off('scancodedate') clearTimeout(timer)
}) }, 200)
*/ })
function goorderdetail(item) {
uni.navigateTo({ /* onHide(() => {
url: '/pagesHome/pages/orderDetails/orderDetails?orderCode=' + item.orderCode uni.$off('scancodedate')
}) })
} */
function goorderdetail(item) {
/* onPullDownRefresh(() => { uni.navigateTo({
const timer = setTimeout(() => { url: '/pagesHome/pages/orderDetails/orderDetails?orderCode=' + item.orderCode
initpage() })
// }
uni.stopPullDownRefresh()
clearTimeout(timer) /* onPullDownRefresh(() => {
}, 500) const timer = setTimeout(() => {
}) */ initpage()
//
function prinbut() { uni.stopPullDownRefresh()
let list = [], checklist = [] clearTimeout(timer)
details.dataList.map((item, index) => { }, 500)
list.push(item.packageBarCode) }) */
checklist.push(index)
}) function prinbut() {
tiplists.value.setdetails({ let list = [], checklist = []
title: '请选择需要打印的包条码', details.dataList.map((item, index) => {
isshow: true, list.push(item.packageBarCode)
tipstate: 2, checklist.push(index)
list, })
checklist, tiplists.value.setdetails({
inputtext: '', title: '请选择需要打印的包条码',
confirmTxt: '确认选择', isshow: true,
isonecheck: false, tipstate: 2,
success: (deta) => { list,
if (deta.checklist.length == 0) { checklist,
uni.showToast({ inputtext: '',
title: '请选择包条码', confirmTxt: '确认选择',
icon: 'none' isonecheck: false,
}) success: (deta) => {
return if (deta.checklist.length == 0) {
} uni.showToast({
console.log('deta.checklist :>> ', deta.checklist); title: '请选择包条码',
// #ifdef APP icon: 'none'
// , })
if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true }) return
let _isReturn = false }
deta.checklist.forEach(item => { console.log('deta.checklist :>> ', deta.checklist);
if (_isReturn) return // #ifdef APP
let text = '! 0 200 200 333 1\r\n' // ,
text += 'SETBOLD 2\r\n' if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
text += `T 56 0 0 0 ${details.dataList[item]?.orderCode}\r\n` let _isReturn = false
text += 'LINE 0 50 420 50 3\r\n' deta.checklist.forEach(item => {
text += `T 55 0 0 60 客户\r\n` if (_isReturn) return
text += 'LINE 40 50 40 110 3\r\n' let text = '! 0 200 200 333 1\r\n'
text += `T 55 0 50 60 ${details.customer}\r\n` text += 'SETBOLD 2\r\n'
text += 'LINE 40 80 420 80 3\r\n' text += `T 56 0 0 0 ${details.dataList[item]?.orderCode}\r\n`
text += `T 55 0 50 90 ${details.address}\r\n` text += 'LINE 0 50 420 50 3\r\n'
text += 'LINE 0 110 420 110 3\r\n' text += `T 55 0 0 60 客户\r\n`
text += `T 55 0 0 120 物料\r\n` text += 'LINE 40 50 40 110 3\r\n'
text += 'LINE 40 110 40 140 3\r\n' text += `T 55 0 50 60 ${details.customer}\r\n`
text += `T 55 0 50 120 ${details.dataList[item]?.materialName}\r\n` text += 'LINE 40 80 420 80 3\r\n'
text += 'LINE 0 140 420 140 3\r\n' text += `T 55 0 50 90 ${details.address}\r\n`
text += 'B QR 150 150 M 2 U 4\r\n' text += 'LINE 0 110 420 110 3\r\n'
text += `MA,${details.dataList[item]?.packageBarCode}\r\n` text += `T 55 0 0 120 物料\r\n`
text += 'ENDQR\r\n' text += 'LINE 40 110 40 140 3\r\n'
text += `T 55 0 140 260 ${details.dataList[item]?.packageBarCode}\r\n` text += `T 55 0 50 120 ${details.dataList[item]?.materialName}\r\n`
text += 'FORM\r\n' text += 'LINE 0 140 420 140 3\r\n'
text += 'PRINT\r\n' text += 'B QR 150 150 M 2 U 4\r\n'
// return text += `MA,${details.dataList[item]?.packageBarCode}\r\n`
utils.getbl(bluetoothInfo.value, text).catch(() => { text += 'ENDQR\r\n'
bluetoothList.value.setdetails({ isshow: true }) text += `T 55 0 140 260 ${details.dataList[item]?.packageBarCode}\r\n`
_isReturn = true text += 'FORM\r\n'
}) text += 'PRINT\r\n'
}) // return
if (_isReturn) return utils.getbl(bluetoothInfo.value, text).catch(() => {
// #endif bluetoothList.value.setdetails({ isshow: true })
tiplists.value.setdetails({ isshow: false }) _isReturn = true
}, })
cancel: (details) => { })
tiplists.value.setdetails({ isshow: false }) if (_isReturn) return
}, // #endif
close: (details) => { tiplists.value.setdetails({ isshow: false })
tiplists.value.setdetails({ isshow: false }) },
} cancel: (details) => {
}) tiplists.value.setdetails({ isshow: false })
} },
function showsdqs() { close: (details) => {
tiplists.value.setdetails({ tiplists.value.setdetails({ isshow: false })
isshow: true, }
tipstate: 1, })
title: '请输入扫描的码', }
placeholder: '请输入扫描的码', function showsdqs() {
inputtext: '', tiplists.value.setdetails({
success: (detail) => { isshow: true,
details.scancode = detail.inputtext tipstate: 1,
scandata() title: '请输入扫描的码',
tiplists.value.setdetails({ isshow: false }) placeholder: '请输入扫描的码',
}, inputtext: '',
cancel: () => { success: (detail) => {
tiplists.value.setdetails({ isshow: false }) details.scancode = detail.inputtext
}, scandata()
close: () => { tiplists.value.setdetails({ isshow: false })
tiplists.value.setdetails({ isshow: false }) },
} cancel: () => {
}) tiplists.value.setdetails({ isshow: false })
} },
async function scandata() { close: () => {
if (Number(details.planNum) === Number(details.scanNum)) return utils.handleToast('该客户已齐套, 请返回上一级页面') tiplists.value.setdetails({ isshow: false })
}
// })
if (Number(details.status) !== 0) return }
let data = {
scanType: 1, async function scandata() {
orderCode: details.orderCode, if (Number(details.planNum) === Number(details.scanNum)) return utils.handleToast('该客户已齐套, 请返回上一级页面')
packetBarCode: details.scancode,
stockupArea: details.stockupArea, //
reservationId: details.reservationId, if (Number(details.status) !== 0) return
allocationId: details.allocationId, let data = {
stockupId: details.stockupId, scanType: 1,
typeService: details.typeService orderCode: details.orderCode,
} packetBarCode: details.scancode,
let res = await distributionStockupstockupScan(data) stockupArea: details.stockupArea,
console.log(res); reservationId: details.reservationId,
if (res.code == 200) { allocationId: details.allocationId,
details.isscan = true stockupId: details.stockupId,
// typeService: details.typeService,
basicContainer.value.startPullDownRefresh() stockupAllocationId: details.stockupAllocationId,
} else if (res.code === 3001) { stockupAllocationName: details.stockupAllocationName
// }
if (res.audio) utils.ttsspke(res.audio) let res = await distributionStockupstockupScan(data)
} console.log(res);
} if (res.code == 200) {
async function initpage() { details.isscan = true
let data = { //
orderStatus: details.orderStatus, basicContainer.value.startPullDownRefresh()
reservationId: details.reservationId, } else if (res.code === 3001) {
stockArticleId: details.stockArticleId, //
// stockListId:details.stockListId, if (res.audio) utils.ttsspke(res.audio)
allocationId: details.allocationId, }
allocation: details.allocation, }
pallet: details.pallet,
stockupId: details.stockupId, async function initpage() {
status: details.status, let data = {
typeService: details.typeService orderStatus: details.orderStatus,
} reservationId: details.reservationId,
let response = await distributionStockuporderInfo(data) stockArticleId: details.stockArticleId,
if (response.code !== 200) return // stockListId:details.stockListId,
console.log(response); allocationId: details.allocationId,
details.dataList = response.data.packageList allocation: details.allocation,
details.customer = response.data.customer pallet: details.pallet,
details.stockupArea = response.data.stockupArea stockupId: details.stockupId,
details.planNum = response.data.planNum status: details.status,
details.scanNum = response.data.scanNum typeService: details.typeService
details.trays = response.data.trays }
details.warehouseArea = response.data.warehouseArea let response = await distributionStockuporderInfo(data)
details.address = response.data.address if (response.code !== 200) return
if (Number(details.scanNum) > 0 && details.isscan) { console.log(response);
utils.ttsspke(details.scanNum + '件') details.dataList = response.data.packageList
} details.customer = response.data.customer
} details.stockupArea = response.data.stockupArea
const { dataList } = toRefs(details) details.planNum = response.data.planNum
</script> details.scanNum = response.data.scanNum
details.trays = response.data.trays
<style lang="scss"> details.warehouseArea = response.data.warehouseArea
.butbox { details.address = response.data.address
display: flex; if (Number(details.scanNum) > 0 && details.isscan) {
flex-direction: column; utils.ttsspke(details.scanNum + '件')
width: 686upx; }
margin: auto; }
margin-top: 20upx; const { dataList } = toRefs(details)
box-sizing: border-box; </script>
padding: 16upx 0upx;
background-color: #ffffff; <style lang="scss">
border-radius: 8upx; .butbox {
display: flex;
.scrollv { flex-direction: column;
width: 100%; width: 686upx;
height: 50vh; margin: auto;
// padding: 10upx; margin-top: 20upx;
box-sizing: border-box; box-sizing: border-box;
padding: 16upx 0upx;
.mabxs { background-color: #ffffff;
display: flex; border-radius: 8upx;
flex-direction: column;
align-items: center; .scrollv {
padding-top: 5upx; width: 100%;
height: 50vh;
.ite { // padding: 10upx;
width: 93%; box-sizing: border-box;
// width: 100%;
display: flex; .mabxs {
flex-direction: column; display: flex;
align-items: center; flex-direction: column;
padding: 10upx; align-items: center;
box-sizing: border-box; padding-top: 5upx;
border-radius: 8upx;
box-shadow: 0upx 2upx 10upx 0upx #e2e2e3; .ite {
margin-bottom: 20upx; width: 93%;
// width: 100%;
>view { display: flex;
display: flex; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-between; padding: 10upx;
width: 100%; box-sizing: border-box;
margin-bottom: 10upx; border-radius: 8upx;
box-shadow: 0upx 2upx 10upx 0upx #e2e2e3;
&:nth-last-child(1) { margin-bottom: 20upx;
margin-bottom: none;
} >view {
display: flex;
>view { align-items: center;
width: 50%; justify-content: space-between;
// flex: 1; width: 100%;
font-size: 28upx; margin-bottom: 10upx;
font-weight: 400;
color: #092C4D; &:nth-last-child(1) {
} margin-bottom: none;
} }
}
} >view {
} width: 50%;
// flex: 1;
.prtbut { font-size: 28upx;
margin: auto; font-weight: 400;
margin-top: 20upx; color: #092C4D;
width: 320upx; }
height: 88upx; }
background: #D3832A; }
border-radius: 8upx; }
font-size: 32upx; }
font-weight: 400;
color: #FFFFFF; .prtbut {
display: flex; margin: auto;
align-items: center; margin-top: 20upx;
justify-content: center; width: 320upx;
} height: 88upx;
} background: #D3832A;
border-radius: 8upx;
.head { font-size: 32upx;
display: flex; font-weight: 400;
flex-direction: column; color: #FFFFFF;
align-items: center; display: flex;
width: 100%; align-items: center;
padding: 20upx; justify-content: center;
box-sizing: border-box; }
background-color: #ffffff; }
>.type1 { .head {
width: 100%; display: flex;
display: flex; flex-direction: column;
align-items: center; align-items: center;
margin: 14upx 0; width: 100%;
font-size: 28upx; padding: 20upx;
font-weight: 400; box-sizing: border-box;
color: #092C4D; background-color: #ffffff;
>view { >.type1 {
flex: 1; width: 100%;
word-wrap: break-word; display: flex;
word-break: break-all; align-items: center;
margin: 14upx 0;
&:nth-of-type(1) { font-size: 28upx;
margin-right: 30upx; font-weight: 400;
} color: #092C4D;
}
} >view {
flex: 1;
>.type2 { word-wrap: break-word;
width: 100%; word-break: break-all;
display: flex;
align-items: center; &:nth-of-type(1) {
justify-content: space-between; margin-right: 30upx;
margin: 14upx 0; }
font-size: 28upx; }
font-weight: 400; }
color: #092C4D;
>.type2 {
>view:nth-of-type(2) { width: 100%;
width: 50%; display: flex;
display: flex; align-items: center;
align-items: center; justify-content: space-between;
margin: 14upx 0;
>view:nth-of-type(2) { font-size: 28upx;
font-size: 28upx; font-weight: 400;
font-weight: 400; color: #092C4D;
color: #0086F1;
margin-left: 20upx; >view:nth-of-type(2) {
} width: 50%;
} display: flex;
} align-items: center;
}
>view:nth-of-type(2) {
font-size: 28upx;
font-weight: 400;
color: #0086F1;
margin-left: 20upx;
}
}
}
}
</style> </style>

4
pagesHome/pages/StowageListDetails/StowageListDetails.vue

@ -400,7 +400,7 @@
details.pageInfo.exceptionList details.pageInfo.exceptionList
if (!details.isscan) return if (!details.isscan) return
utils.handleToast(details.pageInfo.realLoadingNumber) utils.handleToast(details.pageInfo.realLoadingNumber + '件')
details.isscan = false details.isscan = false
} }
} catch (e) { } catch (e) {
@ -547,7 +547,7 @@
console.log('res :>> ', res); console.log('res :>> ', res);
if (res.code !== 200) return if (res.code !== 200) return
details.isscan = false // details.isscan = false
// //
basicContainer.value.startPullDownRefresh() basicContainer.value.startPullDownRefresh()
} catch (err) { } catch (err) {

12
pagesHome/pages/setbarcode/setbarcode.vue

@ -132,7 +132,11 @@
realityNum: 0, realityNum: 0,
mallName: '', mallName: '',
/** 是否为扫描后进行刷新 */ /** 是否为扫描后进行刷新 */
isscan: true isscan: true,
/** 备货库位ID */
stockupAllocationId: '',
/** 备货库位名称 */
stockupAllocationName: '',
}) })
const tips = ref(null) const tips = ref(null)
const basicContainer = ref(null) const basicContainer = ref(null)
@ -157,6 +161,8 @@
details.positionCode = op.positionCode details.positionCode = op.positionCode
details.typeService = op.typeService details.typeService = op.typeService
details.mallName = op.mallName details.mallName = op.mallName
details.stockupAllocationId = op.stockupAllocationId
details.stockupAllocationName = op.stockupAllocationName
if (op.completeStact == 'true') { if (op.completeStact == 'true') {
details.completeStact = true details.completeStact = true
} }
@ -414,7 +420,9 @@
id: details.orderpackgedetails.stockListId, id: details.orderpackgedetails.stockListId,
cargoNumber: details.items.cargoNumber, cargoNumber: details.items.cargoNumber,
marketCode: details.items.cargoNumber, marketCode: details.items.cargoNumber,
mallName: details.mallName mallName: details.mallName,
stockupAllocationId: details.stockupAllocationId,
stockupAllocationName: details.stockupAllocationName
} }
console.log('details.items.cargoNumber :>> ', details.items.cargoNumber); console.log('details.items.cargoNumber :>> ', details.items.cargoNumber);
// utils.ttsspke('stockPrint'+details.stockPrint) // utils.ttsspke('stockPrint'+details.stockPrint)

13
pagesTask/pages/checkTaskList/checkTaskList.vue

@ -160,8 +160,10 @@
} from '@/api/user.js'; } from '@/api/user.js';
import utils from '@/utils/utils.js'; import utils from '@/utils/utils.js';
import useSystemSettingsStore from '@/store/useSystemSettingsStore'; import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import useStorageStore from '@/store/useStorageStore.js';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
const { scanState } = storeToRefs(useSystemSettingsStore()) const { scanState } = storeToRefs(useSystemSettingsStore())
const { HANDLE_ISSTORAGECODE } = useStorageStore()
const details = reactive({ const details = reactive({
// //
@ -393,6 +395,9 @@
// //
if (details.pageType === 2) { if (details.pageType === 2) {
// id,
if (!HANDLE_ISSTORAGECODE(details.scancode)) return utils.handleToast('请扫描库位码')
getWarehouseTaskAllocationList({ getWarehouseTaskAllocationList({
questId: details.id, questId: details.id,
allocationId: details.scancode, allocationId: details.scancode,
@ -462,11 +467,11 @@
// }) // })
if (code === 200 && data) { if (code === 200 && data) {
const info = { const info = {
trayCode: data[0].trayCode, trayCode: data.trayCode,
trayName: data[0].trayName, trayName: data.trayName,
questId: details.id, questId: details.id,
trayId: data[0].trayId, trayId: data.trayId,
type: data[0].goodsType, type: data.goodsType,
marketName: details.marketName, marketName: details.marketName,
questNum: details.questNum, questNum: details.questNum,
pageType: details.pageType, pageType: details.pageType,

18
pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue

@ -534,8 +534,10 @@
postFindStockList postFindStockList
} from '@/api/user.js'; } from '@/api/user.js';
import useSystemSettingsStore from '@/store/useSystemSettingsStore'; import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import useStorageStore from '@/store/useStorageStore.js';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
const { scanState } = storeToRefs(useSystemSettingsStore()) const { scanState } = storeToRefs(useSystemSettingsStore())
const { HANDLE_ISSTORAGECODE } = useStorageStore()
const option = reactive({ const option = reactive({
/** 页面标题 */ /** 页面标题 */
@ -1119,6 +1121,9 @@
/** 扫描后执行的回调 -- 上架时扫描货位码 */ /** 扫描后执行的回调 -- 上架时扫描货位码 */
async function scanUp() { async function scanUp() {
// id,
if (!HANDLE_ISSTORAGECODE(details.scancode)) return utils.handleToast('请扫描库位码')
try { try {
uni.showLoading({ uni.showLoading({
title: '数据加载中', title: '数据加载中',
@ -2053,10 +2058,15 @@
_item.newTrayId = val.trayId _item.newTrayId = val.trayId
} }
// if (val.oldAllocationId) {
_item.groundingPositionCode = val.positionCode
_item.groundingAllocationId = val.allocationId
// }
// , // ,
delete _item.groundingPositionCode // delete _item.groundingPositionCode
delete _item.groundingAllocationId // delete _item.groundingAllocationId
} }
console.log('val :>> ', val); console.log('val :>> ', val);
@ -2147,8 +2157,8 @@
// , // ,
delete _item.groundingPositionCode // delete _item.groundingPositionCode
delete _item.groundingAllocationId // delete _item.groundingAllocationId
} }
// } // }

BIN
unpackage/debug/android_debug.apk

Binary file not shown.

2
unpackage/dist/build/app-plus/pagesHome/pages/PickingScanList/PickingScanList.css vendored

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1652
unpackage/dist/dev/app-plus/app-service.js vendored

File diff suppressed because it is too large Load Diff

10
unpackage/dist/dev/app-plus/app.css vendored

@ -1349,6 +1349,10 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
} }
.align-center[data-v-0b4fec55]{
display: flex;
align-items: center;
}
.flex1[data-v-0b4fec55]{ .flex1[data-v-0b4fec55]{
flex: 1; flex: 1;
} }
@ -1426,10 +1430,11 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
} }
.PullDownBox[data-v-0b4fec55] { .PullDownBox[data-v-0b4fec55] {
background: #fff; background: #fff;
padding: 0.3125rem; border-radius: 0.46875rem;
} }
.Pulldown-title-container[data-v-0b4fec55] { .Pulldown-title-container[data-v-0b4fec55] {
display: flex; display: flex;
padding: 0.46875rem;
} }
.Pulldown-title[data-v-0b4fec55] { .Pulldown-title[data-v-0b4fec55] {
flex: 1; flex: 1;
@ -1439,6 +1444,9 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
flex: none; flex: none;
transition: all 0.2s; transition: all 0.2s;
} }
.Pulldown_content[data-v-0b4fec55] {
padding: 0.3125rem;
}
.normal[data-v-0b4fec55] { .normal[data-v-0b4fec55] {
transform: rotate(0deg); transform: rotate(0deg);
} }

6
unpackage/dist/dev/app-plus/manifest.json vendored

@ -5,10 +5,10 @@
"iPad" "iPad"
], ],
"id": "__UNI__EB22F37", "id": "__UNI__EB22F37",
"name": "货无忧测试版", "name": "货无忧",
"version": { "version": {
"name": "1.1.27", "name": "1.1.28",
"code": 1127 "code": 1128
}, },
"description": "", "description": "",
"developer": { "developer": {

4
unpackage/dist/dev/app-plus/pagesHome/pages/PickingScanList/PickingScanList.css vendored

@ -41,6 +41,10 @@
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
} }
.align-center[data-v-5628bd90]{
display: flex;
align-items: center;
}
.flex1[data-v-5628bd90]{ .flex1[data-v-5628bd90]{
flex: 1; flex: 1;
} }

1
unpackage/dist/dev/app-plus/pagesHome/pages/StockUplist/StockUplist.css vendored

@ -70,7 +70,6 @@
box-sizing: border-box; box-sizing: border-box;
border-bottom: 0.03125rem solid #ebebeb; border-bottom: 0.03125rem solid #ebebeb;
margin-bottom: 0.625rem; margin-bottom: 0.625rem;
padding-bottom: 0.9375rem;
} }
.scvew .mabx > .item .toptitl[data-v-64d8d9ce] { .scvew .mabx > .item .toptitl[data-v-64d8d9ce] {
width: 100%; width: 100%;

35
unpackage/dist/dev/mp-weixin/api/user.js vendored

@ -513,7 +513,7 @@ function billLadingscan(data, loadingObj = {}) {
function billLadingZeroBillOrderData(data, loadingObj = {}) { function billLadingZeroBillOrderData(data, loadingObj = {}) {
return utils_request.service( return utils_request.service(
{ {
url: `logpm-distribution/app/billLading//zeroBillOrderData`, url: `logpm-distribution/app/billLading/zeroBillOrderData`,
method: "post", method: "post",
data data
}, },
@ -1260,16 +1260,6 @@ function postZeroStockUpData(data, loadingObj = {}) {
loadingObj loadingObj
); );
} }
function postZeroStockUp(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-distribution/app/distributionStockup/zeroStockUp`,
method: "post",
data
},
loadingObj
);
}
function getWarehouseTask(data, loadingObj = {}) { function getWarehouseTask(data, loadingObj = {}) {
return utils_request.service( return utils_request.service(
{ {
@ -1930,6 +1920,26 @@ function postDeliveryInfo(data, loadingObj = {}) {
loadingObj loadingObj
); );
} }
function postGoodsAllocation(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-basicdata/app/goodsAllocation/list`,
method: "get",
data
},
loadingObj
);
}
function postUploadSignPhoto(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-trunkline/api/carsLoad/uploadSignPhoto`,
method: "post",
data
},
loadingObj
);
}
exports.$_initRetentionList = $_initRetentionList; exports.$_initRetentionList = $_initRetentionList;
exports.$_retentionScan = $_retentionScan; exports.$_retentionScan = $_retentionScan;
exports.$_retentionTrayScan = $_retentionTrayScan; exports.$_retentionTrayScan = $_retentionTrayScan;
@ -2026,6 +2036,7 @@ exports.postFindStockList = postFindStockList;
exports.postFindSyncOldTrayData = postFindSyncOldTrayData; exports.postFindSyncOldTrayData = postFindSyncOldTrayData;
exports.postFindTrayData = postFindTrayData; exports.postFindTrayData = postFindTrayData;
exports.postFindUnloadTrayGoodsList = postFindUnloadTrayGoodsList; exports.postFindUnloadTrayGoodsList = postFindUnloadTrayGoodsList;
exports.postGoodsAllocation = postGoodsAllocation;
exports.postIncomingBillladingBillladingList = postIncomingBillladingBillladingList; exports.postIncomingBillladingBillladingList = postIncomingBillladingBillladingList;
exports.postIncomingIncomingPackage = postIncomingIncomingPackage; exports.postIncomingIncomingPackage = postIncomingIncomingPackage;
exports.postLoadingScan = postLoadingScan; exports.postLoadingScan = postLoadingScan;
@ -2044,9 +2055,9 @@ exports.postTransferUnloadTray = postTransferUnloadTray;
exports.postTransferUnloadZero = postTransferUnloadZero; exports.postTransferUnloadZero = postTransferUnloadZero;
exports.postUnloadTray = postUnloadTray; exports.postUnloadTray = postUnloadTray;
exports.postUnloadTrayAllOne = postUnloadTrayAllOne; exports.postUnloadTrayAllOne = postUnloadTrayAllOne;
exports.postUploadSignPhoto = postUploadSignPhoto;
exports.postWarehouseTaskAddDataInfo = postWarehouseTaskAddDataInfo; exports.postWarehouseTaskAddDataInfo = postWarehouseTaskAddDataInfo;
exports.postWarehouseTaskSelectPackageInfo = postWarehouseTaskSelectPackageInfo; exports.postWarehouseTaskSelectPackageInfo = postWarehouseTaskSelectPackageInfo;
exports.postZeroStockUp = postZeroStockUp;
exports.postZeroStockUpData = postZeroStockUpData; exports.postZeroStockUpData = postZeroStockUpData;
exports.postorderUpshelfDetailByAllocationId = postorderUpshelfDetailByAllocationId; exports.postorderUpshelfDetailByAllocationId = postorderUpshelfDetailByAllocationId;
exports.postqueryfindMaterialList = postqueryfindMaterialList; exports.postqueryfindMaterialList = postqueryfindMaterialList;

5
unpackage/dist/dev/mp-weixin/app.js vendored

@ -32,6 +32,7 @@ if (!Math) {
"./pagesHome/pages/LoadingScan/LoadingScan.js"; "./pagesHome/pages/LoadingScan/LoadingScan.js";
"./pagesHome/pages/loadingRetention/loadingRetention.js"; "./pagesHome/pages/loadingRetention/loadingRetention.js";
"./pagesHome/pages/StockUplist/StockUplist.js"; "./pagesHome/pages/StockUplist/StockUplist.js";
"./pagesHome/pages/StockUplistByZero/StockUplistByZero.js";
"./pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js"; "./pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js";
"./pagesHome/pages/DownScan/DownScan.js"; "./pagesHome/pages/DownScan/DownScan.js";
"./pagesHome/pages/signinScan/signinScan.js"; "./pagesHome/pages/signinScan/signinScan.js";
@ -86,6 +87,7 @@ if (!Math) {
"./pagesHome/pages/storageInquiry/storageInquiry.js"; "./pagesHome/pages/storageInquiry/storageInquiry.js";
"./pagesHome/pages/trayInquiry/trayInquiry.js"; "./pagesHome/pages/trayInquiry/trayInquiry.js";
"./pagesHome/pages/inventoryInquiry/inventoryInquiry.js"; "./pagesHome/pages/inventoryInquiry/inventoryInquiry.js";
"./pagesHome/pages/StorageLocationList/StorageLocationList.js";
"./pagesHome/pages/MaterialMaintenance/MaterialMaintenance.js"; "./pagesHome/pages/MaterialMaintenance/MaterialMaintenance.js";
"./pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.js"; "./pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.js";
"./pagesHome/pages/StockUpListZero/StockUpListZero.js"; "./pagesHome/pages/StockUpListZero/StockUpListZero.js";
@ -125,6 +127,7 @@ const BluetoothList = () => "./compoment/BluetoothList/BluetoothList.js";
const ScrollList = () => "./compoment/ScrollList/ScrollList.js"; const ScrollList = () => "./compoment/ScrollList/ScrollList.js";
const PullDownBox = () => "./compoment/PullDownBox/PullDownBox.js"; const PullDownBox = () => "./compoment/PullDownBox/PullDownBox.js";
const MyTree = () => "./compoment/MyTree/MyTree.js"; const MyTree = () => "./compoment/MyTree/MyTree.js";
const CheckBox = () => "./compoment/CheckBox/CheckBox.js";
const saomiao1 = () => "./compoment/saomiao1.js"; const saomiao1 = () => "./compoment/saomiao1.js";
const saomiao2 = () => "./compoment/saomiao2.js"; const saomiao2 = () => "./compoment/saomiao2.js";
const saomiao3 = () => "./compoment/saomiao3.js"; const saomiao3 = () => "./compoment/saomiao3.js";
@ -138,7 +141,7 @@ function createApp() {
app.use(store_index.store); app.use(store_index.store);
app.use(common_vendor.createPinia()); app.use(common_vendor.createPinia());
app.use(uni_modules_fantMiniPlus_index.fantMini); app.use(uni_modules_fantMiniPlus_index.fantMini);
app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp).component("BluetoothList", BluetoothList).component("ScrollList", ScrollList).component("PullDownBox", PullDownBox).component("MyTree", MyTree); app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp).component("BluetoothList", BluetoothList).component("ScrollList", ScrollList).component("PullDownBox", PullDownBox).component("MyTree", MyTree).component("CheckBox", CheckBox);
common_vendor.index.$u.config.unit = "rpx"; common_vendor.index.$u.config.unit = "rpx";
return { return {
app, app,

3
unpackage/dist/dev/mp-weixin/app.json vendored

@ -28,6 +28,7 @@
"pages/LoadingScan/LoadingScan", "pages/LoadingScan/LoadingScan",
"pages/loadingRetention/loadingRetention", "pages/loadingRetention/loadingRetention",
"pages/StockUplist/StockUplist", "pages/StockUplist/StockUplist",
"pages/StockUplistByZero/StockUplistByZero",
"pages/StockUplistScandetails/StockUplistScandetails", "pages/StockUplistScandetails/StockUplistScandetails",
"pages/DownScan/DownScan", "pages/DownScan/DownScan",
"pages/signinScan/signinScan", "pages/signinScan/signinScan",
@ -82,6 +83,7 @@
"pages/storageInquiry/storageInquiry", "pages/storageInquiry/storageInquiry",
"pages/trayInquiry/trayInquiry", "pages/trayInquiry/trayInquiry",
"pages/inventoryInquiry/inventoryInquiry", "pages/inventoryInquiry/inventoryInquiry",
"pages/StorageLocationList/StorageLocationList",
"pages/MaterialMaintenance/MaterialMaintenance", "pages/MaterialMaintenance/MaterialMaintenance",
"pages/CustomerTrayDetails/CustomerTrayDetails", "pages/CustomerTrayDetails/CustomerTrayDetails",
"pages/StockUpListZero/StockUpListZero", "pages/StockUpListZero/StockUpListZero",
@ -164,6 +166,7 @@
"scroll-list": "/compoment/ScrollList/ScrollList", "scroll-list": "/compoment/ScrollList/ScrollList",
"pull-down-box": "/compoment/PullDownBox/PullDownBox", "pull-down-box": "/compoment/PullDownBox/PullDownBox",
"my-tree": "/compoment/MyTree/MyTree", "my-tree": "/compoment/MyTree/MyTree",
"check-box": "/compoment/CheckBox/CheckBox",
"saomiao1": "/compoment/saomiao1", "saomiao1": "/compoment/saomiao1",
"saomiao2": "/compoment/saomiao2", "saomiao2": "/compoment/saomiao2",
"saomiao3": "/compoment/saomiao3", "saomiao3": "/compoment/saomiao3",

36
unpackage/dist/dev/mp-weixin/app.wxss vendored

@ -304,13 +304,6 @@
content: "\e62e"; content: "\e62e";
} }
.u-line-1 { .u-line-1 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -319,13 +312,6 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-2 { .u-line-2 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -334,13 +320,6 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-3 { .u-line-3 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -349,13 +328,6 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-4 { .u-line-4 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -364,13 +336,6 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-5 { .u-line-5 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -413,7 +378,6 @@
.u-reset-button { .u-reset-button {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
color: inherit; color: inherit;

22
unpackage/dist/dev/mp-weixin/common/assets.js vendored

@ -1,13 +1,17 @@
"use strict"; "use strict";
const _imports_0$3 = "/assets/cha.b7e7843e.png"; const _imports_0$4 = "/pagesHome/static/bgby.png";
const _imports_0$2 = "/static/ck.png"; const _imports_0$3 = "/pagesHome/static/removeitem.png";
const _imports_1$2 = "/pagesHome/static/scanicon.png";
const _imports_0$2 = "/assets/cha.b7e7843e.png";
const _imports_0$1 = "/static/ck.png";
const _imports_1$1 = "/static/nock.png"; const _imports_1$1 = "/static/nock.png";
const _imports_1 = "/static/check.png"; const _imports_1 = "/static/check.png";
const _imports_0$1 = "/static/nocheck.png"; const _imports_0 = "/static/nocheck.png";
const _imports_0 = "/assets/top.8e031a5d.png"; exports._imports_0 = _imports_0$2;
exports._imports_0 = _imports_0$3; exports._imports_0$1 = _imports_0;
exports._imports_0$1 = _imports_0$1; exports._imports_0$2 = _imports_0$4;
exports._imports_0$2 = _imports_0$2; exports._imports_0$3 = _imports_0$3;
exports._imports_0$3 = _imports_0; exports._imports_0$4 = _imports_0$1;
exports._imports_1 = _imports_1; exports._imports_1 = _imports_1;
exports._imports_1$1 = _imports_1$1; exports._imports_1$1 = _imports_1$2;
exports._imports_1$2 = _imports_1$1;

344
unpackage/dist/dev/mp-weixin/common/vendor.js vendored

@ -7,87 +7,13 @@ function makeMap(str, expectsLowerCase) {
} }
return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val]; return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val];
} }
function normalizeStyle(value) {
if (isArray$1(value)) {
const res = {};
for (let i2 = 0; i2 < value.length; i2++) {
const item = value[i2];
const normalized = isString(item) ? parseStringStyle(item) : normalizeStyle(item);
if (normalized) {
for (const key in normalized) {
res[key] = normalized[key];
}
}
}
return res;
} else if (isString(value)) {
return value;
} else if (isObject$2(value)) {
return value;
}
}
const listDelimiterRE = /;(?![^(]*\))/g;
const propertyDelimiterRE = /:([^]+)/;
const styleCommentRE = /\/\*.*?\*\//gs;
function parseStringStyle(cssText) {
const ret = {};
cssText.replace(styleCommentRE, "").split(listDelimiterRE).forEach((item) => {
if (item) {
const tmp = item.split(propertyDelimiterRE);
tmp.length > 1 && (ret[tmp[0].trim()] = tmp[1].trim());
}
});
return ret;
}
function normalizeClass(value) {
let res = "";
if (isString(value)) {
res = value;
} else if (isArray$1(value)) {
for (let i2 = 0; i2 < value.length; i2++) {
const normalized = normalizeClass(value[i2]);
if (normalized) {
res += normalized + " ";
}
}
} else if (isObject$2(value)) {
for (const name in value) {
if (value[name]) {
res += name + " ";
}
}
}
return res.trim();
}
const toDisplayString = (val) => {
return isString(val) ? val : val == null ? "" : isArray$1(val) || isObject$2(val) && (val.toString === objectToString || !isFunction(val.toString)) ? JSON.stringify(val, replacer, 2) : String(val);
};
const replacer = (_key, val) => {
if (val && val.__v_isRef) {
return replacer(_key, val.value);
} else if (isMap(val)) {
return {
[`Map(${val.size})`]: [...val.entries()].reduce((entries, [key, val2]) => {
entries[`${key} =>`] = val2;
return entries;
}, {})
};
} else if (isSet(val)) {
return {
[`Set(${val.size})`]: [...val.values()]
};
} else if (isObject$2(val) && !isArray$1(val) && !isPlainObject$2(val)) {
return String(val);
}
return val;
};
const EMPTY_OBJ = Object.freeze({}); const EMPTY_OBJ = Object.freeze({});
const EMPTY_ARR = Object.freeze([]); const EMPTY_ARR = Object.freeze([]);
const NOOP = () => { const NOOP = () => {
}; };
const NO = () => false; const NO = () => false;
const onRE = /^on[^a-z]/; const isOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && // uppercase letter
const isOn = (key) => onRE.test(key); (key.charCodeAt(2) > 122 || key.charCodeAt(2) < 97);
const isModelListener = (key) => key.startsWith("onUpdate:"); const isModelListener = (key) => key.startsWith("onUpdate:");
const extend = Object.assign; const extend = Object.assign;
const remove = (arr, el) => { const remove = (arr, el) => {
@ -106,7 +32,7 @@ const isString = (val) => typeof val === "string";
const isSymbol = (val) => typeof val === "symbol"; const isSymbol = (val) => typeof val === "symbol";
const isObject$2 = (val) => val !== null && typeof val === "object"; const isObject$2 = (val) => val !== null && typeof val === "object";
const isPromise$1 = (val) => { const isPromise$1 = (val) => {
return isObject$2(val) && isFunction(val.then) && isFunction(val.catch); return (isObject$2(val) || isFunction(val)) && isFunction(val.then) && isFunction(val.catch);
}; };
const objectToString = Object.prototype.toString; const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value); const toTypeString = (value) => objectToString.call(value);
@ -119,7 +45,9 @@ const isReservedProp = /* @__PURE__ */ makeMap(
// the leading comma is intentional so empty string "" is also included // the leading comma is intentional so empty string "" is also included
",key,ref,ref_for,ref_key,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted" ",key,ref,ref_for,ref_key,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted"
); );
const isBuiltInDirective = /* @__PURE__ */ makeMap("bind,cloak,else-if,else,for,html,if,model,on,once,pre,show,slot,text,memo"); const isBuiltInDirective = /* @__PURE__ */ makeMap(
"bind,cloak,else-if,else,for,html,if,model,on,once,pre,show,slot,text,memo"
);
const cacheStringFunction = (fn) => { const cacheStringFunction = (fn) => {
const cache = /* @__PURE__ */ Object.create(null); const cache = /* @__PURE__ */ Object.create(null);
return (str) => { return (str) => {
@ -132,9 +60,16 @@ const camelize = cacheStringFunction((str) => {
return str.replace(camelizeRE, (_2, c2) => c2 ? c2.toUpperCase() : ""); return str.replace(camelizeRE, (_2, c2) => c2 ? c2.toUpperCase() : "");
}); });
const hyphenateRE = /\B([A-Z])/g; const hyphenateRE = /\B([A-Z])/g;
const hyphenate = cacheStringFunction((str) => str.replace(hyphenateRE, "-$1").toLowerCase()); const hyphenate = cacheStringFunction(
const capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() + str.slice(1)); (str) => str.replace(hyphenateRE, "-$1").toLowerCase()
const toHandlerKey = cacheStringFunction((str) => str ? `on${capitalize(str)}` : ``); );
const capitalize = cacheStringFunction((str) => {
return str.charAt(0).toUpperCase() + str.slice(1);
});
const toHandlerKey = cacheStringFunction((str) => {
const s2 = str ? `on${capitalize(str)}` : ``;
return s2;
});
const hasChanged = (value, oldValue) => !Object.is(value, oldValue); const hasChanged = (value, oldValue) => !Object.is(value, oldValue);
const invokeArrayFns$1 = (fns, arg) => { const invokeArrayFns$1 = (fns, arg) => {
for (let i2 = 0; i2 < fns.length; i2++) { for (let i2 = 0; i2 < fns.length; i2++) {
@ -156,6 +91,87 @@ const toNumber = (val) => {
const n2 = isString(val) ? Number(val) : NaN; const n2 = isString(val) ? Number(val) : NaN;
return isNaN(n2) ? val : n2; return isNaN(n2) ? val : n2;
}; };
function normalizeStyle(value) {
if (isArray$1(value)) {
const res = {};
for (let i2 = 0; i2 < value.length; i2++) {
const item = value[i2];
const normalized = isString(item) ? parseStringStyle(item) : normalizeStyle(item);
if (normalized) {
for (const key in normalized) {
res[key] = normalized[key];
}
}
}
return res;
} else if (isString(value) || isObject$2(value)) {
return value;
}
}
const listDelimiterRE = /;(?![^(]*\))/g;
const propertyDelimiterRE = /:([^]+)/;
const styleCommentRE = /\/\*[^]*?\*\//g;
function parseStringStyle(cssText) {
const ret = {};
cssText.replace(styleCommentRE, "").split(listDelimiterRE).forEach((item) => {
if (item) {
const tmp = item.split(propertyDelimiterRE);
tmp.length > 1 && (ret[tmp[0].trim()] = tmp[1].trim());
}
});
return ret;
}
function normalizeClass(value) {
let res = "";
if (isString(value)) {
res = value;
} else if (isArray$1(value)) {
for (let i2 = 0; i2 < value.length; i2++) {
const normalized = normalizeClass(value[i2]);
if (normalized) {
res += normalized + " ";
}
}
} else if (isObject$2(value)) {
for (const name in value) {
if (value[name]) {
res += name + " ";
}
}
}
return res.trim();
}
const toDisplayString = (val) => {
return isString(val) ? val : val == null ? "" : isArray$1(val) || isObject$2(val) && (val.toString === objectToString || !isFunction(val.toString)) ? JSON.stringify(val, replacer, 2) : String(val);
};
const replacer = (_key, val) => {
if (val && val.__v_isRef) {
return replacer(_key, val.value);
} else if (isMap(val)) {
return {
[`Map(${val.size})`]: [...val.entries()].reduce(
(entries, [key, val2], i2) => {
entries[stringifySymbol(key, i2) + " =>"] = val2;
return entries;
},
{}
)
};
} else if (isSet(val)) {
return {
[`Set(${val.size})`]: [...val.values()].map((v2) => stringifySymbol(v2))
};
} else if (isSymbol(val)) {
return stringifySymbol(val);
} else if (isObject$2(val) && !isArray$1(val) && !isPlainObject$2(val)) {
return String(val);
}
return val;
};
const stringifySymbol = (v2, i2 = "") => {
var _a2;
return isSymbol(v2) ? `Symbol(${(_a2 = v2.description) != null ? _a2 : i2})` : v2;
};
const LOCALE_ZH_HANS = "zh-Hans"; const LOCALE_ZH_HANS = "zh-Hans";
const LOCALE_ZH_HANT = "zh-Hant"; const LOCALE_ZH_HANT = "zh-Hant";
const LOCALE_EN = "en"; const LOCALE_EN = "en";
@ -417,10 +433,13 @@ E$1.prototype = {
var evts = e2[name]; var evts = e2[name];
var liveEvents = []; var liveEvents = [];
if (evts && callback) { if (evts && callback) {
for (var i2 = 0, len = evts.length; i2 < len; i2++) { for (var i2 = evts.length - 1; i2 >= 0; i2--) {
if (evts[i2].fn !== callback && evts[i2].fn._ !== callback) if (evts[i2].fn === callback || evts[i2].fn._ === callback) {
liveEvents.push(evts[i2]); evts.splice(i2, 1);
break;
}
} }
liveEvents = evts;
} }
liveEvents.length ? e2[name] = liveEvents : delete e2[name]; liveEvents.length ? e2[name] = liveEvents : delete e2[name];
return this; return this;
@ -764,10 +783,15 @@ function formatApiArgs(args, options) {
} }
} }
function invokeSuccess(id, name, res) { function invokeSuccess(id, name, res) {
return invokeCallback(id, extend(res || {}, { errMsg: name + ":ok" })); const result = {
errMsg: name + ":ok"
};
return invokeCallback(id, extend(res || {}, result));
} }
function invokeFail(id, name, errMsg, errRes) { function invokeFail(id, name, errMsg, errRes = {}) {
return invokeCallback(id, extend({ errMsg: name + ":fail" + (errMsg ? " " + errMsg : "") }, errRes)); const apiErrMsg = name + ":fail" + (errMsg ? " " + errMsg : "");
delete errRes.errCode;
return invokeCallback(id, typeof UniError !== "undefined" ? typeof errRes.errCode !== "undefined" ? new UniError(name, errRes.errCode, apiErrMsg) : new UniError(apiErrMsg, errRes) : extend({ errMsg: apiErrMsg }, errRes));
} }
function beforeInvokeApi(name, args, protocol, options) { function beforeInvokeApi(name, args, protocol, options) {
{ {
@ -1261,12 +1285,12 @@ function populateParameters(fromRes, toRes) {
const hostLanguage = language.replace(/_/g, "-"); const hostLanguage = language.replace(/_/g, "-");
const parameters = { const parameters = {
appId: "__UNI__EB22F37", appId: "__UNI__EB22F37",
appName: "货无忧测试版", appName: "货无忧",
appVersion: "1.1.18", appVersion: "1.1.27",
appVersionCode: 1118, appVersionCode: 1127,
appLanguage: getAppLanguage(hostLanguage), appLanguage: getAppLanguage(hostLanguage),
uniCompileVersion: "3.99", uniCompileVersion: "4.08",
uniRuntimeVersion: "3.99", uniRuntimeVersion: "4.08",
uniPlatform: "mp-weixin", uniPlatform: "mp-weixin",
deviceBrand, deviceBrand,
deviceModel: model, deviceModel: model,
@ -1405,9 +1429,9 @@ const getAppBaseInfo = {
hostSDKVersion: SDKVersion, hostSDKVersion: SDKVersion,
hostTheme: theme, hostTheme: theme,
appId: "__UNI__EB22F37", appId: "__UNI__EB22F37",
appName: "货无忧测试版", appName: "货无忧",
appVersion: "1.1.18", appVersion: "1.1.27",
appVersionCode: 1118, appVersionCode: 1127,
appLanguage: getAppLanguage(hostLanguage) appLanguage: getAppLanguage(hostLanguage)
})); }));
} }
@ -5932,7 +5956,7 @@ var plugin = {
}; };
function getCreateApp() { function getCreateApp() {
const method = "createApp"; const method = "createApp";
if (typeof global !== "undefined") { if (typeof global !== "undefined" && typeof global[method] !== "undefined") {
return global[method]; return global[method];
} else if (typeof my !== "undefined") { } else if (typeof my !== "undefined") {
return my[method]; return my[method];
@ -6087,42 +6111,6 @@ function findScopedSlotInvoker(vueId, instance) {
parent = parent.parent; parent = parent.parent;
} }
} }
function withScopedSlot(fn, { name, path, vueId }) {
const instance = getCurrentInstance();
fn.path = path;
const scopedSlots = instance.$ssi || (instance.$ssi = {});
const invoker = scopedSlots[vueId] || (scopedSlots[vueId] = createScopedSlotInvoker(instance));
if (!invoker.slots[name]) {
invoker.slots[name] = {
fn
};
} else {
invoker.slots[name].fn = fn;
}
return getValueByDataPath(instance.ctx.$scope.data, path);
}
function createScopedSlotInvoker(instance) {
const invoker = (slotName, args, index2) => {
const slot = invoker.slots[slotName];
if (!slot) {
return;
}
const hasIndex = typeof index2 !== "undefined";
index2 = index2 || 0;
const prevInstance = setCurrentRenderingInstance(instance);
const data = slot.fn(args, slotName + (hasIndex ? "-" + index2 : ""), index2);
const path = slot.fn.path;
setCurrentRenderingInstance(prevInstance);
(instance.$scopedSlotsData || (instance.$scopedSlotsData = [])).push({
path,
index: index2,
data
});
instance.$updateScopedSlots();
};
invoker.slots = {};
return invoker;
}
function stringifyStyle(value) { function stringifyStyle(value) {
if (isString(value)) { if (isString(value)) {
return value; return value;
@ -6167,7 +6155,6 @@ function withModelModifiers(fn, { number: number2, trim: trim2 }, isComponent =
const o$1 = (value, key) => vOn(value, key); const o$1 = (value, key) => vOn(value, key);
const f$1 = (source, renderItem) => vFor(source, renderItem); const f$1 = (source, renderItem) => vFor(source, renderItem);
const r$1 = (name, props2, key) => renderSlot(name, props2, key); const r$1 = (name, props2, key) => renderSlot(name, props2, key);
const w$1 = (fn, options) => withScopedSlot(fn, options);
const s$1 = (value) => stringifyStyle(value); const s$1 = (value) => stringifyStyle(value);
const e$1 = (target, ...sources) => extend(target, ...sources); const e$1 = (target, ...sources) => extend(target, ...sources);
const n$1 = (value) => normalizeClass(value); const n$1 = (value) => normalizeClass(value);
@ -12137,6 +12124,24 @@ const subPackages = [
} }
} }
}, },
{
path: "pages/StockUplistByZero/StockUplistByZero",
style: {
navigationBarTitleText: "零担备货列表",
enablePullDownRefresh: true,
onReachBottomDistance: 1,
navigationStyle: "custom",
"app-plus": {
animationDuration: 300,
animationType: "zoom-fade-out",
pullToRefresh: {
support: true,
color: "#d3832a",
style: "circle"
}
}
}
},
{ {
path: "pages/StockUplistScandetails/StockUplistScandetails", path: "pages/StockUplistScandetails/StockUplistScandetails",
style: { style: {
@ -13110,9 +13115,9 @@ const subPackages = [
} }
}, },
{ {
path: "pages/MaterialMaintenance/MaterialMaintenance", path: "pages/StorageLocationList/StorageLocationList",
style: { style: {
navigationBarTitleText: "物料维护", navigationBarTitleText: "库存品查询",
enablePullDownRefresh: true, enablePullDownRefresh: true,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom",
@ -13128,9 +13133,9 @@ const subPackages = [
} }
}, },
{ {
path: "pages/CustomerTrayDetails/CustomerTrayDetails", path: "pages/MaterialMaintenance/MaterialMaintenance",
style: { style: {
navigationBarTitleText: "客户托盘扫描", navigationBarTitleText: "物料维护",
enablePullDownRefresh: true, enablePullDownRefresh: true,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom",
@ -13146,9 +13151,9 @@ const subPackages = [
} }
}, },
{ {
path: "pages/StockUpListZero/StockUpListZero", path: "pages/CustomerTrayDetails/CustomerTrayDetails",
style: { style: {
navigationBarTitleText: "备货零担列表", navigationBarTitleText: "客户托盘扫描",
enablePullDownRefresh: true, enablePullDownRefresh: true,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom",
@ -13164,9 +13169,9 @@ const subPackages = [
} }
}, },
{ {
path: "pages/SearchTray/SearchTray", path: "pages/StockUpListZero/StockUpListZero",
style: { style: {
navigationBarTitleText: "按合同号盘点", navigationBarTitleText: "备货零担列表",
enablePullDownRefresh: true, enablePullDownRefresh: true,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom",
@ -13182,9 +13187,9 @@ const subPackages = [
} }
}, },
{ {
path: "pages/integral/integral", path: "pages/SearchTray/SearchTray",
style: { style: {
navigationBarTitleText: "积分指标", navigationBarTitleText: "按合同号盘点",
enablePullDownRefresh: true, enablePullDownRefresh: true,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom",
@ -13199,40 +13204,31 @@ const subPackages = [
} }
} }
}, },
{
path: "pages/integral/integral",
style: {
navigationBarTitleText: "积分指标",
enablePullDownRefresh: false,
onReachBottomDistance: 1,
navigationStyle: "custom"
}
},
{ {
path: "pages/integralEdit/integralEdit", path: "pages/integralEdit/integralEdit",
style: { style: {
navigationBarTitleText: "指标编辑", navigationBarTitleText: "指标编辑",
enablePullDownRefresh: true, enablePullDownRefresh: false,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom"
"app-plus": {
animationDuration: 300,
animationType: "zoom-fade-out",
pullToRefresh: {
support: true,
color: "#d3832a",
style: "circle"
}
}
} }
}, },
{ {
path: "pages/integralMy/integralMy", path: "pages/integralMy/integralMy",
style: { style: {
navigationBarTitleText: "我的考核", navigationBarTitleText: "我的考核",
enablePullDownRefresh: true, enablePullDownRefresh: false,
onReachBottomDistance: 1, onReachBottomDistance: 1,
navigationStyle: "custom", navigationStyle: "custom"
"app-plus": {
animationDuration: 300,
animationType: "zoom-fade-out",
pullToRefresh: {
support: true,
color: "#d3832a",
style: "circle"
}
}
} }
} }
] ]
@ -15207,7 +15203,7 @@ function Kn(e2) {
a2 = new En({ secretType: t3.secretType, uniCloudIns: e2 }).wrapVerifyClientCallFunction(n2.bind(e2))(t3); a2 = new En({ secretType: t3.secretType, uniCloudIns: e2 }).wrapVerifyClientCallFunction(n2.bind(e2))(t3);
} else } else
a2 = o2(t3); a2 = o2(t3);
return Object.defineProperty(a2, "result", { get: () => (console.warn("当前返回结果为Promise类型,不可直接访问其result属性,详情请参考:https://uniapp.dcloud.net.cn/uniCloud/faq?id=promise"), {}) }), a2; return Object.defineProperty(a2, "result", { get: () => (console.warn("当前返回结果为Promise类型,不可直接访问其result属性,详情请参考:https://uniapp.dcloud.net.cn/uniCloud/faq?id=promise"), {}) }), a2.then((e3) => ("undefined" != typeof UTSJSONObject && (e3.result = new UTSJSONObject(e3.result)), e3));
}; };
} }
En = class { En = class {
@ -15690,7 +15686,7 @@ var Cs = n(function(e2, t2) {
if (s5 >= o2) if (s5 >= o2)
return void (!i3.find((e5) => !e5.url && !e5.errMsg) && n3(t5)); return void (!i3.find((e5) => !e5.url && !e5.errMsg) && n3(t5));
const u2 = i3[s5]; const u2 = i3[s5];
e4.uploadFile({ filePath: u2.path, cloudPath: u2.cloudPath, fileType: u2.fileType, cloudPathAsRealPath: u2.cloudPathAsRealPath, onUploadProgress(e5) { e4.uploadFile({ provider: u2.provider, filePath: u2.path, cloudPath: u2.cloudPath, fileType: u2.fileType, cloudPathAsRealPath: u2.cloudPathAsRealPath, onUploadProgress(e5) {
e5.index = s5, e5.tempFile = u2, e5.tempFilePath = u2.path, r4 && r4(e5); e5.index = s5, e5.tempFile = u2, e5.tempFilePath = u2.path, r4 && r4(e5);
} }).then((e5) => { } }).then((e5) => {
u2.url = e5.fileID, s5 < o2 && c2(); u2.url = e5.fileID, s5 < o2 && c2();
@ -15740,7 +15736,7 @@ var Cs = n(function(e2, t2) {
}), xs = t(Cs); }), xs = t(Cs);
const Os = "manual"; const Os = "manual";
function Es(e2) { function Es(e2) {
return { props: { localdata: { type: Array, default: () => [] }, options: { type: [Object, Array], default: () => ({}) }, spaceInfo: { type: Object, default: () => ({}) }, collection: { type: [String, Array], default: "" }, action: { type: String, default: "" }, field: { type: String, default: "" }, orderby: { type: String, default: "" }, where: { type: [String, Object], default: "" }, pageData: { type: String, default: "add" }, pageCurrent: { type: Number, default: 1 }, pageSize: { type: Number, default: 20 }, getcount: { type: [Boolean, String], default: false }, gettree: { type: [Boolean, String], default: false }, gettreepath: { type: [Boolean, String], default: false }, startwith: { type: String, default: "" }, limitlevel: { type: Number, default: 10 }, groupby: { type: String, default: "" }, groupField: { type: String, default: "" }, distinct: { type: [Boolean, String], default: false }, foreignKey: { type: String, default: "" }, loadtime: { type: String, default: "auto" }, manual: { type: Boolean, default: false } }, data: () => ({ mixinDatacomLoading: false, mixinDatacomHasMore: false, mixinDatacomResData: [], mixinDatacomErrorMessage: "", mixinDatacomPage: {} }), created() { return { props: { localdata: { type: Array, default: () => [] }, options: { type: [Object, Array], default: () => ({}) }, spaceInfo: { type: Object, default: () => ({}) }, collection: { type: [String, Array], default: "" }, action: { type: String, default: "" }, field: { type: String, default: "" }, orderby: { type: String, default: "" }, where: { type: [String, Object], default: "" }, pageData: { type: String, default: "add" }, pageCurrent: { type: Number, default: 1 }, pageSize: { type: Number, default: 20 }, getcount: { type: [Boolean, String], default: false }, gettree: { type: [Boolean, String], default: false }, gettreepath: { type: [Boolean, String], default: false }, startwith: { type: String, default: "" }, limitlevel: { type: Number, default: 10 }, groupby: { type: String, default: "" }, groupField: { type: String, default: "" }, distinct: { type: [Boolean, String], default: false }, foreignKey: { type: String, default: "" }, loadtime: { type: String, default: "auto" }, manual: { type: Boolean, default: false } }, data: () => ({ mixinDatacomLoading: false, mixinDatacomHasMore: false, mixinDatacomResData: [], mixinDatacomErrorMessage: "", mixinDatacomPage: {}, mixinDatacomError: null }), created() {
this.mixinDatacomPage = { current: this.pageCurrent, size: this.pageSize, count: 0 }, this.$watch(() => { this.mixinDatacomPage = { current: this.pageCurrent, size: this.pageSize, count: 0 }, this.$watch(() => {
var e3 = []; var e3 = [];
return ["pageCurrent", "pageSize", "localdata", "collection", "action", "field", "orderby", "where", "getont", "getcount", "gettree", "groupby", "groupField", "distinct"].forEach((t2) => { return ["pageCurrent", "pageSize", "localdata", "collection", "action", "field", "orderby", "where", "getont", "getcount", "gettree", "groupby", "groupField", "distinct"].forEach((t2) => {
@ -15757,17 +15753,18 @@ function Es(e2) {
}); });
}, methods: { onMixinDatacomPropsChange(e3, t2) { }, methods: { onMixinDatacomPropsChange(e3, t2) {
}, mixinDatacomEasyGet({ getone: e3 = false, success: t2, fail: n2 } = {}) { }, mixinDatacomEasyGet({ getone: e3 = false, success: t2, fail: n2 } = {}) {
this.mixinDatacomLoading || (this.mixinDatacomLoading = true, this.mixinDatacomErrorMessage = "", this.mixinDatacomGet().then((n3) => { this.mixinDatacomLoading || (this.mixinDatacomLoading = true, this.mixinDatacomErrorMessage = "", this.mixinDatacomError = null, this.mixinDatacomGet().then((n3) => {
this.mixinDatacomLoading = false; this.mixinDatacomLoading = false;
const { data: s2, count: r2 } = n3.result; const { data: s2, count: r2 } = n3.result;
this.getcount && (this.mixinDatacomPage.count = r2), this.mixinDatacomHasMore = s2.length < this.pageSize; this.getcount && (this.mixinDatacomPage.count = r2), this.mixinDatacomHasMore = s2.length < this.pageSize;
const i2 = e3 ? s2.length ? s2[0] : void 0 : s2; const i2 = e3 ? s2.length ? s2[0] : void 0 : s2;
this.mixinDatacomResData = i2, t2 && t2(i2); this.mixinDatacomResData = i2, t2 && t2(i2);
}).catch((e4) => { }).catch((e4) => {
this.mixinDatacomLoading = false, this.mixinDatacomErrorMessage = e4, n2 && n2(e4); this.mixinDatacomLoading = false, this.mixinDatacomErrorMessage = e4, this.mixinDatacomError = e4, n2 && n2(e4);
})); }));
}, mixinDatacomGet(t2 = {}) { }, mixinDatacomGet(t2 = {}) {
let n2 = e2.database(this.spaceInfo); let n2;
t2 = t2 || {}, n2 = "undefined" != typeof __uniX && __uniX ? e2.databaseForJQL(this.spaceInfo) : e2.database(this.spaceInfo);
const s2 = t2.action || this.action; const s2 = t2.action || this.action;
s2 && (n2 = n2.action(s2)); s2 && (n2 = n2.action(s2));
const r2 = t2.collection || this.collection; const r2 = t2.collection || this.collection;
@ -15884,7 +15881,9 @@ async function Us({ openid: e2, callLoginByWeixin: t2 = false } = {}) {
} }
async function Ns(e2) { async function Ns(e2) {
const t2 = Rs(this); const t2 = Rs(this);
return t2.initPromise || (t2.initPromise = Us.call(this, e2)), t2.initPromise; return t2.initPromise || (t2.initPromise = Us.call(this, e2).then((e3) => e3).catch((e3) => {
throw delete t2.initPromise, e3;
})), t2.initPromise;
} }
function Ds(e2) { function Ds(e2) {
return function({ openid: t2, callLoginByWeixin: n2 = false } = {}) { return function({ openid: t2, callLoginByWeixin: n2 = false } = {}) {
@ -16183,7 +16182,6 @@ exports.t = t$1;
exports.toRefs = toRefs; exports.toRefs = toRefs;
exports.unref = unref; exports.unref = unref;
exports.uviewPlus = uviewPlus; exports.uviewPlus = uviewPlus;
exports.w = w$1;
exports.watch = watch; exports.watch = watch;
exports.watchEffect = watchEffect; exports.watchEffect = watchEffect;
exports.wx$1 = wx$1; exports.wx$1 = wx$1;

2
unpackage/dist/dev/mp-weixin/compoment/saomiao1.js vendored

@ -6,13 +6,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
ishidestop: { type: Boolean } ishidestop: { type: Boolean }
}, },
setup(__props) { setup(__props) {
const props = __props;
common_vendor.reactive({ common_vendor.reactive({
activity: null, activity: null,
receiver: null, receiver: null,
intentFilter: null, intentFilter: null,
isstart: false isstart: false
}); });
const props = __props;
common_vendor.onLoad(() => { common_vendor.onLoad(() => {
}); });
common_vendor.onShow(() => { common_vendor.onShow(() => {

2
unpackage/dist/dev/mp-weixin/compoment/saomiao2.js vendored

@ -7,7 +7,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
ishidestop: { type: Boolean } ishidestop: { type: Boolean }
}, },
setup(__props) { setup(__props) {
const props = __props;
common_vendor.reactive({ common_vendor.reactive({
activity: null, activity: null,
receiver: null, receiver: null,
@ -15,6 +14,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
isstart: false isstart: false
}); });
common_vendor.reactive([]); common_vendor.reactive([]);
const props = __props;
common_vendor.onLoad(async () => { common_vendor.onLoad(async () => {
console.log("扫描的--------------onLoad"); console.log("扫描的--------------onLoad");
}); });

5
unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js vendored

@ -8,10 +8,11 @@ require("../../utils/base64.js");
require("../../config/host.js"); require("../../config/host.js");
require("../../utils/request.js"); require("../../utils/request.js");
require("../../store/index.js"); require("../../store/index.js");
require("../../utils/utils.js");
require("../../utils/md5.js"); require("../../utils/md5.js");
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "tiplist", __name: "tiplist",
setup(__props, { expose }) { setup(__props, { expose: __expose }) {
let details = common_vendor.reactive({ let details = common_vendor.reactive({
tipstate: 2, tipstate: 2,
title: "", title: "",
@ -228,7 +229,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.upform.stock.materialCode = val.materialCode; details.upform.stock.materialCode = val.materialCode;
details.materialName = []; details.materialName = [];
} }
expose({ setdetails }); __expose({ setdetails });
const { isonecheck, checklength, imglist, inputtext, checklist, list, isshow, tipstate, title, isshowcancel, placeholder, confirmTxt, cancelTxt, showPreviewPicture, ImagesRequiredFields, maximglength, inpList } = common_vendor.toRefs(details); const { isonecheck, checklength, imglist, inputtext, checklist, list, isshow, tipstate, title, isshowcancel, placeholder, confirmTxt, cancelTxt, showPreviewPicture, ImagesRequiredFields, maximglength, inpList } = common_vendor.toRefs(details);
return (_ctx, _cache) => { return (_ctx, _cache) => {
return common_vendor.e({ return common_vendor.e({

4
unpackage/dist/dev/mp-weixin/compoment/tips/tips.js vendored

@ -3,7 +3,7 @@ const common_vendor = require("../../common/vendor.js");
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "tips", __name: "tips",
emits: ["cancel", "confirm"], emits: ["cancel", "confirm"],
setup(__props, { expose, emit }) { setup(__props, { expose: __expose, emit: __emit }) {
let details = common_vendor.reactive({ let details = common_vendor.reactive({
isshow: false, isshow: false,
title: "", title: "",
@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
break; break;
} }
} }
expose({ setisshow, setdetails }); __expose({ setisshow, setdetails });
const { isshow, title, content, isshowcancel, cancelTxt, confirmTxt } = common_vendor.toRefs(details); const { isshow, title, content, isshowcancel, cancelTxt, confirmTxt } = common_vendor.toRefs(details);
return (_ctx, _cache) => { return (_ctx, _cache) => {
return common_vendor.e({ return common_vendor.e({

2
unpackage/dist/dev/mp-weixin/config/host.js vendored

@ -1,5 +1,5 @@
"use strict"; "use strict";
const devhost = "http://test.api.huo5you.com/"; const devhost = "https://h5uapi.huitongys.com/";
const imghost = ""; const imghost = "";
const host = devhost; const host = devhost;
const APPKEY = "h5u:h5u_secret"; const APPKEY = "h5u:h5u_secret";

17
unpackage/dist/dev/mp-weixin/pages/index/index.js vendored

@ -5,6 +5,7 @@ const utils_cacheimg = require("../../utils/cacheimg.js");
const store_useStorageStore = require("../../store/useStorageStore.js"); const store_useStorageStore = require("../../store/useStorageStore.js");
require("../../utils/request.js"); require("../../utils/request.js");
require("../../store/index.js"); require("../../store/index.js");
require("../../utils/utils.js");
require("../../utils/functions.js"); require("../../utils/functions.js");
require("../../utils/IDCardVerification.js"); require("../../utils/IDCardVerification.js");
require("../../utils/base64.js"); require("../../utils/base64.js");
@ -69,19 +70,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
common_vendor.onShow(() => { common_vendor.onShow(() => {
init(); init();
initbuts(); initbuts();
if (storageArr.value.length === 0)
HANDLE_GETSTORAGEINFO();
}); });
common_vendor.onLoad(() => { common_vendor.onLoad(() => {
}); if (storageArr.value.length === 0)
common_vendor.onPullDownRefresh(() => {
const timer = setTimeout(() => {
init();
initbuts();
HANDLE_GETSTORAGEINFO(); HANDLE_GETSTORAGEINFO();
common_vendor.index.stopPullDownRefresh(); });
clearTimeout(timer); common_vendor.onPullDownRefresh(async () => {
}, 500); await Promise.all([init(), initbuts(), HANDLE_GETSTORAGEINFO()]);
console.log("123 :>> ", 123);
common_vendor.index.stopPullDownRefresh();
}); });
common_vendor.watchEffect(() => { common_vendor.watchEffect(() => {
if (details.tablist.length > 0) { if (details.tablist.length > 0) {

39
unpackage/dist/dev/mp-weixin/pages/login/login.js vendored

@ -20,7 +20,7 @@ if (!Array) {
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "login", __name: "login",
setup(__props) { setup(__props) {
const { HANDLE_CLEARSTORAGE } = store_useStorageStore.useStorageStore(); const { HANDLE_CLEARSTORAGE, HANDLE_GETSTORAGEINFO } = store_useStorageStore.useStorageStore();
const { HANDLE_INITBLUETOOTH } = store_useBluetoothStore.useBluetoothStore(); const { HANDLE_INITBLUETOOTH } = store_useBluetoothStore.useBluetoothStore();
const userStore = store_uaeUserStore.useUserStore(); const userStore = store_uaeUserStore.useUserStore();
const { HANDLE_ACCTOKEN, HANDLE_REFTOKEN, HANDLE_USERINFO } = userStore; const { HANDLE_ACCTOKEN, HANDLE_REFTOKEN, HANDLE_USERINFO } = userStore;
@ -50,7 +50,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}); });
common_vendor.onShow(() => { common_vendor.onShow(() => {
const timer = setTimeout(() => { const timer = setTimeout(() => {
HANDLE_CLEARSTORAGE();
clearTimeout(timer); clearTimeout(timer);
}, 2e3); }, 2e3);
}); });
@ -77,10 +76,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} }
await api_user.preserveCurrentWarehouse(details.checkitem); await api_user.preserveCurrentWarehouse(details.checkitem);
common_vendor.index.setStorageSync("checkname", details.checkitem); common_vendor.index.setStorageSync("checkname", details.checkitem);
common_vendor.index.removeStorageSync("homerouter"); goIndex();
common_vendor.index.switchTab({
url: "/pages/index/index"
});
} }
async function submitlogin() { async function submitlogin() {
try { try {
@ -106,10 +102,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
name: response.detail.warehouse_name name: response.detail.warehouse_name
}); });
if (response.detail.warehouse_id) { if (response.detail.warehouse_id) {
common_vendor.index.removeStorageSync("homerouter"); goIndex();
common_vendor.index.switchTab({
url: "/pages/index/index"
});
return; return;
} }
let res = await api_user.getMyWarehouseList({}); let res = await api_user.getMyWarehouseList({});
@ -123,10 +116,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
if (details.warehouseList.length == 1) { if (details.warehouseList.length == 1) {
let resdata = await api_user.preserveCurrentWarehouse(details.warehouseList[0]); let resdata = await api_user.preserveCurrentWarehouse(details.warehouseList[0]);
common_vendor.index.setStorageSync("checkname", details.warehouseList[0]); common_vendor.index.setStorageSync("checkname", details.warehouseList[0]);
common_vendor.index.removeStorageSync("homerouter"); goIndex();
common_vendor.index.switchTab({
url: "/pages/index/index"
});
return; return;
} }
details.showck = true; details.showck = true;
@ -155,6 +145,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
} }
} }
function goIndex() {
HANDLE_GETSTORAGEINFO();
common_vendor.index.removeStorageSync("homerouter");
common_vendor.index.switchTab({
url: "/pages/index/index"
});
}
function setisremember() { function setisremember() {
details.isremember = !details.isremember; details.isremember = !details.isremember;
common_vendor.index.setStorageSync("isremember", details.isremember); common_vendor.index.setStorageSync("isremember", details.isremember);
@ -171,14 +168,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
HANDLE_USERINFO(userinfo); HANDLE_USERINFO(userinfo);
common_vendor.index.removeStorageSync("authbuts"); common_vendor.index.removeStorageSync("authbuts");
common_vendor.index.removeStorageSync("homerouter"); common_vendor.index.removeStorageSync("homerouter");
if (details.isremember) { let user = {
let user = { tenantId: details.tenantId,
tenantId: details.tenantId, password: details.password,
password: details.password, username: details.username
username: details.username };
}; common_vendor.index.setStorageSync("loginuser", user);
common_vendor.index.setStorageSync("loginuser", user);
}
} }
const { checkitem, warehouseList, showck, username, password, tenantId, isremember } = common_vendor.toRefs(details); const { checkitem, warehouseList, showck, username, password, tenantId, isremember } = common_vendor.toRefs(details);
return (_ctx, _cache) => { return (_ctx, _cache) => {

4
unpackage/dist/dev/mp-weixin/pages/user/user.js vendored

@ -2,6 +2,7 @@
const common_vendor = require("../../common/vendor.js"); const common_vendor = require("../../common/vendor.js");
const api_user = require("../../api/user.js"); const api_user = require("../../api/user.js");
const utils_utils = require("../../utils/utils.js"); const utils_utils = require("../../utils/utils.js");
const store_useStorageStore = require("../../store/useStorageStore.js");
require("../../utils/request.js"); require("../../utils/request.js");
require("../../store/index.js"); require("../../store/index.js");
require("../../utils/functions.js"); require("../../utils/functions.js");
@ -17,6 +18,8 @@ if (!Array) {
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "user", __name: "user",
setup(__props) { setup(__props) {
const storageStore = store_useStorageStore.useStorageStore();
const { HANDLE_GETSTORAGEINFO } = storageStore;
let users = common_vendor.ref(null); let users = common_vendor.ref(null);
const tiplists = common_vendor.ref(null); const tiplists = common_vendor.ref(null);
const tip = common_vendor.ref(null); const tip = common_vendor.ref(null);
@ -60,6 +63,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} }
await api_user.preserveCurrentWarehouse(details.checkitems); await api_user.preserveCurrentWarehouse(details.checkitems);
common_vendor.index.setStorageSync("checkname", details.checkitems); common_vendor.index.setStorageSync("checkname", details.checkitems);
HANDLE_GETSTORAGEINFO();
details.showck = false; details.showck = false;
common_vendor.index.showToast({ common_vendor.index.showToast({
title: "切换成功", title: "切换成功",

20
unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -202,7 +203,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
return; return;
details.zero.data = []; details.zero.data = [];
details.order.data = []; details.order.data = [];
data.forEach((val) => { data && data.forEach((val) => {
let scanNum = 0;
for (let i = 0; i < val.distributionAppParcelListVOS.length; i++) {
const value = val.distributionAppParcelListVOS[i];
if (value.isScan !== "已扫")
continue;
scanNum++;
}
console.log("scanNum :>> ", scanNum);
if (scanNum === 0)
val.completecode = 1;
else if (scanNum < val.distributionAppParcelListVOS.length)
val.completecode = 2;
else
val.completecode = 3;
val.complete = val.completecode === 1 ? "未扫" : val.completecode === 2 ? "部分扫" : "齐套";
if (val.isZero === "1") if (val.isZero === "1")
return details.zero.data.push(val); return details.zero.data.push(val);
details.order.data.push(val); details.order.data.push(val);
@ -481,7 +497,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
d: common_vendor.t(common_vendor.unref(items).isload), d: common_vendor.t(common_vendor.unref(items).isload),
e: common_vendor.t(common_vendor.unref(items).ordNub), e: common_vendor.t(common_vendor.unref(items).ordNub),
f: common_vendor.t(common_vendor.unref(items).reservationNum), f: common_vendor.t(common_vendor.unref(items).reservationNum),
g: common_vendor.t(common_vendor.unref(loadingNub)), g: common_vendor.t(loadingNub.value),
h: common_vendor.t(common_vendor.unref(items).signNub), h: common_vendor.t(common_vendor.unref(items).signNub),
i: common_vendor.o(checktype), i: common_vendor.o(checktype),
j: common_vendor.p({ j: common_vendor.p({

6
unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js vendored

@ -358,9 +358,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
g: common_vendor.t(common_vendor.unref(items).isstock), g: common_vendor.t(common_vendor.unref(items).isstock),
h: common_vendor.t(common_vendor.unref(items).customersNumber), h: common_vendor.t(common_vendor.unref(items).customersNumber),
i: common_vendor.t(common_vendor.unref(items).orderNumber), i: common_vendor.t(common_vendor.unref(items).orderNumber),
j: common_vendor.t(common_vendor.unref(deliveryNumber)), j: common_vendor.t(deliveryNumber.value),
k: common_vendor.t(common_vendor.unref(truckLoadingNum)), k: common_vendor.t(truckLoadingNum.value),
l: common_vendor.t(common_vendor.unref(signNub)), l: common_vendor.t(signNub.value),
m: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => { m: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
return common_vendor.e({ return common_vendor.e({
a: common_vendor.t(item.consignee), a: common_vendor.t(item.consignee),

4
unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js vendored

@ -188,8 +188,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
e: common_vendor.t(common_vendor.unref(items).loadingTeamName), e: common_vendor.t(common_vendor.unref(items).loadingTeamName),
f: common_vendor.t(common_vendor.unref(items).isstock), f: common_vendor.t(common_vendor.unref(items).isstock),
g: common_vendor.t(common_vendor.unref(items).customersNumber), g: common_vendor.t(common_vendor.unref(items).customersNumber),
h: common_vendor.t(common_vendor.unref(ordernumber)), h: common_vendor.t(ordernumber.value),
i: common_vendor.t(common_vendor.unref(deliveryNumber)), i: common_vendor.t(deliveryNumber.value),
j: common_vendor.t(common_vendor.unref(details).scannedNumber), j: common_vendor.t(common_vendor.unref(details).scannedNumber),
k: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => { k: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
return common_vendor.e({ return common_vendor.e({

4
unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
const utils_utils = require("../../../utils/utils.js"); const utils_utils = require("../../../utils/utils.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
const store_useStorageStore = require("../../../store/useStorageStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
@ -24,6 +25,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "DownGoods", __name: "DownGoods",
setup(__props) { setup(__props) {
common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore()); common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
const { HANDLE_ISSTORAGECODE } = store_useStorageStore.useStorageStore();
const tiplists = common_vendor.ref(null); const tiplists = common_vendor.ref(null);
const tip = common_vendor.ref(null); const tip = common_vendor.ref(null);
const details = common_vendor.reactive({ const details = common_vendor.reactive({
@ -143,6 +145,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} }
break; break;
case 2: case 2:
if (!HANDLE_ISSTORAGECODE(details.scancode))
return utils_utils.utils.handleToast("请扫描本仓库位码");
data = { data = {
allocationId: details.scancode allocationId: details.scancode
}; };

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

20
unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js vendored

@ -1,6 +1,7 @@
"use strict"; "use strict";
const common_vendor = require("../../../common/vendor.js"); const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
const utils_utils = require("../../../utils/utils.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
@ -185,6 +186,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.show = value; details.show = value;
} }
async function initpage() { async function initpage() {
if (date.value.length === 0)
return utils_utils.utils.handleToast("请选择时间");
let data = { let data = {
current: details.current, current: details.current,
size: details.size, size: details.size,
@ -445,15 +448,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
l: common_vendor.t(item.trainNumber), l: common_vendor.t(item.trainNumber),
m: common_vendor.o(($event) => goloddeta(item)), m: common_vendor.o(($event) => goloddeta(item)),
n: common_vendor.t(item.customersNumber), n: common_vendor.t(item.customersNumber),
o: common_vendor.t(item.orderNumber), o: common_vendor.o(($event) => goselscan(item)),
p: common_vendor.t(item.deliveryNumber), p: common_vendor.t(item.orderNumber),
q: common_vendor.t(item.scannedNumber), q: common_vendor.t(item.deliveryNumber),
r: common_vendor.t(item.inventoryNub), r: common_vendor.t(item.scannedNumber),
s: common_vendor.o(($event) => goselscan(item)), s: common_vendor.t(item.inventoryNub),
t: common_vendor.o(($event) => goRetention(item)), t: common_vendor.o(($event) => goselscan(item)),
v: !item.departureTime v: common_vendor.o(($event) => goRetention(item)),
w: !item.departureTime
}, !item.departureTime ? { }, !item.departureTime ? {
w: common_vendor.o(($event) => startld(item)) x: common_vendor.o(($event) => startld(item))
} : {}); } : {});
}), }),
o: common_vendor.o(jiazai), o: common_vendor.o(jiazai),

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.wxml vendored

@ -1 +1 @@
<basic-container wx:if="{{q}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="38f22c90-0" bind:__l="__l" u-p="{{q}}"><view slot="head"><view class="tabbmiax"><view bindtap="{{a}}" class="{{b}}"><view>商配</view><view></view></view><view bindtap="{{c}}" class="{{d}}"><view>市配</view><view></view></view></view><view class="schbox"><view>配车日期:</view><view bindtap="{{l}}" class="inputsr"><view class="timeInput">{{e}}</view><view catchtap="{{k}}"><u-icon wx:if="{{f}}" bindclick="{{g}}" style="margin-right:10rpx" u-i="38f22c90-1,38f22c90-0" bind:__l="__l" u-p="{{h}}"></u-icon><u-icon wx:else bindclick="{{i}}" style="margin-right:10rpx" u-i="38f22c90-2,38f22c90-0" bind:__l="__l" u-p="{{j||''}}"></u-icon></view></view><view bindtap="{{m}}"> 查询 </view></view></view><scroll-view scroll-y="true" class="scvbx" bindscrolltolower="{{o}}" slot="body"><view class="mabxslist"><view wx:for="{{n}}" wx:for-item="item" class="item"><view class="headtop"><view class="type1s"><view><text style="color:#90A0AF">配送类型:</text>{{item.a}}</view><view><text style="color:#90A0AF">配送状态:</text>{{item.b}}</view></view><view class="type1s"><view><text style="color:#90A0AF">车牌号:</text>{{item.c}}</view><view><text style="color:#90A0AF">司机:</text>{{item.d}}</view></view><view class="type1s"><view><text style="color:#90A0AF">装卸班组:</text>{{item.e}}</view><view class="bhcolor"><text style="color:#90A0AF">备货是否完成:</text>{{item.f}}</view></view><view class="type1s"><view><text style="color:#90A0AF">客户:</text>{{item.g}}</view></view><view class="type1s"><view><text style="color:#90A0AF">配送日期:</text>{{item.h}}</view></view><view wx:if="{{item.i}}" class="type1s"><view><text style="color:#90A0AF">发车时间:</text>{{item.j}}</view></view><view class="type1s"><view><text style="color:#90A0AF">备货区:</text>{{item.k}}</view></view><view class="type1s" bindtap="{{item.m}}"><view class="bhcolor"><text style="color:#90A0AF">车次号:</text><text style="text-decoration:underline">{{item.l}}</text></view></view><view class="liebs"><view><view>配送客户数</view><view>{{item.n}}</view></view><view><view>订单总数</view><view>{{item.o}}</view></view><view><view>计划件数</view><view>{{item.p}}</view></view><view><view>装车件数</view><view>{{item.q}}</view></view><view><view>库存品数</view><view>{{item.r}}</view></view></view></view><view class="buts"><view bindtap="{{item.s}}">装车扫描</view><view bindtap="{{item.t}}">滞留</view><view wx:if="{{item.v}}" bindtap="{{item.w}}">发车</view></view></view></view></scroll-view></basic-container><l-calendar wx:if="{{v}}" bindhide="{{r}}" bindchange="{{s}}" u-i="38f22c90-3" bind:__l="__l" bindupdateValue="{{t}}" u-p="{{v}}"></l-calendar><tiplist class="r" u-r="tiplists" u-i="38f22c90-4" bind:__l="__l"></tiplist><tips class="r" u-r="tip" u-i="38f22c90-5" bind:__l="__l"></tips> <basic-container wx:if="{{q}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="38f22c90-0" bind:__l="__l" u-p="{{q}}"><view slot="head"><view class="tabbmiax"><view bindtap="{{a}}" class="{{b}}"><view>商配</view><view></view></view><view bindtap="{{c}}" class="{{d}}"><view>市配</view><view></view></view></view><view class="schbox"><view>配车日期:</view><view bindtap="{{l}}" class="inputsr"><view class="timeInput">{{e}}</view><view catchtap="{{k}}"><u-icon wx:if="{{f}}" bindclick="{{g}}" style="margin-right:10rpx" u-i="38f22c90-1,38f22c90-0" bind:__l="__l" u-p="{{h}}"></u-icon><u-icon wx:else bindclick="{{i}}" style="margin-right:10rpx" u-i="38f22c90-2,38f22c90-0" bind:__l="__l" u-p="{{j||''}}"></u-icon></view></view><view bindtap="{{m}}"> 查询 </view></view></view><scroll-view scroll-y="true" class="scvbx" bindscrolltolower="{{o}}" slot="body"><view class="mabxslist"><view wx:for="{{n}}" wx:for-item="item" class="item"><view class="headtop"><view class="type1s"><view><text style="color:#90A0AF">配送类型:</text>{{item.a}}</view><view><text style="color:#90A0AF">配送状态:</text>{{item.b}}</view></view><view class="type1s"><view><text style="color:#90A0AF">车牌号:</text>{{item.c}}</view><view><text style="color:#90A0AF">司机:</text>{{item.d}}</view></view><view class="type1s"><view><text style="color:#90A0AF">装卸班组:</text>{{item.e}}</view><view class="bhcolor"><text style="color:#90A0AF">备货是否完成:</text>{{item.f}}</view></view><view class="type1s"><view><text style="color:#90A0AF">客户:</text>{{item.g}}</view></view><view class="type1s"><view><text style="color:#90A0AF">配送日期:</text>{{item.h}}</view></view><view wx:if="{{item.i}}" class="type1s"><view><text style="color:#90A0AF">发车时间:</text>{{item.j}}</view></view><view class="type1s"><view><text style="color:#90A0AF">备货区:</text>{{item.k}}</view></view><view class="type1s" bindtap="{{item.m}}"><view class="bhcolor"><text style="color:#90A0AF">车次号:</text><text style="text-decoration:underline">{{item.l}}</text></view></view><view class="liebs"><view bindtap="{{item.o}}"><view>配送客户数</view><view>{{item.n}}</view></view><view><view>订单总数</view><view>{{item.p}}</view></view><view><view>计划件数</view><view>{{item.q}}</view></view><view><view>装车件数</view><view>{{item.r}}</view></view><view><view>库存品数</view><view>{{item.s}}</view></view></view></view><view class="buts"><view bindtap="{{item.t}}">装车扫描</view><view bindtap="{{item.v}}">滞留</view><view wx:if="{{item.w}}" bindtap="{{item.x}}">发车</view></view></view></view></scroll-view></basic-container><l-calendar wx:if="{{v}}" bindhide="{{r}}" bindchange="{{s}}" u-i="38f22c90-3" bind:__l="__l" bindupdateValue="{{t}}" u-p="{{v}}"></l-calendar><tiplist class="r" u-r="tiplists" u-i="38f22c90-4" bind:__l="__l"></tiplist><tips class="r" u-r="tip" u-i="38f22c90-5" bind:__l="__l"></tips>

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

11
unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.js vendored

@ -1,6 +1,7 @@
"use strict"; "use strict";
const common_vendor = require("../../../common/vendor.js"); const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
const utils_utils = require("../../../utils/utils.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
@ -34,13 +35,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
scanNum: 0, scanNum: 0,
totalNumber: 0 totalNumber: 0
}, },
ischeckall: false ischeckall: false,
scvboxHeight: "60vh"
}); });
common_vendor.onLoad((op) => { common_vendor.onLoad((op) => {
details.orderCode = op.orderCode; details.orderCode = op.orderCode;
details.trayCode = op.trayCode; details.trayCode = op.trayCode;
}); });
common_vendor.onShow(() => { common_vendor.onShow(async () => {
initpage(); initpage();
}); });
common_vendor.onPullDownRefresh(() => { common_vendor.onPullDownRefresh(() => {
@ -65,6 +67,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
set.add(item.trayName); set.add(item.trayName);
}); });
details.tabcek = [...set]; details.tabcek = [...set];
await common_vendor.nextTick$1();
details.scvboxHeight = await utils_utils.utils.getViewDistanceFormTop(".scvbox");
return response; return response;
} }
common_vendor.watchEffect(() => { common_vendor.watchEffect(() => {
@ -246,7 +250,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}), }),
l: common_vendor.o(() => { l: common_vendor.o(() => {
}), }),
m: common_vendor.sr(tip, "09fe56e4-1", { m: common_vendor.unref(details).scvboxHeight,
n: common_vendor.sr(tip, "09fe56e4-1", {
"k": "tip" "k": "tip"
}) })
}); });

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.wxml vendored

@ -1 +1 @@
<u-navbar wx:if="{{a}}" u-i="09fe56e4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image><view class="mabxtop"><view class="type1s"><view><view>{{b}}</view><view>订单号</view></view><view><view>{{c}}</view><view>订单总数</view></view></view><view class="type2s"><view> 已扫 </view><view>{{d}}件 </view></view></view><view class="scviewtary"><scroll-view scroll-x="true" class="scbox"><view class="viebxs"><view wx:for="{{e}}" wx:for-item="item" bindtap="{{item.b}}" class="{{item.c}}">{{item.a}}</view></view></scroll-view></view><view class="maboxite"><view wx:if="{{f}}" class="headtops"><view bindtap="{{i}}"><image src="{{g}}"></image><view>{{h}}</view></view><view bindtap="{{j}}">批量删除</view></view><scroll-view scroll-y="true" class="scvbox"><view class="maxboxs"><view wx:for="{{k}}" wx:for-item="item" class="items" bindtap="{{item.A}}"><view class="lefticon"><image wx:if="{{item.a}}" src="{{item.b}}"></image></view><view class="rigth"><view class="type1"><view><view>包条码:</view><view style="{{item.d}}">{{item.c}}</view></view></view><view class="type1"><view><view>托盘码:</view><view style="{{item.f}}">{{item.e}}</view></view></view><view class="type1"><view><view>仓库:</view><view style="{{item.h}}">{{item.g}}</view></view></view><view class="type1"><view><view>物料编码:</view><view style="{{item.j}}">{{item.i}}</view></view></view><view class="type1"><view><view>物料名称:</view><view style="{{item.l}}">{{item.k}}</view></view></view><view class="type1"><view><view>物料类型:</view><view style="{{item.n}}">{{item.m}}</view></view></view><view class="type1"><view><view>类型:</view><view style="{{item.p}}">{{item.o}}</view></view></view><view class="type1"><view><view>货区:</view><view style="{{item.r}}">{{item.q}}</view></view></view><view class="type1"><view><view>货架:</view><view style="{{item.t}}">{{item.s}}</view></view></view><view class="type1"><view><view>货位:</view><view style="{{item.w}}">{{item.v}}</view></view></view><view class="type1"><view><view>扫描状态:</view><view>{{item.x}}</view></view></view></view><view class="removeicon" catchtap="{{l}}"><image wx:if="{{item.y}}" src="/pagesHome/static/removeitem.png" bindtap="{{item.z}}"></image></view></view></view></scroll-view></view><tips class="r" u-r="tip" u-i="09fe56e4-1" bind:__l="__l"></tips> <u-navbar wx:if="{{a}}" u-i="09fe56e4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image><view class="mabxtop"><view class="type1s"><view><view>{{b}}</view><view>订单号</view></view><view><view>{{c}}</view><view>订单总数</view></view></view><view class="type2s"><view> 已扫 </view><view>{{d}}件 </view></view></view><view class="scviewtary"><scroll-view scroll-x="true" class="scbox"><view class="viebxs"><view wx:for="{{e}}" wx:for-item="item" bindtap="{{item.b}}" class="{{item.c}}">{{item.a}}</view></view></scroll-view></view><view class="maboxite"><view wx:if="{{f}}" class="headtops"><view bindtap="{{i}}"><image src="{{g}}"></image><view>{{h}}</view></view><view bindtap="{{j}}">批量删除</view></view><scroll-view scroll-y="true" style="{{'height:' + m}}" class="scvbox"><view class="maxboxs"><view wx:for="{{k}}" wx:for-item="item" class="items" bindtap="{{item.A}}"><view class="lefticon"><image wx:if="{{item.a}}" src="{{item.b}}"></image></view><view class="rigth"><view class="type1"><view><view>包条码:</view><view style="{{item.d}}">{{item.c}}</view></view></view><view class="type1"><view><view>托盘码:</view><view style="{{item.f}}">{{item.e}}</view></view></view><view class="type1"><view><view>仓库:</view><view style="{{item.h}}">{{item.g}}</view></view></view><view class="type1"><view><view>物料编码:</view><view style="{{item.j}}">{{item.i}}</view></view></view><view class="type1"><view><view>物料名称:</view><view style="{{item.l}}">{{item.k}}</view></view></view><view class="type1"><view><view>物料类型:</view><view style="{{item.n}}">{{item.m}}</view></view></view><view class="type1"><view><view>类型:</view><view style="{{item.p}}">{{item.o}}</view></view></view><view class="type1"><view><view>货区:</view><view style="{{item.r}}">{{item.q}}</view></view></view><view class="type1"><view><view>货架:</view><view style="{{item.t}}">{{item.s}}</view></view></view><view class="type1"><view><view>货位:</view><view style="{{item.w}}">{{item.v}}</view></view></view><view class="type1"><view><view>扫描状态:</view><view>{{item.x}}</view></view></view></view><view class="removeicon" catchtap="{{l}}"><image wx:if="{{item.y}}" src="/pagesHome/static/removeitem.png" bindtap="{{item.z}}"></image></view></view></view></scroll-view></view><tips class="r" u-r="tip" u-i="09fe56e4-1" bind:__l="__l"></tips>

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js vendored

@ -5,6 +5,7 @@ const store_uaeUserStore = require("../../../store/uaeUserStore.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml vendored

@ -1 +1 @@
<basic-container wx:if="{{i}}" class="r data-v-5628bd90" u-s="{{['head','body']}}" u-r="basicContainer" u-i="5628bd90-0" bind:__l="__l" u-p="{{i}}"><view class="hedtopt data-v-5628bd90" slot="head"><view class="typto data-v-5628bd90"><view class="data-v-5628bd90">备货区域:<text class="vibx data-v-5628bd90" bindtap="{{b}}">{{a}}</text></view></view><view class="typto data-v-5628bd90"><view class="data-v-5628bd90">备货编码:{{c}}</view></view><view class="typto data-v-5628bd90"><view class="data-v-5628bd90">备货状态:{{d}}</view><view class="data-v-5628bd90">备货类型:{{e}}</view></view></view><scroll-view class="scoolv data-v-5628bd90" scroll-y="true" slot="body"><view class="minbx data-v-5628bd90"><block wx:if="{{f}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="j" class="its data-v-5628bd90" bindtap="{{item.i}}"><view class="titl data-v-5628bd90"> 客户:{{item.a}}</view><view class="contsx data-v-5628bd90"><view class="content data-v-5628bd90"><view class="data-v-5628bd90"><text class="data-v-5628bd90" style="color:#90A0AF">备货是否完成:</text>{{item.b}}</view><view class="data-v-5628bd90"><text class="data-v-5628bd90" style="color:#90A0AF">备货类型:</text>{{item.c}}</view></view><view class="content data-v-5628bd90"><view class="data-v-5628bd90"><text class="data-v-5628bd90" style="color:#90A0AF">商场名称:</text>{{item.d}}</view></view><view class="total data-v-5628bd90"><view class="data-v-5628bd90"><view class="data-v-5628bd90">订单总数</view><view class="data-v-5628bd90">{{item.e}}</view></view><view class="data-v-5628bd90"><view class="data-v-5628bd90">库存品数量</view><view class="data-v-5628bd90">{{item.f}}</view></view><view class="data-v-5628bd90"><view class="data-v-5628bd90">计划件数</view><view class="data-v-5628bd90">{{item.g}}</view></view><view class="data-v-5628bd90"><view class="data-v-5628bd90">已备数量</view><view class="data-v-5628bd90">{{item.h}}</view></view></view></view></view></block></view></scroll-view></basic-container><tiplist class="r data-v-5628bd90" u-r="tiplists" u-i="5628bd90-1" bind:__l="__l"></tiplist><tips class="r data-v-5628bd90" u-r="tips" u-i="5628bd90-2" bind:__l="__l"></tips> <basic-container wx:if="{{i}}" class="r data-v-5628bd90" u-s="{{['head','body']}}" u-r="basicContainer" u-i="5628bd90-0" bind:__l="__l" u-p="{{i}}"><view class="hedtopt data-v-5628bd90" slot="head"><view class="typto data-v-5628bd90"><view class="data-v-5628bd90">备货区域:<text class="vibx data-v-5628bd90" bindtap="{{b}}">{{a}}</text></view></view><view class="typto data-v-5628bd90"><view class="data-v-5628bd90">备货编码:{{c}}</view></view><view class="typto data-v-5628bd90"><view class="data-v-5628bd90">备货状态:{{d}}</view><view class="data-v-5628bd90">备货类型:{{e}}</view></view></view><scroll-view class="scoolv data-v-5628bd90" scroll-y="true" slot="body"><view class="minbx data-v-5628bd90"><block wx:if="{{f}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="j" class="its data-v-5628bd90" bindtap="{{item.i}}"><view class="titl data-v-5628bd90"> 客户:{{item.a}}</view><view class="contsx data-v-5628bd90"><view class="content data-v-5628bd90"><view class="data-v-5628bd90"><text class="data-v-5628bd90" style="color:#90A0AF">备货是否完成:</text>{{item.b}}</view><view class="data-v-5628bd90"><text class="data-v-5628bd90" style="color:#90A0AF">备货类型:</text>{{item.c}}</view></view><view class="content mt10 data-v-5628bd90"><view class="data-v-5628bd90"><text class="data-v-5628bd90" style="color:#90A0AF">商场名称:</text>{{item.d}}</view></view><view class="total mt10 data-v-5628bd90"><view class="data-v-5628bd90"><view class="data-v-5628bd90">订单总数</view><view class="data-v-5628bd90">{{item.e}}</view></view><view class="data-v-5628bd90"><view class="data-v-5628bd90">库存品数量</view><view class="data-v-5628bd90">{{item.f}}</view></view><view class="data-v-5628bd90"><view class="data-v-5628bd90">计划件数</view><view class="data-v-5628bd90">{{item.g}}</view></view><view class="data-v-5628bd90"><view class="data-v-5628bd90">已备数量</view><view class="data-v-5628bd90">{{item.h}}</view></view></view></view></view></block></view></scroll-view></basic-container><tiplist class="r data-v-5628bd90" u-r="tiplists" u-i="5628bd90-1" bind:__l="__l"></tiplist><tips class="r data-v-5628bd90" u-r="tips" u-i="5628bd90-2" bind:__l="__l"></tips>

102
unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxss vendored

@ -23,6 +23,103 @@
/* 垂直间距 */ /* 垂直间距 */
/* 透明度 */ /* 透明度 */
/* 文章场景相关 */ /* 文章场景相关 */
.flex.data-v-5628bd90{
display: flex;
}
.flex-c-c.data-v-5628bd90{
display: flex;
align-items: center;
justify-content: center;
}
.flex-c-sb.data-v-5628bd90{
display: flex;
align-items: center;
justify-content: space-between;
}
.flex-c-sa.data-v-5628bd90{
display: flex;
align-items: center;
justify-content: space-around;
}
.align-center.data-v-5628bd90{
display: flex;
align-items: center;
}
.flex1.data-v-5628bd90{
flex: 1;
}
.flexnone.data-v-5628bd90{
flex: none;
}
.mt10.data-v-5628bd90{
margin-top: 10rpx;
}
.mt20.data-v-5628bd90{
margin-top: 20rpx;
}
.ml10.data-v-5628bd90{
margin-left: 10rpx;
}
.ml20.data-v-5628bd90{
margin-left: 20rpx;
}
.mb10.data-v-5628bd90{
margin-bottom: 10rpx;
}
.mb20.data-v-5628bd90{
margin-bottom: 20rpx;
}
.mr10.data-v-5628bd90{
margin-right: 10rpx;
}
.mr20.data-v-5628bd90{
margin-right: 20rpx;
}
.pd10.data-v-5628bd90{
padding: 10rpx;
}
.pd15.data-v-5628bd90{
padding: 15rpx;
}
.pd20.data-v-5628bd90{
padding: 20rpx;
}
.w100.data-v-5628bd90{
width: 100%;
}
.h100.data-v-5628bd90{
height: 100%;
}
.text-center.data-v-5628bd90{
text-align: center;
}
.text-start.data-v-5628bd90{
text-align: start;
}
.text-end.data-v-5628bd90{
text-align: end;
}
.fwb.data-v-5628bd90{
font-weight: bold;
}
.rem-1.data-v-5628bd90{
font-size: 1rem;
}
.rem-0-8.data-v-5628bd90{
font-size: 0.8rem;
}
.rem-0-9.data-v-5628bd90{
font-size: 0.9rem;
}
.rem-1-5.data-v-5628bd90{
font-size: 1.5rem;
}
.primaryColor.data-v-5628bd90{
color: #172e60;
}
.primaryColorIm.data-v-5628bd90{
color: #172e60 !important;
}
.topBox.data-v-5628bd90 { .topBox.data-v-5628bd90 {
width: 100%; width: 100%;
display: flex; display: flex;
@ -44,7 +141,7 @@
} }
.scoolv.data-v-5628bd90 { .scoolv.data-v-5628bd90 {
width: 100%; width: 100%;
height: 60vh; height: 70vh;
margin-top: 20rpx; margin-top: 20rpx;
} }
.scoolv .minbx.data-v-5628bd90 { .scoolv .minbx.data-v-5628bd90 {
@ -117,7 +214,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
margin-top: 44rpx;
} }
.scoolv .minbx > .its .contsx .total > view.data-v-5628bd90 { .scoolv .minbx > .its .contsx .total > view.data-v-5628bd90 {
display: flex; display: flex;
@ -138,7 +234,7 @@
.scoolv .minbx > .its .contsx .total > view > view.data-v-5628bd90:nth-of-type(2) { .scoolv .minbx > .its .contsx .total > view > view.data-v-5628bd90:nth-of-type(2) {
font-size: 36rpx; font-size: 36rpx;
color: #0086F1; color: #0086F1;
margin-top: 20rpx; margin-top: 10rpx;
} }
.hedtopt.data-v-5628bd90 { .hedtopt.data-v-5628bd90 {
display: flex; display: flex;

6
unpackage/dist/dev/mp-weixin/pagesHome/pages/Relocation/Relocation.js vendored

@ -233,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
i: common_vendor.t(common_vendor.unref(dtilobj).trayNum || "0"), i: common_vendor.t(common_vendor.unref(dtilobj).trayNum || "0"),
j: common_vendor.unref(pagetype) == 2 j: common_vendor.unref(pagetype) == 2
}, common_vendor.unref(pagetype) == 2 ? { }, common_vendor.unref(pagetype) == 2 ? {
k: common_vendor.t(common_vendor.unref(traynumber) || "0") k: common_vendor.t(traynumber.value || "0")
} : {}, { } : {}, {
l: common_vendor.f(common_vendor.unref(scanlist), (item, index, i0) => { l: common_vendor.f(common_vendor.unref(scanlist), (item, index, i0) => {
return common_vendor.e(Number(common_vendor.unref(pagetype)) === 1 ? common_vendor.e({ return common_vendor.e(Number(common_vendor.unref(pagetype)) === 1 ? common_vendor.e({
@ -287,14 +287,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}, common_vendor.unref(pagetype) == "1" ? { }, common_vendor.unref(pagetype) == "1" ? {
r: common_vendor.t((((_g = common_vendor.unref(obldate)) == null ? void 0 : _g.areaName) || "") + "-" + (((_h = common_vendor.unref(obldate)) == null ? void 0 : _h.shelfName) || "") + "-" + (((_i = common_vendor.unref(obldate)) == null ? void 0 : _i.allocationName) || "")), r: common_vendor.t((((_g = common_vendor.unref(obldate)) == null ? void 0 : _g.areaName) || "") + "-" + (((_h = common_vendor.unref(obldate)) == null ? void 0 : _h.shelfName) || "") + "-" + (((_i = common_vendor.unref(obldate)) == null ? void 0 : _i.allocationName) || "")),
s: common_vendor.t(common_vendor.unref(trayCode)), s: common_vendor.t(common_vendor.unref(trayCode)),
t: common_vendor.t(common_vendor.unref(traynumber)), t: common_vendor.t(traynumber.value),
v: common_vendor.t((((_j = common_vendor.unref(dtilobj)) == null ? void 0 : _j.areaTitle) || "") + "-" + (((_k = common_vendor.unref(dtilobj)) == null ? void 0 : _k.shelfTitle) || "") + "-" + (((_l = common_vendor.unref(dtilobj)) == null ? void 0 : _l.allocationTitle) || "")), v: common_vendor.t((((_j = common_vendor.unref(dtilobj)) == null ? void 0 : _j.areaTitle) || "") + "-" + (((_k = common_vendor.unref(dtilobj)) == null ? void 0 : _k.shelfTitle) || "") + "-" + (((_l = common_vendor.unref(dtilobj)) == null ? void 0 : _l.allocationTitle) || "")),
w: common_vendor.o(($event) => setstate(false)), w: common_vendor.o(($event) => setstate(false)),
x: common_vendor.o(uplist) x: common_vendor.o(uplist)
} : {}, { } : {}, {
y: common_vendor.unref(pagetype) == "2" y: common_vendor.unref(pagetype) == "2"
}, common_vendor.unref(pagetype) == "2" ? common_vendor.e({ }, common_vendor.unref(pagetype) == "2" ? common_vendor.e({
z: common_vendor.t(common_vendor.unref(traynumber)), z: common_vendor.t(traynumber.value),
A: common_vendor.t((((_m = common_vendor.unref(dtilobj)) == null ? void 0 : _m.areaTitle) || "") + "-" + (((_n = common_vendor.unref(dtilobj)) == null ? void 0 : _n.shelfTitle) || "") + "-" + (((_o = common_vendor.unref(dtilobj)) == null ? void 0 : _o.allocationTitle) || "")), A: common_vendor.t((((_m = common_vendor.unref(dtilobj)) == null ? void 0 : _m.areaTitle) || "") + "-" + (((_n = common_vendor.unref(dtilobj)) == null ? void 0 : _n.shelfTitle) || "") + "-" + (((_o = common_vendor.unref(dtilobj)) == null ? void 0 : _o.allocationTitle) || "")),
B: common_vendor.unref(dtilobj).trayCode B: common_vendor.unref(dtilobj).trayCode
}, common_vendor.unref(dtilobj).trayCode ? { }, common_vendor.unref(dtilobj).trayCode ? {

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/Retention/Retention.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

57
unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -117,15 +118,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
billLadingId: details.billLadingId, billLadingId: details.billLadingId,
orderCode: details.orderCode orderCode: details.orderCode
}; };
let response = await api_user.billLadingorderList(data); let response2 = await api_user.billLadingorderList(data);
if (response.code !== 200) if (response2.code !== 200)
return; return;
details.datalist = response.data.list; details.datalist = response2.data.list;
details.orderNum = response.data.orderNum; details.orderNum = response2.data.orderNum;
details.completeNum = response.data.completeNum; details.completeNum = response2.data.completeNum;
details.planNum = response.data.planNum; details.planNum = response2.data.planNum;
details.inventoryNub = response.data.inventoryNub; details.inventoryNub = response2.data.inventoryNub;
details.signedNum = response.data.signedNum; details.signedNum = response2.data.signedNum;
if (!details.isscan) if (!details.isscan)
return; return;
details.isscan = false; details.isscan = false;
@ -135,10 +136,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
current: 1, current: 1,
size: 10 size: 10
}; };
let response = await api_user.billLadinggetInventory(date); let response2 = await api_user.billLadinggetInventory(date);
if (response.code !== 200) const { code, data } = response2;
if (code !== 200)
return; return;
details.datalist = response.data.records; console.log("data.inventoryList :>> ", data.inventoryList);
details.datalist = data.inventoryList;
details.datalist.every((item) => { details.datalist.every((item) => {
if (item.esauInventoryNum == -1) { if (item.esauInventoryNum == -1) {
common_vendor.index.showToast({ common_vendor.index.showToast({
@ -149,6 +152,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} }
return true; return true;
}); });
details.orderNum = response2.data.orderNum;
details.completeNum = response2.data.completeNum;
details.planNum = response2.data.planNum;
details.inventoryNub = response2.data.inventoryNub;
details.signedNum = response2.data.signedNum;
if (!details.isscan)
return;
details.isscan = false;
} else if (details.orderType === 3) { } else if (details.orderType === 3) {
let deta = { let deta = {
billLadingId: details.billLadingId, billLadingId: details.billLadingId,
@ -158,8 +169,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
const res = await api_user.billLadingZeroBillOrderData(deta); const res = await api_user.billLadingZeroBillOrderData(deta);
console.log("res :>> ", res); console.log("res :>> ", res);
const { code, data } = res; const { code, data } = res;
if (code === 200) if (code !== 200)
details.datalist = data; return;
details.datalist = data.billLadingZeroOrderVOS;
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;
if (!details.isscan)
return;
details.isscan = false;
} }
} catch (e) { } catch (e) {
} finally { } finally {
@ -178,14 +198,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
try { try {
console.log("item :>> ", item); console.log("item :>> ", item);
let subdata = { let subdata = {
billLadingId: details.billLadingId billLadingId: details.billLadingId,
stockArtieleld: item.id
}; };
const response = await api_user.billLadingzeroBillData(subdata); const response2 = await api_user.billLadingzeroBillData(subdata);
console.log("response :>> ", response); console.log("response :>> ", response2);
const { code, data } = response; const { code, data } = response2;
if (code !== 200) if (code !== 200)
return common_vendor.index.showToast({ return common_vendor.index.showToast({
title: response.msg, title: response2.msg,
icon: "none" icon: "none"
}); });
const inpList = data.map((val) => { const inpList = data.map((val) => {

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -242,6 +243,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} finally { } finally {
if (details.isscan && details.signedNum) { if (details.isscan && details.signedNum) {
utils.ttsspke(details.signedNum + "件"); utils.ttsspke(details.signedNum + "件");
details.isscan = false;
} }
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
} }

4
unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js vendored

@ -145,12 +145,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
initpage(); initpage();
} }
async function initpage() { async function initpage() {
console.log("details :>> ", details);
console.log("date.value :>> ", date.value);
if (details.tabBarCode === 10) if (details.tabBarCode === 10)
details.searchInfo1.date = [...date.value]; details.searchInfo1.date = [...date.value];
else if (details.tabBarCode === 20) else if (details.tabBarCode === 20)
details.searchInfo2.date = [...date.value]; details.searchInfo2.date = [...date.value];
if (date.value.length === 0)
return utils_utils.utils.handleToast("请选择自提时间");
let data = { let data = {
current: details.current, current: details.current,
size: details.size, size: details.size,

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/SetPrice/SetPrice.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

3
unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -122,7 +123,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
return (_ctx, _cache) => { return (_ctx, _cache) => {
return common_vendor.e({ return common_vendor.e({
a: common_vendor.p({ a: common_vendor.p({
title: "签收明细扫描", title: "签收扫描明细",
bgColor: "#D3832A", bgColor: "#D3832A",
leftIconColor: "#ffffff", leftIconColor: "#ffffff",
titleStyle: "color:#ffffff", titleStyle: "color:#ffffff",

191
unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js vendored

@ -5,6 +5,7 @@ const store_useBluetoothStore = require("../../../store/useBluetoothStore.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -196,165 +197,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} }
}); });
} }
async function showZeroOrderDetails(item) { const handleStockUpByZero = (item) => {
if (!item.allocation) {
return common_vendor.index.showToast({
title: "未上架,上架后再进行操作",
icon: "none"
});
}
let data = {
typeService: details.items.typeService,
stockupId: details.stockupId,
allocationId: item.allocationId,
orderCode: item.orderCode,
stockArticleId: item.stockArticleId
};
const res = await api_user.postZeroStockUpData(data);
const { code } = res;
let inpList = [];
if (code !== 200)
return;
console.log("res.data :>> ", res.data);
inpList = res.data.map((val) => {
return {
id: val.id,
title: val.categoryName,
value: val.realityQuantity,
maxNum: val.quantity,
minNum: val.realityQuantity || 0,
type: "Number",
disabled: item.completeStact,
allocationId: item.allocationId,
orderCode: item.orderCode,
stockArticleId: val.stockArticleId
};
});
if (item.completeStact) {
return tiplists.value.setdetails({
title: "产看零担物料明细",
isshow: true,
tipstate: 4,
inpList,
inputtext: "",
confirmTxt: "关闭",
isonecheck: true,
success: async (deta) => {
tiplists.value.setdetails({ isshow: false });
},
cancel: (details2) => {
tiplists.value.setdetails({ isshow: false });
},
close: (details2) => {
tiplists.value.setdetails({ isshow: false });
}
});
}
tiplists.value.setdetails({
title: "设置零担物料数量",
isshow: true,
tipstate: 4,
inpList,
inputtext: "",
confirmTxt: "确认选择",
isonecheck: true,
success: async (deta) => {
console.log("deta :>> ", deta);
if (deta.inpList.length === 0 || item.completeStact)
return tiplists.value.setdetails({ isshow: false });
let data2 = {
reservationId: details.reservationId,
typeService: details.items.typeService,
stockupId: details.stockupId,
orderCode: deta.inpList[0].orderCode,
stockArticleId: deta.inpList[0].stockArticleId,
list: []
};
if (deta.inpList[0].allocationId)
data2.allocationId = deta.inpList[0].allocationId;
const _flag = deta.inpList.every((val) => {
console.log("val :>> ", val);
if (val.value < val.minNum) {
common_vendor.index.showToast({
title: "不能小于当前数量"
});
return false;
}
if (val.value > val.minNum) {
console.log("1 :>> ", 1);
data2.list.push({
firsts: val.title,
id: val.id,
quantity: val.value,
stockArticleId: val.stockArticleId
});
}
return true;
});
if (!_flag)
return;
if (data2.list.length === 0) {
return common_vendor.index.showToast({
title: "最少修改一项物料",
icon: "none"
});
}
const res2 = await api_user.postZeroStockUp(data2);
console.log("res :>> ", res2);
const { code: code2 } = res2;
if (code2 === 200) {
tiplists.value.setdetails({ isshow: false });
basicContainer.value.startPullDownRefresh();
}
if (res2.audio)
;
},
cancel: (details2) => {
tiplists.value.setdetails({ isshow: false });
},
close: (details2) => {
tiplists.value.setdetails({ isshow: false });
}
});
}
function printOrderCode(item) {
console.log("item :>> ", item); console.log("item :>> ", item);
tiplists.value.setdetails({ common_vendor.index.navigateTo({
title: "生成订单编号二维码数量", url: "/pagesHome/pages/StockUplistByZero/StockUplistByZero?info=" + JSON.stringify({
isshow: true, typeService: details.items.typeService,
tipstate: 1, stockupId: details.stockupId,
// inpList, orderCode: item.orderCode,
inputtext: 1, stockArticleId: item.stockArticleId,
confirmTxt: "确定生成", reservationId: details.reservationId
isonecheck: true, })
success: async (deta) => {
const _inputValue = parseInt(deta.inputtext);
let _flag = true;
if (_inputValue !== _inputValue) {
common_vendor.index.showToast({
title: "请输入数字",
icon: "none"
});
_flag = false;
} else if (_inputValue <= 0) {
common_vendor.index.showToast({
title: "数字必须大于零",
icon: "none"
});
_flag = false;
}
if (!_flag)
return tiplists.value.setdetails({ isshow: false });
tiplists.value.setdetails({ isshow: false });
},
cancel: (details2) => {
tiplists.value.setdetails({ isshow: false });
},
close: (details2) => {
tiplists.value.setdetails({ isshow: false });
}
}); });
} };
const { user, orderList, orderStatus, stockList, zeroOrderList } = common_vendor.toRefs(details); const { user, orderList, orderStatus, stockList, zeroOrderList } = common_vendor.toRefs(details);
return (_ctx, _cache) => { return (_ctx, _cache) => {
return common_vendor.e({ return common_vendor.e({
@ -412,21 +266,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
o: common_vendor.unref(orderStatus) == 3 o: common_vendor.unref(orderStatus) == 3
}, common_vendor.unref(orderStatus) == 3 ? { }, common_vendor.unref(orderStatus) == 3 ? {
p: common_vendor.f(common_vendor.unref(zeroOrderList), (item, k0, i0) => { p: common_vendor.f(common_vendor.unref(zeroOrderList), (item, k0, i0) => {
return common_vendor.e({ return {
a: common_vendor.t(item.allocation), a: common_vendor.t(item.orderCode),
b: item.stockQuantity b: common_vendor.o(($event) => goorderdetail(item)),
}, item.stockQuantity ? { c: common_vendor.t(item.planNum || 0),
c: common_vendor.t(`(${item.stockQuantity})`) d: common_vendor.t(item.scanNum || 0),
} : {}, { e: common_vendor.t(item.completeStact ? "查看明细" : "去备货"),
d: common_vendor.t(item.pallet), f: common_vendor.o(($event) => handleStockUpByZero(item))
e: common_vendor.t(item.orderCode), };
f: common_vendor.o(($event) => goorderdetail(item)),
g: common_vendor.t(item.planNum || 0),
h: common_vendor.t(item.scanNum || 0),
i: common_vendor.t(item.completeStact ? "查看明细" : "去备货"),
j: common_vendor.o(($event) => showZeroOrderDetails(item)),
k: common_vendor.o(($event) => printOrderCode(item))
});
}) })
} : {}, { } : {}, {
q: common_vendor.unref(details).scrollHeight, q: common_vendor.unref(details).scrollHeight,

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.wxml vendored

File diff suppressed because one or more lines are too long

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.wxss vendored

@ -70,7 +70,6 @@
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1rpx solid #ebebeb; border-bottom: 1rpx solid #ebebeb;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding-bottom: 30rpx;
} }
.scvew .mabx > .item .toptitl.data-v-64d8d9ce { .scvew .mabx > .item .toptitl.data-v-64d8d9ce {
width: 100%; width: 100%;

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryDetail/inventoryDetail.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

3
unpackage/dist/dev/mp-weixin/pagesHome/pages/inventoryenter/inventoryenter.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -229,7 +230,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
titleStyle: "color:#ffffff" titleStyle: "color:#ffffff"
}), }),
b: common_vendor.t(common_vendor.unref(details).trayCode), b: common_vendor.t(common_vendor.unref(details).trayCode),
c: common_vendor.t(common_vendor.unref(kcnumber)), c: common_vendor.t(kcnumber.value),
d: common_vendor.t(marketName.value), d: common_vendor.t(marketName.value),
e: common_vendor.o(checkmake), e: common_vendor.o(checkmake),
f: common_vendor.t(common_vendor.unref(details).trayTypeName || (common_vendor.unref(pagety) == "1" ? "物料编码" : common_vendor.unref(pagety) == "2" ? "物料名称" : common_vendor.unref(pagety) == "3" ? "其他" : "未知类型")), f: common_vendor.t(common_vendor.unref(details).trayTypeName || (common_vendor.unref(pagety) == "1" ? "物料编码" : common_vendor.unref(pagety) == "2" ? "物料名称" : common_vendor.unref(pagety) == "3" ? "其他" : "未知类型")),

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

3
unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js vendored

@ -73,6 +73,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
date.value[0] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd"); date.value[0] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
date.value[1] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd"); date.value[1] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
} }
datatime.value = date.value[0] + " 至 " + date.value[1];
await common_vendor.nextTick$1(); await common_vendor.nextTick$1();
basicContainer.value.startPullDownRefresh(); basicContainer.value.startPullDownRefresh();
details.scrollHeight = await utils_utils.utils.getViewDistanceFormTop(".sccv"); details.scrollHeight = await utils_utils.utils.getViewDistanceFormTop(".sccv");
@ -90,6 +91,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
initpage(); initpage();
} }
async function initpage() { async function initpage() {
if (date.value.length === 0)
return utils_utils.utils.handleToast("请选择拣货时间");
try { try {
common_vendor.index.showLoading({ common_vendor.index.showLoading({
title: "数据加载中", title: "数据加载中",

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

1
unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js vendored

@ -5,6 +5,7 @@ const store_useBluetoothStore = require("../../../store/useBluetoothStore.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");

9
unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js vendored

@ -4,6 +4,7 @@ const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js"); const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js"); require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js"); require("../../../utils/base64.js");
@ -277,6 +278,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} }
async function initpage() { async function initpage() {
try { try {
common_vendor.index.showLoading({
mask: true
});
details.listcheckindex = -1; details.listcheckindex = -1;
let data = { let data = {
reservationId: details.id, reservationId: details.id,
@ -321,6 +325,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
console.log("err :>> ", err); console.log("err :>> ", err);
} finally { } finally {
computedNum(); computedNum();
common_vendor.index.hideLoading();
return null; return null;
} }
} }
@ -438,7 +443,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
c: common_vendor.t(common_vendor.unref(items).deliveryAddress), c: common_vendor.t(common_vendor.unref(items).deliveryAddress),
d: common_vendor.t(common_vendor.unref(items).deliveryPhone), d: common_vendor.t(common_vendor.unref(items).deliveryPhone),
e: common_vendor.o(showsdqs), e: common_vendor.o(showsdqs),
f: common_vendor.t(common_vendor.unref(ordNub)), f: common_vendor.t(ordNub.value),
g: common_vendor.t(common_vendor.unref(details).Plannednub), g: common_vendor.t(common_vendor.unref(details).Plannednub),
h: common_vendor.t(common_vendor.unref(items).reservationNum), h: common_vendor.t(common_vendor.unref(items).reservationNum),
i: common_vendor.t(common_vendor.unref(details).signNub), i: common_vendor.t(common_vendor.unref(details).signNub),
@ -528,7 +533,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
F: common_vendor.o(($event) => goorderdetail(item)), F: common_vendor.o(($event) => goorderdetail(item)),
G: common_vendor.t(item.descriptionGoods), G: common_vendor.t(item.descriptionGoods),
H: common_vendor.t(item.reservationNum), H: common_vendor.t(item.reservationNum),
I: common_vendor.t(item.loadingNub), I: common_vendor.t(item.distributionParcelNumberVOS.reduce((cur, item2) => cur += item2.signingNum || 0, 0)),
J: item.complete J: item.complete
}, item.complete ? { }, item.complete ? {
K: common_vendor.t(item.complete), K: common_vendor.t(item.complete),

3
unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js vendored

@ -1,6 +1,7 @@
"use strict"; "use strict";
const common_vendor = require("../../../common/vendor.js"); const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js"); const api_user = require("../../../api/user.js");
const utils_utils = require("../../../utils/utils.js");
require("../../../utils/request.js"); require("../../../utils/request.js");
require("../../../store/index.js"); require("../../../store/index.js");
require("../../../utils/functions.js"); require("../../../utils/functions.js");
@ -86,6 +87,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
initpage(); initpage();
} }
async function initpage() { async function initpage() {
if (date.value.length === 0)
return utils_utils.utils.handleToast("请选择配送时间");
let data = { let data = {
current: details.current, current: details.current,
size: details.size, size: details.size,

11
unpackage/dist/dev/mp-weixin/project.config.json vendored

@ -6,25 +6,24 @@
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": false, "es6": true,
"postcss": false, "postcss": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"bigPackageSizeSupport": true, "bigPackageSizeSupport": true,
"ignoreDevUnusedFiles": false, "ignoreDevUnusedFiles": false,
"lazyCodeLoading": "requiredComponents", "lazyCodeLoading": "requiredComponents",
"enhance": false,
"packNpmRelationList": [],
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
} },
"enhance": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.1.2", "libVersion": "3.1.2",
"appid": "wxedb0d10ea46a0113", "appid": "wx35c7fb77840097de",
"projectname": "货无忧测试版", "projectname": "货无忧",
"condition": { "condition": {
"search": { "search": {
"current": -1, "current": -1,

2
unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-icon/u-icon.wxss vendored

@ -59,9 +59,7 @@ view.data-v-ac70166d, scroll-view.data-v-ac70166d, swiper-item.data-v-ac70166d {
.u-icon__icon.data-v-ac70166d { .u-icon__icon.data-v-ac70166d {
font-family: uicon-iconfont; font-family: uicon-iconfont;
position: relative; position: relative;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }

4
unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-navbar/u-navbar.wxss vendored

@ -40,9 +40,7 @@ view.data-v-f631659b, scroll-view.data-v-f631659b, swiper-item.data-v-f631659b {
z-index: 11; z-index: 11;
} }
.u-navbar__content.data-v-f631659b { .u-navbar__content.data-v-f631659b {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
height: 44px; height: 44px;
@ -55,9 +53,7 @@ view.data-v-f631659b, scroll-view.data-v-f631659b, swiper-item.data-v-f631659b {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 0; bottom: 0;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }

31
unpackage/dist/dev/mp-weixin/utils/request.js vendored

@ -1,6 +1,7 @@
"use strict"; "use strict";
const common_vendor = require("../common/vendor.js"); const common_vendor = require("../common/vendor.js");
const store_index = require("../store/index.js"); const store_index = require("../store/index.js");
const utils_utils = require("./utils.js");
const utils_functions = require("./functions.js"); const utils_functions = require("./functions.js");
const config_host = require("../config/host.js"); const config_host = require("../config/host.js");
const utils_base64 = require("./base64.js"); const utils_base64 = require("./base64.js");
@ -31,9 +32,6 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
common_vendor.index.setStorageSync("userinfo", userinfo); common_vendor.index.setStorageSync("userinfo", userinfo);
resolve(res); resolve(res);
} else { } else {
common_vendor.index.reLaunch({
url: "/pages/login/login"
});
const res2 = common_vendor.index.getStorageInfoSync(); const res2 = common_vendor.index.getStorageInfoSync();
res2.keys.map((item) => { res2.keys.map((item) => {
if (item == "loginuser" || item == "HistoryDate" || item == "setip" || item == "checkname" || item.indexOf("IMAGE_CACHE_INFO") != -1) { if (item == "loginuser" || item == "HistoryDate" || item == "setip" || item == "checkname" || item.indexOf("IMAGE_CACHE_INFO") != -1) {
@ -116,24 +114,13 @@ const HandleRequest = (params, key, loadingObj) => {
method: params.method, method: params.method,
header header
}; };
let response = {};
const request = common_vendor.index.request(submitData); const request = common_vendor.index.request(submitData);
request.then((res) => { request.then((res) => {
console.log("请求res :>> ", res); console.log("请求res :>> ", res);
response = res;
if (res.statusCode == 200) { if (res.statusCode == 200) {
let data = res.data; let data = res.data;
if (data.code != 200 && (data == null ? void 0 : data.msg)) {
common_vendor.index.hideLoading();
common_vendor.index.showToast({
title: (data == null ? void 0 : data.msg) || "",
icon: "none"
});
} else if (data.audio) {
common_vendor.index.hideLoading();
common_vendor.index.showToast({
title: data.msg,
icon: "none"
});
}
delete requestObj[key]; delete requestObj[key];
switch (data.code) { switch (data.code) {
case 200: case 200:
@ -194,10 +181,21 @@ const HandleRequest = (params, key, loadingObj) => {
delete requestObj[key]; delete requestObj[key];
utils_functions.api.error("请检查是否连接到无线网络"); utils_functions.api.error("请检查是否连接到无线网络");
}).finally(async (res) => { }).finally(async (res) => {
console.log("response :>> ", response);
console.log("res-finally :>> ", res); console.log("res-finally :>> ", res);
await common_vendor.nextTick$1(); await common_vendor.nextTick$1();
if (loadingObj.isShowLoading !== false) if (loadingObj.isShowLoading !== false)
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
const {
data
} = response;
if (data) {
if (data.code !== 200 && data.code !== 401) {
if (data.msg)
utils_utils.utils.handleToast(data.msg);
} else if (data.audio)
utils_utils.utils.handleToast(data.audio, "none", false);
}
}); });
}); });
}; };
@ -219,7 +217,6 @@ const service = async (params, loadingObj) => {
code: 4e3 code: 4e3
})); }));
requestObj[_key] = params; requestObj[_key] = params;
console.log("_isRefreshToken :>> ", _isRefreshToken);
if (_isRefreshToken._isRefreshToken) { if (_isRefreshToken._isRefreshToken) {
await _isRefreshToken._isRefreshToken; await _isRefreshToken._isRefreshToken;
return HandleRequest(params, _key, loadingObj); return HandleRequest(params, _key, loadingObj);

16
unpackage/dist/dev/mp-weixin/utils/utils.js vendored

@ -75,11 +75,13 @@ const utils = {
* 提示 * 提示
* @param {String} content 提示的文字 * @param {String} content 提示的文字
*/ */
handleToast(content, icon = "none") { handleToast(content, icon = "none", isShowMsg = true) {
common_vendor.index.showToast({ if (isShowMsg)
title: content, common_vendor.index.showToast({
icon title: content,
}); icon,
duration: 1500
});
}, },
/** 防抖函数 */ /** 防抖函数 */
debounce(func, delay) { debounce(func, delay) {
@ -87,9 +89,11 @@ const utils = {
if (!delay) if (!delay)
delay = 500; delay = 500;
return function() { return function() {
const context = this;
const args = arguments;
clearTimeout(timer); clearTimeout(timer);
timer = setTimeout(function() { timer = setTimeout(function() {
func(); func.apply(context, args);
console.log("timer :>> ", timer); console.log("timer :>> ", timer);
clearTimeout(timer); clearTimeout(timer);
}, delay); }, delay);

Loading…
Cancel
Save