Browse Source

修改部分bug

dev
qb 11 months ago
parent
commit
355e2d27d8
  1. 28
      api/user.js
  2. 271
      compoment/MyInput/MyInput.vue
  3. 8
      config/host.js
  4. 2
      interfaces/pagesHome/SelfPickupDetails.ts
  5. 3
      main.js
  6. 6
      manifest.json
  7. 31
      pages.json
  8. 65
      pages/index/index.vue
  9. 7
      pages/login/login.vue
  10. 2
      pagesHome/pages/CustomerSign/CustomerSign.vue
  11. 13
      pagesHome/pages/PickUpLotList/PickUpLotList.vue
  12. 5
      pagesHome/pages/PickingScanList/PickingScanList.vue
  13. 422
      pagesHome/pages/PreStoragePackage/PreStoragePackage.vue
  14. 57
      pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
  15. 9
      pagesHome/pages/StockUplistByZero/StockUplistByZero.vue
  16. 35
      pagesHome/pages/StowageListDetails/StowageListDetails.vue
  17. 57
      pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
  18. 6
      pagesHome/pages/billsList/billsList.vue
  19. 15
      pagesHome/pages/onLoadByScan/onLoadByScan.vue
  20. 37
      pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue
  21. 8
      pagesHome/pages/signOrderScan/signOrderScan.vue
  22. 2
      unpackage/dist/build/app-plus/pagesHome/pages/PickingScanList/PickingScanList.css
  23. 2
      unpackage/dist/build/app-plus/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.css
  24. 4
      unpackage/dist/dev/app-plus/app-config-service.js
  25. 1800
      unpackage/dist/dev/app-plus/app-service.js
  26. 115
      unpackage/dist/dev/app-plus/app.css
  27. 12
      unpackage/dist/dev/app-plus/manifest.json
  28. 4
      unpackage/dist/dev/app-plus/pages/login/login.css
  29. 980
      unpackage/dist/dev/mp-weixin/api/user.js
  30. 12
      unpackage/dist/dev/mp-weixin/common/vendor.js
  31. 2
      unpackage/dist/dev/mp-weixin/config/host.js
  32. 212
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  33. 92
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
  34. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxml
  35. 179
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxss
  36. 13
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
  37. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxml
  38. 8
      unpackage/dist/dev/mp-weixin/project.config.json
  39. 55
      unpackage/dist/dev/mp-weixin/utils/request.js
  40. 2
      utils/request.js

28
api/user.js

@ -3229,4 +3229,32 @@ export function postFindFinanceList(data, loadingObj = {}, canCancel = false) {
loadingObj,
canCancel
);
}
/**
* 通过预约单号搜索已入库或未入库数据
*/
export function postBusinessPreOrderList(data, loadingObj = {}, canCancel = false) {
return request({
url: `logpm-distribution/app/businessPreOrder/list`,
method: "post",
data
},
loadingObj,
canCancel
);
}
/**
* 扫描包条码入库
*/
export function postBusinessPreOrderscanOrderPackageCode(data, loadingObj = {}, canCancel = false) {
return request({
url: `logpm-distribution/app/businessPreOrder/scanOrderPackageCode`,
method: "post",
data
},
loadingObj,
canCancel
);
}

271
compoment/MyInput/MyInput.vue

@ -0,0 +1,271 @@
<template>
<view :class="inputClassName" ref="inputRef">
<input class="input" v-model="inputValue" @blur="handleBlur" @input="handleInput" :placeholder="props.placeholder"
:type="props.type" @confirm="handleConfirm" />
<view class="messageBox" v-if="props.rules.required">
{{props.rules.message}}
</view>
<!-- 移除按钮 -->
<view class="statusIconBox">
<view
:class="{removeIcon:true, showClearable: inputClassName.success, removeClearable: !inputClassName.success}"
v-if="clearable">
<u-icon :name="statusIcon" :color="inputClassName.success ?'#3AD8BC' : '#F8544B'" size="40"></u-icon>
</view>
</view>
<view class="removeIconBox">
<view @click="()=>{
inputValue = ''
handleChangeInputStatus()
}" :class="{removeIcon:true, showClearable: inputValue, removeClearable: !inputValue}" v-if="clearable">
<u-icon name="close-circle-fill" color="#8f8f8f" size="40"></u-icon>
</view>
</view>
</view>
</template>
<script setup lang="ts">
import { computed, defineProps, defineEmits, ref, nextTick, type PropType } from 'vue';
type rulesType = {
/** 警示信息 */
message : string,
/** 是否进行值的检测 */
required : boolean,
/** 检测规则 */
rulesFn ?: Function,
trigger : string | string[]
}
const props = defineProps({
/** 双向绑定的值 */
modelValue: {
type: Number as PropType<Number> || String as PropType<String>,
required: true
},
/** 输入框类型 */
type: {
type: String as PropType<String>,
required: false,
default: 'text'
},
/** 验证规则 */
rules: {
type: Object as PropType<rulesType>,
required: false,
default: {
message: '',
required: true
} as any
},
/** 是否显示清除按钮 */
clearable: {
type: Boolean as PropType<Boolean>,
required: false,
default: true
},
/** 提示 */
placeholder: {
type: String as PropType<String>,
required: false,
default: ''
},
/** 是否聚焦 */
focus: {
type: Boolean as PropType<Boolean>,
required: false,
default: false
}
})
/** 输入框实例 */
const inputRef = ref()
/** 状态Icon */
const statusIcon = ref('')
/** 输入框类名 */
const inputClassName = ref({
input_container: true
})
const emit = defineEmits(['input', 'change', 'blur', 'change', 'update:modelValue', 'confirm'])
const inputValue = computed({
get() {
return props.modelValue
},
set(value) {
emit('update:modelValue', value)
}
})
/** 输入框状态改变 */
const handleChangeInputStatus = async () => {
if (!props.rules.required) return
await nextTick()
statusIcon.value = ''
delete inputClassName.value.success
delete inputClassName.value.error
let isSuccess = false
if (props.rules.rulesFn) isSuccess = props.rules.rulesFn(inputValue.value)
else isSuccess = Boolean(inputValue.value || inputValue.value === 0)
isSuccess ? inputClassName.value.success = true : inputClassName.value.error = true
if (isSuccess) {
inputClassName.value.success = true
statusIcon.value = 'checkmark-circle-fill'
} else {
inputClassName.value.error = true
statusIcon.value = 'info-circle-fill'
}
}
/** 输入框值变化时 */
const handleChange = (newValue : string | number, oldValue : string | number) => {
emit('change', newValue, oldValue)
}
/** 输入框失焦事件 */
const handleBlur = (event) => {
emit('blur', event)
handleChangeInputStatus()
}
/** 输入框事件 */
const handleInput = (event) => {
emit('blur', event)
handleChangeInputStatus()
}
const handleConfirm = (event) => {
emit('confirm', event)
}
</script>
<style scoped lang="scss">
@keyframes showIcon {
from {
transform: translate(-50%, -200%);
opacity: 0;
}
to {
transform: translate(-50%, -50%);
opacity: 1;
}
}
@keyframes romveIcon {
from {
transform: translate(-50%, -50%);
opacity: 1;
}
to {
transform: translate(-50%, -200%);
opacity: 0;
}
}
/** 动画时间 */
$animationTime: 0.3s;
/** 验证成功颜色 */
$successColor: #3AD8BC;
/** 验证失败颜色 */
$errorColor: #F8544B;
.input_container {
display: flex;
position: relative;
overflow: hidden;
// height: 80upx;
height: 100%;
transition: all $animationTime;
border: 4upx solid transparent;
// background: #fff;
border-radius: 10upx;
&.success {
border: 4upx solid $successColor;
.removeIconBox {
width: 60upx;
}
}
&.error {
border: 4upx solid $errorColor;
.removeIconBox {
width: 0upx;
}
}
.removeIconBox {
position: relative;
height: 100%;
width: 0upx;
flex: none;
transition: all $animationTime;
overflow: hidden;
.removeIcon {
position: absolute;
top: 50%;
left: 50%;
transform: translate(50%, -200%);
&.showClearable {
animation: showIcon $animationTime forwards;
}
&.removeClearable {
animation: romveIcon $animationTime forwards;
}
}
}
.statusIconBox {
position: relative;
height: 100%;
width: 60upx;
flex: none;
transition: all $animationTime;
overflow: hidden;
.removeIcon {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
:deep(.u-icon__icon) {
color: $errorColor !important;
transition: all $animationTime;
}
&.showClearable {
:deep(.u-icon__icon) {
color: $successColor !important;
}
}
}
}
}
.input {
height: 100%;
flex: 1;
padding: 0 20upx;
}
</style>

8
config/host.js

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

2
interfaces/pagesHome/SelfPickupDetails.ts

@ -55,4 +55,6 @@ export interface pagedetailType {
stockList : any;
/** 滚动区高度 */
scrollHeight : string
/** 扫描的码值 */
scanOrderPackageCode : string
}

3
main.js

@ -31,6 +31,8 @@ import PullDownBox from '@/compoment/PullDownBox/PullDownBox.vue';
import MyTree from '@/compoment/MyTree/MyTree.vue'
/** 复选框 */
import CheckBox from '@/compoment/CheckBox/CheckBox.vue'
/** 输入框组件 */
import MyInput from '@/compoment/MyInput/MyInput';
import saomiao1 from '@/compoment/saomiao1.vue'
import saomiao2 from '@/compoment/saomiao2.vue'
import saomiao3 from '@/compoment/saomiao3.vue'
@ -63,6 +65,7 @@ export function createApp() {
.component('PullDownBox', PullDownBox)
.component('MyTree', MyTree)
.component('CheckBox', CheckBox)
.component('MyInput', MyInput)
uni.$u.config.unit = 'rpx'
return {

6
manifest.json

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

31
pages.json

@ -362,6 +362,25 @@
}
}
},
{
"path": "pages/PreStoragePackage/PreStoragePackage",
"style": {
"navigationBarTitleText": "预入库包件",
"enablePullDownRefresh": true,
"onReachBottomDistance": 1,
"navigationStyle": "custom",
"app-plus": {
"animationDuration": 300,
"animationType": "zoom-fade-out",
"pullToRefresh": {
"support": true,
"color": "#d3832a", //
"style": "circle" //
}
}
}
},
{
"path": "pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray",
@ -1771,12 +1790,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",

65
pages/index/index.vue

@ -48,27 +48,27 @@
name: '工作台',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231016/440a01005f8333bcc76c1254a1d35570.png',
name: '订单查询',
router: '/pagesHome/pages/orderInquiry/orderInquiry',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
name: '运单查询',
router: '/pagesHome/pages/waybillInquiry/waybillInquiry',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
name: '库位查询',
router: '/pagesHome/pages/storageInquiry/storageInquiry',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
name: '托盘查询',
router: '/pagesHome/pages/trayInquiry/trayInquiry',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
name: '库存品查询',
router: '/pagesHome/pages/inventoryInquiry/inventoryInquiry',
},
@ -78,7 +78,7 @@
router: '/pagesHome/pages/MaterialMaintenance/MaterialMaintenance',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240320/d22bc792f9deff3f106aafc590ec14fb.png',
name: '库位列表',
router: '/pagesHome/pages/StorageLocationList/StorageLocationList',
},
@ -94,20 +94,25 @@
name: '入库',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240429/14451e54503266f168edf3651f2ab798.png',
name: '码板打托',
router: '/pagesHome/pages/codePlateBracket/codePlateBracket',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png',
name: '入库扫描',
router: '/pagesHome/pages/TranNumber/TranNumber',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240429/49254333c9c5c7aed6e9c8aab89c5998.png',
name: '到车入库',
router: '/pagesHome/pages/ArrivalList/ArrivalList',
},
{
icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png',
name: '预入库包件',
router: '/pagesHome/pages/PreStoragePackage/PreStoragePackage',
},
]
},
{
@ -115,7 +120,7 @@
name: '库内',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/e2604b3c97ee6001f367df87e3d0fdd1.png',
name: '分拣打托',
router: '/pagesHome/pages/scansorting/scansorting',
},
@ -130,47 +135,47 @@
// router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// },
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/03add918888d36ce0d566da120510840.png',
name: '扫码上架',
router: '/pagesHome/pages/ScanUpType/ScanUpType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7ca70b84ebf6a2f72e74300725132c.png',
name: '手动上架',
router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7e477dd35483ca7628567c609657fc.png',
name: '移库',
router: '/pagesHome/pages/RelocationType/RelocationType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png',
name: '滞留',
router: '/pagesHome/pages/Retention/Retention',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/ce45bb522069f1fd154ca964e66069c2.png',
name: '合托',
router: '/pagesHome/pages/MergeTray/MergeTray',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/91403695005c2c65ea2c9d4ddadac9c3.png',
name: '下架',
router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png',
name: '空置托盘',
router: '/pagesHome/pages/RemoveTray/RemoveTray',
},
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/Check/Check',
// },
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '复核',
router: '/pagesHome/pages/Check/Check',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231217/5d3a466a54b62a60cfb9dc53b0f6ded1.png',
name: '托盘数据同步',
router: '/pagesHome/pages/SearchTray/SearchTray',
},
@ -181,22 +186,22 @@
name: '出库',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/b58252914de56c0e3da1bdc75ac51c07.png',
name: '拣货扫描',
router: '/pagesHome/pages/pickingScan/pickingScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/7a9648ffdefd77f7ab8bb7861a2473e7.png',
name: '自提扫描',
router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240429/e5562240ca21316b21306d17f9394abc.png',
name: '配载装车',
router: '/pagesHome/pages/StowageList/StowageList',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240429/d58281e6ba1845f313d85a119107e260.png',
name: '中转装车',
router: '/pagesHome/pages/RelayScanList/RelayScanList',
},
@ -207,17 +212,17 @@
name: '配送',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/1a9bbc8c842b8b7ef555d6cd79d421be.png',
name: '装车扫描',
router: '/pagesHome/pages/LoadingScan/LoadingScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20231012/6956f6950cfc291e01c038ea5e13f984.png',
name: '签收扫描',
router: '/pagesHome/pages/signinScan/signinScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
icon: 'http://47.108.51.143:9000/basic/upload/20240429/16a9b462df1546f2fa6159df00ade62e.png',
name: '直发商家签收',
router: '/pagesHome/pages/directGoMarket/directGoMarket',
},

7
pages/login/login.vue

@ -12,18 +12,21 @@
<view>公司编号</view>
<view>
<input placeholder="请输入" v-model="tenantId" />
<!-- <MyInput placeholder="请输入" v-model="tenantId" /> -->
</view>
</view>
<view class="inputs">
<view>用户账号</view>
<view>
<input placeholder="请输入" v-model="username" />
<!-- <MyInput placeholder="请输入" v-model="username" /> -->
</view>
</view>
<view class="inputs">
<view>登录密码</view>
<view>
<input placeholder="请输入" v-model="password" password />
<!-- <MyInput placeholder="请输入" v-model="password" type="password" /> -->
</view>
</view>
</view>
@ -515,10 +518,10 @@
background: #F4F8FB;
border-radius: 8upx;
opacity: 1;
padding: 10upx;
padding: 10upx 0;
padding-left: 20upx;
box-sizing: border-box;
font-size: 24upx;
font-size: 24upx !important;
font-weight: 400;
color: #AFB4BA;
display: flex;

2
pagesHome/pages/CustomerSign/CustomerSign.vue

@ -428,7 +428,7 @@
icon: 'none'
})
// #ifdef APP
utils.ttsspke('成功签收' + item.reservationNum + '件')
utils.ttsspke(item.reservationNum + '件')
// #endif
initpage()
}

13
pagesHome/pages/PickUpLotList/PickUpLotList.vue

@ -70,7 +70,7 @@
<!-- 主体 -->
<template #body>
<u-divider text="订单列表" textPosition="left"></u-divider>
<u-divider text="订 表" textPosition="left"></u-divider>
<!-- 提货单件数 -->
<scroll-view class="scollView" scroll-y="true" :style="{height: details.height}"
@ -184,7 +184,7 @@
chooseIndex: -1,
/** 提货状态 */
type: {
1: '未扫', 2: '部分扫', 3: '齐套',
1: '未 扫', 2: '部分扫', 3: '齐 套',
},
/** 滚动区高度 */
height: '80vh',
@ -440,15 +440,18 @@
border-top-right-radius: $borderRadius;
&.none {
background: #e56862;
color: #f8625a;
background-color: #feeded;
}
&.portion {
background: var(--subjectColor);
color: #fa8c16;
background: #fef3e7;
}
&.all {
background: #45db86;
color: #0086F1;
background-color: #e5f2fd;
}
}
}

5
pagesHome/pages/PickingScanList/PickingScanList.vue

@ -98,9 +98,12 @@
// pinia
import { useUserStore } from '@/store/uaeUserStore.js';
import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import useStorageStore from '@/store/useStorageStore.js';
import { storeToRefs } from 'pinia';
//
const { scanState } = storeToRefs(useSystemSettingsStore())
//
const { HANDLE_ISSTORAGECODE } = useStorageStore()
//
const { userInfo } = storeToRefs(useUserStore())
@ -193,6 +196,8 @@
async function scandata() {
if (details.stockUpStorageInfo.stockupAllocationId === details.scancode) return utils.handleToast('当前已在该备货区')
if (!HANDLE_ISSTORAGECODE(details.scancode)) return utils.handleToast('该码值不是库位码')
const submitData = { allocationId: details.scancode }
const res = await postUpShelfScanAllocation(submitData)
const { code, data } = res

422
pagesHome/pages/PreStoragePackage/PreStoragePackage.vue

@ -0,0 +1,422 @@
<template>
<BasicContainer ref="basicContainer" :option="option">
<template #head>
<view class="header_total_container">
<PullDownBox ref="pullDownBox">
<template #title>
<text class="fwb">
预约号:
</text>
<text>
{{details.pageInfo.reservationCode || '暂无数据'}}
</text>
</template>
<template #content>
<view class="header_total">
<view class="header_total_item">
<view class="">
总件数
</view>
<view class="total">
{{ details.info.sumNum || 0 }}
</view>
</view>
<view class="header_total_item">
<view class="">
已扫件数
</view>
<view class="scanNum">
{{ details.info.inNum || 0 }}
</view>
</view>
<view class="header_total_item">
<view class="">
未扫件数
</view>
<view class="notScanNum">
{{ (details.info.sumNum || 0) - (details.info.inNum || 0) }}
</view>
</view>
</view>
</template>
</PullDownBox>
</view>
<view class="tabBar_container fwb">
<view :class="{'tabBar-item': true, active: details.tabBarActive === 0}"
@click="() => handleTabbarStatus(0)">
</view>
<view :class="{'tabBar-item': true, active: details.tabBarActive === 1}"
@click="() => handleTabbarStatus(1)">
</view>
<!-- 激活进度条 -->
<view class="activeView" :style="{left: ((details.tabBarActive) * (100 / 2)) + '%'}">
<view class="item">
</view>
</view>
</view>
</template>
<template #body>
<scroll-view :style="{height: details.scrollHeight}" @touchmove.stop class="scve" scroll-y="true"
@refresherpulling="()=>{}">
<block v-for="(item,index) in details.data" :key="item.id">
<view class="orderPackage_container">
<view class="orderPackage_container_item">
<text class="">
订单号
</text>
<text class="flex1">
{{item.orderCode}}
</text>
</view>
<view class="orderPackage_container_item">
<text class="">
包条码
</text>
<text class="flex1">
{{item.orderPackageCode}}
</text>
</view>
<view class="orderPackage_container_item">
<text class="">
一级品
</text>
<text class="flex1">
{{item.firsts}}
</text>
</view>
<view class="orderPackage_container_item">
<text class="">
二级品
</text>
<text class="flex1">
{{item.second}}
</text>
</view>
<view class="orderPackage_container_item">
<text class="">
三级品
</text>
<text class="flex1">
{{item.thirdProduct}}
</text>
</view>
<view class="orderPackage_container_item">
<text class="">
物料
</text>
<text class="flex1">
{{item.materialName}}
</text>
</view>
<view :class="details.tabBarActive === 0 ? 'tip red' : 'tip blue'">
{{details.tabBarActive === 0 ?'未入库' : '已入库'}}
</view>
</view>
</block>
</scroll-view>
</template>
</BasicContainer>
<tiplist ref="tiplists"></tiplist>
<!-- #ifdef APP -->
<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
<!-- #endif -->
</template>
<script lang="ts" setup>
import { ref, reactive, onMounted, nextTick, } from 'vue';
import {
onShow,
onLoad,
} from '@dcloudio/uni-app'
import utils from '@/utils/utils.js';
import {
postBusinessPreOrderList,
postBusinessPreOrderscanOrderPackageCode
} from '@/api/user.js'
import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import { storeToRefs } from 'pinia';
const { scanState } = storeToRefs(useSystemSettingsStore())
const option = reactive({
title: '预入库包件入库',
haveData: true,
async pullDownRefreshInitPage() {
return await initpage()
}
})
const details = reactive({
/** 扫码码值 */
scancode: '',
/** 内容容器高度 */
scrollHeight: '60vh',
/** tabBar激活值, 0 -- 有数据, 1 -- 无数据 */
tabBarActive: 0 as 0 | 1,
pageInfo: {
/** 预约单号 */
reservationCode: ''
},
info: {},
data: []
})
//
const tiplists = ref(null)
const pullDownBox = ref()
onLoad(() => {
// #ifdef APP
utils.ttsspke('请扫描预约号')
// #endif
})
//
onShow(async () => {
// #ifdef APP
uni.$off('scancodedate')
uni.$on('scancodedate', function (code) {
if (code) {
details.scancode = code
scandata()
}
})
// #endif
await nextTick()
pullDownBox.value.handleShowPullDown(true)
// orderRef.value.details.showPopUp = true
})
onMounted(async () => {
await nextTick()
details.scrollHeight = await utils.getViewDistanceFormTop('.scve')
})
/** 扫描预约单号 */
const scanReservationCode = () => {
console.log('扫描预约单号')
const reg = new RegExp('^YY', 'i')
if (!reg.test(details.scancode)) return utils.handleToast('请扫描预约单号')
initpage()
}
/** 扫描包件 */
const scanOrderPackageCode = async () => {
console.log('扫描包件')
const { reservationCode } = details.pageInfo
const submitData = {
reservationCode: reservationCode,
orderPackageCode: details.scancode
}
if (!submitData.reservationCode) return
const res = await postBusinessPreOrderscanOrderPackageCode(submitData)
const { code } = res
if (code !== 200) return
initpage()
}
/** 扫描函数 */
async function scandata() {
if (!details.pageInfo.reservationCode) scanReservationCode()
else scanOrderPackageCode()
}
/** 设置tabBar激活状态 */
const handleTabbarStatus = (code : 0 | 1) => {
if (code === details.tabBarActive) return
details.tabBarActive = code
initpage()
}
const initpage = async () => {
const { reservationCode } = details.pageInfo
details.data = []
const submitData = {
reservationCode: reservationCode ? reservationCode : details.scancode,
inWarehouse: details.tabBarActive
}
console.log('submitData.reservationCode :>> ', submitData.reservationCode);
if (!submitData.reservationCode) return utils.handleToast('请扫描预约单号')
const response = await postBusinessPreOrderList(submitData, {}, true)
const { code, data } = response
if (code !== 200) return
details.pageInfo.reservationCode = submitData.reservationCode
details.data = data.list
details.info = data
}
</script>
<style lang="scss" scoped>
@import url("@/utils/style/common.scss");
.tabBar_container {
display: flex;
position: relative;
// font-family: ;
margin-bottom: 20upx;
background: #fff;
.activeView {
display: block;
height: 2px;
position: absolute;
width: 50%;
top: 100%;
z-index: 1;
transition: all .3s;
>.item {
background: var(--subjectColor);
height: 100%;
width: 40%;
margin: 0 auto;
}
}
.tabBar-item {
flex: 1;
text-align: center;
padding: 20upx;
position: relative;
background-color: transparent;
z-index: 10;
transition: all 0.3s;
&.active {
color: var(--subjectColor);
}
}
}
:deep(.u-divider__text) {
color: var(--subjectColor) !important;
font-size: 1rem !important;
}
.header {
margin: 10upx;
}
//
.header_total_container {
padding: 10upx;
}
//
.header_total {
padding: 10upx;
border-radius: 10upx;
margin-top: 20upx;
display: flex;
align-items: center;
justify-content: space-around;
background: #f5f7fb;
font-size: 0.9rem;
}
.header_total_item {
height: 100upx;
text-align: center;
display: flex;
flex-direction: column;
justify-content: space-between;
>view {
&:nth-child(2) {
font-size: 1.2rem;
&.total {
color: var(--subjectColor);
}
&.scanNum {
color: #0f0;
}
&.notScanNum {
color: #f00;
}
}
}
}
//
.orderPackage_container {
margin: 10upx;
padding: 10upx;
background: #fff;
border-radius: 5upx;
font-size: 0.9rem;
position: relative;
overflow: hidden;
.tip {
position: absolute;
top: 0;
right: 0;
padding: 15upx 20upx;
&.blue {
background-color: #0086F120;
color: #0086F1;
}
&.red {
background-color: #F8544B20;
color: #F8544B;
}
&.tp3 {
background-color: #FA8C1620;
color: #FA8C16;
}
}
.orderPackage_container_item {
padding: 10upx;
}
}
</style>

57
pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue

@ -187,7 +187,9 @@
orderList: [],
stockList: [],
/** 滚动区高度 */
scrollHeight: '45vh'
scrollHeight: '45vh',
/** 扫描的码值 */
scanOrderPackageCode: ''
})
const tiplists = ref(null)
const basicContainer = ref(null)
@ -221,6 +223,8 @@
uni.$off('scancodedate')
}) */
function showsdqs() {
if (details.planNum <= details.signedNum) return utils.handleToast('提货计划已完成')
tiplists.value.setdetails({
isshow: true,
tipstate: 1,
@ -228,6 +232,7 @@
placeholder: '请输入扫描的码',
inputtext: '',
success: (detail) => {
if (!detail.inputtext && detail.inputtext !== 0) return utils.handleToast('请输入码值')
details.scancode = detail.inputtext
sacn()
tiplists.value.setdetails({ isshow: false })
@ -302,6 +307,32 @@
try {
// 3,
if (details.orderCode === 3) return
if (details.planNum <= details.signedNum) return utils.handleToast('提货计划已完成')
let content = ''
let haveData = false
for (let i = 0; i < details.orderList.length; i++) {
const item = details.orderList[i]
if (content) break
if (details.scancode !== item.orderPackageCode) continue
haveData = true
if (item.scanStatus === 2) {
content = '包件已扫描';
const _value = details.orderList.splice(i, 1)
details.orderList.unshift(_value[0])
}
break;
}
if (!haveData) return utils.handleToast('码值错误, 不在本计划内')
if (content) return utils.handleToast(content)
let data = {
id: details.billLadingId,
coding: details.scancode,
@ -311,6 +342,7 @@
console.log(res);
if (res.code == 200) {
details.isscan = true
details.scanOrderPackageCode = data.coding
initpage()
} else if (res.code === 3001) {
@ -340,9 +372,26 @@
billLadingId: details.billLadingId,
orderCode: details.orderCode
}
let response = await billLadingdetailList(data,)
if (response.code !== 200) return
details.orderList = response.data.list || []
let response = await billLadingdetailList(data)
const { code, data: { list } } = response
console.log('response :>> ', response);
if (code !== 200 || !list) return
const _arr = []
const scanArr = []
for (let i = 0; i < list.length; i++) {
const item = list[i]
if (item.scanStatus === 1) _arr.push(item)
else if (item.orderPackageCode === details.scanOrderPackageCode) _arr.unshift(item)
else scanArr.push(item)
}
details.scanOrderPackageCode = ''
details.orderList = [..._arr, ...scanArr]
details.consignee = response.data.consignee
details.pickUpPlate = response.data.pickUpPlate
details.carTypeStr = response.data.carTypeStr

9
pagesHome/pages/StockUplistByZero/StockUplistByZero.vue

@ -31,7 +31,7 @@
<scroll-view scroll-y="true" @touchmove.stop :style="{height: details.scrollHeight}" class="scvew">
<view class="pullDown_container">
<!-- 在库数据 -->
<view class="mb20" v-if="details.trayList.length > 0">
<view class="mb20" v-show="details.allocationList.length > 0">
<PullDownBox ref="PullDownRef1">
<template #title>
<view class="fwb align-center">
@ -69,7 +69,7 @@
</view>
<!-- 在托数据 -->
<view class="mb20" v-if="details.trayList.length > 0">
<view class="mb20" v-show="details.trayList.length > 0">
<PullDownBox ref="PullDownRef2">
<template #title>
<view class="fwb align-center">
@ -107,7 +107,7 @@
</view>
<!-- 其它数据 -->
<view v-if="details.other.num">
<view v-show="details.other.num">
<PullDownBox ref="PullDownRef3">
<template #title>
<view class="fwb align-center">
@ -343,6 +343,9 @@
}
await nextTick()
console.log('PullDownRef1.value :>> ', PullDownRef1.value);
console.log('PullDownRef2 :>> ', PullDownRef2);
console.log('PullDownRef3 :>> ', PullDownRef3);
//
PullDownRef1.value.handleShowPullDown(true)
PullDownRef2.value.handleShowPullDown(true)

35
pagesHome/pages/StowageListDetails/StowageListDetails.vue

@ -7,7 +7,7 @@
配载批次{{details.pageInfo.carsNo}}
</view>
<view class="butlur" @click="showsdqs">
{{details.pageType === 1? '录入包条码': '录入托盘码'}}
{{Number(details.pageType) === 1? '录入包条码': '录入托盘码'}}
</view>
</view>
<view>
@ -303,7 +303,8 @@
orderType: 0,
inputtxt: '',
listcheckindex: -1,
isscan: false,
/** 是否播报件数 */
BroadcastOrNot: false,
order: [],
zero: [],
pageInfo: {},
@ -348,7 +349,6 @@
if (code) {
console.log('code', code);
details.scancode = code
details.isscan = true
scandata()
}
})
@ -380,8 +380,9 @@
})
}
/** 请求页面 -- 按件装车 */
const initPageByOrder = async () => {
/** 请求页面数据 */
async function initpage() {
try {
const response = await postFindCarsLoadingDetail({
loadId: details.loadId
@ -396,9 +397,8 @@
details.pageInfo.zeroList :
details.pageInfo.exceptionList
if (!details.isscan) return
utils.handleToast(details.pageInfo.realLoadingNumber + '件')
details.isscan = false
if (details.BroadcastOrNot) utils.handleToast(details.pageInfo.realLoadingNumber + '件')
details.BroadcastOrNot = false
}
} catch (e) {
//TODO handle the exception
@ -407,20 +407,6 @@
}
}
/** 请求页面数据 */
async function initpage() {
try {
//
await initPageByOrder()
// else { }
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
} finally {
return null
}
}
function checktype(e) {
if (e == '') {
details.schanvalue = ''
@ -506,6 +492,7 @@
// icon: 'none'
// })
basicContainer.value.startPullDownRefresh()
details.BroadcastOrNot = true
TrayStowage.value.details.showPopUp = false
} catch (e) {
//TODO handle the exception
@ -538,7 +525,8 @@
console.log('res :>> ', res);
if (res.code !== 200) return
// details.isscan = false
details.BroadcastOrNot = true
//
basicContainer.value.startPullDownRefresh()
} catch (err) {
@ -577,6 +565,7 @@
const res = await postLoadingZero(submitData)
if (res.code !== 200) return
ZeroStowage.value.details.showPopUp = false
details.BroadcastOrNot = true
//
basicContainer.value.startPullDownRefresh()
} catch (err) {

57
pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue

@ -105,7 +105,7 @@
</template>
<template #content>
<u-divider text="详情"></u-divider>
<u-divider text="详 情"></u-divider>
<block v-for="value in item.unloadPackageList" :key="value.name">
<view class="details_container">
<!-- 定制品 -->
@ -119,7 +119,7 @@
<view :class="{
'tip': true,
'red': Number(value.scanStatus) === 1,
'green': Number(value.scanStatus) === 2,
'portion': Number(value.scanStatus) === 2,
'blue': Number(value.scanStatus) === 3
}">
{{Number(value.scanStatus) === 1? '已装车': Number(value.scanStatus) === 2? '已卸车': '已签收'}}
@ -184,7 +184,7 @@
<view :class="{
'tip': true,
'red': Number(item.scanStatus) === 1,
'green': Number(item.scanStatus) === 2,
'portion': Number(item.scanStatus) === 2,
'blue': Number(item.scanStatus) === 3
}">
{{Number(item.scanStatus) === 1? '已装车': Number(item.scanStatus) === 2? '已卸车': '已签收'}}
@ -824,32 +824,7 @@
</script>
<style lang="scss" scoped>
.xialaxz {
display: flex;
flex-direction: column;
.box {
display: flex;
align-items: flex-start;
justify-content: space-between;
border-top: 2upx solid #00000010;
padding: 20upx 0;
box-sizing: border-box;
font-size: 28upx;
color: #092C4D;
flex-wrap: wrap;
>view {
min-width: 50%;
word-wrap: break-word;
word-break: break-all;
&:nth-last-child(1) {
margin-right: 0upx;
}
}
}
}
@import url(@/utils/style/common.scss);
.butlur {
width: 200upx !important;
@ -1044,7 +1019,8 @@
.abnormal {
padding: 10upx;
background: #fff;
margin: 5upx 0;
margin: 10upx;
border-radius: 10upx;
}
.w100 {
@ -1069,7 +1045,9 @@
}
:deep(.u-divider__text) {
font-size: 28upx !important;
font-size: 0.9rem !important;
font-weight: bold;
color: var(--subjectColor) !important;
}
//
@ -1107,15 +1085,18 @@
margin-left: 10upx;
&.red {
background: #dc362e;
color: #f8625a;
background-color: #feeded;
}
&.green {
background: #00d400;
&.blue {
color: #0086F1;
background-color: #e5f2fd;
}
&.blue {
background: #0086F1;
&.portion {
color: #fa8c16;
background: #fef3e7;
}
}
@ -1127,4 +1108,8 @@
flex: 1;
}
}
:deep(.PullDownBox) {
margin: 10upx;
}
</style>

6
pagesHome/pages/billsList/billsList.vue

@ -137,9 +137,9 @@
onLoad((op) => {
details.pageInfo = op
// #ifdef APP
utils.ttsspke('请扫描或输入托盘码')
// #endif
// // #ifdef APP
// utils.ttsspke('')
// // #endif
})
onShow(async () => {
// #ifdef APP

15
pagesHome/pages/onLoadByScan/onLoadByScan.vue

@ -212,7 +212,7 @@
chooseIndex: -1,
/** 提货状态 */
type: {
1: '未扫', 2: '部分扫', 3: '齐套',
1: '未 扫', 2: '部分扫', 3: '齐 套',
},
/** 滚动区高度 */
height: '80vh',
@ -620,15 +620,18 @@
border-top-right-radius: $borderRadius;
&.none {
background: #e56862;
color: #f8625a;
background-color: #feeded;
}
&.portion {
background: #0086F1;
&.all {
color: #0086F1;
background-color: #e5f2fd;
}
&.all {
background: #45db86;
&.portion {
color: #fa8c16;
background: #fef3e7;
}
}
}

37
pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue

@ -29,7 +29,7 @@
<!-- 主体 -->
<template #body>
<u-divider text="详情列表" textPosition="left"></u-divider>
<u-divider text="详 表" textPosition="left"></u-divider>
<!-- 提货单件数 -->
<scroll-view class="scollView" scroll-y="true" :style="{height: details.height}">
@ -39,13 +39,13 @@
<view class="text flex-c-c">
<text class="mr10 serialNumber">{{index + 1}}</text>
<text class="mr10">
<text class="mr10 ">
{{value.title}}
</text>
<text> {{value.scanNum}} </text>
<text class="ml10 mr10"> / </text>
<text class=""> {{value.dataList.length}} </text>
<text> {{value.dataList.length}} </text>
</view>
<view class="flex-c-c">
@ -77,7 +77,7 @@
</view>
<view
:class="{'table-tag': true, 'red': Number(item.packageStatus) !== 1, 'green': Number(item.packageStatus) === 1}">
{{Number(item.packageStatus) === 1 ? '已扫': '未扫' }}
{{Number(item.packageStatus) === 1 ? '已 扫': '未 扫' }}
</view>
</view>
</block>
@ -310,14 +310,16 @@
right: 0;
top: 0;
color: #fff;
padding: 5upx 10upx;
padding: 10upx 20upx;
&.red {
background: #f00;
color: #f8625a;
background-color: #feeded;
}
&.green {
background: #1ba035;
color: #1ba035;
background-color: #edfef2;
}
}
}
@ -336,9 +338,11 @@
overflow: hidden;
>.title {
font-family: serif;
padding: 20upx;
background: var(--subjectColor);
color: #fff;
font-weight: bold;
.tip {
font-weight: normal;
@ -376,17 +380,20 @@
}
//
$serialNumberHeight: 0.9rem;
$serialNumberHeight: 1.4rem;
.serialNumber {
border: 2upx solid;
width: $serialNumberHeight;
border: 4upx solid;
min-width: $serialNumberHeight;
height: $serialNumberHeight;
line-height: $serialNumberHeight;
display: inline-block;
text-align: center;
border-radius: 50%;
display: inline-flex;
align-items: center;
justify-content: center;
border-radius: 0.7rem;
box-sizing: border-box;
font-weight: normal;
font-size: 0.7rem;
font-size: 0.8rem;
font-weight: bold;
padding: 5upx;
}
</style>

8
pagesHome/pages/signOrderScan/signOrderScan.vue

@ -141,6 +141,9 @@
<view class="contenbx1">
<view><text style="color: #90A0AF;">SKU</text>{{item.sku}}</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">包条码</text>{{item.orderPackageCode}}</view>
</view>
<view class="contenbx1">
<view><text style="color: #90A0AF;">物品</text>{{item.descriptionGoods}}</view>
<view><text style="color: #90A0AF;">规格</text>{{item.specification}}</view>
@ -149,8 +152,11 @@
<view><text style="color: #90A0AF;">单位</text>{{item.logpmUnit}}</view>
<!-- <view><text style="color: #90A0AF;">签收</text>{{item.signforNub}}</view> -->
</view>
<view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">
<!-- <view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">
{{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}
</view> -->
<view :class="item.signforNub==0?'tip tp2':'tip tp1'">
{{item.signforNub==0?'未扫':'已扫'}}
</view>
</view>
</template>

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because it is too large Load Diff

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

@ -1563,4 +1563,119 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
.active[data-v-1a0f2470] {
border-color: var(--subjectColor);
color: var(--subjectColor);
}
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量
* 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
@keyframes showIcon-2efc7f08 {
from {
transform: translate(-50%, -200%);
opacity: 0;
}
to {
transform: translate(-50%, -50%);
opacity: 1;
}
}
@keyframes romveIcon-2efc7f08 {
from {
transform: translate(-50%, -50%);
opacity: 1;
}
to {
transform: translate(-50%, -200%);
opacity: 0;
}
}
/** 动画时间 */
/** 验证成功颜色 */
/** 验证失败颜色 */
.input_container[data-v-2efc7f08] {
display: flex;
position: relative;
overflow: hidden;
height: 100%;
transition: all 0.3s;
border: 0.125rem solid transparent;
border-radius: 0.3125rem;
}
.input_container.success[data-v-2efc7f08] {
border: 0.125rem solid #3AD8BC;
}
.input_container.success .removeIconBox[data-v-2efc7f08] {
width: 1.875rem;
}
.input_container.error[data-v-2efc7f08] {
border: 0.125rem solid #F8544B;
}
.input_container.error .removeIconBox[data-v-2efc7f08] {
width: 0;
}
.input_container .removeIconBox[data-v-2efc7f08] {
position: relative;
height: 100%;
width: 0;
flex: none;
transition: all 0.3s;
overflow: hidden;
}
.input_container .removeIconBox .removeIcon[data-v-2efc7f08] {
position: absolute;
top: 50%;
left: 50%;
transform: translate(50%, -200%);
}
.input_container .removeIconBox .removeIcon.showClearable[data-v-2efc7f08] {
animation: showIcon-2efc7f08 0.3s forwards;
}
.input_container .removeIconBox .removeIcon.removeClearable[data-v-2efc7f08] {
animation: romveIcon-2efc7f08 0.3s forwards;
}
.input_container .statusIconBox[data-v-2efc7f08] {
position: relative;
height: 100%;
width: 1.875rem;
flex: none;
transition: all 0.3s;
overflow: hidden;
}
.input_container .statusIconBox .removeIcon[data-v-2efc7f08] {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.input_container .statusIconBox .removeIcon[data-v-2efc7f08] .u-icon__icon {
color: #F8544B !important;
transition: all 0.3s;
}
.input_container .statusIconBox .removeIcon.showClearable[data-v-2efc7f08] .u-icon__icon {
color: #3AD8BC !important;
}
.input[data-v-2efc7f08] {
height: 100%;
flex: 1;
padding: 0 0.625rem;
}

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

@ -5,10 +5,10 @@
"iPad"
],
"id": "__UNI__EB22F37",
"name": "货无忧",
"name": "货无忧测试版",
"version": {
"name": "1.1.31",
"code": 1131
"name": "1.1.28",
"code": 1128
},
"description": "",
"developer": {
@ -220,12 +220,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",

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

@ -211,10 +211,10 @@
background: #F4F8FB;
border-radius: 0.25rem;
opacity: 1;
padding: 0.3125rem;
padding: 0.3125rem 0;
padding-left: 0.625rem;
box-sizing: border-box;
font-size: 0.75rem;
font-size: 0.75rem !important;
font-weight: 400;
color: #AFB4BA;
display: flex;

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

File diff suppressed because it is too large Load Diff

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

@ -1285,9 +1285,9 @@ function populateParameters(fromRes, toRes) {
const hostLanguage = language.replace(/_/g, "-");
const parameters = {
appId: "__UNI__EB22F37",
appName: "货无忧",
appVersion: "1.1.30",
appVersionCode: 1130,
appName: "货无忧测试版",
appVersion: "1.1.28",
appVersionCode: 1128,
appLanguage: getAppLanguage(hostLanguage),
uniCompileVersion: "4.08",
uniRuntimeVersion: "4.08",
@ -1429,9 +1429,9 @@ const getAppBaseInfo = {
hostSDKVersion: SDKVersion,
hostTheme: theme,
appId: "__UNI__EB22F37",
appName: "货无忧",
appVersion: "1.1.30",
appVersionCode: 1130,
appName: "货无忧测试版",
appVersion: "1.1.28",
appVersionCode: 1128,
appLanguage: getAppLanguage(hostLanguage)
}));
}

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

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

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

@ -27,7 +27,217 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
const { HANDLE_GETSTORAGEINFO } = storageStore;
const { storageArr } = common_vendor.storeToRefs(storageStore);
const tip = common_vendor.ref(null);
let details = common_vendor.reactive({ tablist: [] });
let details = common_vendor.reactive({
tablist: [
{
type: 1,
name: "工作台",
minilist: [
{
icon: "http://47.108.51.143:9000/basic/upload/20231016/440a01005f8333bcc76c1254a1d35570.png",
name: "订单查询",
router: "/pagesHome/pages/orderInquiry/orderInquiry"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png",
name: "运单查询",
router: "/pagesHome/pages/waybillInquiry/waybillInquiry"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png",
name: "库位查询",
router: "/pagesHome/pages/storageInquiry/storageInquiry"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png",
name: "托盘查询",
router: "/pagesHome/pages/trayInquiry/trayInquiry"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png",
name: "库存品查询",
router: "/pagesHome/pages/inventoryInquiry/inventoryInquiry"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "物料维护",
router: "/pagesHome/pages/MaterialMaintenance/MaterialMaintenance"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240320/d22bc792f9deff3f106aafc590ec14fb.png",
name: "库位列表",
router: "/pagesHome/pages/StorageLocationList/StorageLocationList"
}
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '发起工单',
// router: '/pagesHome/pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder',
// },
]
},
{
type: 1,
name: "入库",
minilist: [
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/14451e54503266f168edf3651f2ab798.png",
name: "码板打托",
router: "/pagesHome/pages/codePlateBracket/codePlateBracket"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png",
name: "入库扫描",
router: "/pagesHome/pages/TranNumber/TranNumber"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/49254333c9c5c7aed6e9c8aab89c5998.png",
name: "到车入库",
router: "/pagesHome/pages/ArrivalList/ArrivalList"
}
]
},
{
type: 1,
name: "库内",
minilist: [
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/e2604b3c97ee6001f367df87e3d0fdd1.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://47.108.51.143:9000/basic/upload/20231012/03add918888d36ce0d566da120510840.png",
name: "扫码上架",
router: "/pagesHome/pages/ScanUpType/ScanUpType"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/7b7ca70b84ebf6a2f72e74300725132c.png",
name: "手动上架",
router: "/pagesHome/pages/PeopleScanUpType/PeopleScanUpType"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/7b7e477dd35483ca7628567c609657fc.png",
name: "移库",
router: "/pagesHome/pages/RelocationType/RelocationType"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png",
name: "滞留",
router: "/pagesHome/pages/Retention/Retention"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/ce45bb522069f1fd154ca964e66069c2.png",
name: "合托",
router: "/pagesHome/pages/MergeTray/MergeTray"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/91403695005c2c65ea2c9d4ddadac9c3.png",
name: "下架",
router: "/pagesHome/pages/DownGoodsType/DownGoodsType"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png",
name: "空置托盘",
router: "/pagesHome/pages/RemoveTray/RemoveTray"
},
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '复核',
// router: '/pagesHome/pages/Check/Check',
// },
{
icon: "http://47.108.51.143:9000/basic/upload/20231217/5d3a466a54b62a60cfb9dc53b0f6ded1.png",
name: "托盘数据同步",
router: "/pagesHome/pages/SearchTray/SearchTray"
}
]
},
{
type: 1,
name: "出库",
minilist: [
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/b58252914de56c0e3da1bdc75ac51c07.png",
name: "拣货扫描",
router: "/pagesHome/pages/pickingScan/pickingScan"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/7a9648ffdefd77f7ab8bb7861a2473e7.png",
name: "自提扫描",
router: "/pagesHome/pages/SelfPickupScan/SelfPickupScan"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/e5562240ca21316b21306d17f9394abc.png",
name: "配载装车",
router: "/pagesHome/pages/StowageList/StowageList"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/d58281e6ba1845f313d85a119107e260.png",
name: "中转装车",
router: "/pagesHome/pages/RelayScanList/RelayScanList"
}
]
},
{
type: 1,
name: "配送",
minilist: [
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/1a9bbc8c842b8b7ef555d6cd79d421be.png",
name: "装车扫描",
router: "/pagesHome/pages/LoadingScan/LoadingScan"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20231012/6956f6950cfc291e01c038ea5e13f984.png",
name: "签收扫描",
router: "/pagesHome/pages/signinScan/signinScan"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/16a9b462df1546f2fa6159df00ade62e.png",
name: "直发商家签收",
router: "/pagesHome/pages/directGoMarket/directGoMarket"
}
]
},
{
type: 1,
name: "离线上传",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "离线上传",
router: "/pagesHome/pages/OfflineUpload/OfflineUpload"
}
]
},
{
type: 1,
name: "考核",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "考核指标",
router: "/pagesHome/pages/integral/integral"
},
{
icon: "http://8.137.14.82:9000/bladex/upload/20240117/fac9c4fd6c4f0bee599417fc8fbbee62.png",
name: "我的考核",
router: "/pagesHome/pages/integralMy/integralMy"
}
]
}
]
});
function gopathpage(path) {
common_vendor.index.navigateTo({
url: path

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

@ -2,9 +2,9 @@
const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
const utils_utils = require("../../../utils/utils.js");
require("../../../utils/request.js");
require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js");
@ -31,7 +31,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "SelfPickupDetails",
setup(__props) {
common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
const utils = common_vendor.inject("utils");
const option = {
title: "自提明细扫描",
haveData: true,
@ -72,19 +71,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
isscan: false,
zeroList: [],
orderList: [],
stockList: []
stockList: [],
/** 滚动区高度 */
scrollHeight: "45vh",
/** 扫描的码值 */
scanOrderPackageCode: ""
});
const tiplists = common_vendor.ref(null);
const basicContainer = common_vendor.ref(null);
common_vendor.onLoad((op) => {
details.billLadingId = op.billLadingId;
});
common_vendor.onShow(() => {
const timer = setTimeout(() => {
basicContainer.value.startPullDownRefresh();
clearTimeout(timer);
}, 200);
common_vendor.onShow(async () => {
await common_vendor.nextTick$1();
basicContainer.value.startPullDownRefresh();
details.dataList = details.orderList;
details.scrollHeight = await utils_utils.utils.getViewDistanceFormTop(".scrollv");
});
function goorderdetail(item) {
common_vendor.index.navigateTo({
@ -92,6 +94,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
}
function showsdqs() {
if (details.planNum <= details.signedNum)
return utils_utils.utils.handleToast("提货计划已完成");
tiplists.value.setdetails({
isshow: true,
tipstate: 1,
@ -99,6 +103,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
placeholder: "请输入扫描的码",
inputtext: "",
success: (detail) => {
if (!detail.inputtext && detail.inputtext !== 0)
return utils_utils.utils.handleToast("请输入码值");
details.scancode = detail.inputtext;
sacn();
tiplists.value.setdetails({ isshow: false });
@ -167,6 +173,28 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
try {
if (details.orderCode === 3)
return;
if (details.planNum <= details.signedNum)
return utils_utils.utils.handleToast("提货计划已完成");
let content = "";
let haveData = false;
for (let i = 0; i < details.orderList.length; i++) {
const item = details.orderList[i];
if (content)
break;
if (details.scancode !== item.orderPackageCode)
continue;
haveData = true;
if (item.scanStatus === 2) {
content = "包件已扫描";
const _value = details.orderList.splice(i, 1);
details.orderList.unshift(_value[0]);
}
break;
}
if (!haveData)
return utils_utils.utils.handleToast("码值错误, 不在本计划内");
if (content)
return utils_utils.utils.handleToast(content);
let data = {
id: details.billLadingId,
coding: details.scancode,
@ -176,13 +204,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
console.log(res);
if (res.code == 200) {
details.isscan = true;
details.scanOrderPackageCode = data.coding;
initpage();
} else if (res.code === 3001) {
common_vendor.index.showToast({
title: res.msg,
icon: "none"
});
utils.ttsspke(res.audio);
utils_utils.utils.ttsspke(res.audio);
}
} catch (err) {
console.log("err :>> ", err);
@ -192,11 +221,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
async function initpage() {
details.dataList = [];
try {
common_vendor.index.showLoading({
title: "数据加载中",
mask: true
});
console.log("获取数据");
if (details.orderType == 1) {
let data = {
orderStatus: details.orderStatus,
@ -204,9 +228,23 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
orderCode: details.orderCode
};
let response = await api_user.billLadingdetailList(data);
if (response.code !== 200)
const { code, data: { list } } = response;
console.log("response :>> ", response);
if (code !== 200 || !list)
return;
details.orderList = response.data.list || [];
const _arr = [];
const scanArr = [];
for (let i = 0; i < list.length; i++) {
const item = list[i];
if (item.scanStatus === 1)
_arr.push(item);
else if (item.orderPackageCode === details.scanOrderPackageCode)
_arr.unshift(item);
else
scanArr.push(item);
}
details.scanOrderPackageCode = "";
details.orderList = [..._arr, ...scanArr];
details.consignee = response.data.consignee;
details.pickUpPlate = response.data.pickUpPlate;
details.carTypeStr = response.data.carTypeStr;
@ -242,10 +280,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
} catch (e) {
} finally {
if (details.isscan && details.signedNum) {
utils.ttsspke(details.signedNum + "件");
utils_utils.utils.ttsspke(details.signedNum + "件");
details.isscan = false;
}
common_vendor.index.hideLoading();
}
}
function setorderStatus(state) {
@ -283,12 +320,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
f: common_vendor.f([1, 2], (item, k0, i0) => {
return {
a: common_vendor.t(item == 1 ? "计划" : "完成"),
b: "45762c3a-7-" + i0 + "," + ("45762c3a-6-" + i0),
b: "8cd5f8a8-7-" + i0 + "," + ("8cd5f8a8-6-" + i0),
c: common_vendor.t(item == 1 ? common_vendor.unref(details).orderNum : common_vendor.unref(details).completeNum),
d: "45762c3a-8-" + i0 + "," + ("45762c3a-6-" + i0),
d: "8cd5f8a8-8-" + i0 + "," + ("8cd5f8a8-6-" + i0),
e: common_vendor.t(item == 1 ? common_vendor.unref(details).planNum : common_vendor.unref(details).signedNum),
f: "45762c3a-9-" + i0 + "," + ("45762c3a-6-" + i0),
g: "45762c3a-6-" + i0 + ",45762c3a-1"
f: "8cd5f8a8-9-" + i0 + "," + ("8cd5f8a8-6-" + i0),
g: "8cd5f8a8-6-" + i0 + ",8cd5f8a8-1"
};
}),
g: common_vendor.p({
@ -326,7 +363,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
b: common_vendor.o(($event) => goorderdetail(item), item),
c: common_vendor.t(item.orderPackageCode),
d: common_vendor.t(item.scanStatusStr),
e: common_vendor.t(item.errorStatusStr),
e: Number(item.scanStatus) !== 1 ? 1 : "",
f: common_vendor.o(showsdqs, item)
} : {}, common_vendor.unref(orderType) == 2 ? {
g: common_vendor.t(item.sku),
@ -350,18 +387,19 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
v: common_vendor.unref(orderType) == 1,
w: common_vendor.unref(orderType) == 2,
x: common_vendor.unref(orderType) == 3,
y: common_vendor.sr(basicContainer, "45762c3a-0", {
y: common_vendor.unref(details).scrollHeight,
z: common_vendor.sr(basicContainer, "8cd5f8a8-0", {
"k": "basicContainer"
}),
z: common_vendor.p({
A: common_vendor.p({
option
}),
A: common_vendor.sr(tiplists, "45762c3a-11", {
B: common_vendor.sr(tiplists, "8cd5f8a8-11", {
"k": "tiplists"
})
};
};
}
});
const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/worksp/logpm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]);
const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8cd5f8a8"], ["__file", "D:/worksp/logpm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]);
wx.createPage(MiniProgramPage);

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

@ -1 +1 @@
<basic-container wx:if="{{z}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="45762c3a-0" bind:__l="__l" u-p="{{z}}"><view slot="head"><view class="headtop"><view><view>车牌号:{{a}}</view><view>司机:{{b}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{j}}" u-s="{{['d']}}" u-i="45762c3a-1,45762c3a-0" bind:__l="__l" u-p="{{j}}"><uni-tr u-s="{{['d']}}" u-i="45762c3a-2,45762c3a-1" bind:__l="__l"><uni-th wx:if="{{c}}" u-i="45762c3a-3,45762c3a-2" bind:__l="__l" u-p="{{c}}"></uni-th><uni-th wx:if="{{d}}" u-s="{{['d']}}" u-i="45762c3a-4,45762c3a-2" bind:__l="__l" u-p="{{d}}">订单总数</uni-th><uni-th wx:if="{{e}}" u-s="{{['d']}}" u-i="45762c3a-5,45762c3a-2" bind:__l="__l" u-p="{{e}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{f}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.g}}" bind:__l="__l"><uni-td wx:if="{{g}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{g}}">{{item.a}}</uni-td><uni-td wx:if="{{h}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{h}}">{{item.c}}</uni-td><uni-td wx:if="{{i}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{i}}">{{item.e}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{l}}" bindchange="{{k}}" u-i="45762c3a-10,45762c3a-0" bind:__l="__l" u-p="{{l}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan" bindtap="{{m}}">查询</view></view><view class="tabtip"><view bindtap="{{o}}"><view class="{{n}}">定制品</view></view><view bindtap="{{q}}"><view class="{{p}}">库存品</view></view><view bindtap="{{s}}"><view class="{{r}}">零担</view></view></view></view><scroll-view scroll-y="true" class="scrollv" slot="body"><view class="mabxs"><block wx:for="{{t}}" wx:for-item="item" wx:key="t"><block wx:if="{{v}}"><view class="ite" bindtap="{{item.f}}"><view><view catchtap="{{item.b}}">订单号:{{item.a}}</view><view>包条码:{{item.c}}</view></view><view><view>是否扫描:{{item.d}}</view><view>异常:{{item.e}}</view></view></view></block><block wx:if="{{w}}"><view class="ite" bindtap="{{item.m}}"><view><view>SKU:{{item.g}}</view><view>包件号:{{item.h}}</view></view><view><view>物品:{{item.i}}</view><view>规格:{{item.j}}</view></view><view><view>单位:{{item.k}}</view><view>扫描:{{item.l}}</view></view></view></block><block wx:if="{{x}}"><view class="ite" bindtap="{{item.s}}"><view><view>订单号:{{item.n}}</view></view><view><view>运单号:{{item.o}}</view></view><view><view>产品名称:{{item.p}}</view></view><view><view>预计签收件数:{{item.q}}</view><view>实际签收件数:{{item.r}}</view></view></view></block></block></view></scroll-view></basic-container><tiplist class="r" u-r="tiplists" u-i="45762c3a-11" bind:__l="__l"></tiplist>
<basic-container wx:if="{{A}}" class="r data-v-8cd5f8a8" u-s="{{['head','body']}}" u-r="basicContainer" u-i="8cd5f8a8-0" bind:__l="__l" u-p="{{A}}"><view slot="head"><view class="headtop data-v-8cd5f8a8"><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">车牌号:{{a}}</view><view class="data-v-8cd5f8a8">司机:{{b}}</view></view></view><view class="tabmabx data-v-8cd5f8a8"><view class="data-v-8cd5f8a8"><uni-table wx:if="{{j}}" class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="8cd5f8a8-1,8cd5f8a8-0" bind:__l="__l" u-p="{{j}}"><uni-tr class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="8cd5f8a8-2,8cd5f8a8-1" bind:__l="__l"><uni-th wx:if="{{c}}" class="data-v-8cd5f8a8" u-i="8cd5f8a8-3,8cd5f8a8-2" bind:__l="__l" u-p="{{c}}"></uni-th><uni-th wx:if="{{d}}" class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="8cd5f8a8-4,8cd5f8a8-2" bind:__l="__l" u-p="{{d}}">订单总数</uni-th><uni-th wx:if="{{e}}" class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="8cd5f8a8-5,8cd5f8a8-2" bind:__l="__l" u-p="{{e}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{f}}" wx:for-item="item" class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="{{item.g}}" bind:__l="__l"><uni-td wx:if="{{g}}" u-s="{{['d']}}" class="jhjs data-v-8cd5f8a8" u-i="{{item.b}}" bind:__l="__l" u-p="{{g}}">{{item.a}}</uni-td><uni-td wx:if="{{h}}" class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{h}}">{{item.c}}</uni-td><uni-td wx:if="{{i}}" class="data-v-8cd5f8a8" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{i}}">{{item.e}}</uni-td></uni-tr></uni-table></view></view><view class="scinp data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">齐套状态</view><view class="data-v-8cd5f8a8"><cus-selects wx:if="{{l}}" class="data-v-8cd5f8a8" bindchange="{{k}}" u-i="8cd5f8a8-10,8cd5f8a8-0" bind:__l="__l" u-p="{{l}}"></cus-selects></view><view class="inputs data-v-8cd5f8a8"><input class="data-v-8cd5f8a8" placeholder="请输入查询的订单号"/></view><view class="btscan data-v-8cd5f8a8" bindtap="{{m}}">查询</view></view><view class="tabtip data-v-8cd5f8a8"><view class="data-v-8cd5f8a8" bindtap="{{o}}"><view class="{{['data-v-8cd5f8a8', n]}}">定制品</view></view><view class="data-v-8cd5f8a8" bindtap="{{q}}"><view class="{{['data-v-8cd5f8a8', p]}}">库存品</view></view><view class="data-v-8cd5f8a8" bindtap="{{s}}"><view class="{{['data-v-8cd5f8a8', r]}}">零担</view></view></view></view><scroll-view scroll-y="true" style="{{'height:' + y}}" class="scrollv data-v-8cd5f8a8" slot="body"><view class="mabxs data-v-8cd5f8a8"><block wx:for="{{t}}" wx:for-item="item" wx:key="t"><block wx:if="{{v}}"><view class="ite data-v-8cd5f8a8" bindtap="{{item.f}}"><view class=" data-v-8cd5f8a8"><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8" catchtap="{{item.b}}">订单号:{{item.a}}</view><view class="mt10 data-v-8cd5f8a8">包条码:{{item.c}}</view></view></view><view class="{{['data-v-8cd5f8a8', 'scanTip', item.e && 'isScan']}}">{{item.d}}</view></view></block><block wx:if="{{w}}"><view class="ite data-v-8cd5f8a8" bindtap="{{item.m}}"><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">SKU:{{item.g}}</view><view class="data-v-8cd5f8a8">包件号:{{item.h}}</view></view><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">物品:{{item.i}}</view><view class="data-v-8cd5f8a8">规格:{{item.j}}</view></view><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">单位:{{item.k}}</view><view class="data-v-8cd5f8a8">扫描:{{item.l}}</view></view></view></block><block wx:if="{{x}}"><view class="ite data-v-8cd5f8a8" bindtap="{{item.s}}"><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">订单号:{{item.n}}</view></view><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">运单号:{{item.o}}</view></view><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">产品名称:{{item.p}}</view></view><view class="data-v-8cd5f8a8"><view class="data-v-8cd5f8a8">预计签收件数:{{item.q}}</view><view class="data-v-8cd5f8a8">实际签收件数:{{item.r}}</view></view></view></block></block></view></scroll-view></basic-container><tiplist class="r data-v-8cd5f8a8" u-r="tiplists" u-i="8cd5f8a8-11" bind:__l="__l"></tiplist>

179
unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxss vendored

@ -23,12 +23,109 @@
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
.tabtip {
.flex.data-v-8cd5f8a8{
display: flex;
}
.flex-c-c.data-v-8cd5f8a8{
display: flex;
align-items: center;
justify-content: center;
}
.flex-c-sb.data-v-8cd5f8a8{
display: flex;
align-items: center;
justify-content: space-between;
}
.flex-c-sa.data-v-8cd5f8a8{
display: flex;
align-items: center;
justify-content: space-around;
}
.align-center.data-v-8cd5f8a8{
display: flex;
align-items: center;
}
.flex1.data-v-8cd5f8a8{
flex: 1;
}
.flexnone.data-v-8cd5f8a8{
flex: none;
}
.mt10.data-v-8cd5f8a8{
margin-top: 10rpx;
}
.mt20.data-v-8cd5f8a8{
margin-top: 20rpx;
}
.ml10.data-v-8cd5f8a8{
margin-left: 10rpx;
}
.ml20.data-v-8cd5f8a8{
margin-left: 20rpx;
}
.mb10.data-v-8cd5f8a8{
margin-bottom: 10rpx;
}
.mb20.data-v-8cd5f8a8{
margin-bottom: 20rpx;
}
.mr10.data-v-8cd5f8a8{
margin-right: 10rpx;
}
.mr20.data-v-8cd5f8a8{
margin-right: 20rpx;
}
.pd10.data-v-8cd5f8a8{
padding: 10rpx;
}
.pd15.data-v-8cd5f8a8{
padding: 15rpx;
}
.pd20.data-v-8cd5f8a8{
padding: 20rpx;
}
.w100.data-v-8cd5f8a8{
width: 100%;
}
.h100.data-v-8cd5f8a8{
height: 100%;
}
.text-center.data-v-8cd5f8a8{
text-align: center;
}
.text-start.data-v-8cd5f8a8{
text-align: start;
}
.text-end.data-v-8cd5f8a8{
text-align: end;
}
.fwb.data-v-8cd5f8a8{
font-weight: bold;
}
.rem-1.data-v-8cd5f8a8{
font-size: 1rem;
}
.rem-0-8.data-v-8cd5f8a8{
font-size: 0.8rem;
}
.rem-0-9.data-v-8cd5f8a8{
font-size: 0.9rem;
}
.rem-1-5.data-v-8cd5f8a8{
font-size: 1.5rem;
}
.primaryColor.data-v-8cd5f8a8{
color: #172e60;
}
.primaryColorIm.data-v-8cd5f8a8{
color: #172e60 !important;
}
.tabtip.data-v-8cd5f8a8 {
display: flex;
align-items: center;
justify-content: space-between;
}
.tabtip > view {
.tabtip > view.data-v-8cd5f8a8 {
width: 50%;
display: flex;
align-items: center;
@ -38,19 +135,18 @@
font-weight: 400;
color: #90A0AF;
}
.tabtip > view > view {
.tabtip > view > view.data-v-8cd5f8a8 {
height: 80rpx;
border-bottom: 8rpx solid #ffffff;
display: flex;
align-items: center;
justify-content: center;
}
.tabtip .xz {
.tabtip .xz.data-v-8cd5f8a8 {
color: #D3832A;
border-bottom: 8rpx solid #D3832A;
}
.scrollv {
width: 686rpx;
.scrollv.data-v-8cd5f8a8 {
height: 48.5vh;
box-sizing: border-box;
background-color: #ffffff;
@ -59,104 +155,121 @@
padding: 20rpx;
box-sizing: border-box;
}
.scrollv .mabxs {
.scrollv .mabxs.data-v-8cd5f8a8 {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 5rpx;
}
.scrollv .mabxs .ite {
width: 96%;
.scrollv .mabxs .ite.data-v-8cd5f8a8 {
width: 98%;
display: flex;
flex-direction: column;
align-items: center;
padding: 20rpx 15rpx;
padding: 20rpx 15rpx 0rpx;
box-sizing: border-box;
border-radius: 8rpx;
box-shadow: 0rpx 2rpx 10rpx 0rpx #e2e2e3;
margin-bottom: 20rpx;
padding-bottom: 10rpx;
position: relative;
overflow: hidden;
}
.scrollv .mabxs .ite:nth-last-child(1) {
.scrollv .mabxs .ite.data-v-8cd5f8a8:nth-last-child(1) {
margin-bottom: 5rpx;
}
.scrollv .mabxs .ite > view {
.scrollv .mabxs .ite > view.data-v-8cd5f8a8 {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
margin-bottom: 20rpx;
}
.scrollv .mabxs .ite > view:nth-last-child(1) {
.scrollv .mabxs .ite > view.data-v-8cd5f8a8:nth-last-child(1) {
margin-bottom: none !important;
}
.scrollv .mabxs .ite > view > view {
.scrollv .mabxs .ite > view > view.data-v-8cd5f8a8 {
font-size: 28rpx;
font-weight: 400;
color: #092C4D;
}
.tabmabx {
.scrollv .mabxs .ite .scanTip.data-v-8cd5f8a8 {
position: absolute;
top: 0;
right: 0;
width: -webkit-fit-content;
width: fit-content;
padding: 10rpx;
font-size: 0.8rem;
background: #f00;
color: #fff;
font-weight: bold;
}
.scrollv .mabxs .ite .scanTip.isScan.data-v-8cd5f8a8 {
background: #1ba035;
}
.tabmabx.data-v-8cd5f8a8 {
width: 100%;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #ffffff;
padding-bottom: 20rpx;
}
.tabmabx .uni-table-th {
.tabmabx .uni-table-th.data-v-8cd5f8a8 {
background-color: #F8FBFF;
font-size: 28rpx;
font-weight: 400;
color: #092C4D;
padding: 10rpx;
}
.tabmabx .uni-table-tr:nth-last-child(2) > .uni-table-td {
.tabmabx .uni-table-tr:nth-last-child(2) > .uni-table-td.data-v-8cd5f8a8 {
font-size: 36rpx;
font-weight: 400;
color: #092C4D;
padding: 10rpx;
}
.tabmabx .uni-table-tr:nth-last-child(2) > .uni-table-td:nth-of-type(1) {
.tabmabx .uni-table-tr:nth-last-child(2) > .uni-table-td.data-v-8cd5f8a8:nth-of-type(1) {
font-size: 28rpx !important;
font-weight: 400;
color: #092C4D !important;
}
.tabmabx .uni-table-tr:nth-last-child(1) > .uni-table-td {
.tabmabx .uni-table-tr:nth-last-child(1) > .uni-table-td.data-v-8cd5f8a8 {
border-bottom: none !important;
font-size: 36rpx;
font-weight: 400;
color: #0086F1;
}
.tabmabx .uni-table-tr:nth-last-child(1) > .uni-table-td:nth-of-type(1) {
.tabmabx .uni-table-tr:nth-last-child(1) > .uni-table-td.data-v-8cd5f8a8:nth-of-type(1) {
font-size: 28rpx !important;
font-weight: 400;
color: #092C4D !important;
}
.tabmabx > view {
.tabmabx > view.data-v-8cd5f8a8 {
border-radius: 8rpx;
border: 2rpx solid #EEEEEE;
padding-bottom: -2rpx;
}
.headtop {
.headtop.data-v-8cd5f8a8 {
display: flex;
flex-direction: column;
padding: 34rpx 32rpx;
padding: 20rpx 32rpx;
box-sizing: border-box;
background-color: #ffffff;
}
.headtop > view {
.headtop > view.data-v-8cd5f8a8 {
display: flex;
align-items: center;
justify-content: space-between;
font-size: 28rpx;
font-weight: 400;
color: #092C4D;
margin-bottom: 24rpx;
}
.headtop > view:nth-of-type(2) {
.headtop > view.data-v-8cd5f8a8:nth-of-type(2) {
margin-bottom: 0;
}
.headtop > view > view {
.headtop > view > view.data-v-8cd5f8a8 {
flex: 1;
}
.scinp {
.scinp.data-v-8cd5f8a8 {
display: flex;
align-items: center;
justify-content: space-between;
@ -164,12 +277,12 @@
box-sizing: border-box;
background-color: #ffffff;
}
.scinp > view:nth-of-type(1) {
.scinp > view.data-v-8cd5f8a8:nth-of-type(1) {
font-size: 28rpx;
font-weight: 400;
color: #092C4D;
}
.scinp .inputs {
.scinp .inputs.data-v-8cd5f8a8 {
width: 276rpx;
height: 64rpx;
background: #F5F5F6;
@ -182,12 +295,12 @@
font-weight: 400;
color: #AFB4BA;
}
.scinp .inputs > input {
.scinp .inputs > input.data-v-8cd5f8a8 {
flex: 1;
font-size: 24rpx;
color: #092C4D;
}
.scinp .btscan {
.scinp .btscan.data-v-8cd5f8a8 {
width: 128rpx;
height: 64rpx;
background: #D3832A;

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

@ -542,12 +542,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
M: common_vendor.o(($event) => checkphon(item, index))
}) : {}, common_vendor.unref(orderStatus) === 3 ? {
N: common_vendor.t(item.sku),
O: common_vendor.t(item.descriptionGoods),
P: common_vendor.t(item.specification),
Q: common_vendor.t(item.logpmUnit),
R: common_vendor.t(item.signforNub == 0 ? "未扫" : item.signforNub == item.reservationNum ? "齐套" : "部分扫"),
S: common_vendor.n(item.signforNub == 0 ? "tip tp2" : item.signforNub == item.reservationNum ? "tip tp1" : "tip tp3"),
T: common_vendor.o(($event) => setcheckindex(index))
O: common_vendor.t(item.orderPackageCode),
P: common_vendor.t(item.descriptionGoods),
Q: common_vendor.t(item.specification),
R: common_vendor.t(item.logpmUnit),
S: common_vendor.t(item.signforNub == 0 ? "未扫" : "已扫"),
T: common_vendor.n(item.signforNub == 0 ? "tip tp2" : "tip tp1"),
U: common_vendor.o(($event) => setcheckindex(index))
} : {});
}),
w: common_vendor.unref(orderStatus) === 1,

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

File diff suppressed because one or more lines are too long

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

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

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

@ -73,6 +73,7 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
};
const HandleRequest = (params, key, loadingObj) => {
return new Promise(async (relove, reject) => {
console.log("进入请求");
let refresh_token = common_vendor.index.getStorageSync("refresh_token");
let token = common_vendor.index.getStorageSync("access_token");
let user = common_vendor.index.getStorageSync("userinfo");
@ -112,11 +113,12 @@ const HandleRequest = (params, key, loadingObj) => {
url: urlhd + params.url,
data: params.data,
method: params.method,
header
header,
complete: () => {
}
};
let response = {};
const request = common_vendor.index.request(submitData);
request.then((res) => {
submitData.success = (res) => {
console.log("请求res :>> ", res);
response = res;
if (res.statusCode == 200) {
@ -153,7 +155,7 @@ const HandleRequest = (params, key, loadingObj) => {
}
if (_isRefreshToken._isRefreshToken) {
_isRefreshToken._isRefreshToken.then(() => {
HandleRequest(requestObj[key], key, loadingObj).then((res2) => {
HandleRequest(requestObj[key].params, key, loadingObj).then((res2) => {
relove(res2);
});
});
@ -161,7 +163,7 @@ const HandleRequest = (params, key, loadingObj) => {
console.log("header :>> ", header);
const refreshFn = HandleRefreshToken(header, urlhd, refresh_token, user);
refreshFn.then((res2) => {
HandleRequest(requestObj[key], key, loadingObj).then((res3) => {
HandleRequest(requestObj[key].params, key, loadingObj).then((res3) => {
relove(res3);
});
}).catch(() => {
@ -176,13 +178,18 @@ const HandleRequest = (params, key, loadingObj) => {
reject(res);
}
}
}).catch(async (err) => {
console.log(err);
};
submitData.fail = async (err) => {
console.log("err", err);
const {
errMsg
} = err;
if (errMsg === "request:fail abort")
return;
delete requestObj[key];
utils_functions.api.error("请检查是否连接到无线网络");
}).finally(async (res) => {
console.log("response :>> ", response);
console.log("res-finally :>> ", res);
};
submitData.complete = async (res) => {
await common_vendor.nextTick$1();
if (loadingObj.isShowLoading !== false)
common_vendor.index.hideLoading();
@ -196,7 +203,9 @@ const HandleRequest = (params, key, loadingObj) => {
} else if (data.audio)
utils_utils.utils.handleToast(data.audio, "none", false);
}
});
};
const request = common_vendor.index.request(submitData);
requestObj[key].request = request;
});
};
let requestObj = {};
@ -204,19 +213,31 @@ let _isRefreshToken = {
_isRefreshToken: null
};
let isLogin = false;
const service = async (params, loadingObj) => {
const service = async (params, loadingObj, canCancel = false) => {
if (params.data.isLogin) {
isLogin = true;
delete params.data.isLogin;
} else
isLogin = false;
console.log("params :>> ", params);
console.log("requestObj :>> ", requestObj);
const _key = params.url + JSON.stringify(params.data);
if (requestObj[_key])
return new Promise((resolve) => resolve({
code: 4e3
}));
requestObj[_key] = params;
if (requestObj[_key]) {
const {
request
} = requestObj[_key];
if (canCancel && request) {
console.log("request :>> ", request);
request.abort();
} else
return new Promise((resolve) => resolve({
code: 4e3
}));
}
console.log("222 :>> ", 222);
requestObj[_key] = {
params
};
if (_isRefreshToken._isRefreshToken) {
await _isRefreshToken._isRefreshToken;
return HandleRequest(params, _key, loadingObj);

2
utils/request.js

@ -294,7 +294,7 @@ const HandleRequest = (params, key, loadingObj) => {
if (data) {
if (data.code !== 200 && data.code !== 401) {
if (data.msg) utils.handleToast(data.msg)
if (data.msg) utils.handleToast(data.msg.length > 100 ? '系统异常,请联系管理员' : data.msg)
} else if (data.audio) utils.handleToast(data.audio, 'none', false)
}
}

Loading…
Cancel
Save