Browse Source

修改生产退料详细显示不全

wms3.0_pda
lijuncheng 1 year ago
parent
commit
12e09e3e49
  1. 4
      mycomponents/item/itemCompareQty.vue
  2. 8
      mycomponents/recommend/recommend.vue
  3. 2
      pages.json
  4. 14
      pages/productionReturn/coms/comReturnDetailCard.vue

4
mycomponents/item/itemCompareQty.vue

@ -1,9 +1,9 @@
<template> <template>
<view class="uni-flex uni-row space-between uni-inline-item" style="background-color:#fff;"> <view class="uni-flex uni-row space-between uni-inline-item" style="background-color:#fff;">
<view> <view style="word-break: break-all;width: 50%;">
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>
<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> <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"

8
mycomponents/recommend/recommend.vue

@ -2,7 +2,7 @@
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;"> <view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
<view class="uni-flex uni-row space-between" style="align-items: center"> <view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉--> <!-- uni-inline-item 暂时拿掉-->
<view> <view style="word-break: break-all;width: 50%;">
<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
<batch v-if="isShowBatch" :batch="detail.batch"></batch> <batch v-if="isShowBatch" :batch="detail.batch"></batch>
<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode"> <location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
@ -11,15 +11,17 @@
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode"> <to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
</to-location> </to-location>
</view> </view>
<view> <view style="word-break: break-all;">
<!-- ||detail.handleQty==0 可能会有扫描到0的情况--> <!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail" <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty> :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" <compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
:handleQty="Number(detail.handleQty)" :isShowStdPack="false"> :handleQty="Number(detail.handleQty)" :isShowStdPack="false">
</compare-qty> </compare-qty>
<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text> <text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text> <text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
</view> </view>

2
pages.json

@ -299,7 +299,7 @@
{ {
"path": "pages/putaway/record/putawayRecord", "path": "pages/putaway/record/putawayRecord",
"style": { "style": {
"navigationBarTitleText": "原料上架", "navigationBarTitleText": "原料上架记录",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },

14
pages/productionReturn/coms/comReturnDetailCard.vue

@ -69,7 +69,19 @@
}, },
watch: { watch: {
dataContent: {
handler(newName, oldName) {
if (this.dataContent.subList.length > 0) {
if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
this.$nextTick(res => {
this.$refs.collapse1.resize()
})
}
}
},
immediate: true,
deep: true
}
}, },
data() { data() {

Loading…
Cancel
Save