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

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

hella_vue3
niexiting 9 months ago
parent
bd9e6a0afb
commit
1df31bb8bc
5 changed files with 48 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 43
      src/pages/purchaseReceipt/job/receiptDetail.vue

10
src/common/style/new_style.css
View File

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

8
src/mycomponents/item/itemCompareQty.vue
View File

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

6
src/mycomponents/qty/compareQty.vue
View File

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

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

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

43
src/pages/purchaseReceipt/job/receiptDetail.vue
View File

@ -4,19 +4,21 @@
<view class="header_job_top"> <view class="header_job_top">
<jobTopAsn :dataContent="jobContent"></jobTopAsn> <jobTopAsn :dataContent="jobContent"></jobTopAsn>
</view> </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>
<view class="uni-flex" style="margin-left: 50rpx; align-items: center; text-align: center;"> <view class="uni-flex" style="margin-left: 20rpx; align-items: center; text-align: center;">
<u-switch v-model="isAllReceived" active-color="#4DD865" inactive-color="#eee" size="42" @change="switchChange"></u-switch> <u-switch v-model="isAllReceived" active-color="#5FCB94" inactive-color="#eee" size="35"
@change="switchChange"></u-switch>
</view> </view>
</view> </view>
<u-line color="#D8D8D8" style="margin-top: 10rpx; margin-bottom: 10rpx;" />
<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode" <!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
:isShowEdit="false"></required-location> :isShowEdit="false"></required-location>
<u-line color="#D8D8D8" /> --> <u-line color="#D8D8D8" /> -->
</view> </view>
<view class="split_line"></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<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">
@ -33,8 +35,9 @@
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<locationCompare ref="locationCompare" title="收货库位:" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref="locationCompare" title="收货库位:" :recommendLocationCode="jobToLocationCode"
@getLocation='scanLocationCode' :locationTypeList="toLocationTypeList"> :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList">
</locationCompare> </locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -46,7 +49,6 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont> <winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -114,7 +116,7 @@
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
jobStatus: "", jobStatus: "",
isAllReceived:false isAllReceived: false
}; };
}, },
onLoad(option) { onLoad(option) {
@ -291,13 +293,13 @@
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
if(this.jobContent.allowModifyLocation == 'TRUE'){ if (this.jobContent.allowModifyLocation == 'TRUE') {
this.toLocationCode = code;
} else {
if (code == this.jobToLocationCode) {
this.toLocationCode = code; this.toLocationCode = code;
}else { } else {
if(code==this.jobToLocationCode){ this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【" + code + "】与推荐的库位【" + this.jobToLocationCode + "】不一致")
this.toLocationCode =code;
}else {
this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【"+code+"】与推荐的库位【"+this.jobToLocationCode+"】不一致")
} }
} }
@ -435,12 +437,12 @@
return isPass; return isPass;
}, },
switchChange(isOn){ switchChange(isOn) {
this.isAllReceived =isOn this.isAllReceived = isOn
if(this.isAllReceived){ if (this.isAllReceived) {
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
detail.scaned =true detail.scaned = true
detail.handleQty = detail.qty; detail.handleQty = detail.qty;
detail.toLocationCode = this.toLocationCode; detail.toLocationCode = this.toLocationCode;
detail.labelQty = detail.qty; detail.labelQty = detail.qty;
@ -449,8 +451,7 @@
}) })
console.log(JSON.stringify(this.detailSource)) console.log(JSON.stringify(this.detailSource))
calcHandleQty(this.detailSource); calcHandleQty(this.detailSource);
this.continueScan() } else {
}else {
this.getDetail() this.getDetail()
} }
}, },

Write Preview
Loading…
Cancel
Save