|
|
@@ -33,7 +33,7 @@
|
|
|
</van-field>
|
|
|
</div>
|
|
|
<van-row class="list">
|
|
|
- <van-col span="7">
|
|
|
+ <van-col span="8">
|
|
|
<div class="left">
|
|
|
<div class="item" ref="itemRefs" :class="index==activeIndex?'active':allPicking(location)"
|
|
|
v-for="(location,index) in locationList"
|
|
|
@@ -43,7 +43,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</van-col>
|
|
|
- <van-col span="17">
|
|
|
+ <van-col span="16">
|
|
|
<div class="right">
|
|
|
<div class="right-list" v-for="(item,index) in locationList[activeIndex].list"
|
|
|
:class="activeClass(item)">
|
|
|
@@ -110,6 +110,7 @@ const router = useRouter()
|
|
|
const route = useRoute()
|
|
|
import { useStore } from '@/store/modules/user'
|
|
|
const store = useStore()
|
|
|
+const basic = basicStore()
|
|
|
import { back, getHeader, playVoicePickNum, scanError, scanSuccess } from '@/utils/android'
|
|
|
import { closeListener, openListener, scanInit } from '@/utils/keydownListener'
|
|
|
import PickingNoInput from '@/views/outbound/components/PickingNoInput.vue'
|
|
|
@@ -118,6 +119,8 @@ import { formatDateTime } from '@/utils/date'
|
|
|
import { isLot } from '@/views/outbound/picking/list/hooks/lotNum'
|
|
|
import { barcodeToUpperCase } from '@/utils/dataType'
|
|
|
import { containerDef } from '@/views/outbound/picking/list/hooks/containerDef'
|
|
|
+import { getCarrierList } from '@/hooks/basic/carrier'
|
|
|
+import { basicStore } from '@/store/modules/basic'
|
|
|
onUnmounted(() => {
|
|
|
closeListener()
|
|
|
})
|
|
|
@@ -143,6 +146,9 @@ const containerNoTrueFalseBy=ref(false)
|
|
|
const modeTrueFalseBy=ref(false)
|
|
|
// 获取货主
|
|
|
const { ownerMap, getOwnerData } = getOwnerList()
|
|
|
+// 获取货主
|
|
|
+const {carrierMap, getCarrierData } = getCarrierList()
|
|
|
+
|
|
|
let taskMap = ref({})
|
|
|
//组合后库位
|
|
|
let locationList = ref([])
|
|
|
@@ -233,6 +239,9 @@ if(route.query.code){
|
|
|
}else {
|
|
|
getPickingCode()
|
|
|
}
|
|
|
+if(Object.keys(basic.carrierMap).length == 0){
|
|
|
+ getCarrierData()
|
|
|
+}
|
|
|
getOwnerData()
|
|
|
// 计算已成功数量
|
|
|
const quantity = computed(() => {
|
|
|
@@ -521,7 +530,7 @@ const onRefresh = () => {
|
|
|
|
|
|
.left
|
|
|
background: #f2f8fe
|
|
|
- padding: 2px 5px
|
|
|
+ padding: 2px 10px
|
|
|
height: 83.1vh
|
|
|
overflow: scroll
|
|
|
box-sizing: border-box
|
|
|
@@ -540,7 +549,7 @@ const onRefresh = () => {
|
|
|
background: #1989fa
|
|
|
color: #fff
|
|
|
position: relative
|
|
|
- right: -5px
|
|
|
+ right: -10px
|
|
|
|
|
|
.allActive
|
|
|
background: #72dc41
|
zhaohuanhuan