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

Merge branch 'master' into xiaochengxu

xiaochengxu
qb 1 year ago
parent
f95fb134f7 f3ca2b2f51
commit
d883dc4dba
33 changed files with 1120 additions and 437 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      App.vue
  2. 14
      api/user.js
  3. 12
      pages.json
  4. 4
      pages/index/index.vue
  5. 16
      pages/user/user.vue
  6. 11
      pagesHome/pages/StowageList/StowageList.vue
  7. 359
      pagesHome/pages/StowageListDetails/StowageListDetails.vue
  8. 4
      unpackage/dist/dev/app-plus/app-config-service.js
  9. 554
      unpackage/dist/dev/app-plus/app-service.js
  10. 6
      unpackage/dist/dev/app-plus/manifest.json
  11. 64
      unpackage/dist/dev/mp-weixin/api/user.js
  12. 5
      unpackage/dist/dev/mp-weixin/app.js
  13. 11
      unpackage/dist/dev/mp-weixin/app.json
  14. 6
      unpackage/dist/dev/mp-weixin/app.wxss
  15. 12
      unpackage/dist/dev/mp-weixin/common/vendor.js
  16. 2
      unpackage/dist/dev/mp-weixin/config/host.js
  17. 195
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  18. 10
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  19. 2
      unpackage/dist/dev/mp-weixin/pages/user/user.js
  20. 11
      unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js
  21. 10
      unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js
  22. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml
  23. 85
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js
  24. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxml
  25. 17
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js
  26. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.wxml
  27. 17
      unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js
  28. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js
  29. 80
      unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js
  30. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml
  31. 12
      unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxss
  32. 11
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
  33. 10
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js

7
App.vue
Unescape View File

@ -63,4 +63,11 @@
:root {
--subjectColor: #d3832a;
}
/* #ifdef MP-WEIXIN */
page {
--subjectColor: #d3832a;
}
/* #endif */
</style>

14
api/user.js
Unescape View File

@ -1934,7 +1934,7 @@ export function postFindCarsLoadingOrderDetail(data) {
}
/**
* 按件装车扫描
* 按件装车扫描 -- 包件
* @param {Object} data
*/
export function postLoadingScan(data) {
@ -1945,6 +1945,18 @@ export function postLoadingScan(data) {
});
}
/**
* 按件装车扫描 -- 托盘
* @param {Object} data
*/
export function postLoadingTrayInfo(data) {
return request({
url: `logpm-trunkline/api/carsLoad/loadingTrayInfo`,
method: "post",
data
});
}
/**
* 按件装车删除
* @param {Object} data

12
pages.json
Unescape View File

@ -1367,12 +1367,12 @@
// "selectedIconPath": "/static/TabberIcon/icon3check.png",
// "text": "报表"
// },
// {
// "pagePath": "pages/news/news",
// "iconPath": "/static/TabberIcon/icon4.png",
// "selectedIconPath": "/static/TabberIcon/icon4check.png",
// "text": "消息"
// },
{
"pagePath": "pages/news/news",
"iconPath": "/static/TabberIcon/icon4.png",
"selectedIconPath": "/static/TabberIcon/icon4check.png",
"text": "消息"
},
{
"pagePath": "pages/user/user",
"iconPath": "/static/TabberIcon/icon5.png",

4
pages/index/index.vue
Unescape View File

@ -330,7 +330,10 @@
uni.setStorageSync('authbuts', qxan)
}
onShow(() => {
// #ifdef APP
updateApp()
// #endif
init()
// print()
@ -442,6 +445,7 @@
// },3500)
}
/** 检测程序更新 */
async function updateApp() {
let version = await utils.getversion()
// let version = {

16
pages/user/user.vue
Unescape View File

@ -81,10 +81,24 @@
{ icon: '/static/usericon3.png', name: '系统设置', type: 3 },
{ icon: '/static/usericon4.png', name: '安全设置', type: 4 },
{ icon: '/static/usericon5.png', name: '关于我们', type: 5 },
{ icon: '/static/usericon6.png', name: '检测更新', type: 6 },
// { icon: '/static/usericon6.png', name: '检测更新', type: 6 },
{ icon: '/static/usericon7.png', name: '分享', type: 7 },
{ icon: '/static/usericon8.png', name: '切换账号', type: 8 },
])
// #ifdef APP
butlist.value = [
{ icon: '/static/usericon1.png', name: '通讯录', type: 1 },
{ icon: '/static/usericon2.png', name: '计件工资', type: 2 },
{ icon: '/static/usericon3.png', name: '系统设置', type: 3 },
{ icon: '/static/usericon4.png', name: '安全设置', type: 4 },
{ icon: '/static/usericon5.png', name: '关于我们', type: 5 },
{ icon: '/static/usericon6.png', name: '检测更新', type: 6 },
{ icon: '/static/usericon7.png', name: '分享', type: 7 },
{ icon: '/static/usericon8.png', name: '切换账号', type: 8 },
]
// #endif
let details = reactive({
showck: false,
warehouseList: [],

11
pagesHome/pages/StowageList/StowageList.vue
Unescape View File

@ -73,7 +73,7 @@
</view>
<view class="bts" v-if="Number(item.stockupStatus)!=40">
<view @click="gostockuplist(item)">
<view @click="gostockuplistBytray(item)">
整托装车
</view>
<view @click="gostockuplist(item)">
@ -220,9 +220,16 @@
details.show = false
console.log(details.datatime);
}
/** 按件装车 */
function gostockuplist(item : any) {
uni.navigateTo({
url: '/pagesHome/pages/StowageListDetails/StowageListDetails?id=' + item.id
url: '/pagesHome/pages/StowageListDetails/StowageListDetails?id=' + item.id + '&type=' + 1
})
}
/** 按托装车 */
function gostockuplistBytray(item : any) {
uni.navigateTo({
url: '/pagesHome/pages/StowageListDetails/StowageListDetails?id=' + item.id + '&type=' + 2
})
}
function cleartime() {

359
pagesHome/pages/StowageListDetails/StowageListDetails.vue
Unescape View File

@ -40,147 +40,155 @@
</view>
</view>
<view class="tabtip">
<view @click="setorderStatus(1)">
<view :class="orderStatus==1?'xz':''">定制品</view>
</view>
<view @click="setorderStatus(2)">
<view :class="orderStatus==2?'xz':''">零担</view>
</view>
<view @click="setorderStatus(3)">
<view :class="orderStatus==3?'xz':''">异常</view>
<template v-if="Number(details.pageType) === 1">
<view class="tabtip">
<view @click="setorderStatus(1)">
<view :class="orderStatus==1?'xz':''">定制品</view>
</view>
<view @click="setorderStatus(2)">
<view :class="orderStatus==2?'xz':''">零担</view>
</view>
<view @click="setorderStatus(3)">
<view :class="orderStatus==3?'xz':''">异常</view>
</view>
</view>
</view>
</template>
</template>
<template #body>
<scroll-view class="scve" scroll-y="true" @refresherpulling="" @scrolltolower="()=>{}">
<view class="mabx">
<block v-for="(item,index) in datalist" :key="item">
<!-- 定制品 -->
<template v-if="orderStatus== 1">
<view class="itec" @click="handleDetails(item,index,1)">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">订单编号：</text>{{item.orderCode}}
<!-- 按件装车 -->
<template v-if='Number(details.pageType) === 1'>
<view class="mabx">
<block v-for="(item,index) in datalist" :key="item">
<!-- 定制品 -->
<template v-if="orderStatus== 1">
<view class="itec" @click="handleDetails(item,index,1)">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">订单编号：</text>{{item.orderCode}}
</view>
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">运单号：</text>{{item.waybillNo}}
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">运单号：</text>{{item.waybillNo}}
</view>
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">订单总数：</text>{{item.totalNum}}</view>
<view><text style="color: #90A0AF;">
计划数/已扫数：</text>{{item.planNum + '/' + item.realNum}}
<view class="contenbx1">
<view><text style="color: #90A0AF;">订单总数：</text>{{item.totalNum}}</view>
<view><text style="color: #90A0AF;">
计划数/已扫数：</text>{{item.planNum + '/' + item.realNum}}
</view>
</view>
</view>
<view class="xialaxz" v-if="listcheckindex==index">
<block v-for="ite in item.distributionAppParcelListVOS" :key="ite">
<view class="box">
<view>包条码：{{ite.scanCode}}</view>
<view>数量：{{ite.num}}</view>
<view>托盘名称：{{ite.trayName}}</view>
<view>托盘码：{{ite.trayCode}}
</view>
<view class="w100">
<view class="">
<view class="xialaxz" v-if="listcheckindex==index">
<block v-for="ite in item.distributionAppParcelListVOS" :key="ite">
<view class="box">
<view>包条码：{{ite.scanCode}}</view>
<view>数量：{{ite.num}}</view>
<view>托盘名称：{{ite.trayName}}</view>
<view>托盘码：{{ite.trayCode}}
</view>
<view class="w100">
<view class="">
</view>
<view @click.stop="handleDelete(ite, 1)" class="button abnormalBtn">删除</view>
</view>
<view @click.stop="handleDelete(ite, 1)" class="button abnormalBtn">删除</view>
</view>
</view>
</block>
</view>
<view v-if="item.complete"
:class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">
{{item.complete}}
</view>
</view>
</template>
<!-- 零担 -->
<template v-else-if="orderStatus == 2">
<view class="itec" @click="handleDetails(item,index,2)">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">订单编号：</text>{{item.orderCode}}
</block>
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">运单号：</text>{{item.waybillNo}}
<view v-if="item.complete"
:class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">
{{item.complete}}
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">计划数量：</text>{{item.planNum || 0}}</view>
<view><text style="color: #90A0AF;">装车数量：</text>{{item.loadingNum || 0}}</view>
</view>
<view class="flex-c-sb">
<view class="button" @click.stop="handleShowZeroStowage(item)">
零担装车
</template>
<!-- 零担 -->
<template v-else-if="orderStatus == 2">
<view class="itec" @click="handleDetails(item,index,2)">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">订单编号：</text>{{item.orderCode}}
</view>
</view>
</view>
<view class="xialaxz" v-if="listcheckindex==index">
<block v-for="ite in item.distributionAppParcelListVOS" :key="ite">
<view class="box">
<view>物料名称：{{ite.scanCode}}</view>
<view>数量：{{ite.num}}</view>
<view>托盘名称：{{ite.trayName}}</view>
<view>托盘码：{{ite.trayCode}}
</view>
<view class="w100 flex-c-sb">
<view class="">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">运单号：</text>{{item.waybillNo}}
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">计划数量：</text>{{item.planNum || 0}}</view>
<view><text style="color: #90A0AF;">装车数量：</text>{{item.loadingNum || 0}}</view>
</view>
<view class="flex-c-sb">
<view class="button" @click.stop="handleShowZeroStowage(item)">
零担装车
</view>
</view>
<view class="xialaxz" v-if="listcheckindex==index">
<block v-for="ite in item.distributionAppParcelListVOS" :key="ite">
<view class="box">
<view>物料名称：{{ite.scanCode}}</view>
<view>数量：{{ite.num}}</view>
<view>托盘名称：{{ite.trayName}}</view>
<view>托盘码：{{ite.trayCode}}
</view>
<view class="w100 flex-c-sb">
<view class="">
</view>
<view class="button abnormalBtn" @click.stop="handleDelete(ite, 1)">删除</view>
</view>
<view class="button abnormalBtn" @click.stop="handleDelete(ite, 1)">删除</view>
</view>
</view>
</block>
</view>
</block>
</view>
<view v-if="item.complete"
:class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">
{{item.complete}}
</view>
</view>
</template>
<!-- 异常 -->
<template v-else-if="orderStatus == 3">
<view class="itec" @click="checkphon(item,index)">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">订单编号：</text>{{item.orderCode}}
<view v-if="item.complete"
:class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">
{{item.complete}}
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">运单号：</text>{{item.waybillNo}}
</template>
<!-- 异常 -->
<template v-else-if="orderStatus == 3">
<view class="itec" @click="checkphon(item,index)">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">订单编号：</text>{{item.orderCode}}
</view>
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">码值：</text>{{item.scanCode || 0}}</view>
<view><text style="color: #90A0AF;">装车数量：</text>{{item.loadingNum || 0}}</view>
</view>
<view class="flex-c-sb">
<view class="">
<view class="contenbx1">
<view><text style="color: #90A0AF;"
@click.stop="goorderdetail(item)">运单号：</text>{{item.waybillNo}}
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">码值：</text>{{item.scanCode || 0}}</view>
<view><text style="color: #90A0AF;">装车数量：</text>{{item.loadingNum || 0}}</view>
</view>
<view class="flex-c-sb">
<view class="">
</view>
<view class="button" @click.stop="handleDelete(item,3)">
删除
</view>
</view>
<view class="button" @click.stop="handleDelete(item,3)">
删除
<view v-if="item.complete"
:class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">
{{item.complete}}
</view>
</view>
</template>
</block>
</view>
</template>
<view v-if="item.complete"
:class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">
{{item.complete}}
</view>
</view>
</template>
</block>
</view>
<!-- 整托装车 -->
</scroll-view>
</template>
</BasicContainer>
@ -206,6 +214,42 @@
</block>
</scroll-view>
</PopUp>
<!-- 整托装车 -->
<PopUp ref='TrayStowage'>
<scroll-view style="height: 30vh;" scroll-y="true">
<view class="">
零担:
</view>
<block v-for="item in details.trayInfo.zeroList" :key="item">
<view class="">
<view class="flex-c-sb">
<view class="">
订单号: {{item.associationValue}}
</view>
<view class="">
在库数: {{item.num}}
</view>
</view>
<u--input type="number" class="input" placeholder="请输入内容" border="surround" v-model="item.enterNum"
clearable></u--input>
</view>
</block>
<view class="">
定制品:
</view>
<block v-for="item in details.trayInfo.packageList" :key="item">
<view class="">
<view class="flex-c-sb">
<view>包条码：{{item.associationValue}}</view>
<view>数量：{{item.num}}</view>
</view>
</view>
</block>
</scroll-view>
</PopUp>
<!-- #ifdef APP -->
<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
<!-- #endif -->
@ -218,7 +262,8 @@
postFindCarsLoadingOrderDetail,
postLoadingScan,
postRemoveCarsLoadScan,
postLoadingZero
postLoadingZero,
postLoadingTrayInfo
} from '@/api/user.js'
import {
onLoad,
@ -238,9 +283,9 @@
haveData: true,
async pullDownRefreshInitPage() {
details.datalist = []
// initpage()
return await initpage()
},
})
let details = reactive({
@ -272,7 +317,14 @@
zero: [],
pageInfo: {},
// 零担详情装车列表
zeroList: []
zeroList: [],
/** 页面类型 1: 按件装车 2: 整托装车 */
pageType: 1,
/** 整托渲染列表 */
trayInfo: {
zeroList: [],
packageList: []
}
})
// 获取组件实例
@ -282,8 +334,14 @@
/** 零担装车 */
const ZeroStowage = ref()
/** 整托装车 */
const TrayStowage = ref()
onLoad((op) => {
details.loadId = op.id
details.pageType = op.type
option.title = Number(op.type) === 2 ? '配载整托装车' : '配载按件装车'
})
function goorderdetail(item) {
uni.navigateTo({
@ -332,8 +390,8 @@
})
}
/** 请求页面数据 */
async function initpage() {
/** 请求页面 -- 按件装车 */
const initPageByOrder = async () => {
try {
const response = await postFindCarsLoadingDetail({
loadId: details.loadId
@ -348,6 +406,19 @@
details.pageInfo.zeroList :
details.pageInfo.exceptionList
}
} catch (e) {
//TODO handle the exception
} finally {
return null
}
}
/** 请求页面数据 */
async function initpage() {
try {
// 按件请求页面
await initPageByOrder()
// else { }
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
@ -385,17 +456,53 @@
details.pageInfo.exceptionList
}
/** 扫描包件 */
const scanOrder = async () => {
const submitData = {
orderPackageCode: details.scancode,
loadId: details.loadId
}
const res = await postLoadingScan(submitData)
return res
}
/** 扫描托盘 */
const scanTray = async () => {
const submitData = {
trayCode: details.scancode,
loadId: details.loadId
}
const res = await postLoadingTrayInfo(submitData)
const { code, data } = res
if (code !== 200) return res
details.trayInfo = data
// 通过Promise控制进程
return new Promise((resolve, reject) => {
TrayStowage.value.setDetails({
title: '整托装车',
showPopUp: true,
success() {
// 结束Promise状态
resolve(null)
},
close() {
// 结束Promise状态, 并关闭弹窗
reject()
TrayStowage.value.details.showPopUp = false
}
})
})
// return res
}
/** 扫描接口
* */
async function scandata() {
try {
const submitData = {
orderPackageCode: details.scancode,
loadId: details.loadId
}
const res = await postLoadingScan(submitData)
console.log('res :>> ', res);
if (Number(details.pageType === 1)) await scanOrder()
else await scanTray()
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
@ -840,6 +947,6 @@
padding: 10upx 20upx;
border: 1upx solid #aaa;
border-radius: 10upx;
margin: 10upx 0 20upx;
margin: 5upx 0 20upx;
}
</style>

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

File diff suppressed because one or more lines are too long

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

@ -3288,6 +3288,13 @@ if (uni.restoreGlobal) {
data
});
}
function postLoadingTrayInfo(data) {
return service({
url: `logpm-trunkline/api/carsLoad/loadingTrayInfo`,
method: "post",
data
});
}
function postRemoveCarsLoadScan(data) {
return service({
url: `logpm-trunkline/api/carsLoad/removeCarsLoadScan`,
@ -3295,6 +3302,13 @@ if (uni.restoreGlobal) {
data
});
}
function postLoadingZero(data) {
return service({
url: `logpm-trunkline/api/carsLoad/loadingZero`,
method: "post",
data
});
}
var isVue2 = false;
function set(target, key, val) {
if (Array.isArray(target)) {
@ -7906,7 +7920,7 @@ This will fail in production if not fixed.`);
maxarr.push(arr);
}
details.tablist = maxarr;
formatAppLog("log", "at pages/index/index.vue:427", details.tablist);
formatAppLog("log", "at pages/index/index.vue:430", details.tablist);
}
async function updateApp() {
let version2 = await utils.getversion();
@ -7915,12 +7929,12 @@ This will fail in production if not fixed.`);
versionCode: version2.version.split(".").join(""),
versionType: version2.pkName.indexOf("test") != -1 ? "1" : version2.pkName.indexOf("bate") != -1 ? "2" : "3"
};
formatAppLog("log", "at pages/index/index.vue:456", "data", data);
formatAppLog("log", "at pages/index/index.vue:460", "data", data);
let response = await AppPdaversiondetail(data);
formatAppLog("log", "at pages/index/index.vue:458", "response :>> ", response);
formatAppLog("log", "at pages/index/index.vue:462", "response :>> ", response);
if (response.code == 200 && response.data) {
formatAppLog("log", "at pages/index/index.vue:460", response.data);
formatAppLog("log", "at pages/index/index.vue:461", "有可更新包");
formatAppLog("log", "at pages/index/index.vue:464", response.data);
formatAppLog("log", "at pages/index/index.vue:465", "有可更新包");
if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) {
utils.updatefile1(response.data.link);
} else {
@ -8038,10 +8052,20 @@ This will fail in production if not fixed.`);
{ icon: "/static/usericon3.png", name: "系统设置", type: 3 },
{ icon: "/static/usericon4.png", name: "安全设置", type: 4 },
{ icon: "/static/usericon5.png", name: "关于我们", type: 5 },
{ icon: "/static/usericon6.png", name: "检测更新", type: 6 },
// { icon: '/static/usericon6.png', name: '检测更新', type: 6 },
{ icon: "/static/usericon7.png", name: "分享", type: 7 },
{ icon: "/static/usericon8.png", name: "切换账号", type: 8 }
]);
butlist.value = [
{ icon: "/static/usericon1.png", name: "通讯录", type: 1 },
{ icon: "/static/usericon2.png", name: "计件工资", type: 2 },
{ icon: "/static/usericon3.png", name: "系统设置", type: 3 },
{ icon: "/static/usericon4.png", name: "安全设置", type: 4 },
{ icon: "/static/usericon5.png", name: "关于我们", type: 5 },
{ icon: "/static/usericon6.png", name: "检测更新", type: 6 },
{ icon: "/static/usericon7.png", name: "分享", type: 7 },
{ icon: "/static/usericon8.png", name: "切换账号", type: 8 }
];
let details = vue.reactive({
showck: false,
warehouseList: [],
@ -8085,7 +8109,7 @@ This will fail in production if not fixed.`);
}
async function showwhselist() {
let res = await getMyWarehouseList({});
formatAppLog("log", "at pages/user/user.vue:140", res.data);
formatAppLog("log", "at pages/user/user.vue:154", res.data);
details.warehouseList = res.data;
details.showck = true;
}
@ -8117,24 +8141,24 @@ This will fail in production if not fixed.`);
uni.reLaunch({
url: "/pages/login/login"
});
formatAppLog("log", "at pages/user/user.vue:176", res.currentSize);
formatAppLog("log", "at pages/user/user.vue:177", String(res.limitSize));
formatAppLog("log", "at pages/user/user.vue:190", res.currentSize);
formatAppLog("log", "at pages/user/user.vue:191", String(res.limitSize));
}
async function updateApp() {
let version2 = await utils.getversion();
formatAppLog("log", "at pages/user/user.vue:186", "version 版本>>>>", version2);
formatAppLog("log", "at pages/user/user.vue:200", "version 版本>>>>", version2);
let data = {
betenantCode: uni.getStorageSync("userinfo").tenant_id,
versionCode: version2.version.split(".").join(""),
versionType: version2.pkName.indexOf("test") != -1 ? "1" : version2.pkName.indexOf("bate") != -1 ? "2" : "3"
};
formatAppLog("log", "at pages/user/user.vue:192", "data>>>>", data);
formatAppLog("log", "at pages/user/user.vue:206", "data>>>>", data);
let response = await AppPdaversiondetail(data);
formatAppLog("log", "at pages/user/user.vue:194", "123 :>> ", 123);
formatAppLog("log", "at pages/user/user.vue:195", "response :>> ", response);
formatAppLog("log", "at pages/user/user.vue:208", "123 :>> ", 123);
formatAppLog("log", "at pages/user/user.vue:209", "response :>> ", response);
if (response.code == 200 && response.data && Object.keys(response.data).length !== 0) {
formatAppLog("log", "at pages/user/user.vue:197", "res.data", response.data);
formatAppLog("log", "at pages/user/user.vue:198", "有可更新包");
formatAppLog("log", "at pages/user/user.vue:211", "res.data", response.data);
formatAppLog("log", "at pages/user/user.vue:212", "有可更新包");
if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) {
utils.updatefile1(response.data.link);
} else {
@ -10571,8 +10595,13 @@ This will fail in production if not fixed.`);
}
}
function gostockuplist(item) {
uni.reLaunch({
url: "/pagesHome/pages/StowageListDetails/StowageListDetails?id=" + item.id
uni.navigateTo({
url: "/pagesHome/pages/StowageListDetails/StowageListDetails?id=" + item.id + "&type=1"
});
}
function gostockuplistBytray(item) {
uni.navigateTo({
url: "/pagesHome/pages/StowageListDetails/StowageListDetails?id=" + item.id + "&type=2"
});
}
function cleartime() {
@ -10776,7 +10805,7 @@ This will fail in production if not fixed.`);
class: "bts"
}, [
vue.createElementVNode("view", {
onClick: ($event) => gostockuplist(item)
onClick: ($event) => gostockuplistBytray(item)
}, " 整托装车 ", 8, ["onClick"]),
vue.createElementVNode("view", {
onClick: ($event) => gostockuplist(item)
@ -10885,13 +10914,25 @@ This will fail in production if not fixed.`);
isscan: false,
order: [],
zero: [],
pageInfo: {}
pageInfo: {},
// 零担详情装车列表
zeroList: [],
/** 页面类型 1: 按件装车 2: 整托装车 */
pageType: 1,
/** 整托渲染列表 */
trayInfo: {
zeroList: [],
packageList: []
}
});
const tiplists = vue.ref(null);
const basicContainer = vue.ref(null);
const ZeroStowage = vue.ref();
const TrayStowage = vue.ref();
onLoad((op) => {
details.loadId = op.id;
details.pageType = op.type;
option.title = Number(op.type) === 2 ? "配载整托装车" : "配载按件装车";
});
function goorderdetail(item) {
uni.navigateTo({
@ -10902,7 +10943,7 @@ This will fail in production if not fixed.`);
uni.$off("scancodedate");
uni.$on("scancodedate", function(code2) {
if (code2) {
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:256", "code", code2);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:356", "code", code2);
details.scancode = code2;
details.isscan = true;
scandata();
@ -10931,19 +10972,27 @@ This will fail in production if not fixed.`);
}
});
}
async function initpage() {
const initPageByOrder = async () => {
try {
const response = await postFindCarsLoadingDetail({
loadId: details.loadId
});
const { code: code2, data } = response;
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:300", "response :>> ", response);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:400", "response :>> ", response);
if (code2 === 200) {
details.pageInfo = data;
details.datalist = details.orderStatus === 1 ? details.pageInfo.loadScanOrderList : details.orderStatus === 2 ? details.pageInfo.zeroList : details.pageInfo.exceptionList;
}
} catch (e) {
} finally {
return null;
}
};
async function initpage() {
try {
await initPageByOrder();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:310", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:423", "err :>> ", err);
} finally {
return null;
}
@ -10954,36 +11003,95 @@ This will fail in production if not fixed.`);
details.orderStatus = state;
details.datalist = details.orderStatus === 1 ? details.pageInfo.loadScanOrderList : details.orderStatus === 2 ? details.pageInfo.zeroList : details.pageInfo.exceptionList;
}
const scanOrder = async () => {
const submitData = {
orderPackageCode: details.scancode,
loadId: details.loadId
};
const res = await postLoadingScan(submitData);
return res;
};
const scanTray = async () => {
const submitData = {
trayCode: details.scancode,
loadId: details.loadId
};
const res = await postLoadingTrayInfo(submitData);
const { code: code2, data } = res;
if (code2 !== 200)
return res;
details.trayInfo = data;
return new Promise((resolve, reject) => {
TrayStowage.value.setDetails({
title: "整托装车",
showPopUp: true,
success() {
resolve(null);
},
close() {
reject();
TrayStowage.value.details.showPopUp = false;
}
});
});
};
async function scandata() {
try {
const submitData = {
orderPackageCode: details.scancode,
loadId: details.loadId
};
const res = await postLoadingScan(submitData);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:356", "res :>> ", res);
if (Number(details.pageType === 1))
await scanOrder();
else
await scanTray();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:358", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:507", "err :>> ", err);
} finally {
basicContainer.value.startPullDownRefresh();
}
}
const handleShowZeroStowage = (_item) => {
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:368", "item :>> ", _item);
const handleShowZeroStowage = async (_item) => {
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:517", "item :>> ", _item);
details.zeroList = [];
const submitData = {
loadId: details.loadId,
orderCode: _item.orderCode
};
const res = postFindLoadScanWaybillDetailList(submitData);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:374", "ZeroStowage :>> ", ZeroStowage);
const res = await postFindLoadScanWaybillDetailList(submitData);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:525", "ZeroStowage :>> ", ZeroStowage);
if (res.code !== 200)
return;
details.zeroList = res.data;
for (let item of details.zeroList) {
item.enterNum = 0;
}
ZeroStowage.value.setDetails({
title: "零担装车",
showPopUp: true
showPopUp: true,
async success() {
try {
uni.showLoading({
mask: true
});
const submitData2 = {
waybillNo: _item.waybillNo,
loadId: details.loadId,
productInfoList: []
};
details.zeroList.forEach((val) => {
if (val.enterNum > 0) {
submitData2.productInfoList.push(val);
}
});
const res2 = await postLoadingZero(submitData2);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:555", "res :>> ", res2);
} catch (e) {
} finally {
uni.hideLoading();
}
}
});
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:379", " res :>> ", res);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:564", " res :>> ", res);
};
const handleDetails = async (item, index2, type) => {
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:386", "item :>> ", item);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:571", "item :>> ", item);
if (details.listcheckindex == index2) {
details.listcheckindex = -1;
} else {
@ -10997,8 +11105,8 @@ This will fail in production if not fixed.`);
if (res.code !== 200)
return;
item.distributionAppParcelListVOS = res.data;
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:401", "item.distributionAppParcelListVOS :>> ", item.distributionAppParcelListVOS);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:402", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:586", "item.distributionAppParcelListVOS :>> ", item.distributionAppParcelListVOS);
formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:587", "res :>> ", res);
} catch (e) {
} finally {
uni.hideLoading();
@ -11018,6 +11126,9 @@ This will fail in production if not fixed.`);
basicContainer.value.startPullDownRefresh();
}
};
const leftClick = () => {
uni.navigateBack();
};
const { listcheckindex, inputtxt, orderStatus, schanvalue, typearr, items, datalist } = vue.toRefs(details);
return (_ctx, _cache) => {
const _component_BasicContainer = vue.resolveComponent("BasicContainer");
@ -11031,7 +11142,8 @@ This will fail in production if not fixed.`);
vue.createVNode(_component_BasicContainer, {
ref_key: "basicContainer",
ref: basicContainer,
option
option,
leftClick
}, {
head: vue.withCtx(() => [
vue.createElementVNode("view", { class: "hdtp" }, [
@ -11116,7 +11228,10 @@ This will fail in production if not fixed.`);
)
])
]),
vue.createElementVNode("view", { class: "tabtip" }, [
Number(vue.unref(details).pageType) === 1 ? (vue.openBlock(), vue.createElementBlock("view", {
key: 0,
class: "tabtip"
}, [
vue.createElementVNode("view", {
onClick: _cache[0] || (_cache[0] = ($event) => setorderStatus(1))
}, [
@ -11156,7 +11271,7 @@ This will fail in production if not fixed.`);
/* CLASS */
)
])
])
])) : vue.createCommentVNode("v-if", true)
]),
body: vue.withCtx(() => [
vue.createElementVNode(
@ -11170,7 +11285,11 @@ This will fail in production if not fixed.`);
})
},
[
vue.createElementVNode("view", { class: "mabx" }, [
vue.createCommentVNode(" 按件装车 "),
Number(vue.unref(details).pageType) === 1 ? (vue.openBlock(), vue.createElementBlock("view", {
key: 0,
class: "mabx"
}, [
(vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
null,
@ -11269,12 +11388,13 @@ This will fail in production if not fixed.`);
1
/* TEXT */
),
vue.createElementVNode("view", {
class: "w100",
onClick: vue.withModifiers(($event) => handleDelete(ite, 1), ["stop"])
}, [
vue.createElementVNode("view", { class: "button" }, "删除")
], 8, ["onClick"])
vue.createElementVNode("view", { class: "w100" }, [
vue.createElementVNode("view", { class: "" }),
vue.createElementVNode("view", {
onClick: vue.withModifiers(($event) => handleDelete(ite, 1), ["stop"]),
class: "button abnormalBtn"
}, "删除", 8, ["onClick"])
])
]);
}),
128
@ -11350,10 +11470,63 @@ This will fail in production if not fixed.`);
onClick: vue.withModifiers(($event) => handleShowZeroStowage(item), ["stop"])
}, " 零担装车 ", 8, ["onClick"])
]),
vue.unref(listcheckindex) == index2 ? (vue.openBlock(), vue.createElementBlock("view", {
key: 0,
class: "xialaxz"
}, [
(vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
null,
vue.renderList(item.distributionAppParcelListVOS, (ite) => {
return vue.openBlock(), vue.createElementBlock("view", {
key: ite,
class: "box"
}, [
vue.createElementVNode(
"view",
null,
"物料名称：" + vue.toDisplayString(ite.scanCode),
1
/* TEXT */
),
vue.createElementVNode(
"view",
null,
"数量：" + vue.toDisplayString(ite.num),
1
/* TEXT */
),
vue.createElementVNode(
"view",
null,
"托盘名称：" + vue.toDisplayString(ite.trayName),
1
/* TEXT */
),
vue.createElementVNode(
"view",
null,
"托盘码：" + vue.toDisplayString(ite.trayCode),
1
/* TEXT */
),
vue.createElementVNode("view", { class: "w100 flex-c-sb" }, [
vue.createElementVNode("view", { class: "" }),
vue.createElementVNode("view", {
class: "button abnormalBtn",
onClick: vue.withModifiers(($event) => handleDelete(ite, 1), ["stop"])
}, "删除", 8, ["onClick"])
])
]);
}),
128
/* KEYED_FRAGMENT */
))
])) : vue.createCommentVNode("v-if", true),
item.complete ? (vue.openBlock(), vue.createElementBlock(
"view",
{
key: 0,
key: 1,
class: vue.normalizeClass(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
},
vue.toDisplayString(item.complete),
@ -11364,73 +11537,81 @@ This will fail in production if not fixed.`);
],
64
/* STABLE_FRAGMENT */
)) : vue.unref(orderStatus) == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
key: 2,
class: "itec",
onClick: ($event) => _ctx.checkphon(item, index2)
}, [
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", {
style: { "color": "#90A0AF" },
onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"])
}, "订单编号：", 8, ["onClick"]),
vue.createTextVNode(
vue.toDisplayString(item.orderCode),
1
/* TEXT */
)
])
]),
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", {
style: { "color": "#90A0AF" },
onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"])
}, "运单号：", 8, ["onClick"]),
vue.createTextVNode(
vue.toDisplayString(item.waybillNo),
1
/* TEXT */
)
])
]),
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "码值："),
vue.createTextVNode(
vue.toDisplayString(item.scanCode || 0),
1
/* TEXT */
)
]),
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装车数量："),
vue.createTextVNode(
vue.toDisplayString(item.loadingNum || 0),
1
/* TEXT */
)
])
]),
vue.createElementVNode("view", { class: "flex-c-sb" }, [
vue.createElementVNode("view", { class: "" }),
)) : vue.unref(orderStatus) == 3 ? (vue.openBlock(), vue.createElementBlock(
vue.Fragment,
{ key: 2 },
[
vue.createCommentVNode(" 异常 "),
vue.createElementVNode("view", {
class: "button",
onClick: vue.withModifiers(($event) => handleDelete(item, 3), ["stop"])
}, " 删除 ", 8, ["onClick"])
]),
item.complete ? (vue.openBlock(), vue.createElementBlock(
"view",
{
key: 0,
class: vue.normalizeClass(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
},
vue.toDisplayString(item.complete),
3
/* TEXT, CLASS */
)) : vue.createCommentVNode("v-if", true)
], 8, ["onClick"])) : vue.createCommentVNode("v-if", true)
class: "itec",
onClick: ($event) => _ctx.checkphon(item, index2)
}, [
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", {
style: { "color": "#90A0AF" },
onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"])
}, "订单编号：", 8, ["onClick"]),
vue.createTextVNode(
vue.toDisplayString(item.orderCode),
1
/* TEXT */
)
])
]),
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", {
style: { "color": "#90A0AF" },
onClick: vue.withModifiers(($event) => goorderdetail(item), ["stop"])
}, "运单号：", 8, ["onClick"]),
vue.createTextVNode(
vue.toDisplayString(item.waybillNo),
1
/* TEXT */
)
])
]),
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "码值："),
vue.createTextVNode(
vue.toDisplayString(item.scanCode || 0),
1
/* TEXT */
)
]),
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装车数量："),
vue.createTextVNode(
vue.toDisplayString(item.loadingNum || 0),
1
/* TEXT */
)
])
]),
vue.createElementVNode("view", { class: "flex-c-sb" }, [
vue.createElementVNode("view", { class: "" }),
vue.createElementVNode("view", {
class: "button",
onClick: vue.withModifiers(($event) => handleDelete(item, 3), ["stop"])
}, " 删除 ", 8, ["onClick"])
]),
item.complete ? (vue.openBlock(), vue.createElementBlock(
"view",
{
key: 0,
class: vue.normalizeClass(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
},
vue.toDisplayString(item.complete),
3
/* TEXT, CLASS */
)) : vue.createCommentVNode("v-if", true)
], 8, ["onClick"])
],
64
/* STABLE_FRAGMENT */
)) : vue.createCommentVNode("v-if", true)
],
64
/* STABLE_FRAGMENT */
@ -11439,7 +11620,8 @@ This will fail in production if not fixed.`);
128
/* KEYED_FRAGMENT */
))
])
])) : vue.createCommentVNode("v-if", true),
vue.createCommentVNode(" 整托装车 ")
],
32
/* HYDRATE_EVENTS */
@ -11465,7 +11647,141 @@ This will fail in production if not fixed.`);
ref_key: "ZeroStowage",
ref: ZeroStowage
},
null,
{
default: vue.withCtx(() => [
vue.createElementVNode("scroll-view", {
style: { "height": "30vh" },
"scroll-y": "true"
}, [
(vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
null,
vue.renderList(vue.unref(details).zeroList, (item) => {
return vue.openBlock(), vue.createElementBlock("view", {
key: item,
class: ""
}, [
vue.createElementVNode("view", { class: "flex-c-sb" }, [
vue.createElementVNode(
"view",
{ class: "" },
" 产品名称: " + vue.toDisplayString(item.productName),
1
/* TEXT */
),
vue.createElementVNode(
"view",
{ class: "" },
" 在库数: " + vue.toDisplayString(item.totalNum),
1
/* TEXT */
)
]),
vue.withDirectives(vue.createElementVNode("input", {
class: "input",
"onUpdate:modelValue": ($event) => item.enterNum = $event,
type: "number"
}, null, 8, ["onUpdate:modelValue"]), [
[vue.vModelText, item.enterNum]
])
]);
}),
128
/* KEYED_FRAGMENT */
))
])
]),
_: 1
/* STABLE */
},
512
/* NEED_PATCH */
),
vue.createCommentVNode(" 整托装车 "),
vue.createVNode(
_component_PopUp,
{
ref_key: "TrayStowage",
ref: TrayStowage
},
{
default: vue.withCtx(() => [
vue.createElementVNode("scroll-view", {
style: { "height": "30vh" },
"scroll-y": "true"
}, [
vue.createElementVNode("view", { class: "" }, " 零担: "),
(vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
null,
vue.renderList(vue.unref(details).trayInfo.zeroList, (item) => {
return vue.openBlock(), vue.createElementBlock("view", {
key: item,
class: ""
}, [
vue.createElementVNode("view", { class: "flex-c-sb" }, [
vue.createElementVNode(
"view",
{ class: "" },
" 订单号: " + vue.toDisplayString(item.associationValue),
1
/* TEXT */
),
vue.createElementVNode(
"view",
{ class: "" },
" 在库数: " + vue.toDisplayString(item.num),
1
/* TEXT */
)
]),
vue.withDirectives(vue.createElementVNode("input", {
class: "input",
"onUpdate:modelValue": ($event) => item.enterNum = $event,
type: "number"
}, null, 8, ["onUpdate:modelValue"]), [
[vue.vModelText, item.enterNum]
])
]);
}),
128
/* KEYED_FRAGMENT */
)),
vue.createElementVNode("view", { class: "" }, " 定制品: "),
(vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
null,
vue.renderList(vue.unref(details).trayInfo.packageList, (item) => {
return vue.openBlock(), vue.createElementBlock("view", {
key: item,
class: ""
}, [
vue.createElementVNode("view", { class: "flex-c-sb" }, [
vue.createElementVNode(
"view",
null,
"包条码：" + vue.toDisplayString(item.associationValue),
1
/* TEXT */
),
vue.createElementVNode(
"view",
null,
"数量：" + vue.toDisplayString(item.num),
1
/* TEXT */
)
])
]);
}),
128
/* KEYED_FRAGMENT */
))
])
]),
_: 1
/* STABLE */
},
512
/* NEED_PATCH */
),
@ -11479,7 +11795,7 @@ This will fail in production if not fixed.`);
};
}
});
const PagesHomePagesStowageListDetailsStowageListDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__file", "D:/worksp/logpm/pagesHome/pages/StowageListDetails/StowageListDetails.vue"]]);
const PagesHomePagesStowageListDetailsStowageListDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__scopeId", "data-v-66cbfd20"], ["__file", "D:/worksp/logpm/pagesHome/pages/StowageListDetails/StowageListDetails.vue"]]);
const _sfc_main$1u = /* @__PURE__ */ vue.defineComponent({
__name: "RelayScanList",
setup(__props) {

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

@ -220,6 +220,12 @@
"selectedIconPath": "/static/TabberIcon/icon2check.png",
"text": "任务"
},
{
"pagePath": "pages/news/news",
"iconPath": "/static/TabberIcon/icon4.png",
"selectedIconPath": "/static/TabberIcon/icon4check.png",
"text": "消息"
},
{
"pagePath": "pages/user/user",
"iconPath": "/static/TabberIcon/icon5.png",

64
unpackage/dist/dev/mp-weixin/api/user.js vendored
Unescape View File

@ -219,6 +219,13 @@ function signforwrapIn(data) {
});
}
function signforinventory(data) {
return utils_request.service({
url: `logpm-distribution/app/signfor/inventory`,
method: "get",
data
});
}
function deliveryInventory(data) {
return utils_request.service({
url: `logpm-distribution/app/delivery/inventory`,
method: "get",
@ -981,6 +988,55 @@ function $_retentionTrayScan(data) {
data
});
}
function postCarsLoadPageList(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/carsLoadPageList`,
method: "post",
data
});
}
function postFindCarsLoadingDetail(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/findCarsLoadingDetail`,
method: "post",
data
});
}
function postFindLoadScanWaybillDetailList(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/findLoadScanWaybillDetailList`,
method: "post",
data
});
}
function postFindCarsLoadingOrderDetail(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/findCarsLoadingOrderDetail`,
method: "post",
data
});
}
function postLoadingScan(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/loadingScan`,
method: "post",
data
});
}
function postRemoveCarsLoadScan(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/removeCarsLoadScan`,
method: "post",
data
});
}
function postLoadingZero(data) {
return utils_request.service({
url: `logpm-trunkline/api/carsLoad/loadingZero`,
method: "post",
data
});
}
exports.$_initRetentionList = $_initRetentionList;
exports.$_retentionScan = $_retentionScan;
exports.$_retentionTrayScan = $_retentionTrayScan;
@ -1006,6 +1062,7 @@ exports.billLadingpageList = billLadingpageList;
exports.billLadingscan = billLadingscan;
exports.billLadingzeroBillBatch = billLadingzeroBillBatch;
exports.billLadingzeroBillData = billLadingzeroBillData;
exports.deliveryInventory = deliveryInventory;
exports.deliveryZeroLoading = deliveryZeroLoading;
exports.deliverycustom = deliverycustom;
exports.deliveryloadinginventory = deliveryloadinginventory;
@ -1046,6 +1103,13 @@ exports.pcontractQuestDetailList = pcontractQuestDetailList;
exports.pgetContractList = pgetContractList;
exports.pgetgetMaterialName = pgetgetMaterialName;
exports.postAbnormalTruckLoading = postAbnormalTruckLoading;
exports.postCarsLoadPageList = postCarsLoadPageList;
exports.postFindCarsLoadingDetail = postFindCarsLoadingDetail;
exports.postFindCarsLoadingOrderDetail = postFindCarsLoadingOrderDetail;
exports.postFindLoadScanWaybillDetailList = postFindLoadScanWaybillDetailList;
exports.postLoadingScan = postLoadingScan;
exports.postLoadingZero = postLoadingZero;
exports.postRemoveCarsLoadScan = postRemoveCarsLoadScan;
exports.postWarehouseTaskAddDataInfo = postWarehouseTaskAddDataInfo;
exports.postWarehouseTaskSelectPackageInfo = postWarehouseTaskSelectPackageInfo;
exports.postZeroStockUp = postZeroStockUp;

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

@ -16,6 +16,11 @@ if (!Math) {
"./pages/taskList/taskList.js";
"./pages/reportForms/reportForms.js";
"./pagesHome/pages/pickingScan/pickingScan.js";
"./pagesHome/pages/StowageList/StowageList.js";
"./pagesHome/pages/StowageListDetails/StowageListDetails.js";
"./pagesHome/pages/RelayScanList/RelayScanList.js";
"./pagesHome/pages/codePlateBracket/codePlateBracket.js";
"./pagesHome/pages/ArrivalList/ArrivalList.js";
"./pagesHome/pages/SelfPickupScan/SelfPickupScan.js";
"./pagesHome/pages/LoadingScan/LoadingScan.js";
"./pagesHome/pages/loadingRetention/loadingRetention.js";

11
unpackage/dist/dev/mp-weixin/app.json vendored
Unescape View File

@ -12,6 +12,11 @@
"root": "pagesHome",
"pages": [
"pages/pickingScan/pickingScan",
"pages/StowageList/StowageList",
"pages/StowageListDetails/StowageListDetails",
"pages/RelayScanList/RelayScanList",
"pages/codePlateBracket/codePlateBracket",
"pages/ArrivalList/ArrivalList",
"pages/SelfPickupScan/SelfPickupScan",
"pages/LoadingScan/LoadingScan",
"pages/loadingRetention/loadingRetention",
@ -109,12 +114,6 @@
"selectedIconPath": "/static/TabberIcon/icon2check.png",
"text": "任务"
},
{
"pagePath": "pages/news/news",
"iconPath": "/static/TabberIcon/icon4.png",
"selectedIconPath": "/static/TabberIcon/icon4check.png",
"text": "消息"
},
{
"pagePath": "pages/user/user",
"iconPath": "/static/TabberIcon/icon5.png",

6
unpackage/dist/dev/mp-weixin/app.wxss vendored
Unescape View File

@ -580,4 +580,10 @@ page {
.golink {
color: #0086F1 !important;
text-decoration: underline;
}
:root {
--subjectColor: #d3832a;
}
page {
--subjectColor: #d3832a;
}page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}[data-c-h="true"]{display: none !important;}

12
unpackage/dist/dev/mp-weixin/common/vendor.js vendored
Unescape View File

@ -1254,10 +1254,10 @@ function populateParameters(fromRes, toRes) {
let _SDKVersion = SDKVersion;
const hostLanguage = language.replace(/_/g, "-");
const parameters = {
appId: "__UNI__FC20B18",
appId: "__UNI__EB22F37",
appName: "货无忧",
appVersion: "1.0.31",
appVersionCode: 1031,
appVersion: "1.0.32",
appVersionCode: 1032,
appLanguage: getAppLanguage(hostLanguage),
uniCompileVersion: "3.95",
uniRuntimeVersion: "3.95",
@ -1398,10 +1398,10 @@ const getAppBaseInfo = {
hostName: _hostName,
hostSDKVersion: SDKVersion,
hostTheme: theme,
appId: "__UNI__FC20B18",
appId: "__UNI__EB22F37",
appName: "货无忧",
appVersion: "1.0.31",
appVersionCode: 1031,
appVersion: "1.0.32",
appVersionCode: 1032,
appLanguage: getAppLanguage(hostLanguage)
}));
}

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

@ -1,5 +1,5 @@
"use strict";
const devhost = "http://192.168.10.200:13000/";
const devhost = "http://192.168.10.48:13000/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";

195
unpackage/dist/dev/mp-weixin/pages/index/index.js vendored
Unescape View File

@ -2,7 +2,6 @@
const common_vendor = require("../../common/vendor.js");
const api_user = require("../../api/user.js");
const utils_cacheimg = require("../../utils/cacheimg.js");
const utils_utils = require("../../utils/utils.js");
require("../../utils/request.js");
require("../../store/index.js");
require("../../utils/functions.js");
@ -23,7 +22,156 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "index",
setup(__props) {
const tip = common_vendor.ref(null);
let details = common_vendor.reactive({ tablist: [] });
let details = common_vendor.reactive({
tablist: [
{
type: 1,
name: "工作台",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "订单查询",
router: "/pagesHome/pages/orderInquiry/orderInquiry"
}
]
},
{
type: 1,
name: "入库",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "码板打托",
router: "/pagesHome/pages/codePlateBracket/codePlateBracket"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "入库扫描",
router: "/pagesHome/pages/orderInquiry/orderInquiry"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "到车入库",
router: "/pagesHome/pages/ArrivalList/ArrivalList"
}
]
},
{
type: 1,
name: "库内",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "分拣打托",
router: "/pagesHome/pages/scansorting/scansorting"
},
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '订单分拣',
// router: '/pagesHome/pages/ordersorting/ordersorting',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '库存品分拣',
// router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// },
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "扫码上架",
router: "/pagesHome/pages/ScanUpType/ScanUpType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "手动上架",
router: "/pagesHome/pages/PeopleScanUpType/PeopleScanUpType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "移库",
router: "/pagesHome/pages/RelocationType/RelocationType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "滞留",
router: "/pagesHome/pages/Retention/Retention"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "合托",
router: "/pagesHome/pages/MergeTray/MergeTray"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "下架",
router: "/pagesHome/pages/DownGoodsType/DownGoodsType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "空置托盘",
router: "/pagesHome/pages/RemoveTray/RemoveTray"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "复核",
router: "/pagesHome/pages/Check/Check"
}
]
},
{
type: 1,
name: "出库",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "拣货扫描",
router: "/pagesHome/pages/pickingScan/pickingScan"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "自提扫描",
router: "/pagesHome/pages/SelfPickupScan/SelfPickupScan"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "配载装车",
router: "/pagesHome/pages/StowageList/StowageList"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "中转装车",
router: "/pagesHome/pages/RelayScanList/RelayScanList"
}
]
},
{
type: 1,
name: "配送",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "装车扫描",
router: "/pagesHome/pages/LoadingScan/LoadingScan"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "签收扫描",
router: "/pagesHome/pages/signinScan/signinScan"
}
]
},
{
type: 1,
name: "离线上传",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "离线上传",
router: "/pagesHome/pages/OfflineUpload/OfflineUpload"
}
]
}
]
});
function gopathpage(path) {
common_vendor.index.navigateTo({
url: path
@ -64,7 +212,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
common_vendor.index.setStorageSync("authbuts", qxan);
}
common_vendor.onShow(() => {
updateApp();
init();
});
common_vendor.onLoad(() => {
@ -110,48 +257,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.tablist = maxarr;
console.log(details.tablist);
}
async function updateApp() {
let version = await utils_utils.utils.getversion();
let data = {
betenantCode: common_vendor.index.getStorageSync("userinfo").tenant_id,
versionCode: version.version.split(".").join(""),
versionType: version.pkName.indexOf("test") != -1 ? "1" : version.pkName.indexOf("bate") != -1 ? "2" : "3"
};
console.log("data", data);
let response = await api_user.AppPdaversiondetail(data);
console.log("response :>> ", response);
if (response.code == 200 && response.data) {
console.log(response.data);
console.log("有可更新包");
if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) {
utils_utils.utils.updatefile1(response.data.link);
} else {
tip.value.setdetails({
title: "提示",
content: "检测到有新版本，请问是否更新？",
confirmTxt: "更新",
isshow: true,
isshowcancel: true,
success: async () => {
utils_utils.utils.updatefile(response.data.link);
tip.value.setisshow(false);
},
cancel: () => {
tip.value.setisshow(false);
if (response.data.isUpdates == "2") {
plus.runtime.quit();
}
},
close: () => {
tip.value.setisshow(false);
if (response.data.isUpdates == "2") {
plus.runtime.quit();
}
}
});
}
}
}
const { tablist } = common_vendor.toRefs(details);
return (_ctx, _cache) => {
return {

10
unpackage/dist/dev/mp-weixin/pages/index/index.wxss vendored
Unescape View File

@ -26,30 +26,28 @@
.mabox {
display: flex;
flex-direction: column;
padding: 20rpx 0;
box-sizing: border-box;
width: 686rpx;
margin: auto;
background-color: #ffffff;
margin-bottom: 20rpx;
margin-bottom: 10rpx;
margin-top: 10rpx;
border-radius: 10rpx;
box-shadow: 0rpx 2rpx 10rpx 0rpx #e2e2e380;
}
.mabox .boxtitl {
font-size: 34rpx;
font-size: 30rpx;
font-weight: 500;
margin-bottom: 10rpx;
border-bottom: 1rpx solid #EEEEEE;
padding: 0rpx 20rpx;
padding-bottom: 20rpx;
padding: 20rpx;
color: #092C4D;
}
.mabox .minboxlist {
display: flex;
flex-wrap: wrap;
align-items: center;
padding-top: 10rpx;
padding: 10rpx 0;
}
.mabox .minboxlist > view {
width: 25%;

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

@ -27,7 +27,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
{ icon: "/static/usericon3.png", name: "系统设置", type: 3 },
{ icon: "/static/usericon4.png", name: "安全设置", type: 4 },
{ icon: "/static/usericon5.png", name: "关于我们", type: 5 },
{ icon: "/static/usericon6.png", name: "检测更新", type: 6 },
// { icon: '/static/usericon6.png', name: '检测更新', type: 6 },
{ icon: "/static/usericon7.png", name: "分享", type: 7 },
{ icon: "/static/usericon8.png", name: "切换账号", type: 8 }
]);

11
unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js vendored
Unescape View File

@ -111,7 +111,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
completecode: details.orderType,
orderCode: details.inputtxt
};
let response1 = await api_user.signforinventory(data);
let response1 = await api_user.deliveryInventory(data);
details.stock.data = response1.data || [];
});
const loadingNub = common_vendor.computed(() => {
@ -120,6 +120,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
num += details.order.data.reduce((curr, item) => curr + item.loadingNub, 0);
if (details.zero.data)
num += details.zero.data.reduce((curr, item) => curr + item.loadingNub, 0);
console.log("details.stock.data :>> ", details.stock.data);
if (details.stock.data)
num += details.stock.data.reduce((curr, item) => {
if (item.loadingStatusName !== "未装车")
@ -177,6 +178,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
try {
const response = await api_user.deliveryorder(submitData);
const { data } = response;
if (response.code !== 200)
return;
details.zero.data = [];
details.order.data = [];
data.forEach((val) => {
@ -191,9 +194,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
async function initPageStock(submitData) {
try {
details.stock.data = [];
const response = await api_user.signforinventory(submitData);
const response = await api_user.deliveryInventory(submitData);
const { data } = response;
details.stock.data = data;
if (response.code !== 200)
return;
details.stock.data = data || [];
return response;
} catch (err) {
console.log("err :>> ", err);

10
unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js vendored
Unescape View File

@ -81,6 +81,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
console.log("details.imgList :>> ", details.imgList);
}
}
function gosetorice(item) {
common_vendor.index.navigateTo({
url: "/pagesHome/pages/SetPrice/SetPrice?reservationId=" + details.id + "&item=" + JSON.stringify(item)
});
}
const signNub = common_vendor.computed(() => {
let num = 0;
details.datalist.map((item) => {
@ -358,9 +363,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
m: common_vendor.o(($event) => getLocation(item)),
n: common_vendor.o(($event) => gosinorderscan(item)),
o: common_vendor.o(($event) => uplodimg(item)),
p: common_vendor.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送"
p: common_vendor.o(($event) => gosetorice(item)),
q: common_vendor.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送"
}, common_vendor.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送" ? {
q: common_vendor.o(($event) => allclick(item))
r: common_vendor.o(($event) => allclick(item))
} : {});
}),
n: common_vendor.sr(tiplists, "1f112ba4-1", {

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml vendored
Unescape View File

@ -1 +1 @@
<u-navbar wx:if="{{a}}" u-i="1f112ba4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>计划件数</view><view>{{j}}</view></view><view><view>装车数量</view><view>{{k}}</view></view><view><view>签收件数</view><view>{{l}}</view></view></view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabx"><view wx:for="{{m}}" wx:for-item="item" class="its"><view class="title"><view style="{{item.c}}">客户：{{item.a}} {{item.b}}</view><view class="statetype">{{item.d}}</view></view><view class="conxb"><view><view>订单总数</view><view>{{item.e}}</view></view><view><view>配送件数</view><view>{{item.f}}</view></view><view><view>扫描件数</view><view>{{item.g}}</view></view></view><view class="info"><view class=""> 客户电话: {{item.h}}</view><view class=""> 客户地址: {{item.i}}</view></view><view class="remarks"> 备注：{{item.j}}</view><view class="tbck"><view class="buts"><view class="{{item.l}}" bindtap="{{item.m}}">{{item.k}}</view><view bindtap="{{item.n}}">签收扫描</view><view bindtap="{{item.o}}">上传签收图片</view></view><view wx:if="{{item.p}}" class="mabut" bindtap="{{item.q}}"> 批量签收 </view></view></view></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="1f112ba4-1" bind:__l="__l"></tiplist>
<u-navbar wx:if="{{a}}" u-i="1f112ba4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>计划件数</view><view>{{j}}</view></view><view><view>装车数量</view><view>{{k}}</view></view><view><view>签收件数</view><view>{{l}}</view></view></view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabx"><view wx:for="{{m}}" wx:for-item="item" class="its"><view class="title"><view style="{{item.c}}">客户：{{item.a}} {{item.b}}</view><view class="statetype">{{item.d}}</view></view><view class="conxb"><view><view>订单总数</view><view>{{item.e}}</view></view><view><view>配送件数</view><view>{{item.f}}</view></view><view><view>扫描件数</view><view>{{item.g}}</view></view></view><view class="info"><view class=""> 客户电话: {{item.h}}</view><view class=""> 客户地址: {{item.i}}</view></view><view class="remarks"> 备注：{{item.j}}</view><view class="tbck"><view class="buts"><view class="{{item.l}}" bindtap="{{item.m}}">{{item.k}}</view><view bindtap="{{item.n}}">签收扫描</view><view bindtap="{{item.o}}">上传签收图片</view></view><view bindtap="{{item.p}}" class="mabut"> 设置增值服务 </view><view wx:if="{{item.q}}" class="mabut" bindtap="{{item.r}}"> 批量签收 </view></view></view></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="1f112ba4-1" bind:__l="__l"></tiplist>

85
unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js vendored
Unescape View File

@ -71,10 +71,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
common_vendor.watchEffect(() => {
if (Number(details.upshelfScanType) == 1 || Number(details.upshelfScanType) == 2) {
details.uplistarr = fn2(details.uplistarr, "orderCode");
} else if (Number(details.upshelfScanType) == 3) {
details.uplistarr = fn2(details.uplistarr, "orderPackageCode");
} else if (Number(details.upshelfScanType) == 4) {
details.uplistarr = fn2(details.uplistarr, "trayCode");
} else if (Number(details.upshelfScanType) == 3 || Number(details.upshelfScanType) == 4) {
details.uplistarr = fn2(details.uplistarr, "materialCode,incomingBatch");
}
});
function goorderdetail(item) {
@ -159,7 +157,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.uplistarr.push(item);
}
});
details.uplistarr = fn2(details.uplistarr, "orderCode");
details.uplistarr = fn2(details.uplistarr, "materialCode,incomingBatch");
details.showstate = 0;
details.codelist = [];
details.waybillCode = "";
@ -167,35 +165,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
function setshowstate(state) {
details.showstate = state;
}
async function scandata() {
var _a;
if (details.scancode[0] === "T") {
common_vendor.index.showToast({
title: "请扫描库位码",
icon: "none"
});
return;
}
let data = {
allocationId: details.scancode
};
let res = await api_user.warehouseUpdownTypeupShelfScanAllocation(data);
console.log(res);
if (res.code == 200) {
details.reqobj = res.data;
const _positionArr = details.reqobj.allocationTitle.split("-");
details.reqobj.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列";
details.allocationId = res.data.allocationId;
details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
console.log("details.pageName.slice(0, details.pageName.length - 3) :>> ", details.pageName);
utils_utils.utils.ttsspke("请输入" + details.pageName.slice(0, details.pageName.length - 2));
} else {
common_vendor.index.showToast({
title: res.msg,
icon: "none"
});
}
}
function uplist() {
if (details.uplistarr.length == 0) {
let content = "";
@ -228,7 +197,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
mask: true,
title: "上架中"
});
let res;
details.uplistarr.map((item) => {
if (item.enterNum > item.totalNumber) {
item.enterNum = item.totalNumber;
@ -239,30 +207,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
allocationId: details.allocationId,
upShelfZeroOrderList: details.uplistarr
};
res = await api_user.warehouseUpdownTypeupShelfZeroOrder(data);
await api_user.warehouseUpdownTypeupShelfZeroOrder(data);
} else if (Number(details.upshelfScanType) == 3 || Number(details.upshelfScanType) == 4) {
let data = {
allocationId: details.allocationId,
upShelfStockList: details.uplistarr
};
res = await api_user.warehouseUpdownTypeupShelfStockList(data);
await api_user.warehouseUpdownTypeupShelfStockList(data);
}
common_vendor.index.hideLoading();
console.log("res上架 :>> ", res);
if (res.code == 200) {
common_vendor.index.showToast({
title: "上架成功",
icon: "none"
});
details.uplistarr = [];
details.scancode = details.allocationId;
scandata();
} else {
common_vendor.index.showToast({
title: "上架失败",
icon: "error"
});
}
tip.value.setisshow(false);
},
cancel: () => {
@ -284,26 +237,32 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.checkstate = state;
}
function fn2(tempArr, fnname) {
const _fnnameArr = fnname.split(",");
console.log("_fnnameArr :>> ", _fnnameArr);
console.log("tempArr :>> ", tempArr);
let result = [];
tempArr.map((item) => {
if (result.length == 0) {
item.enterNum = Number(item.enterNum);
result.push(item);
} else {
let ckindex = -1;
result.map((ite, index) => {
if (ite[fnname] == item[fnname]) {
ckindex = index;
}
const _ckindex = result.findIndex((ite) => {
return _fnnameArr.every((key) => {
console.log("key :>> ", key);
console.log("ite[key] == item[key] :>> ", ite[key] == item[key]);
return ite[key] == item[key];
});
});
if (ckindex != -1) {
result[ckindex].enterNum += Number(item.enterNum);
console.log("_ckindex :>> ", _ckindex);
if (_ckindex != -1) {
result[_ckindex].enterNum += Number(item.enterNum);
} else {
item.enterNum = Number(item.enterNum);
result.push(item);
}
}
});
console.log("result :>> ", result);
return result;
}
let isClick = null;
@ -390,7 +349,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} : {}, {
j: item.goodsType === 2,
m: item.goodsType === 3,
r: common_vendor.t(item.totalNumber)
r: common_vendor.t(item.totalNumber),
s: common_vendor.t(item.enterNum)
});
})
} : {}, {
@ -424,9 +384,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} : {}, {
j: item.goodsType === 2,
m: item.goodsType === 3,
s: common_vendor.t(item.totalNum)
s: common_vendor.t(item.totalNum),
t: common_vendor.t(item.stockNum)
}, Number(common_vendor.unref(details).upshelfScanType) != 3 ? {
t: item.totalNum == item.shelfNum ? "/pagesHome/static/qitao.png" : "/pagesHome/static/weiqitao.png"
v: item.totalNum == item.shelfNum ? "/pagesHome/static/qitao.png" : "/pagesHome/static/weiqitao.png"
} : {});
}),
s: Number(common_vendor.unref(details).upshelfScanType) != 3

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.wxml vendored
View File

File diff suppressed because one or more lines are too long

17
unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js vendored
Unescape View File

@ -105,7 +105,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
let response = await api_user.distributionStockuppageListClient(data);
if (response.code !== 200)
return;
details.datalist = response.data.orderList;
details.datalist = [];
if (response.data && response.data.orderList)
details.datalist = response.data.orderList.map((val) => {
val.inventoryNub = val.inventoryNub !== 0 ? val.inventoryNub : 0;
val.planNum = val.planNum !== 0 ? val.planNum : 0;
return val;
});
details.items = response.data;
}
function goCustomerOrdersDetails(item) {
@ -134,10 +140,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
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.t(item.stockupNum || 0),
g: common_vendor.o(($event) => goCustomerOrdersDetails(item), item),
h: item
e: common_vendor.t(item.inventoryNub || 0),
f: common_vendor.t(item.planNum + item.inventoryNub),
g: common_vendor.t(item.stockupNum || 0),
h: common_vendor.o(($event) => goCustomerOrdersDetails(item), item),
i: item
};
})
} : {}, {

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

@ -1 +1 @@
<basic-container wx:if="{{i}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="4ad682fe-0" bind:__l="__l" u-p="{{i}}"><view class="hedtopt" slot="head"><view class="typto"><view>备货区域：<text class="vibx" bindtap="{{b}}">{{a}}</text></view></view><view class="typto"><view>备货编码：{{c}}</view></view><view class="typto"><view>备货状态：{{d}}</view><view>备货类型：{{e}}</view></view></view><scroll-view class="scoolv" scroll-y="true" slot="body"><view class="minbx"><block wx:if="{{f}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="h" class="its" bindtap="{{item.g}}"><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>{{item.f}}</view></view></view></view></view></block></view></scroll-view></basic-container><tiplist class="r" u-r="tiplists" u-i="4ad682fe-1" bind:__l="__l"></tiplist><tips class="r" u-r="tips" u-i="4ad682fe-2" bind:__l="__l"></tips>
<basic-container wx:if="{{i}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="4ad682fe-0" bind:__l="__l" u-p="{{i}}"><view class="hedtopt" slot="head"><view class="typto"><view>备货区域：<text class="vibx" bindtap="{{b}}">{{a}}</text></view></view><view class="typto"><view>备货编码：{{c}}</view></view><view class="typto"><view>备货状态：{{d}}</view><view>备货类型：{{e}}</view></view></view><scroll-view class="scoolv" scroll-y="true" slot="body"><view class="minbx"><block wx:if="{{f}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="i" class="its" bindtap="{{item.h}}"><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>{{item.f}}</view></view><view><view>已备数量</view><view>{{item.g}}</view></view></view></view></view></block></view></scroll-view></basic-container><tiplist class="r" u-r="tiplists" u-i="4ad682fe-1" bind:__l="__l"></tiplist><tips class="r" u-r="tips" u-i="4ad682fe-2" bind:__l="__l"></tips>

17
unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js vendored
Unescape View File

@ -94,12 +94,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
console.log("details.orderStatus :>> ", details.orderStatus);
details.user.consignee = (_a = response.data) == null ? void 0 : _a.consignee;
details.user.goodsAreaName = (_b = response.data) == null ? void 0 : _b.goodsAreaName;
details.user.planNum = (_c = response.data) == null ? void 0 : _c.planNum;
details.user.scanNum = (_d = response.data) == null ? void 0 : _d.scanNum;
details.orderList = (_e = response.data) == null ? void 0 : _e.orderList;
details.stockList = (_f = response.data) == null ? void 0 : _f.stockList;
details.orderList = ((_c = response.data) == null ? void 0 : _c.orderList) || [];
details.stockList = ((_d = response.data) == null ? void 0 : _d.stockList) || [];
if (details.orderStatus === 3)
details.zeroOrderList = (_g = response.data) == null ? void 0 : _g.orderList;
details.zeroOrderList = ((_e = response.data) == null ? void 0 : _e.orderList) || [];
details.user.planNum = (_f = response.data) == null ? void 0 : _f.planNum;
details.user.scanNum = (_g = response.data) == null ? void 0 : _g.scanNum;
details.isscan = false;
return null;
}
@ -126,6 +126,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
basicContainer.value.startPullDownRefresh();
}
async function goBarCode(item) {
if (!item.allocationList || item.allocationList.length === 0) {
common_vendor.index.showToast({
title: "该库存品没有上架数据",
icon: "none"
});
return;
}
console.log("item :>> ", item);
const _allocationList = item.allocationList.map((val) => val.name);
console.log("_allocationList :>> ", _allocationList);

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/scansorting/scansorting.js vendored
Unescape View File

@ -1,7 +1,6 @@
"use strict";
const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js");
const utils_utils = require("../../../utils/utils.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
require("../../../utils/request.js");
require("../../../store/index.js");
@ -129,7 +128,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
return;
console.log("res", res);
if (Number(res.data.isHasData) === 0) {
utils_utils.utils.ttsspke("请选择分拣方式");
common_vendor.index.setStorageSync("trayCodeType", res.data.data);
common_vendor.index.navigateTo({
url: "/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=" + details.scancode

80
unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js vendored
Unescape View File

@ -13,8 +13,9 @@ require("../../../utils/md5.js");
if (!Array) {
const _component_BasicContainer = common_vendor.resolveComponent("BasicContainer");
const _component_tiplist = common_vendor.resolveComponent("tiplist");
const _component_PopUp = common_vendor.resolveComponent("PopUp");
const _component_BluetoothList = common_vendor.resolveComponent("BluetoothList");
(_component_BasicContainer + _component_tiplist + _component_BluetoothList)();
(_component_BasicContainer + _component_tiplist + _component_PopUp + _component_BluetoothList)();
}
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "setbarcode",
@ -29,7 +30,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
reservationId: "",
codelist: [],
printlist: [],
packageNum: 0,
goodsAreaName: "",
allocationId: "",
positionCode: "",
@ -38,10 +38,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
customer: "",
deliveryAddress: "",
completeStact: false,
orderpackgedetails: {}
orderpackgedetails: {},
/** 新增包条数量 */
packageNum: 0
});
const tips = common_vendor.ref(null);
const basicContainer = common_vendor.ref(null);
const popUp_AddPrint = common_vendor.ref(null);
const popUp_Edit = common_vendor.ref(null);
const option = {
title: "配置包条码",
haveData: true,
@ -60,7 +64,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
if (op.completeStact == "true") {
details.completeStact = true;
}
console.log("111111111111111111111111111111111111111111");
});
common_vendor.onShow(() => {
const timer = setTimeout(() => {
@ -69,6 +72,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}, 200);
});
function setstockPrint(values) {
if (Number(details.items.planNum) === details.codelist.length) {
common_vendor.index.showToast({
title: "扫描完毕",
icon: "none"
});
return;
}
details.stockPrint = values;
if (values == 1) {
utils.ttsspke("请扫描原有包条码");
@ -97,33 +107,42 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
console.log(">>>>111111:", response);
}
function showmd() {
tips.value.setdetails({
list: details.printlist,
isshow: true,
tipstate: 1,
placeholder: "请输入需要生成的包条码数量",
success: (deta) => {
console.log(deta);
details.packageNum = deta.inputtext;
if (Number(details.packageNum) > Number(details.items.planNum)) {
const _maxNum = Number(details.items.planNum) - details.codelist.length;
if (_maxNum === 0) {
common_vendor.index.showToast({
title: "没有可用数量",
icon: "none"
});
utils.ttsspke("没有可用数量");
return;
}
popUp_AddPrint.value.setDetails({
title: "生成包条数量",
showPopUp: true,
success() {
details.packageNum = Number(details.packageNum);
if (details.packageNum > _maxNum) {
common_vendor.index.showToast({
title: "不能大于计划数量，请重新输入",
icon: "none"
});
tips.value.setdetails({ inputtext: "" });
return;
}
if (details.packageNum <= 0) {
common_vendor.index.showToast({
title: "数量必须大于0，请重新输入",
icon: "none"
});
}
ctokListpackage();
},
cancel: (details2) => {
tips.value.setdetails({ isshow: false });
},
close: (details2) => {
tips.value.setdetails({ isshow: false });
}
});
}
async function ctokListpackage() {
common_vendor.index.showLoading({
mask: true,
title: "数据请求中"
});
let data = {
reservationId: details.reservationId,
stockListId: details.items.stockListId,
@ -133,14 +152,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
cargoNumber: details.items.cargoNumber
};
let response = await api_user.distributionStockupstockupStockListPackageCode(data);
common_vendor.index.hideLoading();
if (response.code !== 200)
return;
popUp_AddPrint.value.details.showPopUp = false;
console.log(response);
details.printlist = response.data;
let checklist = [];
response.data.map((item, index) => {
checklist.push(index);
});
console.log("tips :>> ", tips);
tips.value.setdetails({
title: "请选择要打印的包条",
tipstate: 2,
@ -148,6 +170,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
checklist,
inputtext: "",
confirmTxt: "打印",
isshow: true,
success: (deta) => {
if (deta.checklist.length == 0) {
common_vendor.index.showToast({
@ -177,13 +200,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
f: common_vendor.t(common_vendor.unref(items).planNum),
g: common_vendor.t(common_vendor.unref(codelist).length),
h: common_vendor.o(($event) => setstockPrint(1)),
i: common_vendor.o(($event) => setstockPrint(0)),
i: common_vendor.o(($event) => setstockPrint(2)),
j: common_vendor.o(showmd),
k: common_vendor.f(common_vendor.unref(codelist), (item, index, i0) => {
return {
a: common_vendor.t(index + 1),
b: common_vendor.t(item.createTime),
c: common_vendor.t(item.packageCode)
c: common_vendor.t(item.code),
d: common_vendor.t(item.incomingBatch)
};
}),
l: common_vendor.sr(basicContainer, "592c6178-0", {
@ -195,7 +219,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
n: common_vendor.sr(tips, "592c6178-1", {
"k": "tips"
}),
o: common_vendor.sr(bluetoothList, "592c6178-2", {
o: common_vendor.t(Number(common_vendor.unref(details).items.planNum)),
p: common_vendor.t(Number(common_vendor.unref(details).items.planNum) - common_vendor.unref(details).codelist.length),
q: common_vendor.unref(details).packageNum,
r: common_vendor.o(($event) => common_vendor.unref(details).packageNum = $event.detail.value),
s: common_vendor.sr(popUp_AddPrint, "592c6178-2", {
"k": "popUp_AddPrint"
}),
t: common_vendor.sr(popUp_Edit, "592c6178-3", {
"k": "popUp_Edit"
}),
v: common_vendor.sr(bluetoothList, "592c6178-4", {
"k": "bluetoothList"
})
};

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml vendored
Unescape View File

@ -1 +1 @@
<basic-container wx:if="{{m}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="592c6178-0" bind:__l="__l" u-p="{{m}}"><view slot="head"><view class="head"><view class="type1"><view>物品：<view style="color:#092C4D">{{a}}</view></view></view><view class="type1"><view>货位：<view style="color:#092C4D">{{b}}</view></view><view>SKU：<view style="color:#092C4D">{{c}}</view></view></view><view class="type1"><view>规格：<view style="color:#092C4D">{{d}}</view></view><view>单位：<view style="color:#092C4D">{{e}}</view></view></view><view class="type1"><view>计划数量：<view style="color:#092C4D">{{f}}</view></view><view>已扫数量：<view style="color:#092C4D">{{g}}</view></view></view></view><view class="butsbx"><view bindtap="{{h}}">采集原包条码</view><view bindtap="{{i}}">扫描打印包条</view><view bindtap="{{j}}">新生成包码</view></view></view><scroll-view scroll-y="true" class="scrollv" slot="body"><view class="mabxs"><view wx:for="{{k}}" wx:for-item="item" class="ite"><view><view>序号：{{item.a}}</view><view>作业时间：{{item.b}}</view></view><view><view>包条码：{{item.c}}</view><view></view></view></view></view></scroll-view></basic-container><tiplist class="r" u-r="tips" u-i="592c6178-1" bind:__l="__l"></tiplist><bluetooth-list class="r" u-r="bluetoothList" u-i="592c6178-2" bind:__l="__l"></bluetooth-list>
<basic-container wx:if="{{m}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="592c6178-0" bind:__l="__l" u-p="{{m}}"><view slot="head"><view class="head"><view class="type1"><view>物品：<view style="color:#092C4D">{{a}}</view></view></view><view class="type1"><view>货位：<view style="color:#092C4D">{{b}}</view></view><view>SKU：<view style="color:#092C4D">{{c}}</view></view></view><view class="type1"><view>规格：<view style="color:#092C4D">{{d}}</view></view><view>单位：<view style="color:#092C4D">{{e}}</view></view></view><view class="type1"><view>计划数量：<view style="color:#092C4D">{{f}}</view></view><view>已扫数量：<view style="color:#092C4D">{{g}}</view></view></view></view><view class="butsbx"><view bindtap="{{h}}">采集原包条码</view><view bindtap="{{i}}">扫描打印包条</view><view bindtap="{{j}}">新生成包码</view></view></view><scroll-view scroll-y="true" class="scrollv" slot="body"><view class="mabxs"><view wx:for="{{k}}" wx:for-item="item" class="ite"><view><view>序号：{{item.a}}</view><view>作业时间：{{item.b}}</view></view><view><view>包条码：{{item.c}}</view><view></view></view><view><view>批次号：{{item.d}}</view><view></view></view></view></view></scroll-view></basic-container><tiplist class="r" u-r="tips" u-i="592c6178-1" bind:__l="__l"></tiplist><pop-up class="r" u-s="{{['d']}}" u-r="popUp_AddPrint" u-i="592c6178-2" bind:__l="__l"><view class=""> 计划件数: {{o}} 可用数量: {{p}}</view><input class="popUpInput" type="number" placeholder="新生成包条数量" value="{{q}}" bindinput="{{r}}"/></pop-up><pop-up class="r" u-s="{{['d']}}" u-r="popUp_Edit" u-i="592c6178-3" bind:__l="__l"><view class="popUp_Edit_text"> 检测当前批次和计划批次不同，是否切换批次 </view></pop-up><bluetooth-list class="r" u-r="bluetoothList" u-i="592c6178-4" bind:__l="__l"></bluetooth-list>

12
unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxss vendored
Unescape View File

@ -89,8 +89,6 @@
justify-content: center;
border: 2rpx solid #D3832A;
color: #D3832A;
}
.butsbx > view:nth-of-type(2) {
margin-left: 20rpx;
}
.head {
@ -119,4 +117,14 @@
}
.head > .type1 > view > view:nth-of-type(1) {
flex: 1;
}
.popUpInput {
border: 3rpx solid #ccc;
margin-top: 10rpx;
border-radius: 5rpx;
padding: 5rpx 10rpx;
}
.popUp_Edit_text {
font-size: 28rpx;
color: #f00;
}

11
unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js vendored
Unescape View File

@ -97,11 +97,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
return;
details.zeroArr = [];
details.orderArr = [];
response.data.records.forEach((val) => {
if (val.isZero === "1")
return details.zeroArr.push(val);
details.orderArr.push(val);
});
if (response.data && response.data.records)
response.data.records.forEach((val) => {
if (val.isZero === "1")
return details.zeroArr.push(val);
details.orderArr.push(val);
});
let response1 = await api_user.signforinventory(data);
if (response1.code !== 200)
return;

10
unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js vendored
Unescape View File

@ -36,6 +36,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
taskTime_start: "",
taskTime_end: "",
datalist: [],
orderList: [],
stockList: [],
current: 1,
size: 5,
checkstate: 1
@ -96,7 +98,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
return;
console.log("response :>> ", response);
if (details.current == 1) {
details.datalist = response.data.records;
if (details.checkstate === data.type) {
details.datalist = response.data.records;
}
} else {
if (response.data.records.lngth == 0) {
common_vendor.index.showToast({
@ -106,7 +110,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.current--;
return;
}
details.datalist = details.datalist.concat(response.data.records);
if (details.checkstate === data.type) {
details.datalist = details.datalist.concat(response.data.records);
}
}
return;
}

Write Preview
Loading…
Cancel
Save