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

合并

master
qb 1 year ago
parent
1bb3f9a76c 81f875f3e4
commit
c627d32658
24 changed files with 445 additions and 263 deletions
Split View
  1. 2
      compoment/tiplist/tiplist.vue
  2. 4
      config/host.js
  3. 5
      manifest.json
  4. 9
      pages/user/user.vue
  5. 19
      pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
  6. 2
      pagesHome/pages/CustomerSign/CustomerSign.vue
  7. 2
      pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
  8. 7
      pagesHome/pages/StockUplist/StockUplist.vue
  9. 4
      pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
  10. 181
      pagesHome/pages/signOrderScan/signOrderScan.vue
  11. BIN
      static/appIcon/favicon.png
  12. 330
      unpackage/dist/dev/app-plus/app-service.js
  13. 2
      unpackage/dist/dev/app-plus/app.css
  14. 4
      unpackage/dist/dev/app-plus/manifest.json
  15. 4
      unpackage/dist/dev/app-plus/pages/user/user.css
  16. 4
      unpackage/dist/dev/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css
  17. 4
      unpackage/dist/dev/app-plus/pagesHome/pages/signOrderScan/signOrderScan.css
  18. 110
      unpackage/dist/dev/mp-weixin/api/user.js
  19. 3
      unpackage/dist/dev/mp-weixin/app.js
  20. 2
      unpackage/dist/dev/mp-weixin/config/host.js
  21. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js
  22. 4
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js
  23. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js
  24. 2
      utils/request.js

2
compoment/tiplist/tiplist.vue
Unescape View File

@ -443,7 +443,7 @@
&.showTitle {
&::after {
content: '最少传入三张图片';
content: '最少传入一张图片';
margin-left: 20upx;
color: #f00;
}

4
config/host.js
Unescape View File

@ -15,9 +15,9 @@
// const devhost = 'http://192.168.6.148:9777/'
// const devhost = 'http://192.168.6.141:8777/'
// cg
// const devhost = 'http://192.168.10.57:13000/'
const devhost = 'http://192.168.10.57:13000/'
// 正式
const devhost = 'https://h5uapi.huitongys.com/'
// const devhost = 'https://h5uapi.huitongys.com/'
// cg
// const devhost = 'http://192.168.10.200:13000/'
/**

5
manifest.json
Unescape View File

@ -2,8 +2,13 @@
"name" : "货无忧",
"appid" : "__UNI__EB22F37",
"description" : "",
<<<<<<< HEAD
"versionName" : "1.1.06",
"versionCode" : 1106,
=======
"versionName" : "1.1.07",
"versionCode" : 1107,
>>>>>>> dev
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

9
pages/user/user.vue
Unescape View File

@ -2,13 +2,13 @@
<view class="titles">个人中心</view>
<image class="usebg" src="/static/userbg.png"></image>
<view class="userviews" @click="gologin" v-if="!(users?.user_id)">
<image src="/static/userimg.png"></image>
<image class="profilePhoto" src="/static/appIcon/favicon.png"></image>
<view>
<view>未登录</view>
</view>
</view>
<view class="userviews" v-if="users?.user_id">
<image src="/static/userimg.png"></image>
<image class="profilePhoto" src="/static/appIcon/favicon.png"></image>
<view>
<view>{{users.real_name}}</view>
<view>
@ -541,4 +541,9 @@
height: 400upx;
background-color: #FA8C16da;
}
.profilePhoto {
background: #fff;
border-radius: 10upx;
}
</style>

19
pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
Unescape View File

@ -86,7 +86,8 @@
<block v-for="ite in item.distributionAppParcelListVOS">
<uni-tr
:class="{'active': Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1}">
<uni-td>{{ite.orderPackageCode}}</uni-td>
<uni-td
:class="{'isScan': ite.orderPackageLoadingStatus !== '20'}">{{ite.orderPackageCode}}</uni-td>
<uni-td>{{ite.thirdProduct}}</uni-td>
<uni-td>{{ite.isScan}}</uni-td>
<uni-td
@ -390,6 +391,8 @@
}
async function initpage() {
details.listcheckindex = -1
try {
let data = {
reservationId: details.items.id,
@ -549,6 +552,8 @@
/** 扫描接口
* */
async function scandata() {
let code = 0
try {
let loadingId = uni.getStorageSync('checkvehicle').id
// 定制品
@ -561,7 +566,8 @@
barcode: details.scancode
}
let res = await deliveryloadingscan(data)
const { code, audio } = res
const { audio } = res
code = res.code
// 异常装车
if (code === 5000) {
utils.ttsspke('不在本次计划, 是否继续装车')
@ -584,6 +590,10 @@
}
// 提价异常装车请求
const res = await postAbnormalTruckLoading(data)
if (res.code !== 200) return
basicContainer.value.startPullDownRefresh()
console.log('res :>> ', res);
tiplists.value.setdetails({ isshow: false })
},
@ -1047,4 +1057,9 @@
.uni-scroll-view {
overflow: hidden;
}
.isScan {
background: var(--subjectColor);
color: #fff;
}
</style>

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

@ -52,7 +52,7 @@
<view>{{item.ordNub}}</view>
</view>
<view>
<view>配送件数</view>
<view>计划件数</view>
<view>{{item.reservationNum}}</view>
</view>
<view>

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

@ -217,7 +217,7 @@
let response = await warehouseTrayTypeorderDetail(data)
if (response.code !== 200) return
details.list = response.data.parcelList
details.detaobj = response.data
details.detaobj = response.data || []
let set = new Set()
response.data.parcelList.map(item => {
set.add(item.trayName)

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

@ -320,10 +320,9 @@
async function ckscanningCode(item : any) {
let content = '请扫描托盘码'
if (!details.goodsStockupAllocationId) {
content = '请先扫描库位码'
return
}
// if (!details.goodsStockupAllocationId) {
// content = '请先扫描库位码'
// }
details.isscan = item.taryLean
details.trayId = item.trayId
uni.showToast({

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

@ -286,6 +286,8 @@
})
}
async function scandata() {
if (Number(details.planNum) === Number(details.scanNum)) return utils.handleToast('该客户已齐套, 请返回上一级页面')
// 查看模式不执行扫描
if (Number(details.status) !== 0) return
let data = {
@ -334,7 +336,7 @@
details.warehouseArea = response.data.warehouseArea
details.address = response.data.address
if (Number(details.scanNum) > 0 && details.isscan) {
utils.ttsspke('扫描' + details.scanNum + '件')
utils.ttsspke(details.scanNum + '件')
}
}
const { dataList } = toRefs(details)

181
pagesHome/pages/signOrderScan/signOrderScan.vue
Unescape View File

@ -18,7 +18,7 @@
</view>
<view>
<view>计划件数</view>
<view>{{Plannednub}}</view>
<view>{{details.Plannednub}}</view>
</view>
<view>
<view>配送件数</view>
@ -26,7 +26,7 @@
</view>
<view>
<view>签收件数</view>
<view>{{signNub}}</view>
<view>{{details.signNub}}</view>
</view>
</view>
</view>
@ -64,12 +64,11 @@
</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">总数：</text>{{item.reservationNum}}</view>
<view><text style="color: #90A0AF;">计划：</text>{{item.reservationNum}}</view>
<view><text style="color: #90A0AF;">装车：</text>{{item.loadingNub}}</view>
<view><text style="color: #90A0AF;">签收：</text>{{item.signforNub}}</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">计划：</text>{{item.reservationNum}}</view>
<view><text style="color: #90A0AF;">异常装车：</text>{{item.abnormalLoading}}</view>
<view><text style="color: #90A0AF;">异常签收：</text>{{item.abnormalSignature}}</view>
</view>
@ -85,7 +84,8 @@
<block v-for="ite in item.distributionAppParcelListVOS">
<uni-tr
:class="{'active': Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1}">
<uni-td>{{ite.orderPackageCode}}</uni-td>
<uni-td
:class="{'isScan': ite.orderPackageStatus !== '70'}">{{ite.orderPackageCode}}</uni-td>
<uni-td>{{ite.thirdProduct}}</uni-td>
<uni-td>{{ite.orderPackageStatus === '70'?'已扫':'未扫'}}</uni-td>
<uni-td
@ -209,32 +209,22 @@
inputtxt: '',
listcheckindex: -1,
scrollHeight: '',
/** 计划件数 */
Plannednub: 0,
/** 签收数 */
signNub: 0,
})
const tiplists = ref(null)
const tip = ref(null)
const Plannednub = computed(() => {
let num = 0
// 将所有订单的计划件数相加
num += details.orderArr.reduce((curr, item) => curr + item.reservationNum, 0)
num += details.zeroArr.reduce((curr, item) => curr + item.reservationNum, 0)
num += details.stockArr.reduce((curr, item) => curr + item.reservationNum, 0)
return num
})
const ordNub = computed(() => {
let num = 0
num += details.orderArr.length
num += details.zeroArr.length
return num
})
const signNub = computed(() => {
let num = 0
details.datalist.map(item => {
if (item.signforNub) {
num += item.signforNub
}
})
return num
})
onLoad(async (op) => {
// #ifdef APP
utils.ttsspke('请扫描包条码')
@ -267,13 +257,18 @@
}
details.datalist = []
const promise1 = signfororder(data, { isShowLoading: false })
const promise2 = signforinventory(data, { isShowLoading: false })
uni.showLoading()
const [response, response1] = await Promise.all([promise1, promise2])
// 零担和定制品
let response = null
response = await signfororder(data)
// let response = null
// response = await signfororder(data)
if (response.code !== 200) return
details.zeroArr = []
details.orderArr = []
if (response.data && response.data.records) response.data.records.forEach(val => {
if (response.data && response.data) response.data.forEach(val => {
// 零担订单
if (val.isZero === '1') return details.zeroArr.push(val)
@ -289,12 +284,12 @@
details.orderArr.push(val)
})
// 库存品
let response1 = await signforinventory(data)
// let response1 = await signforinventory(data)
if (response1.code !== 200) return
if (response1.data) details.stockArr = response1.data.records || []
if (response1.data) details.stockArr = response1.data || []
computedNum()
console.log('response :>> ', response);
console.log('response1 :>> ', response1);
// 定制品
if (details.orderStatus === 1) details.datalist = details.orderArr
// 零担
@ -304,6 +299,9 @@
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
} finally {
await nextTick()
uni.hideLoading()
}
})
@ -325,14 +323,25 @@
})
}
/** 计算数据 */
function computedNum() {
const _arr = [...details.orderArr, ...details.zeroArr, ...details.stockArr]
details.Plannednub = 0
details.signNub = 0
for (let item of _arr) {
details.Plannednub += item.reservationNum
details.signNub += item.signforNub
}
}
// 页面下拉刷新
onPullDownRefresh(() => {
const timer = setTimeout(() => {
initpage()
// 关闭下拉动画
uni.stopPullDownRefresh()
clearTimeout(timer)
}, 500)
onPullDownRefresh(async () => {
await initpage()
// 关闭下拉动画
uni.stopPullDownRefresh()
})
async function scandata() {
let data = {
@ -367,6 +376,7 @@
title: response.msg,
icon: 'none'
})
initpage()
tip.value.setdetails({ isshow: false })
},
cancel: () => {
@ -376,6 +386,8 @@
tip.value.setdetails({ isshow: false })
}
})
return
} else {
uni.showToast({
title: response.msg,
@ -403,6 +415,7 @@
title: response.msg,
icon: 'none'
})
initpage()
tip.value.setdetails({ isshow: false })
},
cancel: () => {
@ -412,6 +425,7 @@
tip.value.setdetails({ isshow: false })
}
})
return
} else {
uni.showToast({
title: response.msg,
@ -467,49 +481,59 @@
}
}
async function initpage() {
let data = {
reservationId: details.id,
completecode: details.orderType,
orderCode: details.inputtxt,
}
details.datalist = []
let response = null;
// 定制品和零担
if (details.orderStatus == 1 || details.orderStatus === 2) {
response = await signfororder(data)
if (response.code !== 200) return
details.zeroArr = []
details.orderArr = []
response.data.records.forEach(val => {
// 零担订单
if (val.isZero === '1') return details.zeroArr.push(val)
try {
details.listcheckindex = -1
// 异常签收
val.abnormalSignature = 0
// 异常装车
val.abnormalLoading = 0
val.distributionAppParcelListVOS.forEach(value => {
if (value.isAbnnormalSigning === 1) val.abnormalSignature += 1
if (value.isAbnormalLoading === 1) val.abnormalLoading += 1
let data = {
reservationId: details.id,
completecode: details.orderType,
orderCode: details.inputtxt,
}
details.datalist = []
let response = null;
// 定制品和零担
if (details.orderStatus == 1 || details.orderStatus === 2) {
response = await signfororder(data)
if (response.code !== 200) return
details.zeroArr = []
details.orderArr = []
response.data.forEach(val => {
// 零担订单
if (val.isZero === '1') return details.zeroArr.push(val)
// 异常签收
val.abnormalSignature = 0
// 异常装车
val.abnormalLoading = 0
val.distributionAppParcelListVOS.forEach(value => {
if (value.isAbnnormalSigning === 1) val.abnormalSignature += 1
if (value.isAbnormalLoading === 1) val.abnormalLoading += 1
})
console.log('val :>> ', val);
details.orderArr.push(val)
})
console.log('val :>> ', val);
details.orderArr.push(val)
})
}
// 库存品
else if (details.orderStatus == 3) {
response = await signforinventory(data)
if (response.code !== 200) return
details.stockArr = response.data.records || []
}
// 库存品
else if (details.orderStatus == 3) {
response = await signforinventory(data)
if (response.code !== 200) return
details.stockArr = response.data || []
}
// 定制品
if (details.orderStatus === 1) details.datalist = details.orderArr
// 零担
else if (details.orderStatus === 2) details.datalist = details.zeroArr
// 库存品
else details.datalist = details.stockArr
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
} finally {
computedNum()
return null
}
// 定制品
if (details.orderStatus === 1) details.datalist = details.orderArr
// 零担
else if (details.orderStatus === 2) details.datalist = details.zeroArr
// 库存品
else details.datalist = details.stockArr
}
function setcheckindex(index : number) {
if (details.listcheckindex == index) {
@ -907,6 +931,11 @@
}
}
.isScan {
background: var(--subjectColor);
color: #fff;
}
.uni-table .active:hover {
background: #ff4344 !important;
}

BIN
static/appIcon/favicon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

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

@ -1747,7 +1747,7 @@ if (uni.restoreGlobal) {
};
};
const Base64$1 = new Base64();
const devhost = "http://192.168.10.200:13000/";
const devhost = "http://192.168.10.25:13000/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";
@ -2235,7 +2235,8 @@ if (uni.restoreGlobal) {
utils.ttsspke("请检查是否连接到无线网络");
}).finally(async (res) => {
await vue.nextTick();
uni.hideLoading();
if (loadingObj.isShowLoading !== false)
uni.hideLoading();
});
});
};
@ -8767,7 +8768,10 @@ This will fail in production if not fixed.`);
class: "userviews",
onClick: gologin
}, [
vue.createElementVNode("image", { src: "/static/userimg.png" }),
vue.createElementVNode("image", {
class: "profilePhoto",
src: "/static/appIcon/favicon.png"
}),
vue.createElementVNode("view", null, [
vue.createElementVNode("view", null, "未登录")
])
@ -8776,7 +8780,10 @@ This will fail in production if not fixed.`);
key: 1,
class: "userviews"
}, [
vue.createElementVNode("image", { src: "/static/userimg.png" }),
vue.createElementVNode("image", {
class: "profilePhoto",
src: "/static/appIcon/favicon.png"
}),
vue.createElementVNode("view", null, [
vue.createElementVNode(
"view",
@ -19919,10 +19926,6 @@ This will fail in production if not fixed.`);
}
async function ckscanningCode(item) {
let content = "请扫描托盘码";
if (!details.goodsStockupAllocationId) {
content = "请先扫描库位码";
return;
}
details.isscan = item.taryLean;
details.trayId = item.trayId;
uni.showToast({
@ -19949,9 +19952,9 @@ This will fail in production if not fixed.`);
});
return;
}
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:357", "item :>> ", item);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:356", "item :>> ", item);
const _allocationList = item.allocationList.map((val) => val.name);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:359", "_allocationList :>> ", _allocationList);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:358", "_allocationList :>> ", _allocationList);
if (_allocationList.length === 1) {
return uni.navigateTo({
url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + item.allocationList[0].id + "&positionCode=" + item.allocationList[0].name + "&mallName=" + details.items.mallName
@ -19976,7 +19979,7 @@ This will fail in production if not fixed.`);
});
return;
}
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:392", "deta :>> ", deta);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:391", "deta :>> ", deta);
const _index = deta.checklist[0];
uni.navigateTo({
url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + item.allocationList[_index].id + "&positionCode=" + item.allocationList[_index].name + "&mallName=" + details.items.mallName
@ -20014,7 +20017,7 @@ This will fail in production if not fixed.`);
utils2.ttsspke(res.audio);
basicContainer.value.startPullDownRefresh();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:453", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:452", "err :>> ", err);
} finally {
details.isscan = false;
uni.hideLoading();
@ -20022,9 +20025,9 @@ This will fail in production if not fixed.`);
};
function scanChooseStorage() {
const _allocationList = details.chooseItem.allocationList;
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:464", "_allocationList :>> ", _allocationList);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:463", "_allocationList :>> ", _allocationList);
const _item = _allocationList.find((val) => val.id + "" === details.scancode + "");
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:466", "_item :>> ", _item);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:465", "_item :>> ", _item);
if (!_item)
return uni.showToast({
title: "该货位无此物料",
@ -20056,7 +20059,7 @@ This will fail in production if not fixed.`);
let inpList = [];
if (code2 !== 200)
return;
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:513", "res.data :>> ", res.data);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:512", "res.data :>> ", res.data);
inpList = res.data.map((val) => {
return {
id: val.id,
@ -20100,7 +20103,7 @@ This will fail in production if not fixed.`);
confirmTxt: "确认选择",
isonecheck: true,
success: async (deta) => {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:562", "deta :>> ", deta);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:561", "deta :>> ", deta);
if (deta.inpList.length === 0 || item.completeStact)
return tiplists.value.setdetails({ isshow: false });
let data2 = {
@ -20114,7 +20117,7 @@ This will fail in production if not fixed.`);
if (deta.inpList[0].allocationId)
data2.allocationId = deta.inpList[0].allocationId;
const _flag = deta.inpList.every((val) => {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:574", "val :>> ", val);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:573", "val :>> ", val);
if (val.value < val.minNum) {
uni.showToast({
title: "不能小于当前数量"
@ -20122,7 +20125,7 @@ This will fail in production if not fixed.`);
return false;
}
if (val.value > val.minNum) {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:582", "1 :>> ", 1);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:581", "1 :>> ", 1);
data2.list.push({
firsts: val.title,
id: val.id,
@ -20141,7 +20144,7 @@ This will fail in production if not fixed.`);
});
}
const res2 = await postZeroStockUp(data2);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:603", "res :>> ", res2);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:602", "res :>> ", res2);
const { code: code22 } = res2;
if (code22 === 200) {
tiplists.value.setdetails({ isshow: false });
@ -20160,7 +20163,7 @@ This will fail in production if not fixed.`);
});
}
function printOrderCode(item) {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:629", "item :>> ", item);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:628", "item :>> ", item);
tiplists.value.setdetails({
title: "生成订单编号二维码数量",
isshow: true,
@ -20192,7 +20195,7 @@ This will fail in production if not fixed.`);
for (let i = 0; i <= _inputValue; i++) {
if (_isReturn)
return;
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:664", "i :>> ", i);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:663", "i :>> ", i);
let text = "! 0 200 200 330 1\r\n";
text += "SETBOLD 2\r\n";
text += `T 56 0 0 0 ${item.orderCode}\r
@ -20222,7 +20225,7 @@ This will fail in production if not fixed.`);
text += "FORM\r\n";
text += "PRINT\r\n";
let sylist = utils2.initbl();
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:686", sylist);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:685", sylist);
utils2.getbl(bluetoothInfo.value, text).catch(() => {
bluetoothList.value.setdetails({ isshow: true });
_isReturn = true;
@ -20845,6 +20848,8 @@ This will fail in production if not fixed.`);
});
}
async function scandata() {
if (Number(details.planNum) === Number(details.scanNum))
return utils.handleToast("该客户已齐套");
if (Number(details.status) !== 0)
return;
let data = {
@ -20858,7 +20863,7 @@ This will fail in production if not fixed.`);
typeService: details.typeService
};
let res = await distributionStockupstockupScan(data);
formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:302", res);
formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:304", res);
if (res.code == 200) {
details.isscan = true;
basicContainer.value.startPullDownRefresh();
@ -20883,7 +20888,7 @@ This will fail in production if not fixed.`);
let response = await distributionStockuporderInfo(data);
if (response.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:327", response);
formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:329", response);
details.dataList = response.data.packageList;
details.customer = response.data.customer;
details.stockupArea = response.data.stockupArea;
@ -20893,7 +20898,7 @@ This will fail in production if not fixed.`);
details.warehouseArea = response.data.warehouseArea;
details.address = response.data.address;
if (Number(details.scanNum) > 0 && details.isscan) {
utils.ttsspke("扫描" + details.scanNum + "件");
utils.ttsspke(details.scanNum + "件");
}
}
const { dataList } = vue.toRefs(details);
@ -24356,7 +24361,7 @@ This will fail in production if not fixed.`);
uni.$off("scancodedate");
uni.$on("scancodedate", function(code2) {
if (code2) {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:296", "code", code2);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:297", "code", code2);
details.scancode = code2;
details.isscan = true;
scandata();
@ -24377,7 +24382,7 @@ This will fail in production if not fixed.`);
vue.onMounted(async () => {
await vue.nextTick();
details.scrollHeight = utils2.getViewDistanceFormTop(".scve").then((res) => {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:326", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:327", "res :>> ", res);
details.scrollHeight = res;
});
});
@ -24387,14 +24392,14 @@ This will fail in production if not fixed.`);
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);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:362", "details.stock.data :>> ", details.stock.data);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:363", "details.stock.data :>> ", details.stock.data);
if (details.stock.data)
num += details.stock.data.reduce((curr, item) => {
if (item.loadingStatusName !== "未装车")
return curr += 1;
return curr;
}, 0);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:367", "num :>> ", num);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:368", "num :>> ", num);
return num;
});
function showsdqs() {
@ -24418,6 +24423,7 @@ This will fail in production if not fixed.`);
});
}
async function initpage() {
details.listcheckindex = -1;
try {
let data = {
reservationId: details.items.id,
@ -24436,7 +24442,7 @@ This will fail in production if not fixed.`);
else
details.datalist = details.stock.data;
} catch (err) {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:412", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:415", "err :>> ", err);
} finally {
return null;
}
@ -24455,7 +24461,7 @@ This will fail in production if not fixed.`);
details.order.data.push(val);
});
} catch (err) {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:435", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:438", "err :>> ", err);
}
}
async function initPageStock(submitData) {
@ -24468,7 +24474,7 @@ This will fail in production if not fixed.`);
details.stock.data = data || [];
return response;
} catch (err) {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:453", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:456", "err :>> ", err);
}
}
function checktype(e) {
@ -24497,7 +24503,7 @@ This will fail in production if not fixed.`);
details.datalist = details.zero.data;
else
details.datalist = details.stock.data;
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:491", " details.datalist :>> ", details.datalist);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:494", " details.datalist :>> ", details.datalist);
}
function reatchBootomOrder() {
if (details.order.pages <= details.order.page.current) {
@ -24530,7 +24536,7 @@ This will fail in production if not fixed.`);
initpage();
}
function reatchBottom() {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:540", "111 :>> ", 111);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:543", "111 :>> ", 111);
if (details.orderStatus === 1)
reatchBootomOrder();
else if (details.orderStatus === 2)
@ -24539,6 +24545,7 @@ This will fail in production if not fixed.`);
reatchBootomStock();
}
async function scandata() {
let code2 = 0;
try {
let loadingId = uni.getStorageSync("checkvehicle").id;
if (details.orderStatus == 1) {
@ -24550,7 +24557,8 @@ This will fail in production if not fixed.`);
barcode: details.scancode
};
let res = await deliveryloadingscan(data);
const { code: code2, audio } = res;
const { audio } = res;
code2 = res.code;
if (code2 === 5e3) {
utils2.ttsspke("不在本次计划, 是否继续装车");
tiplists.value.setdetails({
@ -24569,7 +24577,10 @@ This will fail in production if not fixed.`);
barcode: details.scancode
};
const res2 = await postAbnormalTruckLoading(data2);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:587", "res :>> ", res2);
if (res2.code !== 200)
return;
basicContainer.value.startPullDownRefresh();
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:597", "res :>> ", res2);
tiplists.value.setdetails({ isshow: false });
},
cancel: () => {
@ -24592,13 +24603,13 @@ This will fail in production if not fixed.`);
};
let res = await deliveryloadinginventory(data);
const { audio } = res;
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:611", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:621", "res :>> ", res);
if (!audio)
return;
utils2.ttsspke(res.audio);
}
} catch (err) {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:618", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:628", "err :>> ", err);
} finally {
basicContainer.value.startPullDownRefresh();
}
@ -24657,7 +24668,7 @@ This will fail in production if not fixed.`);
}
basicContainer.value.startPullDownRefresh();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:686", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:696", "err :>> ", err);
} finally {
uni.hideLoading();
tiplists.value.setdetails({ isshow: false });
@ -24963,23 +24974,19 @@ This will fail in production if not fixed.`);
class: vue.normalizeClass({ "active": Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 })
}, {
default: vue.withCtx(() => [
vue.createVNode(
_component_uni_td,
null,
{
default: vue.withCtx(() => [
vue.createTextVNode(
vue.toDisplayString(ite.orderPackageCode),
1
/* TEXT */
)
]),
_: 2
/* DYNAMIC */
},
1024
/* DYNAMIC_SLOTS */
),
vue.createVNode(_component_uni_td, {
class: vue.normalizeClass({ "isScan": ite.orderPackageLoadingStatus !== "20" })
}, {
default: vue.withCtx(() => [
vue.createTextVNode(
vue.toDisplayString(ite.orderPackageCode),
1
/* TEXT */
)
]),
_: 2
/* DYNAMIC */
}, 1032, ["class"]),
vue.createVNode(
_component_uni_td,
null,
@ -26241,32 +26248,20 @@ This will fail in production if not fixed.`);
orderType: "",
inputtxt: "",
listcheckindex: -1,
scrollHeight: ""
scrollHeight: "",
/** 计划件数 */
Plannednub: 0,
/** 签收数 */
signNub: 0
});
const tiplists = vue.ref(null);
const tip = vue.ref(null);
const Plannednub = vue.computed(() => {
let num = 0;
num += details.orderArr.reduce((curr, item) => curr + item.reservationNum, 0);
num += details.zeroArr.reduce((curr, item) => curr + item.reservationNum, 0);
num += details.stockArr.reduce((curr, item) => curr + item.reservationNum, 0);
return num;
});
const ordNub = vue.computed(() => {
let num = 0;
num += details.orderArr.length;
num += details.zeroArr.length;
return num;
});
const signNub = vue.computed(() => {
let num = 0;
details.datalist.map((item) => {
if (item.signforNub) {
num += item.signforNub;
}
});
return num;
});
onLoad(async (op) => {
utils2.ttsspke("请扫描包条码");
details.items = JSON.parse(op.item);
@ -26278,7 +26273,7 @@ This will fail in production if not fixed.`);
uni.$off("scancodedate");
uni.$on("scancodedate", function(code2) {
if (code2) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:255", code2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:245", code2);
details.scancode = code2;
scandata();
}
@ -26289,14 +26284,16 @@ This will fail in production if not fixed.`);
orderCode: details.inputtxt
};
details.datalist = [];
let response = null;
response = await signfororder(data);
const promise1 = signfororder(data, { isShowLoading: false });
const promise2 = signforinventory(data, { isShowLoading: false });
uni.showLoading();
const [response, response1] = await Promise.all([promise1, promise2]);
if (response.code !== 200)
return;
details.zeroArr = [];
details.orderArr = [];
if (response.data && response.data.records)
response.data.records.forEach((val) => {
if (response.data && response.data)
response.data.forEach((val) => {
if (val.isZero === "1")
return details.zeroArr.push(val);
val.abnormalSignature = 0;
@ -26309,13 +26306,11 @@ This will fail in production if not fixed.`);
});
details.orderArr.push(val);
});
let response1 = await signforinventory(data);
if (response1.code !== 200)
return;
if (response1.data)
details.stockArr = response1.data.records || [];
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:296", "response :>> ", response);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:297", "response1 :>> ", response1);
details.stockArr = response1.data || [];
computedNum();
if (details.orderStatus === 1)
details.datalist = details.orderArr;
else if (details.orderStatus === 2)
@ -26323,13 +26318,16 @@ This will fail in production if not fixed.`);
else
details.datalist = details.stockArr;
} catch (err) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:305", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:300", "err :>> ", err);
} finally {
await vue.nextTick();
uni.hideLoading();
}
});
vue.onMounted(async () => {
await vue.nextTick();
utils2.getViewDistanceFormTop(".scve").then((res) => {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:317", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:315", "res :>> ", res);
details.scrollHeight = res;
});
});
@ -26338,12 +26336,18 @@ This will fail in production if not fixed.`);
url: "/pagesHome/pages/orderDetails/orderDetails?orderCode=" + item.orderCode
});
}
onPullDownRefresh(() => {
const timer = setTimeout(() => {
initpage();
uni.stopPullDownRefresh();
clearTimeout(timer);
}, 500);
function computedNum() {
const _arr = [...details.orderArr, ...details.zeroArr, ...details.stockArr];
details.Plannednub = 0;
details.signNub = 0;
for (let item of _arr) {
details.Plannednub += item.reservationNum;
details.signNub += item.signforNub;
}
}
onPullDownRefresh(async () => {
await initpage();
uni.stopPullDownRefresh();
});
async function scandata() {
let data = {
@ -26353,7 +26357,7 @@ This will fail in production if not fixed.`);
};
if (Number(details.orderStatus) == 1) {
let response = await signforsignfor(data);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:346", response);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:355", response);
if (response.code === 200)
;
else if (response.code == 3006) {
@ -26369,11 +26373,12 @@ This will fail in production if not fixed.`);
let response2 = await signforsignforcontinue(data2);
if (response2.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:365", response2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:374", response2);
uni.showToast({
title: response2.msg,
icon: "none"
});
initpage();
tip.value.setdetails({ isshow: false });
},
cancel: () => {
@ -26383,6 +26388,7 @@ This will fail in production if not fixed.`);
tip.value.setdetails({ isshow: false });
}
});
return;
} else {
uni.showToast({
title: response.msg,
@ -26391,7 +26397,7 @@ This will fail in production if not fixed.`);
}
} else if (Number(details.orderStatus) === 3) {
let response = await signforsignforIn(data);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:388", response);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:400", response);
if (response.code == 3006) {
tip.value.setdetails({
isshow: true,
@ -26403,13 +26409,14 @@ This will fail in production if not fixed.`);
reservationId: details.id
};
let response2 = await signforsignforcontinue(data2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:400", response2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:412", response2);
if (response2.code !== 200)
return;
uni.showToast({
title: response2.msg,
icon: "none"
});
initpage();
tip.value.setdetails({ isshow: false });
},
cancel: () => {
@ -26419,6 +26426,7 @@ This will fail in production if not fixed.`);
tip.value.setdetails({ isshow: false });
}
});
return;
} else {
uni.showToast({
title: response.msg,
@ -26462,45 +26470,53 @@ This will fail in production if not fixed.`);
}
}
async function initpage() {
let data = {
reservationId: details.id,
completecode: details.orderType,
orderCode: details.inputtxt
};
details.datalist = [];
let response = null;
if (details.orderStatus == 1 || details.orderStatus === 2) {
response = await signfororder(data);
if (response.code !== 200)
return;
details.zeroArr = [];
details.orderArr = [];
response.data.records.forEach((val) => {
if (val.isZero === "1")
return details.zeroArr.push(val);
val.abnormalSignature = 0;
val.abnormalLoading = 0;
val.distributionAppParcelListVOS.forEach((value) => {
if (value.isAbnnormalSigning === 1)
val.abnormalSignature += 1;
if (value.isAbnormalLoading === 1)
val.abnormalLoading += 1;
try {
details.listcheckindex = -1;
let data = {
reservationId: details.id,
completecode: details.orderType,
orderCode: details.inputtxt
};
details.datalist = [];
let response = null;
if (details.orderStatus == 1 || details.orderStatus === 2) {
response = await signfororder(data);
if (response.code !== 200)
return;
details.zeroArr = [];
details.orderArr = [];
response.data.forEach((val) => {
if (val.isZero === "1")
return details.zeroArr.push(val);
val.abnormalSignature = 0;
val.abnormalLoading = 0;
val.distributionAppParcelListVOS.forEach((value) => {
if (value.isAbnnormalSigning === 1)
val.abnormalSignature += 1;
if (value.isAbnormalLoading === 1)
val.abnormalLoading += 1;
});
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:513", "val :>> ", val);
details.orderArr.push(val);
});
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:496", "val :>> ", val);
details.orderArr.push(val);
});
} else if (details.orderStatus == 3) {
response = await signforinventory(data);
if (response.code !== 200)
return;
details.stockArr = response.data.records || [];
} else if (details.orderStatus == 3) {
response = await signforinventory(data);
if (response.code !== 200)
return;
details.stockArr = response.data || [];
}
if (details.orderStatus === 1)
details.datalist = details.orderArr;
else if (details.orderStatus === 2)
details.datalist = details.zeroArr;
else
details.datalist = details.stockArr;
} catch (err) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:531", "err :>> ", err);
} finally {
computedNum();
return null;
}
if (details.orderStatus === 1)
details.datalist = details.orderArr;
else if (details.orderStatus === 2)
details.datalist = details.zeroArr;
else
details.datalist = details.stockArr;
}
function setcheckindex(index2) {
if (details.listcheckindex == index2) {
@ -26523,7 +26539,7 @@ This will fail in production if not fixed.`);
});
}
function checkphon(item, index2) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:537", "item :>> ", item);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:561", "item :>> ", item);
if (item.isZero === "1") {
const inpList = item.distributionParcelNumberVOS.map((val) => {
return {
@ -26565,7 +26581,7 @@ This will fail in production if not fixed.`);
parcelListDTOS: []
};
data.parcelListDTOS = deta.inpList.map((val) => {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:581", "val :>> ", val);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:605", "val :>> ", val);
return {
parcelListId: val.id,
stockArticleId: val.stockArticleId,
@ -26580,7 +26596,7 @@ This will fail in production if not fixed.`);
}
initpage();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:598", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:622", "err :>> ", err);
} finally {
uni.hideLoading();
tiplists.value.setdetails({ isshow: false });
@ -26669,7 +26685,7 @@ This will fail in production if not fixed.`);
vue.createElementVNode(
"view",
null,
vue.toDisplayString(vue.unref(Plannednub)),
vue.toDisplayString(vue.unref(details).Plannednub),
1
/* TEXT */
)
@ -26689,7 +26705,7 @@ This will fail in production if not fixed.`);
vue.createElementVNode(
"view",
null,
vue.toDisplayString(vue.unref(signNub)),
vue.toDisplayString(vue.unref(details).signNub),
1
/* TEXT */
)
@ -26809,7 +26825,7 @@ This will fail in production if not fixed.`);
]),
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "总数："),
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "计划："),
vue.createTextVNode(
vue.toDisplayString(item.reservationNum),
1
@ -26834,14 +26850,6 @@ This will fail in production if not fixed.`);
])
]),
vue.createElementVNode("view", { class: "contenbx1" }, [
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "计划："),
vue.createTextVNode(
vue.toDisplayString(item.reservationNum),
1
/* TEXT */
)
]),
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "异常装车："),
vue.createTextVNode(
@ -26918,23 +26926,19 @@ This will fail in production if not fixed.`);
class: vue.normalizeClass({ "active": Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 })
}, {
default: vue.withCtx(() => [
vue.createVNode(
_component_uni_td,
null,
{
default: vue.withCtx(() => [
vue.createTextVNode(
vue.toDisplayString(ite.orderPackageCode),
1
/* TEXT */
)
]),
_: 2
/* DYNAMIC */
},
1024
/* DYNAMIC_SLOTS */
),
vue.createVNode(_component_uni_td, {
class: vue.normalizeClass({ "isScan": ite.orderPackageStatus !== "70" })
}, {
default: vue.withCtx(() => [
vue.createTextVNode(
vue.toDisplayString(ite.orderPackageCode),
1
/* TEXT */
)
]),
_: 2
/* DYNAMIC */
}, 1032, ["class"]),
vue.createVNode(
_component_uni_td,
null,
@ -32986,7 +32990,7 @@ This will fail in production if not fixed.`);
if (response.code !== 200)
return;
details.list = response.data.parcelList;
details.detaobj = response.data;
details.detaobj = response.data || [];
let set2 = /* @__PURE__ */ new Set();
response.data.parcelList.map((item) => {
set2.add(item.trayName);

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

@ -699,7 +699,7 @@ body {
color: #f00;
}
.tpstitl.showTitle[data-v-a3a2f036]::after {
content: "最少传入三张图片";
content: "最少传入一张图片";
margin-left: 0.625rem;
color: #f00;
}

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

@ -7,8 +7,8 @@
"id": "__UNI__EB22F37",
"name": "货无忧",
"version": {
"name": "1.1.04",
"code": 1104
"name": "1.1.07",
"code": 1107
},
"description": "",
"developer": {

4
unpackage/dist/dev/app-plus/pages/user/user.css vendored
Unescape View File

@ -262,4 +262,8 @@
width: 100%;
height: 12.5rem;
background-color: #FA8C16da;
}
.profilePhoto {
background: #fff;
border-radius: 0.3125rem;
}

4
unpackage/dist/dev/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css vendored
Unescape View File

@ -830,4 +830,8 @@
}
.uni-scroll-view[data-v-6197e305] {
overflow: hidden;
}
.isScan[data-v-6197e305] {
background: var(--subjectColor);
color: #fff;
}

4
unpackage/dist/dev/app-plus/pagesHome/pages/signOrderScan/signOrderScan.css vendored
Unescape View File

@ -1008,6 +1008,10 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
.active td[data-v-fb393026] {
color: #fff;
}
.isScan[data-v-fb393026] {
background: var(--subjectColor);
color: #fff;
}
.uni-table .active[data-v-fb393026]:hover {
background: #ff4344 !important;
}

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

@ -30,6 +30,26 @@ function postFindAllAllocationId(loadingObj = {}) {
loadingObj
);
}
function distributionStockupupdateStockArea(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-distribution/app/distributionStockup/updateStockArea`,
method: "put",
data
},
loadingObj
);
}
function distributionStockupgetStockupArea(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-distribution/app/distributionStockup/getStockupArea`,
method: "post",
data
},
loadingObj
);
}
function distributionStockuppageList(data, loadingObj = {}) {
return utils_request.service(
{
@ -40,6 +60,16 @@ function distributionStockuppageList(data, loadingObj = {}) {
loadingObj
);
}
function distributionStockuppageListClient(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-distribution/app/distributionStockup/pageListClient`,
method: "post",
data
},
loadingObj
);
}
function distributionStockuporderList(data, loadingObj = {}) {
return utils_request.service(
{
@ -1510,6 +1540,76 @@ function postArriveUnloadPageList(data, loadingObj = {}) {
loadingObj
);
}
function postArriveUnloadCarsDetail(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-trunkline/api/carsLoad/unloadCarsDetail`,
method: "post",
data
},
loadingObj
);
}
function postCarsLoadUnloadPackage(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-trunkline/api/carsLoad/unloadPackage`,
method: "post",
data
},
loadingObj
);
}
function postCarsLoadUnloadZero(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-trunkline/api/carsLoad/unloadZero`,
method: "post",
data
},
loadingObj
);
}
function postFindUnloadTrayGoodsList(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-trunkline/api/carsLoad/findUnloadTrayGoodsList`,
method: "post",
data
},
loadingObj
);
}
function postUnloadTray(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-trunkline/api/carsLoad/unloadTray`,
method: "post",
data
},
loadingObj
);
}
function postFindSyncOldTrayData(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-warehouse/api/warehouseTrayType/findSyncOldTrayData`,
method: "post",
data
},
loadingObj
);
}
function postSyncOldTrayData(data, loadingObj = {}) {
return utils_request.service(
{
url: `logpm-warehouse/api/warehouseTrayType/syncOldTrayData`,
method: "post",
data
},
loadingObj
);
}
exports.$_initRetentionList = $_initRetentionList;
exports.$_retentionScan = $_retentionScan;
exports.$_retentionTrayScan = $_retentionTrayScan;
@ -1551,11 +1651,14 @@ exports.deliverywrap = deliverywrap;
exports.deliverywrapIn = deliverywrapIn;
exports.dictbizdictionary = dictbizdictionary;
exports.distributionOrderInfoInQuery = distributionOrderInfoInQuery;
exports.distributionStockupgetStockupArea = distributionStockupgetStockupArea;
exports.distributionStockuporderInfo = distributionStockuporderInfo;
exports.distributionStockuporderList = distributionStockuporderList;
exports.distributionStockuppageList = distributionStockuppageList;
exports.distributionStockuppageListClient = distributionStockuppageListClient;
exports.distributionStockupstockupScan = distributionStockupstockupScan;
exports.distributionStockupstockupStockListPackageCode = distributionStockupstockupStockListPackageCode;
exports.distributionStockupupdateStockArea = distributionStockupupdateStockArea;
exports.distributionTrayDetail = distributionTrayDetail;
exports.editPassword = editPassword;
exports.getMyWarehouseList = getMyWarehouseList;
@ -1576,16 +1679,23 @@ exports.pcontractQuestDetailList = pcontractQuestDetailList;
exports.pgetContractList = pgetContractList;
exports.pgetgetMaterialName = pgetgetMaterialName;
exports.postAbnormalTruckLoading = postAbnormalTruckLoading;
exports.postArriveUnloadCarsDetail = postArriveUnloadCarsDetail;
exports.postArriveUnloadPageList = postArriveUnloadPageList;
exports.postCarsLoadPageList = postCarsLoadPageList;
exports.postCarsLoadUnloadPackage = postCarsLoadUnloadPackage;
exports.postCarsLoadUnloadZero = postCarsLoadUnloadZero;
exports.postFindAllAllocationId = postFindAllAllocationId;
exports.postFindCarsLoadingDetail = postFindCarsLoadingDetail;
exports.postFindCarsLoadingOrderDetail = postFindCarsLoadingOrderDetail;
exports.postFindSyncOldTrayData = postFindSyncOldTrayData;
exports.postFindUnloadTrayGoodsList = postFindUnloadTrayGoodsList;
exports.postLoadingScan = postLoadingScan;
exports.postLoadingTray = postLoadingTray;
exports.postLoadingTrayInfo = postLoadingTrayInfo;
exports.postLoadingZero = postLoadingZero;
exports.postRemoveCarsLoadScan = postRemoveCarsLoadScan;
exports.postSyncOldTrayData = postSyncOldTrayData;
exports.postUnloadTray = postUnloadTray;
exports.postWarehouseTaskAddDataInfo = postWarehouseTaskAddDataInfo;
exports.postWarehouseTaskSelectPackageInfo = postWarehouseTaskSelectPackageInfo;
exports.postZeroStockUp = postZeroStockUp;

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

@ -21,6 +21,7 @@ if (!Math) {
"./pagesHome/pages/RelayScanList/RelayScanList.js";
"./pagesHome/pages/codePlateBracket/codePlateBracket.js";
"./pagesHome/pages/ArrivalList/ArrivalList.js";
"./pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.js";
"./pagesHome/pages/SelfPickupScan/SelfPickupScan.js";
"./pagesHome/pages/LoadingScan/LoadingScan.js";
"./pagesHome/pages/loadingRetention/loadingRetention.js";
@ -58,6 +59,7 @@ if (!Math) {
"./pagesHome/pages/Relocation/Relocation.js";
"./pagesHome/pages/PeopleScanUpType/PeopleScanUpType.js";
"./pagesHome/pages/PeopleScanUp/PeopleScanUp.js";
"./pagesHome/pages/PickingScanList/PickingScanList.js";
"./pagesHome/pages/Retention/Retention.js";
"./pagesHome/pages/MergeTray/MergeTray.js";
"./pagesHome/pages/MergeTrayDetails/MergeTrayDetails.js";
@ -73,6 +75,7 @@ if (!Math) {
"./pagesHome/pages/orderInquiry/orderInquiry.js";
"./pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.js";
"./pagesHome/pages/StockUpListZero/StockUpListZero.js";
"./pagesHome/pages/SearchTray/SearchTray.js";
"./pagesUser/pages/about/about.js";
"./pagesUser/pages/systemSettings/systemSettings.js";
"./pagesUser/pages/securitySettings/securitySettings.js";

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.25:13000/";
const devhost = "https://h5uapi.huitongys.com/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";

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

@ -102,7 +102,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
if (response.code !== 200)
return;
console.log("response", response);
details.datalist = response.data.records;
details.datalist = response.data;
} catch (e) {
} finally {
return null;

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

@ -121,9 +121,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}
const { items, datalist } = common_vendor.toRefs(details);
function backPreviousPage() {
common_vendor.index.redirectTo({
url: "/pagesHome/pages/pickingScan/pickingScan"
});
common_vendor.index.navigateBack();
}
return (_ctx, _cache) => {
return common_vendor.e({

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

@ -188,7 +188,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.warehouseArea = response.data.warehouseArea;
details.address = response.data.address;
if (Number(details.scanNum) > 0 && details.isscan) {
utils_utils.utils.ttsspke("扫描" + details.scanNum + "件");
utils_utils.utils.ttsspke(details.scanNum + "件");
}
}
const { dataList } = common_vendor.toRefs(details);

2
utils/request.js
Unescape View File

@ -269,7 +269,7 @@ const HandleRequest = (params, key, loadingObj) => {
// #endif
}).finally(async res => {
await nextTick()
uni.hideLoading()
if (loadingObj.isShowLoading !== false) uni.hideLoading()
})
})

Write Preview
Loading…
Cancel
Save