Browse Source

修改推荐数量和实际数量的对比

hella_vue3
niexiting 8 months ago
parent
commit
1df31bb8bc
  1. 10
      src/common/style/new_style.css
  2. 8
      src/mycomponents/item/itemCompareQty.vue
  3. 6
      src/mycomponents/qty/compareQty.vue
  4. 5
      src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
  5. 57
      src/pages/purchaseReceipt/job/receiptDetail.vue

10
src/common/style/new_style.css

@ -62,6 +62,10 @@ uni-page-head .uni-page-head__title {
font-size: 1.125rem;
}
.font_default {
font-size: 1rem;
}
.margin_top {
margin-top: 20rpx;
}
@ -2748,3 +2752,9 @@ button[disabled] {
padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx;
}
.split_line {
background-color: #e0e0e0;
height: 1px;
margin: 10rpx;
}

8
src/mycomponents/item/itemCompareQty.vue

@ -5,10 +5,10 @@
</view>
<view style="word-break: break-all;width: 50%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="isShowStdPack"></recommend-qty>
<!-- <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
:handleQty="Number(handleQty)" :isShowStatus="false"
:isShowStdPack ="isShowStdPack">
</compare-qty> -->
:isShowPackUnit ="isShowPackUnit">
</compare-qty>
</view>
</view>
</template>
@ -45,7 +45,7 @@
type: Number,
default: 0
},
isShowStdPack:{
isShowPackUnit:{
type: Boolean,
default: true
}

6
src/mycomponents/qty/compareQty.vue

@ -28,13 +28,13 @@
</view>
</view>
</view>
<uom v-show="!isShowStdPack" :uom="dataContent.uom">
<uom :uom="dataContent.uom">
</uom>
<!-- <uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
</uom> -->
</view>
<view>
<pack-unit :dataContent="dataContent"></pack-unit>
<pack-unit v-show="isShowPackUnit" :dataContent="dataContent"></pack-unit>
<!-- <std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
</view>
</view>
@ -83,7 +83,7 @@
type: Boolean,
default: true
},
isShowStdPack: {
isShowPackUnit: {
type: Boolean,
default: true
},

5
src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@ -3,9 +3,9 @@
<uni-collapse ref="collapse1" @change="">
<uni-collapse-item :open="true">
<template v-slot:title>
<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"></itemCompareQty>
</template>
<u-line />
<view class="" v-for="(item,index) in dataContent.subList" :key="item.id">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)"
@ -14,7 +14,6 @@
</uni-swipe-action-item>
</uni-swipe-action>
</view>
<u-line />
</uni-collapse-item>
</uni-collapse>

57
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -4,19 +4,21 @@
<view class="header_job_top">
<jobTopAsn :dataContent="jobContent"></jobTopAsn>
</view>
<view class="uni-flex u-col-center" style="width: 100%;margin-top: 10rpx; margin-left: 10rpx; align-items: center; ">
<view class="" style="font-size: 33rpx; font-weight: 600; ">
<view class="uni-flex uni-row " style=";margin-top: 10rpx; margin-left: 10rpx; text-align: right;">
<view class="font_default" style="display: block; ">
整单收货
</view>
<view class="uni-flex" style="margin-left: 50rpx; align-items: center; text-align: center;">
<u-switch v-model="isAllReceived" active-color="#4DD865" inactive-color="#eee" size="42" @change="switchChange"></u-switch>
<view class="uni-flex" style="margin-left: 20rpx; align-items: center; text-align: center;">
<u-switch v-model="isAllReceived" active-color="#5FCB94" inactive-color="#eee" size="35"
@change="switchChange"></u-switch>
</view>
</view>
<u-line color="#D8D8D8" style="margin-top: 10rpx; margin-bottom: 10rpx;" />
<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
:isShowEdit="false"></required-location>
<u-line color="#D8D8D8" /> -->
</view>
<view class="split_line"></view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -33,8 +35,9 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="locationCompare" title="收货库位:" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationTypeList="toLocationTypeList">
<locationCompare ref="locationCompare" title="收货库位:" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList">
</locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -46,7 +49,6 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont>
<comMessage ref="comMessage"></comMessage>
</view>
</template>
@ -88,7 +90,7 @@
import locationCompare from '@/mycomponents/location/locationCompare.vue'
import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue'
import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue'
export default {
name: 'receipt_detail',
@ -114,7 +116,7 @@
businessTypeInfo: {},
managementList: [],
jobStatus: "",
isAllReceived:false
isAllReceived: false
};
},
onLoad(option) {
@ -200,7 +202,7 @@
that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode
that.detailSource = getDataSource(that.subList)
console.log(JSON.stringify(this.detailSource))
console.log(JSON.stringify(this.detailSource))
} else {
that.showMessage('列表数据为0');
}
@ -250,7 +252,7 @@
this.showMessage("物料号【" + itemCode + "】不在列表中")
} else {
var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch ==
batch);
batch);
if (itemDetail == undefined) {
this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
} else {
@ -291,16 +293,16 @@
},
scanLocationCode(location, code) {
if(this.jobContent.allowModifyLocation == 'TRUE'){
if (this.jobContent.allowModifyLocation == 'TRUE') {
this.toLocationCode = code;
}else {
if(code==this.jobToLocationCode){
this.toLocationCode =code;
}else {
this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【"+code+"】与推荐的库位【"+this.jobToLocationCode+"】不一致")
} else {
if (code == this.jobToLocationCode) {
this.toLocationCode = code;
} else {
this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【" + code + "】与推荐的库位【" + this.jobToLocationCode + "】不一致")
}
}
// this.$refs.comMessage.showQuestionMessage("[" + code + "]", res => {
// this.toLocationCode = code
// this.detailSource.forEach(item => {
@ -434,23 +436,22 @@
// }
return isPass;
},
switchChange(isOn){
this.isAllReceived =isOn
if(this.isAllReceived){
switchChange(isOn) {
this.isAllReceived = isOn
if (this.isAllReceived) {
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.scaned =true
detail.scaned = true
detail.handleQty = detail.qty;
detail.toLocationCode = this.toLocationCode;
detail.labelQty = detail.qty;
})
})
console.log(JSON.stringify(this.detailSource))
calcHandleQty(this.detailSource);
this.continueScan()
}else {
} else {
this.getDetail()
}
},
@ -543,4 +544,4 @@
background: #e0e0e0;
}
</style>
</style>
Loading…
Cancel
Save