Browse Source

修改库存转移

wms3.0_pda
Niext 11 months ago
parent
commit
93165ec98e
  1. 24
      mycomponents/balance/moveStatus.vue
  2. 5
      mycomponents/qty/balanceQtyEdit.vue
  3. 3
      pages/inventoryMove/coms/comInventoryDetailCard.vue
  4. 13
      pages/inventoryMove/coms/comMoveRecord.vue
  5. 4
      pages/inventoryMove/coms/comMoveRecordCard.vue
  6. 50
      pages/inventoryMove/coms/comMovebalance.vue
  7. 18
      pages/inventoryMove/job/inventoryMoveDetail.vue
  8. 6
      pages/inventoryMove/record/holdToOkRecord.vue
  9. 6
      pages/inventoryMove/record/holdToScrapRecord.vue
  10. 6
      pages/inventoryMove/record/moveFreeRecord.vue
  11. 6
      pages/inventoryMove/record/okToHoldRecord.vue
  12. 6
      pages/inventoryMove/record/oktoScrapRecord.vue
  13. 6
      pages/inventoryMove/record/scrapToHoldRecord.vue

24
mycomponents/balance/moveStatus.vue

@ -1,18 +1,12 @@
<template> <template>
<view class="uni-row uni-flex center" style="font-size: 30rpx;"> <view class="uni-row uni-flex center" style="font-size: 30rpx;">
<!-- <view :class="statusStyle(fromInventoryStatus)"> <status :status='fromInventoryStatus' :showDesc="true"></status>
<view class="uni-flex uni-row center" v-if='showToInventoryStatus && toInventoryStatus!=""'>
{{statusDesc(fromInventoryStatus)}} <text style="color:#909399 ; ">
</view> --> >
<status :status='fromInventoryStatus'></status> </text>
<text style="color:#909399 ; "> <status :status='toInventoryStatus' :showDesc="true"></status>
> </view>
</text>
<status :status='toInventoryStatus'></status>
<!-- <view :class="statusStyle(toInventoryStatus)">
{{statusDesc(toInventoryStatus)}}
</view> -->
</view> </view>
</template> </template>
@ -43,6 +37,10 @@
type: String, type: String,
default: '' default: ''
}, },
showToInventoryStatus: {
type: Boolean,
default: false
},
}, },
watch: { watch: {

5
mycomponents/qty/balanceQtyEdit.vue

@ -165,8 +165,11 @@
}, },
callback() { callback() {
let qty = Number(this.allQty); let qty = Number(this.allQty);
this.dataContent.toInventoryStatus = this.inventoryStatus;
this.dataContent.handleQty = qty; this.dataContent.handleQty = qty;
if (this.allowEditStatus) //,
{
this.dataContent.toInventoryStatus = this.inventoryStatus;
}
this.$emit("confirm", qty); this.$emit("confirm", qty);
this.closeEditPopup(); this.closeEditPopup();
}, },

3
pages/inventoryMove/coms/comInventoryDetailCard.vue

@ -124,8 +124,7 @@
}); });
}, },
confirm(qty) { confirm(qty) {
// this.editItem.handleQty=qty; this.editItem.handleQty=qty;
//this.editItem.qty = qty;
this.$emit('updateData') this.$emit('updateData')
}, },
showLocation(item) { showLocation(item) {

13
pages/inventoryMove/coms/comMove.vue → pages/inventoryMove/coms/comMoveRecord.vue

@ -147,7 +147,7 @@
methods: { methods: {
updateTitle() { updateTitle() {
if (this.businessTypeCode == "InventoryMove") { if (this.businessTypeCode == "Move") {
this.title = "库存转移记录"; this.title = "库存转移记录";
this.toInventoryStatus = "OK" this.toInventoryStatus = "OK"
} else if (this.businessTypeCode == "HoldToOk") { } else if (this.businessTypeCode == "HoldToOk") {
@ -210,7 +210,7 @@
var itemp = createItemInfo(balance, pack); var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); // let newDetail = createDetailInfo(balance, pack); //
newDetail.inventoryStatus = balance.inventoryStatus; newDetail.inventoryStatus = balance.inventoryStatus;
newDetail.toInventoryStatus = this.toInventoryStatus newDetail.toInventoryStatus = this.toInventoryStatus;
itemp.subList.push(newDetail); itemp.subList.push(newDetail);
this.detailSource.push(itemp) this.detailSource.push(itemp)
} else { } else {
@ -358,7 +358,6 @@
return itemList; return itemList;
}, },
setParams() { setParams() {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
@ -384,10 +383,10 @@
detail.fromLocationCode = detail.locationCode; detail.fromLocationCode = detail.locationCode;
if (this.businessType != '') { // if (this.businessType != '') {
detail.toLocationCode = this.toLocationCode; // detail.toLocationCode = this.toLocationCode;
detail.toInventoryStatus = this.toInventoryStatus; // detail.toInventoryStatus = this.toInventoryStatus;
} // }
subList.push(detail) subList.push(detail)
} }

4
pages/inventoryMove/coms/comMoveRecordCard.vue

@ -14,10 +14,10 @@
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item,index)" <uni-swipe-action-item @click="swipeClick($event,item,index)"
:right-options="item.scaned?scanOptions:detailOptions"> :right-options="item.scaned?scanOptions:detailOptions">
<comMovebalance :dataContent="item" :isShowStdPack="false" :isShowPack="true" <comMovebalance :dataContent="item" :isShowStdPack="false" :isShowPack="true"
:fromInventoryStatus="item.inventoryStatus" :toInventoryStatus="item.toInventoryStatus" :fromInventoryStatus="item.inventoryStatus" :toInventoryStatus="item.toInventoryStatus"
:isShowLocation="true"></comMovebalance> :isShowLocation="true" :allowEditStatus='allowEditStatus'></comMovebalance>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line color="#D8D8D8"></u-line> <u-line color="#D8D8D8"></u-line>

50
pages/inventoryMove/coms/comMovebalance.vue

@ -15,25 +15,10 @@
<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty" <compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack"> :handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack">
</compare-qty> </compare-qty>
<move-status :fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus" :showToInventoryStatus="allowEditStatus">
<moveStatus v-if="dataContent.inventoryStatus!=dataContent.toInventoryStatus" </move-status>
:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
</moveStatus>
<status v-else :status='fromInventoryStatus'></status>
</view> </view>
<!-- <view class="" v-if="isDevlement()">
<view class="" style="font-size: 40rpx;">
<u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
</view>
<view class="" style="font-size: 40rpx;">
<u-button @click="copyPro" size="mini" type="primary">复制制品</u-button>
</view>
</view> -->
</view> </view>
<!-- <u-line></u-line> -->
<!-- <purchase-info :dataContent="dataContent.package"></purchase-info> -->
</view> </view>
</view> </view>
</template> </template>
@ -104,38 +89,15 @@
type: String, type: String,
default: "" default: ""
}, },
allowEditStatus: {
type: Boolean,
default: false
},
}, },
watch: { watch: {
}, },
methods: { methods: {
copy(){
// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
var content = "HPQ;V1.0;I"+this.detail.itemCode+";P"+this.detail.packingNumber+";B"+this.detail.batch+";Q"+this.detail.qty
this.$copyText(content).then(
res => {
uni.showToast({
title: '复制成功',
icon: 'none'
})
}
)
},
copyPro(){
// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
var content = "HMQ;V1.0;I"+this.detail.itemCode+";P"+this.detail.packingNumber+";B"+this.detail.batch+";Q"+this.detail.qty
this.$copyText(content).then(
res => {
uni.showToast({
title: '复制成功',
icon: 'none'
})
}
)
},
isDevlement(){
return getApp().globalData.isDevelopment;
}
} }
} }
</script> </script>

18
pages/inventoryMove/job/inventoryMoveDetail.vue

@ -167,23 +167,23 @@
} else if (this.businessTypeCode == "HoldToOk") { } else if (this.businessTypeCode == "HoldToOk") {
name = "隔离转合格"; name = "隔离转合格";
this.toLocationCode = ''; this.toLocationCode = '';
this.toinventoryStatus = 'Ok'; this.toinventoryStatus = 'OK';
} else if (this.businessTypeCode == "HoldToScrap") { } else if (this.businessTypeCode == "HoldToScrap") {
name = "隔离转报废"; name = "隔离转报废";
this.toLocationCode = 'Scrap'; this.toLocationCode = 'SCRAP';
this.toinventoryStatus = 'Scrap'; this.toinventoryStatus = 'SCRAP';
} else if (this.businessTypeCode == "OkToHold") { } else if (this.businessTypeCode == "OkToHold") {
name = "合格转隔离"; name = "合格转隔离";
this.toLocationCode = 'Hold'; this.toLocationCode = 'HOLD';
this.toinventoryStatus = 'Hold'; this.toinventoryStatus = 'HOLD';
} else if (this.businessTypeCode == "OktoScrap") { } else if (this.businessTypeCode == "OktoScrap") {
name = "合格转报废"; name = "合格转报废";
this.toLocationCode = 'Scrap'; this.toLocationCode = 'SCRAP';
this.toinventoryStatus = 'Scrap'; this.toinventoryStatus = 'SCRAP';
} else if (this.businessTypeCode == "ScrapToHold") { } else if (this.businessTypeCode == "ScrapToHold") {
name = "报废转隔离"; name = "报废转隔离";
this.toLocationCode = 'Hold'; this.toLocationCode = 'HOLD';
this.toinventoryStatus = 'Hold'; this.toinventoryStatus = 'HOLD';
} }
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({

6
pages/inventoryMove/record/holdToOkRecord.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMove businessTypeCode='HoldToOk' > </comMove> <comMoveRecord businessTypeCode='HoldToOk' > </comMoveRecord>
</view> </view>
</template> </template>
<script> <script>
import comMove from '@/pages/inventoryMove/coms/comMove.vue' import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
export default { export default {
components: { components: {
comMove comMoveRecord
}, },
data() { data() {
return { return {

6
pages/inventoryMove/record/holdToScrapRecord.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMove businessTypeCode='HoldToScrap'> </comMove> <comMoveRecord businessTypeCode='HoldToScrap'> </comMoveRecord>
</view> </view>
</template> </template>
<script> <script>
import comMove from '@/pages/inventoryMove/coms/comMove.vue' import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
export default { export default {
components: { components: {
comMove comMoveRecord
}, },
data() { data() {

6
pages/inventoryMove/record/moveFreeRecord.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMove :allowEditStatus="true" businessTypeCode='Move'> </comMove> <comMoveRecord :allowEditStatus="true" businessTypeCode='Move'> </comMoveRecord>
</view> </view>
</template> </template>
<script> <script>
import comMove from '@/pages/inventoryMove/coms/comMove.vue' import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
export default { export default {
components: { components: {
comMove comMoveRecord
}, },
data() { data() {

6
pages/inventoryMove/record/okToHoldRecord.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMove businessTypeCode='OkToHold' toLocationCode="HOLD" > </comMove> <comMoveRecord businessTypeCode='OkToHold' toLocationCode="HOLD" > </comMoveRecord>
</view> </view>
</template> </template>
<script> <script>
import comMove from '@/pages/inventoryMove/coms/comMove.vue' import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
export default { export default {
components: { components: {
comMove comMoveRecord
}, },
data() { data() {
return { return {

6
pages/inventoryMove/record/oktoScrapRecord.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMove businessTypeCode='OktoScrap' > </comMove> <comMoveRecord businessTypeCode='OktoScrap' > </comMoveRecord>
</view> </view>
</template> </template>
<script> <script>
import comMove from '@/pages/inventoryMove/coms/comMove.vue' import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
export default { export default {
components: { components: {
comMove comMoveRecord
}, },
data() { data() {
return { return {

6
pages/inventoryMove/record/scrapToHoldRecord.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMove businessTypeCode='ScrapToHold'> </comMove> <comMoveRecord businessTypeCode='ScrapToHold'> </comMoveRecord>
</view> </view>
</template> </template>
<script> <script>
import comMove from '@/pages/inventoryMove/coms/comMove.vue' import comMoveRecord from '@/pages/inventoryMove/coms/comMoveRecord.vue'
export default { export default {
components: { components: {
comMove comMoveRecord
}, },
data() { data() {

Loading…
Cancel
Save