sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改库存转移

wms3.0_pda
Niext 11 months ago
parent
7858c95bc5
commit
93165ec98e
13 changed files with 57 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

5
mycomponents/qty/balanceQtyEdit.vue
View File

@ -165,8 +165,11 @@
},
callback() {
let qty = Number(this.allQty);
this.dataContent.toInventoryStatus = this.inventoryStatus;
this.dataContent.handleQty = qty;
if (this.allowEditStatus) //只有编辑了库存状态,才给库存状态赋值
{
this.dataContent.toInventoryStatus = this.inventoryStatus;
}
this.$emit("confirm", qty);
this.closeEditPopup();
},

3
pages/inventoryMove/coms/comInventoryDetailCard.vue
View File

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

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

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

4
pages/inventoryMove/coms/comMoveRecordCard.vue
View File

@ -14,10 +14,10 @@
<view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction">
<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"
:fromInventoryStatus="item.inventoryStatus" :toInventoryStatus="item.toInventoryStatus"
:isShowLocation="true"></comMovebalance>
:isShowLocation="true" :allowEditStatus='allowEditStatus'></comMovebalance>
</uni-swipe-action-item>
</uni-swipe-action>
<u-line color="#D8D8D8"></u-line>

50
pages/inventoryMove/coms/comMovebalance.vue
View File

@ -15,25 +15,10 @@
<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack">
</compare-qty>
<moveStatus v-if="dataContent.inventoryStatus!=dataContent.toInventoryStatus"
:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
</moveStatus>
<status v-else :status='fromInventoryStatus'></status>
<move-status :fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus" :showToInventoryStatus="allowEditStatus">
</move-status>
</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>
<!-- <u-line></u-line> -->
<!-- <purchase-info :dataContent="dataContent.package"></purchase-info> -->
</view>
</view>
</template>
@ -104,38 +89,15 @@
type: String,
default: ""
},
allowEditStatus: {
type: Boolean,
default: false
},
},
watch: {
},
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>

18
pages/inventoryMove/job/inventoryMoveDetail.vue
View File

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

6
pages/inventoryMove/record/holdToOkRecord.vue
View File

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

6
pages/inventoryMove/record/holdToScrapRecord.vue
View File

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

6
pages/inventoryMove/record/moveFreeRecord.vue
View File

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

6
pages/inventoryMove/record/okToHoldRecord.vue
View File

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

6
pages/inventoryMove/record/oktoScrapRecord.vue
View File

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

6
pages/inventoryMove/record/scrapToHoldRecord.vue
View File

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

Write Preview
Loading…
Cancel
Save