Browse Source

修改隔离转合格修改目标库位

hella_online_20240904
lijuncheng 3 months ago
parent
commit
6acb6c923a
  1. 26
      src/pages/inventoryMove/coms/comInventoryDetailCard.vue
  2. 12
      src/pages/inventoryMove/job/inventoryMoveDetail.vue

26
src/pages/inventoryMove/coms/comInventoryDetailCard.vue

@ -19,7 +19,7 @@
</uni-collapse> </uni-collapse>
<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :allowEditQty="allowEditQty" @confirm="confirm" <balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :allowEditQty="allowEditQty" @confirm="confirm"
:allowEditStatus="true"></balance-qty-edit> :allowEditStatus="true"></balance-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'></win-scan-location> <win-scan-location ref="scanLocationCode" :locationAreaTypeList="locationAreaTypeList" title="目标库位" @getLocation='getLocation'></win-scan-location>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -71,13 +71,27 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
locationAreaTypeList: {
type: Array,
default: []
}
}, },
watch: { watch: {
// dataContent: { dataContent: {
// handler(newName, oldName) {}, handler(newName, oldName) {
// immediate: true, if (this.dataContent.subList.length > 0) {
// deep: true this.$nextTick(res => {
// } setTimeout(() => {
if (this.$refs.collapse1) {
this.$refs.collapse1.resize();
}
}, 200)
})
}
},
immediate: true,
deep: true
}
}, },
mounted() { mounted() {
if (this.detailOptions.length == 0) { if (this.detailOptions.length == 0) {

12
src/pages/inventoryMove/job/inventoryMoveDetail.vue

@ -13,7 +13,9 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData" <comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
@updateData='updateData' @openDetail="openDetail"> @updateData='updateData'
:locationAreaTypeList="toLocationAreaTypeList"
@openDetail="openDetail">
</comInventoryDetailCard> </comInventoryDetailCard>
</view> </view>
</view> </view>
@ -55,6 +57,10 @@
getScanCount, getScanCount,
calcHandleQty calcHandleQty
} from '@/common/detail.js'; } from '@/common/detail.js';
import {
getDirectoryItemArray,
} from '@/common/directory.js';
import { import {
goHome, goHome,
navigateBack, navigateBack,
@ -95,7 +101,8 @@
toLocationCode: '', toLocationCode: '',
toInventoryStatus: '', toInventoryStatus: '',
jobStatus: "", jobStatus: "",
title: '' title: '',
toLocationAreaTypeList:[]
}; };
}, },
props: { props: {
@ -220,6 +227,7 @@
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.jobContent = res.data;
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.subList = res.data.subList; that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)

Loading…
Cancel
Save