|
|
@@ -102,7 +102,7 @@
|
|
|
<span class="custom-title">{{ item.label }}</span>
|
|
|
</template>
|
|
|
<template #value>
|
|
|
- <div>{{ lotMap[item.mapping] || item.mapping }} </div>
|
|
|
+ <div>{{ item.mapping }}</div>
|
|
|
</template>
|
|
|
</van-cell>
|
|
|
</van-cell-group>
|
|
|
@@ -145,7 +145,7 @@
|
|
|
v-model:show="lotQualityTrueFalseBy"
|
|
|
cancel-text="取消"
|
|
|
close-on-click-action
|
|
|
- :description="'请选择'+lotTitle"
|
|
|
+ description="请选择质量状态"
|
|
|
>
|
|
|
<van-cell-group>
|
|
|
<van-cell v-for="(value,key) in lotQualityMap" @click="onSelectLotQuality(key)">
|
|
|
@@ -320,7 +320,6 @@ const asnInfo = ref({})
|
|
|
const reset = () => {
|
|
|
asnInfo.value = {}
|
|
|
lotData.value = []
|
|
|
- lotMap.value={}
|
|
|
searchCount.value = ''
|
|
|
searchBarcode.value = ''
|
|
|
oldSearchBarcode.value = ''
|
|
|
@@ -346,7 +345,6 @@ const onAsnCancel = () => {
|
|
|
if (searchBarcode.value === '' || (oldSearchBarcode.value.length != searchBarcode.value.length && oldSearchBarcode.value != '')) {
|
|
|
asnInfo.value = {}
|
|
|
lotData.value = []
|
|
|
- lotMap.value={}
|
|
|
searchCount.value = ''
|
|
|
}
|
|
|
}
|
|
|
@@ -452,7 +450,6 @@ const _handlerScan = (code) => {
|
|
|
if (asnDetailsList.value.length > 1) {
|
|
|
asnInfo.value = {}
|
|
|
lotData.value = []
|
|
|
- lotMap.value={}
|
|
|
searchCount.value = ''
|
|
|
uniqueCodeList.value = []
|
|
|
asnDetailsTrueFalseBy.value = true
|
|
|
@@ -545,7 +542,6 @@ const setAttribute = (data) => {
|
|
|
|
|
|
// 批次属性
|
|
|
const lotData = ref([])
|
|
|
-const lotMap = ref({})
|
|
|
const _getProductLot = (item) => {
|
|
|
const params = { warehouse: item.warehouse, owner: item.customerId, barcode: item.sku }
|
|
|
getProductLot(params).then(res => {
|
|
|
@@ -554,12 +550,8 @@ const _getProductLot = (item) => {
|
|
|
if (lotField.startsWith('lotAtt') && lotField.length === 8) {
|
|
|
lot.mapping = item[lotField]
|
|
|
}
|
|
|
- if(lot.format){
|
|
|
- const format =JSON.parse(lot.format)
|
|
|
- lotMap.value= {...lotMap.value, ...format }
|
|
|
- }
|
|
|
})
|
|
|
- lotData.value = res.data.filter(item => item.lotAttFlag!='隐藏')
|
|
|
+ lotData.value = res.data
|
|
|
_calculateShelfLife(item, lotData.value)
|
|
|
})
|
|
|
}
|
|
|
@@ -586,9 +578,8 @@ const lotField = ref('')
|
|
|
const lotDateRef = ref(null)
|
|
|
const lotQualityTrueFalseBy=ref(false)
|
|
|
const lotQualityMap=ref({})
|
|
|
-const lotTitle=ref('质量状态')
|
|
|
const onLot = (item) => {
|
|
|
- lotTitle.value=item.label
|
|
|
+ console.log(item,"item")
|
|
|
lotField.value = item.field
|
|
|
if (item.field == 'lotAtt05' ) return
|
|
|
if (item.type == 'Enum' ){
|