Browse Source

Merge branch 'master' of http://47.108.105.48:3000/zhangsiyu/logpm

# Conflicts:
#	manifest.json
#	pages/user/user.vue
#	unpackage/cache/apk/apkurl
#	unpackage/cache/apk/cmManifestCache.json
#	unpackage/cache/certdata
#	unpackage/dist/build/app-plus/app-config-service.js
#	unpackage/dist/build/app-plus/app-service.js
#	unpackage/dist/build/app-plus/manifest.json
myd
pref_mail@163.com 2 years ago
parent
commit
e72c87c331
  1. 26
      api/user.js
  2. 27
      pages.json
  3. 7
      pages/user/user.vue
  4. 2
      pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
  5. 10
      pagesHome/pages/StockUplist/StockUplist.vue
  6. 212
      pagesTask/pages/checkTaskList/checkTaskList.vue
  7. 171
      pagesTask/pages/dynamicCheck/dynamicCheck.vue
  8. 10
      pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
  9. 405
      pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
  10. 2
      unpackage/dist/dev/app-plus/app-config-service.js
  11. 1264
      unpackage/dist/dev/app-plus/app-service.js
  12. 4
      unpackage/dist/dev/app-plus/manifest.json
  13. 16
      unpackage/dist/dev/mp-weixin/api/user.js
  14. 2
      unpackage/dist/dev/mp-weixin/app.js
  15. 4
      unpackage/dist/dev/mp-weixin/app.json
  16. 10
      unpackage/dist/dev/mp-weixin/common/vendor.js
  17. 2
      unpackage/dist/dev/mp-weixin/config/host.js
  18. 2
      unpackage/dist/dev/mp-weixin/pages/user/user.js
  19. 37
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js
  20. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml
  21. 18
      unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js
  22. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.wxml
  23. 74
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
  24. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxml
  25. 370
      utils/utils.js

26
api/user.js

@ -1424,4 +1424,30 @@ export function postZeroStockUp(data) {
method: "post",
data
});
}
/**
* 查询盘点任务列表
* @param {Object} data
*/
export function getWarehouseTask(data) {
return request({
url: `logpm-warehouse/api/WarehouseTask/page`,
method: "get",
data
});
}
/**
* 库位盘点库位详情信息
* @param {Object} data
*/
export function getWarehouseTaskAllocationList(data) {
return request({
url: `logpm-warehouse/api/WarehouseTask/allocationList`,
method: "get",
data
});
}

27
pages.json

@ -748,11 +748,36 @@
}
}
},
{
"path": "pages/checkTaskList/checkTaskList",
"style": {
"navigationBarTitleText": "盘点任务列表",
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"app-plus": {
"animationDuration": 300,
"animationType": "zoom-fade-out"
}
}
},
{
"path": "pages/dynamicCheckDetails/dynamicCheckDetails",
"style": {
"navigationBarTitleText": "盘点",
"navigationBarTitleText": "随机盘点",
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"app-plus": {
"animationDuration": 300,
"animationType": "zoom-fade-out"
}
}
},
{
"path": "pages/storageLocationCheckDetails/storageLocationCheckDetails",
"style": {
"navigationBarTitleText": "库位盘点",
"enablePullDownRefresh": false,
"onReachBottomDistance": 1,
"navigationStyle": "custom",
"app-plus": {
"animationDuration": 300,

7
pages/user/user.vue

@ -217,7 +217,8 @@
console.log(String(res.limitSize));
}
async function updateApp() {
let version=await utils.getversion()
//
let version = await utils.getversion()
// let version = {
// version: '10.10.4',
// pkName: 'com.hwy.pda.test'
@ -230,9 +231,7 @@
}
console.log('data>>>>', data);
let response = await AppPdaversiondetail(data)
console.log('response>>>>', Object.keys(response.data) );
if (response.code == 200 && Object.keys(response.data).length!=0) {
if (response.code == 200 && response.data) {
console.log("res.data", response.data);
console.log('有可更新包');
//

2
pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue

@ -42,9 +42,11 @@
<view @click="setorderStatus(2)">
<view :class="orderType==2?'xz':''">库存品</view>
</view>
<!--
<view @click="setorderStatus(3)">
<view :class="orderType==3?'xz':''">零担</view>
</view>
-->
</view>
<scroll-view scroll-y="true" class="scrollv">
<view class="mabxs">

10
pagesHome/pages/StockUplist/StockUplist.vue

@ -19,9 +19,11 @@
<view @click="setorderStatus(2)">
<view :class="orderStatus==2?'xz':''">库存品</view>
</view>
<!--
<view @click="setorderStatus(3)">
<view :class="orderStatus==3?'xz':''">零担</view>
</view>
-->
</view>
<scroll-view scroll-y="true" class="scvew">
<view class="mabx">
@ -352,7 +354,7 @@
}
})
}
//
if (item.completeStact) {
return tiplists.value.setdetails({
@ -373,8 +375,8 @@
tiplists.value.setdetails({ isshow: false })
}
})
}
}
//
tiplists.value.setdetails({
title: '设置零担物料数量',
@ -408,7 +410,7 @@
const res = await postZeroStockUp(data)
console.log('res :>> ', res);
/* if (deta.checklist.length == 0) {
uni.showToast({
title: '请选择货位',

212
pagesTask/pages/checkTaskList/checkTaskList.vue

@ -0,0 +1,212 @@
<template>
<view>
<!-- 顶部导航栏 -->
<u-navbar :title="title" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
titleStyle='color:#ffffff'></u-navbar>
</view>
<!-- 主体内容 -->
<view class="main">
<!-- 随机盘点 -->
<template v-if="pageType === 1">
<!-- 表格 -->
<view class="table">
<!-- 表格头部 -->
<view class="thead">
</view>
<!-- 表格主体 -->
<view class="tbody">
</view>
</view>
</template>
<!-- 按库位盘点 -->
<template v-if="pageType === 2">
<!-- 顶部 -->
<view class="main_top">
<input type="text" placeholder="请输入库位id" class="main_top_search" />
<view class="button" @click="searchStorageLocation">搜索</view>
</view>
<!-- 表格 -->
<view class="table">
<!-- 表格头部 -->
<view class="thead">
</view>
<!-- 表格主体 -->
<view class="tbody">
</view>
</view>
</template>
<!-- 按合同号盘点 -->
<template v-if="pageType === 3">
<!-- 顶部 -->
<view class="main_top">
<input type="text" placeholder="请输入合同号" class="main_top_search" />
<view class="button">搜索</view>
</view>
<!-- 表格 -->
<view class="table">
<!-- 表格头部 -->
<view class="thead">
</view>
<!-- 表格主体 -->
<view class="tbody">
</view>
</view>
</template>
<!-- 按托盘盘点 -->
<template v-if="pageType === 4">
<!-- 顶部 -->
<view class="main_top">
<input type="text" placeholder="请输入托盘码" class="main_top_search" />
<view class="button">搜索</view>
</view>
<!-- 表格 -->
<view class="table">
<!-- 表格头部 -->
<view class="thead">
</view>
<!-- 表格主体 -->
<view class="tbody">
</view>
</view>
</template>
</view>
<saomiao2></saomiao2>
</template>
<script setup lang="ts">
import {
onShow,
onLoad,
onHide
} from '@dcloudio/uni-app'
import { reactive, toRefs } from "vue";
const details = reactive({
//
title: '',
// 1: ; 2: ; 3: ; 4: ;
pageType: 1,
//
scancode: '',
isscan: false
})
//
onLoad((info) => {
const { pageType, data } = JSON.parse(info.data)
details.title = data.title
details.pageType = pageType
// ,
if (pageType === 2) details.isscan = true
else details.isscan = false
//
initPage()
})
//
onShow(() => {
uni.$on('scancodedate', function (code) {
if (code) {
// console.log(code);
details.scancode = code
scandata()
}
})
})
//
onHide(() => {
uni.$off('scancodedate')
})
//
function initPage() { }
//
function scandata() {
//
if (details.isscan) return
//
if (details.pageType === 2) return
}
//
const searchStorageLocation = () => {
uni.navigateTo({
url: '/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails'
})
}
const { title,
pageType,
} = toRefs(details)
</script>
<style lang="scss" scoped>
$buttonColor: #d3832a;
//
.button {
font-size: 28upx;
padding: 10upx 20upx;
border: 1upx solid $buttonColor;
background-color: #fff;
color: #d3832a;
border-radius: 5upx;
}
.main {
padding: 10upx;
font-size: 28upx; //
}
.main_top {
display: flex;
// align-items: center;
justify-content: space-between;
margin-bottom: 10upx;
//
&_search {
flex: 1;
padding-left: 20upx;
margin-right: 20upx;
box-sizing: border-box;
height: 28upx * 2;
border-radius: 28upx;
border: 1upx solid #000;
}
.button {
background-color: $buttonColor;
color: #fff;
padding: 0 60upx;
display: inline-flex;
align-items: center;
}
}
</style>

171
pagesTask/pages/dynamicCheck/dynamicCheck.vue

@ -5,65 +5,155 @@
titleStyle='color:#ffffff'></u-navbar>
</view>
<view class="taskList">
<view class="taskData">
<view class="label">任务编号: </view>
<view>123</view>
<template v-if="renderList.length !== 0">
<view class="taskList" v-for="item in renderList" :key="item.id">
<view class="taskData">
<view class="label">任务编号: </view>
<view>{{item.questNum}}</view>
</view>
<view class="taskData">
<view class="label">商城名称: </view>
<view>{{item.marketName}}</view>
</view>
<view class="taskData">
<view class="label">品牌: </view>
<view>{{item.brandName}}</view>
</view>
<view class="taskData">
<view class="label">任务开始时间: </view>
<view>{{item.startTime}}</view>
</view>
<view class="taskData">
<view class="label">任务结束时间: </view>
<view>{{item.endTime}}</view>
</view>
<view class="row-button">
<button class="button" @click="goCheckList(1, item)">随机盘点</button>
<button class="button" @click="goCheckList(2, item)">按库位盘点</button>
</view>
<view class="row-button">
<button class="button" @click="goCheckList(3, item)">按合同号盘点</button>
<button class="button" @click="goCheckList(4, item)">按托盘盘点</button>
</view>
</view>
<view class="taskData">
<view class="label">商城名称: </view>
<view>123</view>
<view v-show="isEnd" class="footer-end">
到底啦
</view>
<view class="taskData">
<view class="label">品牌: </view>
<view>213</view>
</view>
<view class="taskData">
<view class="label">盘点时间: </view>
<view>1231</view>
<view>123</view>
</view>
<view class="row-button">
<button class="button" @click="goDetails(1)">随机盘点</button>
<button class="button" @click="goDetails(2)">按库位盘点</button>
</view>
<view class="row-button">
<button class="button" @click="goDetails(3)">按合同号盘点</button>
<button class="button" @click="goDetails(4)">按托盘盘点</button>
</view>
</view>
</template>
</template>
<script setup lang="ts">
import { reactive } from 'vue';
import { reactive, toRefs } from 'vue';
import {
onLoad,
onShow,
onHide,
onUnload,
onReachBottom
} from '@dcloudio/uni-app'
import { getWarehouseTask } from '@/api/user.js';
/**
* 1 : 随机盘点
* 2 : 按库位盘点
* 3 : 按合同号盘点
* 4 : 按托盘盘点
*/
* 1 : 随机盘点
* 2 : 按库位盘点
* 3 : 按合同号盘点
* 4 : 按托盘盘点
*/
const details = reactive({
checkType: {
1: '随机盘点',
2: '按库位盘点',
3: '按合同号盘点',
4: '按托盘盘点'
}
},
page: {
//
current: 1,
//
size: 10
},
//
renderList: [],
//
isEnd: false,
})
const goDetails = (pageType : number | string) => {
const data = {
//
onLoad((_info) => {
initPage()
})
//
let antiShake : any = null
//
onReachBottom(() => {
// ,
if (isEnd) return
if (antiShake) return clearTimeout(antiShake)
antiShake = setTimeout(() => {
// +1
details.page.current += 1
//
initPage()
}, 500)
})
const goCheckList = (pageType : number | string, item : any) => {
//
const { startTime, endTime } = item
//
const nowDate = new Date().getTime()
//
if (new Date(startTime).getTime() > nowDate) return uni.showToast({
title: '盘点时间未到'
})
//
if (new Date(endTime).getTime() < nowDate) return uni.showToast({
title: '盘点时间已结束'
})
const data = {
pageType, data: {
title: details.checkType[pageType]
}
}
uni.navigateTo({
url: `/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails?data=${JSON.stringify(data)}`
url: `/pagesTask/pages/checkTaskList/checkTaskList?data=${JSON.stringify(data)}`
})
}
//
async function initPage() {
try {
const res = await getWarehouseTask({ ...details.page })
console.log('res :>> ', res);
const { code, data: { records } } = res
if (code === 200 && res.data) {
console.log('records :>> ', records);
details.renderList = [...details.renderList, ...records]
details.renderList.forEach(item => {
item.marketName = item.list.map(val => val.refName).join(',')
})
details.renderList.forEach(item => {
item.brandName = item.list.map(val => val.brandName).join(',')
if (item.brandName === ',') item.brandName = ''
})
if (records.length < details.page.size) details.isEnd = true
}
} catch (error) {
//TODO handle the exception
console.log('error :>> ', error);
}
}
const { renderList, isEnd } = toRefs(details)
</script>
<style lang="scss">
@ -79,7 +169,7 @@
}
.label {
width: 160upx;
width: 180upx;
}
}
@ -93,4 +183,9 @@
font-size: 28upx;
}
}
.footer-end {
padding: 20upx 0;
text-align: center;
}
</style>

10
pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue

@ -111,7 +111,7 @@
</template>
<!-- 提交 -->
<button class="submitButton" type="primary">提交盘点</button>
<button @click="submitCheck" class="submitButton" type="primary">提交盘点</button>
</view>
<saomiao2></saomiao2>
</template>
@ -174,6 +174,14 @@
details.tabBarCode = code
}
/**
* 提交盘点
*/
function submitCheck() { }
//
function randomCheck() { }
const { title,
pageType,
showControl,

405
pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue

@ -0,0 +1,405 @@
<template>
<view>
<!-- 顶部导航栏 -->
<u-navbar title="库位盘点" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
titleStyle='color:#ffffff'></u-navbar>
</view>
<!-- 主体内容 -->
<view class="main">
<!-- 顶部 -->
<view class="main_top">
<input type="text" placeholder="请输入包条码" class="main_top_search" />
<view class="button">搜索</view>
</view>
<!-- 库位信息 -->
<view class="main_info">
<view class="main_info_row">
<view class="main_info_item">
<text>库位号:</text>
<text>{{1}}</text>
</view>
</view>
<view class="main_info_row">
<view class="main_info_item">
<text>库位总数:</text>
<text>{{1}}</text>
</view>
<view class="main_info_item">
<text>库位已盘数:</text>
<text>{{1}}</text>
</view>
<view class="main_info_item">
<text>库位未盘数:</text>
<text>{{1}}</text>
</view>
</view>
</view>
<!-- tabBar选项卡 -->
<view class="tabBar">
<view :class="{'tabBar-item': true, 'active': tabBarCode === 1}" @click="handleTabBarCode(1)">
定制品{{300}}
</view>
<view :class="{'tabBar-item': true, 'active': tabBarCode === 2}" @click="handleTabBarCode(2)">
库存品{{100}}
</view>
<view :class="{'tabBar-item': true, 'active': tabBarCode === 3}" @click="handleTabBarCode(3)">
零担{{1000}}
</view>
</view>
<!-- 控件 -->
<view class="control">
<view class="button" @click="showControl = true" v-show="!showControl">批量操作</view>
<template v-if="showControl">
<view class="button">反选</view>
<view class="controlList">
<view class="button">
批量删除
</view>
<view class="button">
批量删除
</view>
<view class="button">
状态修改
</view>
</view>
</template>
</view>
<!-- 按库位盘点 -->
<!-- 表格 -->
<template v-if="renderList.length !== 0">
<view class="list" v-for="item in renderList" :key="item">
<!-- 定制品 -->
<view v-if="item.goodsType === 1">
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>服务号{{item.serviceNum}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>订单号{{item.orderCode}}</view>
</view>
<!-- <view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>仓库地址{{dtilobj.warehouseName}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>库位信息{{dtilobj.areaTitle + '-' + dtilobj.allocationTitle}}</view>
</view> -->
</view>
<!-- 零担 -->
<view v-if="item.goodsType === 2">
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>运单号{{item.waybillNo}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>订单号{{item.orderCode}}</view>
</view>
<!-- <view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>仓库地址{{dtilobj.warehouseName}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>库位信息{{dtilobj.areaTitle + '-' + dtilobj.allocationTitle}}</view>
</view> -->
</view>
<!-- 库存品 -->
<view v-if="item.goodsType === 3">
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>物料编码{{item.materialCode}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>物料名称{{item.materialName}}</view>
</view>
<!-- <view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>仓库地址{{dtilobj.warehouseName}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>库位信息{{dtilobj.areaTitle + '-' + dtilobj.allocationTitle}}</view>
</view> -->
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>订单号{{item.orderCode}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>商场名称{{item.marketName}}</view>
</view>
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>批次号{{item.incomingBatch}}</view>
</view>
</view>
</view>
</template>
<!-- 提交 -->
<button @click="submitCheck" class="submitButton" type="primary">提交盘点</button>
</view>
<saomiao2></saomiao2>
</template>
<script setup lang="ts">
import {
onShow,
onLoad,
onHide
} from '@dcloudio/uni-app'
import { reactive, toRefs } from "vue";
const details = reactive({
//
title: '',
//
tabBarCode: 1,
//
showControl: false,
//
scancode: '',
//
renderList: []
})
//
onLoad((_info) => {
//
initPage()
})
//
onShow(() => {
uni.$on('scancodedate', function (code) {
if (code) {
// console.log(code);
details.scancode = code
scandata()
}
})
})
//
onHide(() => {
uni.$off('scancodedate')
})
//
function initPage() { }
//
function scandata() { }
//
function handleTabBarCode(code : number) {
details.tabBarCode = code
}
/**
* 提交盘点
*/
function submitCheck() { }
//
function randomCheck() { }
const {
showControl,
tabBarCode,
renderList
} = toRefs(details)
</script>
<style lang="scss" scoped>
$buttonColor: #d3832a;
//
.button {
font-size: 28upx;
padding: 10upx 20upx;
border: 1upx solid $buttonColor;
background-color: #fff;
color: #d3832a;
border-radius: 5upx;
}
.main {
padding: 10upx;
font-size: 28upx; //
}
.main_top {
display: flex;
// align-items: center;
justify-content: space-between;
margin-bottom: 10upx;
//
&_search {
flex: 1;
padding-left: 20upx;
margin-right: 20upx;
box-sizing: border-box;
height: 28upx * 2;
border-radius: 28upx;
border: 1upx solid #000;
}
.button {
background-color: $buttonColor;
color: #fff;
padding: 0 60upx;
display: inline-flex;
align-items: center;
}
}
//
.main_info {
margin-bottom: 10upx;
padding: 10upx;
background-color: #fff;
&_row {
padding: 10upx 0;
display: flex;
justify-content: space-between;
border-bottom: 2upx solid #000;
&:last-child {
border-bottom: none;
}
}
&_item {
flex: 1;
flex-basis: 0;
display: inline-flex;
text:first-child {
margin-right: 10upx;
}
}
}
// tabBar
.tabBar {
display: flex;
justify-content: space-evenly;
background-color: #fff;
margin-bottom: 10upx;
&-item {
position: relative;
flex: 1;
flex-basis: 0;
padding: 20upx 0;
text-align: center;
&::after {
content: '';
position: absolute;
bottom: 0;
left: 50%;
display: block;
width: 0;
box-sizing: border-box;
border: 1upx solid $buttonColor;
transition: all 0.5s;
}
&.active {
color: $buttonColor;
&::after {
left: 0;
width: 100%;
}
}
}
}
//
.control {
display: flex;
justify-content: space-between;
.controlList {
display: flex;
.button {
margin: 0 5upx;
&:last-child {
margin-right: 0;
}
}
}
}
//
.tpbx {
display: flex;
align-items: center;
padding: 18upx 24upx;
box-sizing: border-box;
border-bottom: 4upx solid #EEEEEE;
>image {
flex: none;
width: 64upx;
height: 64upx;
margin-right: 15upx;
}
>view {
font-size: 28upx;
font-weight: 400;
color: #020B18;
.numb {
font-size: 28upx;
color: #178AF2;
}
}
}
.viewnum {
height: 100upx;
display: flex;
align-items: center;
justify-content: space-around;
>view {
font-size: 28upx;
font-weight: 400;
color: #020B18;
}
}
//
.submitButton {
position: fixed;
color: #fff;
background-color: $buttonColor;
width: 50%;
bottom: 30upx;
left: 50%;
transform: translateX(-50%);
}
</style>

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because it is too large Load Diff

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

@ -7,8 +7,8 @@
"id": "__UNI__EB22F37",
"name": "货无忧测试版",
"version": {
"name": "10.1.4",
"code": 1014
"name": "10.10.6",
"code": 10106
},
"description": "",
"developer": {

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

@ -84,6 +84,13 @@ function billLadingdetailList(data) {
data
});
}
function billLadingzeroBillData(data) {
return utils_request.service({
url: `logpm-distribution/app/billLading/zeroBillData`,
method: "post",
data
});
}
function distributionStockupstockupStockListPackageCode(data) {
return utils_request.service({
url: `logpm-distribution/app/distributionStockup/stockupStockListPackageCode`,
@ -784,6 +791,13 @@ function postZeroStockUp(data) {
data
});
}
function getWarehouseTask(data) {
return utils_request.service({
url: `logpm-warehouse/api/WarehouseTask/page`,
method: "get",
data
});
}
exports.AppPdaversiondetail = AppPdaversiondetail;
exports.BatchPrintPackages = BatchPrintPackages;
exports.addvalueaddvalueInfo = addvalueaddvalueInfo;
@ -798,6 +812,7 @@ exports.billLadinggetInventoryNum = billLadinggetInventoryNum;
exports.billLadingorderList = billLadingorderList;
exports.billLadingpageList = billLadingpageList;
exports.billLadingscan = billLadingscan;
exports.billLadingzeroBillData = billLadingzeroBillData;
exports.deliverycustom = deliverycustom;
exports.deliveryloadinginventory = deliveryloadinginventory;
exports.deliveryloadingscan = deliveryloadingscan;
@ -823,6 +838,7 @@ exports.distributionStockupstockupStockListPackageCode = distributionStockupstoc
exports.distributionStockupupdateStockArea = distributionStockupupdateStockArea;
exports.distributionTrayDetail = distributionTrayDetail;
exports.getMyWarehouseList = getMyWarehouseList;
exports.getWarehouseTask = getWarehouseTask;
exports.oauthtoken = oauthtoken;
exports.postAbnormalTruckLoading = postAbnormalTruckLoading;
exports.postZeroStockUp = postZeroStockUp;

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

@ -70,7 +70,9 @@ if (!Math) {
"./pagesHome/pages/StockUpListZero/StockUpListZero.js";
"./pagesUser/pages/about/about.js";
"./pagesTask/pages/dynamicCheck/dynamicCheck.js";
"./pagesTask/pages/checkTaskList/checkTaskList.js";
"./pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.js";
"./pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.js";
}
const _sfc_main = {
setup() {

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

@ -76,7 +76,9 @@
"root": "pagesTask",
"pages": [
"pages/dynamicCheck/dynamicCheck",
"pages/dynamicCheckDetails/dynamicCheckDetails"
"pages/checkTaskList/checkTaskList",
"pages/dynamicCheckDetails/dynamicCheckDetails",
"pages/storageLocationCheckDetails/storageLocationCheckDetails"
]
}
],

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

@ -1256,8 +1256,8 @@ function populateParameters(fromRes, toRes) {
const parameters = {
appId: "__UNI__EB22F37",
appName: "货无忧测试版",
appVersion: "10.1.3",
appVersionCode: 1013,
appVersion: "10.10.5",
appVersionCode: 10105,
appLanguage: getAppLanguage(hostLanguage),
uniCompileVersion: "3.8.12",
uniRuntimeVersion: "3.8.12",
@ -1400,8 +1400,8 @@ const getAppBaseInfo = {
hostTheme: theme,
appId: "__UNI__EB22F37",
appName: "货无忧测试版",
appVersion: "10.1.3",
appVersionCode: 1013,
appVersion: "10.10.5",
appVersionCode: 10105,
appLanguage: getAppLanguage(hostLanguage)
}));
}
@ -6896,6 +6896,7 @@ const onHide = /* @__PURE__ */ createHook(ON_HIDE);
const onLaunch = /* @__PURE__ */ createHook(ON_LAUNCH);
const onLoad = /* @__PURE__ */ createHook(ON_LOAD);
const onUnload = /* @__PURE__ */ createHook(ON_UNLOAD);
const onReachBottom = /* @__PURE__ */ createHook(ON_REACH_BOTTOM);
const mixin = {
// 定义每个组件都可能需要用到的外部样式以及类名
props: {
@ -10840,6 +10841,7 @@ exports.o = o;
exports.onHide = onHide;
exports.onLaunch = onLaunch;
exports.onLoad = onLoad;
exports.onReachBottom = onReachBottom;
exports.onShow = onShow;
exports.onUnload = onUnload;
exports.p = p;

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

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

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

@ -101,7 +101,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}
async function updateApp() {
let version = {
version: "10.1.1",
version: "10.10.4",
pkName: "com.hwy.pda.test"
};
console.log("version 版本>>>>", version);

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

@ -12,11 +12,12 @@ if (!Array) {
const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
const _component_tiplist = common_vendor.resolveComponent("tiplist");
(_easycom_u_navbar2 + _component_saomiao2 + _component_tiplist)();
const _component_tips = common_vendor.resolveComponent("tips");
(_easycom_u_navbar2 + _component_saomiao2 + _component_tiplist + _component_tips)();
}
const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
if (!Math) {
(_easycom_u_navbar + common_vendor.unref(tips))();
_easycom_u_navbar();
}
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "PickingScanList",
@ -29,13 +30,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
authbuts: common_vendor.index.getStorageSync("authbuts"),
stockupArea: ""
});
const tips2 = common_vendor.ref(null);
const tiplists = common_vendor.ref(null);
common_vendor.onLoad((op) => {
details.id = op.id;
details.stockupArea = op.stockupArea;
});
common_vendor.onShow(() => {
console.log("onShow");
initpage();
common_vendor.index.$on("scancodedate", function(code) {
if (code) {
@ -111,9 +112,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
url: "/pagesHome/pages/StockUplist/StockUplist?item=" + JSON.stringify(item) + "&id=" + item.reservationId + "&stockupId=" + details.id
});
}
const { authbuts, items, datalist } = common_vendor.toRefs(details);
const { items, datalist } = common_vendor.toRefs(details);
async function scandata() {
tips2.value.setdetails({
tiplists.value.setdetails({
isshow: true,
tipstate: 1,
title: "是否切换备货区",
@ -130,13 +131,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
if (res.code === 200) {
initpage();
}
tips2.value.setdetails({ isshow: false });
tiplists.value.setdetails({ isshow: false });
},
cancel: () => {
tips2.value.setdetails({ isshow: false });
tiplists.value.setdetails({ isshow: false });
},
close: () => {
tips2.value.setdetails({ isshow: false });
tiplists.value.setdetails({ isshow: false });
}
});
}
@ -146,7 +147,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
}
return (_ctx, _cache) => {
return {
return common_vendor.e({
a: common_vendor.o(backPreviousPage),
b: common_vendor.p({
title: "拣货客户列表",
@ -161,23 +162,25 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
e: common_vendor.t(common_vendor.unref(items).stockupCode),
f: common_vendor.t(common_vendor.unref(items).stockupStatusStr),
g: common_vendor.t(common_vendor.unref(items).typeServiceStr),
h: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
h: common_vendor.unref(datalist).length !== 0
}, common_vendor.unref(datalist).length !== 0 ? {
i: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
return {
a: common_vendor.t(item.customer),
b: common_vendor.t(item.stockupStatusStr),
c: common_vendor.t(item.typeServiceStr),
d: common_vendor.t(item.orderNum),
e: common_vendor.t(item.planNum),
f: common_vendor.o(($event) => goCustomerOrdersDetails(item))
f: common_vendor.o(($event) => goCustomerOrdersDetails(item), item),
g: item
};
}),
i: common_vendor.sr(tiplists, "4ad682fe-2", {
})
} : {}, {
j: common_vendor.sr(tiplists, "4ad682fe-2", {
"k": "tiplists"
}),
j: common_vendor.sr(tips2, "4ad682fe-3", {
"k": "tips"
})
};
k: common_vendor.sr("tips", "4ad682fe-3")
});
};
}
});

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

@ -1 +1 @@
<u-navbar wx:if="{{b}}" bindleftClick="{{a}}" u-i="4ad682fe-0" bind:__l="__l" u-p="{{b}}"></u-navbar><view class="hedtopt"><view class="typto"><view>备货区域:<text class="vibx" bindtap="{{d}}">{{c}}</text></view></view><view class="typto"><view>备货编码:{{e}}</view></view><view class="typto"><view>备货状态:{{f}}</view><view>备货类型:{{g}}</view></view></view><scroll-view class="scoolv" scroll-y="true"><view class="minbx"><view wx:for="{{h}}" wx:for-item="item" class="its" bindtap="{{item.f}}"><view class="titl"> 客户:{{item.a}}</view><view class="contsx"><view><view><text style="color:#90A0AF">备货是否完成:</text>{{item.b}}</view><view><text style="color:#90A0AF">备货类型:</text>{{item.c}}</view></view><view><view><view>订单总数</view><view>{{item.d}}</view></view><view><view>计划件数</view><view>{{item.e}}</view></view></view></view></view></view></scroll-view><saomiao2 u-i="4ad682fe-1" bind:__l="__l"></saomiao2><tiplist class="r" u-r="tiplists" u-i="4ad682fe-2" bind:__l="__l"></tiplist><tips class="r" u-r="tips" u-i="4ad682fe-3" bind:__l="__l"></tips>
<u-navbar wx:if="{{b}}" bindleftClick="{{a}}" u-i="4ad682fe-0" bind:__l="__l" u-p="{{b}}"></u-navbar><view class="hedtopt"><view class="typto"><view>备货区域:<text class="vibx" bindtap="{{d}}">{{c}}</text></view></view><view class="typto"><view>备货编码:{{e}}</view></view><view class="typto"><view>备货状态:{{f}}</view><view>备货类型:{{g}}</view></view></view><scroll-view class="scoolv" scroll-y="true"><view class="minbx"><block wx:if="{{h}}"><view wx:for="{{i}}" wx:for-item="item" wx:key="g" class="its" bindtap="{{item.f}}"><view class="titl"> 客户:{{item.a}}</view><view class="contsx"><view><view><text style="color:#90A0AF">备货是否完成:</text>{{item.b}}</view><view><text style="color:#90A0AF">备货类型:</text>{{item.c}}</view></view><view><view><view>订单总数</view><view>{{item.d}}</view></view><view><view>计划件数</view><view>{{item.e}}</view></view></view></view></view></block></view></scroll-view><saomiao2 u-i="4ad682fe-1" bind:__l="__l"></saomiao2><tiplist class="r" u-r="tiplists" u-i="4ad682fe-2" bind:__l="__l"></tiplist><tips class="r" u-r="tips" u-i="4ad682fe-3" bind:__l="__l"></tips>

18
unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js vendored

@ -45,6 +45,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
common_vendor.onLoad((op) => {
details.upshelfScanType = op.type;
});
common_vendor.onShow(() => {
common_vendor.index.$on("scancodedate", function(code) {
if (code) {
details.scancode = code;
@ -52,6 +54,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}
});
});
common_vendor.onHide(() => {
common_vendor.index.$off("scancodedate");
});
async function scandata() {
var _a;
if (!details.allocationId) {
@ -140,7 +145,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
return;
}
let res;
let res = null;
if (Number(details.upshelfScanType) == 1 || Number(details.upshelfScanType) == 2) {
let data = {
allocationId: details.allocationId,
@ -206,12 +211,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
else if (state === 2)
return details.renderList = details.datalist;
}
let add = 1;
function moni() {
details.scancode = add === 1 ? "1704313588872278030" : "23073000015-2";
add++;
scandata();
}
const {
uplistarr,
checkstate,
@ -289,9 +288,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
s: common_vendor.t(common_vendor.unref(reqobj).trayCode),
t: common_vendor.t(common_vendor.unref(reqobj).trayNum)
} : {}, {
v: common_vendor.o(moni),
w: common_vendor.o(uplist),
x: common_vendor.sr(tip, "62de3784-2", {
v: common_vendor.o(uplist),
w: common_vendor.sr(tip, "62de3784-2", {
"k": "tip"
})
});

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

@ -1 +1 @@
<u-navbar wx:if="{{a}}" u-i="62de3784-0" bind:__l="__l" u-p="{{a}}"></u-navbar><image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image><view class="scanqcview"><image src="/pagesHome/static/scanqc.png"></image><view>请直接扫描库位码</view></view><view class="topviewbox"><view class="oebox"><image src="/pagesHome/static/changku.png"></image><view>{{b}}</view></view><view class="contview"><view><view><image src="/pagesHome/static/uname.png"></image><view>仓库名称</view></view><view>{{c}}</view></view><view><view><image src="/pagesHome/static/changkuquyu.png"></image><view>仓库区域</view></view><view>{{d}}</view></view></view><view class="numbox"><view><view><view>库位总数</view><view>{{e}}</view></view><view><view>库位单数</view><view>{{f}}</view></view><view><view>库存品总数</view><view>{{g}}</view></view><view><view>库存品数</view><view>{{h}}</view></view></view></view></view><view class="tabchecklist"><view bindtap="{{i}}" class="{{j}}"><view>待上架数据</view><view></view></view><view bindtap="{{k}}" class="{{l}}"><view>库位数据</view><view></view></view><view bindtap="{{m}}" class="{{n}}"><view>库位托盘</view><view></view></view></view><view class="scview"><scroll-view class="sclcs" scroll-y="true"><view class="visc"><block wx:if="{{o}}"><view wx:for="{{p}}" wx:for-item="item" class="item1"><view wx:if="{{item.a}}" class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>包条码:{{item.b}}</view></view><view wx:if="{{item.c}}" class="tpbx" catchtap="{{item.e}}"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.d}}</view></view><view wx:if="{{item.f}}"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>服务号:{{item.g}}</view></view><view class="tpbx" catchtap="{{item.i}}"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.h}}</view></view></view><view wx:if="{{item.j}}"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>运单号:{{item.k}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.l}}</view></view></view><view wx:if="{{item.m}}"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>物料编码:{{item.n}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>物料名称:{{item.o}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.p}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>商场名称:{{item.q}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>批次号:{{item.r}}</view></view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>总包数:{{item.s}}</view></view><image wx:if="{{q}}" class="qtimgzt" src="{{item.t}}"></image></view></block><view wx:if="{{r}}" class="item1"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>托盘码:{{s}}</view></view><view class="tpbx"><image src="/pagesHome/static/scanicon.png"></image><view>托盘数量:{{t}}</view></view></view></view></scroll-view><button bindtap="{{v}}">模拟</button></view><view class="butbox"><view bindtap="{{w}}">上架</view></view><saomiao2 u-i="62de3784-1" bind:__l="__l"></saomiao2><tips class="r" u-r="tip" u-i="62de3784-2" bind:__l="__l"></tips>
<u-navbar wx:if="{{a}}" u-i="62de3784-0" bind:__l="__l" u-p="{{a}}"></u-navbar><image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image><view class="scanqcview"><image src="/pagesHome/static/scanqc.png"></image><view>请直接扫描库位码</view></view><view class="topviewbox"><view class="oebox"><image src="/pagesHome/static/changku.png"></image><view>{{b}}</view></view><view class="contview"><view><view><image src="/pagesHome/static/uname.png"></image><view>仓库名称</view></view><view>{{c}}</view></view><view><view><image src="/pagesHome/static/changkuquyu.png"></image><view>仓库区域</view></view><view>{{d}}</view></view></view><view class="numbox"><view><view><view>库位总数</view><view>{{e}}</view></view><view><view>库位单数</view><view>{{f}}</view></view><view><view>库存品总数</view><view>{{g}}</view></view><view><view>库存品数</view><view>{{h}}</view></view></view></view></view><view class="tabchecklist"><view bindtap="{{i}}" class="{{j}}"><view>待上架数据</view><view></view></view><view bindtap="{{k}}" class="{{l}}"><view>库位数据</view><view></view></view><view bindtap="{{m}}" class="{{n}}"><view>库位托盘</view><view></view></view></view><view class="scview"><scroll-view class="sclcs" scroll-y="true"><view class="visc"><block wx:if="{{o}}"><view wx:for="{{p}}" wx:for-item="item" class="item1"><view wx:if="{{item.a}}" class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>包条码:{{item.b}}</view></view><view wx:if="{{item.c}}" class="tpbx" catchtap="{{item.e}}"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.d}}</view></view><view wx:if="{{item.f}}"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>服务号:{{item.g}}</view></view><view class="tpbx" catchtap="{{item.i}}"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.h}}</view></view></view><view wx:if="{{item.j}}"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>运单号:{{item.k}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.l}}</view></view></view><view wx:if="{{item.m}}"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>物料编码:{{item.n}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>物料名称:{{item.o}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>订单号:{{item.p}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>商场名称:{{item.q}}</view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>批次号:{{item.r}}</view></view></view><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>总包数:{{item.s}}</view></view><image wx:if="{{q}}" class="qtimgzt" src="{{item.t}}"></image></view></block><view wx:if="{{r}}" class="item1"><view class="tpbx"><image src="/pagesHome/static/kuweiicon.png"></image><view>托盘码:{{s}}</view></view><view class="tpbx"><image src="/pagesHome/static/scanicon.png"></image><view>托盘数量:{{t}}</view></view></view></view></scroll-view></view><view class="butbox"><view bindtap="{{v}}">上架</view></view><saomiao2 u-i="62de3784-1" bind:__l="__l"></saomiao2><tips class="r" u-r="tip" u-i="62de3784-2" bind:__l="__l"></tips>

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

@ -110,6 +110,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
}
async function sacn() {
if (details.orderCode === 3)
return;
let data = {
id: details.billLadingId,
coding: details.scancode,
@ -123,6 +125,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}
}
async function initpage() {
console.log("获取数据");
if (details.orderType == 1) {
let data = {
orderStatus: details.orderStatus,
@ -148,6 +151,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
};
let response = await api_user.billLadinggetInventoryNum(data);
details.dataList = response.data.records;
} else if (details.orderType == 3) {
let data = {
billLadingId: details.billLadingId
};
const response = await api_user.billLadingzeroBillData(data);
console.log("response :>> ", response);
const { code } = response;
if (code === 200) {
details.dataList = response.data || [];
}
}
}
function setorderStatus(state) {
@ -178,20 +191,19 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
autoBack: true,
leftIconSize: "35"
}),
b: common_vendor.t(common_vendor.unref(details).carTypeStr),
c: common_vendor.t(common_vendor.unref(details).pickUpPlate),
d: common_vendor.t(common_vendor.unref(details).consignee),
e: common_vendor.p({
b: common_vendor.t(common_vendor.unref(details).pickUpPlate),
c: common_vendor.t(common_vendor.unref(details).consignee),
d: common_vendor.p({
width: "70",
align: "center"
}),
f: common_vendor.p({
e: common_vendor.p({
align: "center"
}),
g: common_vendor.p({
f: common_vendor.p({
align: "center"
}),
h: common_vendor.f([1, 2], (item, k0, i0) => {
g: common_vendor.f([1, 2], (item, k0, i0) => {
return {
a: common_vendor.t(item == 1 ? "计划" : "完成"),
b: "45762c3a-7-" + i0 + "," + ("45762c3a-6-" + i0),
@ -202,6 +214,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
g: "45762c3a-6-" + i0 + ",45762c3a-1"
};
}),
h: common_vendor.p({
align: "center"
}),
i: common_vendor.p({
align: "center"
}),
@ -209,14 +224,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
align: "center"
}),
k: common_vendor.p({
align: "center"
}),
l: common_vendor.p({
loading: false,
emptyText: "暂无更多数据"
}),
m: common_vendor.o(checktype),
n: common_vendor.p({
l: common_vendor.o(checktype),
m: common_vendor.p({
data: common_vendor.unref(typearr),
value: common_vendor.unref(schanvalue),
placeholder: "全部",
@ -224,14 +236,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
size: "145",
clearable: true
}),
o: common_vendor.o(initpage),
p: common_vendor.n(common_vendor.unref(orderType) == 1 ? "xz" : ""),
q: common_vendor.o(($event) => setorderStatus(1)),
r: common_vendor.n(common_vendor.unref(orderType) == 2 ? "xz" : ""),
s: common_vendor.o(($event) => setorderStatus(2)),
t: common_vendor.unref(orderType) == 1
n: common_vendor.o(initpage),
o: common_vendor.n(common_vendor.unref(orderType) == 1 ? "xz" : ""),
p: common_vendor.o(($event) => setorderStatus(1)),
q: common_vendor.n(common_vendor.unref(orderType) == 2 ? "xz" : ""),
r: common_vendor.o(($event) => setorderStatus(2)),
s: common_vendor.n(common_vendor.unref(orderType) == 3 ? "xz" : ""),
t: common_vendor.o(($event) => setorderStatus(3)),
v: common_vendor.unref(orderType) == 1
}, common_vendor.unref(orderType) == 1 ? {
v: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
w: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
return {
a: common_vendor.t(item.orderCode),
b: common_vendor.o(($event) => goorderdetail(item)),
@ -240,11 +254,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
e: common_vendor.t(item.errorStatusStr)
};
}),
w: common_vendor.o(showsdqs)
x: common_vendor.o(showsdqs)
} : {}, {
x: common_vendor.unref(orderType) == 2
y: common_vendor.unref(orderType) == 2
}, common_vendor.unref(orderType) == 2 ? {
y: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
z: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
return {
a: common_vendor.t(item.sku),
b: common_vendor.t(item.coding),
@ -254,9 +268,21 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
f: common_vendor.t(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : "扫描")
};
}),
z: common_vendor.o(showsdqs)
A: common_vendor.o(showsdqs)
} : {}, {
B: common_vendor.unref(orderType) == 3
}, common_vendor.unref(orderType) == 3 ? {
C: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
return {
a: common_vendor.t(item.orderCode),
b: common_vendor.t(item.firsts),
c: common_vendor.t(item.quantity),
d: common_vendor.t(item.cargoUnit)
};
}),
D: common_vendor.o(showsdqs)
} : {}, {
A: common_vendor.sr(tiplists, "45762c3a-11", {
E: common_vendor.sr(tiplists, "45762c3a-11", {
"k": "tiplists"
})
});

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

@ -1 +1 @@
<u-navbar wx:if="{{a}}" u-i="45762c3a-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型:{{b}}</view></view><view><view>车牌号:{{c}}</view><view>司机:{{d}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{l}}" u-s="{{['d']}}" u-i="45762c3a-1" bind:__l="__l" u-p="{{l}}"><uni-tr u-s="{{['d']}}" u-i="45762c3a-2,45762c3a-1" bind:__l="__l"><uni-th wx:if="{{e}}" u-i="45762c3a-3,45762c3a-2" bind:__l="__l" u-p="{{e}}"></uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="45762c3a-4,45762c3a-2" bind:__l="__l" u-p="{{f}}">订单总数</uni-th><uni-th wx:if="{{g}}" u-s="{{['d']}}" u-i="45762c3a-5,45762c3a-2" bind:__l="__l" u-p="{{g}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{h}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.g}}" bind:__l="__l"><uni-td wx:if="{{i}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{i}}">{{item.a}}</uni-td><uni-td wx:if="{{j}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{j}}">{{item.c}}</uni-td><uni-td wx:if="{{k}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{k}}">{{item.e}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{n}}" bindchange="{{m}}" u-i="45762c3a-10" bind:__l="__l" u-p="{{n}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan" bindtap="{{o}}">查询</view></view><view class="tabtip"><view bindtap="{{q}}"><view class="{{p}}">定制品</view></view><view bindtap="{{s}}"><view class="{{r}}">库存品</view></view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><block wx:if="{{t}}"><view wx:for="{{v}}" wx:for-item="item" class="ite" bindtap="{{w}}"><view><view catchtap="{{item.b}}">订单号:{{item.a}}</view><view>包条码:{{item.c}}</view></view><view><view>是否扫描:{{item.d}}</view><view>异常:{{item.e}}</view></view></view></block><block wx:if="{{x}}"><view wx:for="{{y}}" wx:for-item="item" class="ite" bindtap="{{z}}"><view><view>SKU:{{item.a}}</view><view>包件号:{{item.b}}</view></view><view><view>物品:{{item.c}}</view><view>规格:{{item.d}}</view></view><view><view>单位:{{item.e}}</view><view>扫描:{{item.f}}</view></view></view></block></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="45762c3a-11" bind:__l="__l"></tiplist><saomiao2 u-i="45762c3a-12" bind:__l="__l"></saomiao2>
<u-navbar wx:if="{{a}}" u-i="45762c3a-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>车牌号:{{b}}</view><view>司机:{{c}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{k}}" u-s="{{['d']}}" u-i="45762c3a-1" bind:__l="__l" u-p="{{k}}"><uni-tr u-s="{{['d']}}" u-i="45762c3a-2,45762c3a-1" bind:__l="__l"><uni-th wx:if="{{d}}" u-i="45762c3a-3,45762c3a-2" bind:__l="__l" u-p="{{d}}"></uni-th><uni-th wx:if="{{e}}" u-s="{{['d']}}" u-i="45762c3a-4,45762c3a-2" bind:__l="__l" u-p="{{e}}">订单总数</uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="45762c3a-5,45762c3a-2" bind:__l="__l" u-p="{{f}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{g}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.g}}" bind:__l="__l"><uni-td wx:if="{{h}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{h}}">{{item.a}}</uni-td><uni-td wx:if="{{i}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{i}}">{{item.c}}</uni-td><uni-td wx:if="{{j}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{j}}">{{item.e}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{m}}" bindchange="{{l}}" u-i="45762c3a-10" bind:__l="__l" u-p="{{m}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan" bindtap="{{n}}">查询</view></view><view class="tabtip"><view bindtap="{{p}}"><view class="{{o}}">定制品</view></view><view bindtap="{{r}}"><view class="{{q}}">库存品</view></view><view bindtap="{{t}}"><view class="{{s}}">零担</view></view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><block wx:if="{{v}}"><view wx:for="{{w}}" wx:for-item="item" class="ite" bindtap="{{x}}"><view><view catchtap="{{item.b}}">订单号:{{item.a}}</view><view>包条码:{{item.c}}</view></view><view><view>是否扫描:{{item.d}}</view><view>异常:{{item.e}}</view></view></view></block><block wx:if="{{y}}"><view wx:for="{{z}}" wx:for-item="item" class="ite" bindtap="{{A}}"><view><view>SKU:{{item.a}}</view><view>包件号:{{item.b}}</view></view><view><view>物品:{{item.c}}</view><view>规格:{{item.d}}</view></view><view><view>单位:{{item.e}}</view><view>扫描:{{item.f}}</view></view></view></block><block wx:if="{{B}}"><view wx:for="{{C}}" wx:for-item="item" class="ite" bindtap="{{D}}"><view><view>订单号:{{item.a}}</view></view><view><view>物料名称:{{item.b}}</view></view><view><view>总数:{{item.c}}</view><view>剩余数量:{{item.d}}</view></view></view></block></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="45762c3a-11" bind:__l="__l"></tiplist><saomiao2 u-i="45762c3a-12" bind:__l="__l"></saomiao2>

370
utils/utils.js

@ -2,56 +2,56 @@
const sunmi_print = uni.requireNativePlugin('Sunmi-Print-Inner')
const TTSSpeech = uni.requireNativePlugin("MT-TTS-Speech");
// #endif
const utils={
const utils = {
//一体机打印初始化
init:()=>{
init: () => {
// #ifdef APP
return new Promise((relove, reject)=>{
return new Promise((relove, reject) => {
sunmi_print.connect(res => {
console.log(res)
if(res.connect == "hello"){
console.log("打印机成功连接")
console.log(res)
if (res.connect == "hello") {
console.log("打印机成功连接")
relove(true)
}else{
} else {
relove(false)
}
})
})
// #endif
},
},
//检查打印机状态
getstate:()=>{
getstate: () => {
// #ifdef APP
return new Promise((relove, reject)=>{
return new Promise((relove, reject) => {
sunmi_print.getPrinterStatus(result => {
console.log("打印机当前状态是:" + result.status)
if(result.status=='running'){
if (result.status == 'running') {
relove(true)
}else{
} else {
let title;
switch (result.status){
switch (result.status) {
case 'offline':
title='打印机未连接'
break;
title = '打印机未连接'
break;
case 'fault':
title='打印机故障'
break;
title = '打印机故障'
break;
case 'outpaper':
title='打印机缺纸'
break;
title = '打印机缺纸'
break;
case 'hot':
title='打印机过热'
break;
title = '打印机过热'
break;
case 'open':
title='打印机开盖'
break;
title = '打印机开盖'
break;
case 'error':
title='未知错误'
break;
title = '未知错误'
break;
}
uni.showToast({
title,
icon:"error"
icon: "error"
})
relove(false)
}
@ -60,65 +60,65 @@ const utils={
// #endif
},
//打印的内容
printxie:async (obj)=>{
printxie: async (obj) => {
// #ifdef APP
let res=await sunmi_print.labelLocate();
let res = await sunmi_print.labelLocate();
console.log(res);
setTimeout(()=>{
setTimeout(() => {
sunmi_print.printText({
text:'日期:'+obj.rigthnumer+' ',
align:2,
size:22,
bold:true,
underline:false,
compact:false,
skip:true
text: '日期:' + obj.rigthnumer + ' ',
align: 2,
size: 22,
bold: true,
underline: false,
compact: false,
skip: true
})
sunmi_print.printText({
text:obj.title,
align:1,
size:90,
bold:true,
underline:false,
compact:true,
skip:true
text: obj.title,
align: 1,
size: 90,
bold: true,
underline: false,
compact: true,
skip: true
})
sunmi_print.printDividingline({
style:0,
height:"3"
}),
style: 0,
height: "3"
}),
sunmi_print.printText({
text: `件数:${obj.number1}`,
align: 0,
size: 40,
bold: true,
underline: false,
compact: true,
skip: true
})
sunmi_print.printText({
text:`件数:${obj.number1}`,
align:0,
size:40,
bold:true,
underline:false,
compact:true,
skip:true
})
sunmi_print.printText({
text:obj.leftnumber,
align:0,
size:27,
bold:true,
underline:false,
compact:true,
skip:true
text: obj.leftnumber,
align: 0,
size: 27,
bold: true,
underline: false,
compact: true,
skip: true
})
sunmi_print.labelOutput()
},2000)
}, 2000)
// #endif
},
//蓝牙打印初始化
initbl:()=>{
initbl: () => {
// #ifdef APP
let deviceList = [];
let main = plus.android.runtimeMainActivity();
let Context = plus.android.importClass("android.content.Context");
let BManager = main.getSystemService(Context.BLUETOOTH_SERVICE);
plus.android.importClass(BManager);
plus.android.importClass(BManager);
let BAdapter = BManager.getAdapter();
plus.android.importClass(BAdapter);
plus.android.importClass(BAdapter);
let lists = BAdapter.getBondedDevices();
plus.android.importClass(lists);
let iterator = lists.iterator();
@ -139,124 +139,131 @@ const utils={
// #endif
},
//给蓝牙打印机推送打印的内容
getbl:(dev,text)=>{
getbl: (dev, text) => {
// #ifdef APP
let main = plus.android.runtimeMainActivity();
let BluetoothAdapter = plus.android.importClass("android.bluetooth.BluetoothAdapter");
let UUID = plus.android.importClass("java.util.UUID");
let uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
let BAdapter = BluetoothAdapter.getDefaultAdapter();
let device = BAdapter.getRemoteDevice(dev.address);
plus.android.importClass(device);
let bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
plus.android.importClass(bluetoothSocket);
console.log("开始连接打印机:"+dev.name);
if (!bluetoothSocket.isConnected()) {
bluetoothSocket.connect();
if (bluetoothSocket.isConnected()) {
console.log("设备已连接,开始发送打印文件");
let outputStream = bluetoothSocket.getOutputStream();
plus.android.importClass(outputStream);
// sb(outputStream);
// text+='PRINT\r\n'
console.log(text)
let arrayBuffer = plus.android.invoke(text, 'getBytes', 'gbk');
outputStream.write(arrayBuffer);
// console.log(111111111);
outputStream.flush();
bluetoothSocket.close();
if (!bluetoothSocket.isConnected()) {
console.log("设备已关闭");
}
} else {
uni.showToast({
title: '设备连接失败',
icon:'error',
duration: 2000
});
let main = plus.android.runtimeMainActivity();
let BluetoothAdapter = plus.android.importClass("android.bluetooth.BluetoothAdapter");
let UUID = plus.android.importClass("java.util.UUID");
let uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
let BAdapter = BluetoothAdapter.getDefaultAdapter();
let device = BAdapter.getRemoteDevice(dev.address);
plus.android.importClass(device);
let bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
plus.android.importClass(bluetoothSocket);
console.log("开始连接打印机:" + dev.name);
if (!bluetoothSocket.isConnected()) {
bluetoothSocket.connect();
if (bluetoothSocket.isConnected()) {
console.log("设备已连接,开始发送打印文件");
let outputStream = bluetoothSocket.getOutputStream();
plus.android.importClass(outputStream);
// sb(outputStream);
// text+='PRINT\r\n'
console.log(text)
let arrayBuffer = plus.android.invoke(text, 'getBytes', 'gbk');
outputStream.write(arrayBuffer);
// console.log(111111111);
outputStream.flush();
bluetoothSocket.close();
if (!bluetoothSocket.isConnected()) {
console.log("设备已关闭");
}
} else {
uni.showToast({
title: '设备连接失败',
icon: 'error',
duration: 2000
});
}
}
// #endif
},
//初始化tts语音引擎
inittts(){
inittts() {
// #ifdef APP
TTSSpeech.init((status) => {
if(status === 0){
console.log('引擎初始化成功')
TTSSpeech.setSpeed(100)
TTSSpeech.getInstallTTS(res => {
console.log(JSON.stringify(res));
let flage=false
res.forEach(v => {
if(v.name=='com.iflytek.speechcloud'){
flage=true
}
console.log(v.label + ': ' +v.name)
})
if(!flage){
// uni.showToast({
// title:'当前未安装语音引擎,前往安装中',
// icon:'none'
// })
uni.showModal({
title: '安装语音引擎',
content: '请选择浏览器下载安装还是直接安装',
cancelText:'浏览器安装',
confirmText:'直接安装',
success: function (res) {
if (res.confirm) {
var fileSaveUrl = plus.io.convertLocalFileSystemURL('static/TTS.apk');
plus.runtime.install( //安装
fileSaveUrl, {
force: true
},
function(res) {
utils.showToast('更新成功,请重新打开APP');
TTSSpeech.setEngine('com.iflytek.speechcloud');
// plus.runtime.restart()
plus.runtime.quit();
}
);
} else if (res.cancel) {
setTimeout(()=>{
plus.runtime.openURL('http://htys.oss-cn-chengdu.aliyuncs.com/htys/5402c622c319fac17c50fe52581cb627.apk')
setTimeout(()=>{
plus.runtime.quit();
},2500)
},1500)
}
if (status === 0) {
console.log('引擎初始化成功')
TTSSpeech.setSpeed(100)
TTSSpeech.getInstallTTS(res => {
console.log(JSON.stringify(res));
let flage = false
res.forEach(v => {
if (v.name == 'com.iflytek.speechcloud') {
flage = true
}
});
}else{
// uni.showToast({
// title:''
// })
}
})
}else{
console.log('引擎初始化失败')
}
console.log(v.label + ': ' + v.name)
})
if (!flage) {
// uni.showToast({
// title:'当前未安装语音引擎,前往安装中',
// icon:'none'
// })
uni.showModal({
title: '安装语音引擎',
content: '请选择浏览器下载安装还是直接安装',
cancelText: '浏览器安装',
confirmText: '直接安装',
success: function(res) {
if (res.confirm) {
var fileSaveUrl = plus.io.convertLocalFileSystemURL(
'static/TTS.apk');
plus.runtime.install( //安装
fileSaveUrl, {
force: true
},
function(res) {
utils.showToast('更新成功,请重新打开APP');
TTSSpeech.setEngine('com.iflytek.speechcloud');
// plus.runtime.restart()
plus.runtime.quit();
}
);
} else if (res.cancel) {
setTimeout(() => {
plus.runtime.openURL(
'http://htys.oss-cn-chengdu.aliyuncs.com/htys/5402c622c319fac17c50fe52581cb627.apk'
)
setTimeout(() => {
plus.runtime.quit();
}, 2500)
}, 1500)
}
}
});
} else {
// uni.showToast({
// title:''
// })
}
})
} else {
console.log('引擎初始化失败')
}
}, 'com.iflytek.speechcloud')
// #endif
},
//语音播报
ttsspke:(text)=>{
ttsspke: (text) => {
// #ifdef APP
console.log('语音播报');
if(!text){return}
TTSSpeech.speak({ text });
if (!text) {
return
}
TTSSpeech.speak({
text
});
// #endif
},
//设置扫描的广播
setting:()=>{
setting: () => {
// #ifdef APP
let main=plus.android.runtimeMainActivity()
let main = plus.android.runtimeMainActivity()
let deviceAction = 'com.android.server.scannerservice.broadcast'
let strdata='scannerdata'
let strdata = 'scannerdata'
let Intent = plus.android.importClass('android.content.Intent')
let intentSetting = new Intent("com.android.scanner.service_settings")
//设置条码发送方式
@ -270,14 +277,15 @@ const utils={
//设置返回状态: getstringExtra键值
intentSetting.putExtra("key_barcode_broadcast", strdata)
// 提交设置
console.log('广播动作:'+ deviceAction +',接受的标签值:' + strdata );
console.log('广播动作:' + deviceAction + ',接受的标签值:' + strdata);
main.sendBroadcast(intentSetting)
// #endif
},
//获取当前APP的版本信息
getversion:()=>{
return new Promise((relove, reject)=>{
getversion: () => {
return new Promise((relove, reject) => {
// #ifdef APP
// console.log('123123123')
//获取当前的包名
let main = plus.android.runtimeMainActivity();
let pkName = main.getPackageName();
@ -292,10 +300,10 @@ const utils={
})
// #endif
})
},
//执行下载更新(apk和wgt都可以)
updatefile:(file)=>{
updatefile: (file) => {
// #ifdef APP
const downloadTask = uni.downloadFile({ //执行下载
url: file, //下载地址
@ -308,19 +316,21 @@ const utils={
},
function(res) {
uni.showToast({
title:"安装成功",
icon:2000,
duration:1000
title: "安装成功",
icon: 2000,
duration: 1000
})
setTimeout(function(){
plus.runtime.restart();
},1100)
setTimeout(function() {
plus.runtime.restart();
}, 1100)
}
);
}
}
});
var showLoading = plus.nativeUI.showWaiting("正在下载", {back: "none"});
var showLoading = plus.nativeUI.showWaiting("正在下载", {
back: "none"
});
downloadTask.onProgressUpdate((res) => {
showLoading.setTitle(" 正在下载" + res.progress + "% ");
if (res.progress == 100) {
@ -330,7 +340,7 @@ const utils={
// #endif
},
//执行下载更新(无感)(wgt)
updatefile1:(file)=>{
updatefile1: (file) => {
// #ifdef APP
const downloadTask = uni.downloadFile({ //执行下载
url: file, //下载地址
@ -342,9 +352,9 @@ const utils={
force: true
},
function(res) {
setTimeout(function(){
plus.runtime.restart();
},1100)
setTimeout(function() {
plus.runtime.restart();
}, 1100)
}
);
}

Loading…
Cancel
Save