Browse Source

HL-5168 修改翻包任务显示箱数

hella_online_20240904
lijuncheng 2 months ago
parent
commit
16be3ee023
  1. 10
      src/mycomponents/item/itemCompareQty.vue
  2. 9
      src/mycomponents/job/jobComMainDetailCard.vue
  3. 8
      src/pages/package/coms/comOverPackJobCard.vue
  4. 7
      src/pages/package/job/overPackageJob.vue

10
src/mycomponents/item/itemCompareQty.vue

@ -3,13 +3,17 @@
<view style="flex: 1;"> <view style="flex: 1;">
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>
<view style="width: 40%;display: flex;justify-content:flex-end;margin-right: 10rpx;word-break:break-word"> <view style="width: 40%;display: flex; flex-direction: column; align-items: flex-end; justify-content:flex-end;margin-right: 10rpx;word-break:break-word; ">
<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true" <recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"
></recommend-qty> ></recommend-qty>
<!-- :objTextStyle='objTextStyle' --> <!-- :objTextStyle='objTextStyle' -->
<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" :isShowPackUnit="isShowPackUnit"> :handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit">
</compare-qty> </compare-qty>
<view class="text_packQty" style="margin-top: 5rpx; margin-right: 20rpx;" v-if="isShowPackCount" >
{{dataContent.fromPackCount}}/{{dataContent.toPackCount}}
</view>
</view> </view>
</view> </view>
</template> </template>
@ -53,6 +57,10 @@
objTextStyle: { objTextStyle: {
type: Object, type: Object,
default: null default: null
},
isShowPackCount: {
type: Boolean,
default: false
} }
}, },
watch: { watch: {

9
src/mycomponents/job/jobComMainDetailCard.vue

@ -2,7 +2,9 @@
<view class="task_item"> <view class="task_item">
<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;"> <view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;">
<!-- 主子表拆分没有数量了 --> <!-- 主子表拆分没有数量了 -->
<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false" <itemCompareQty :dataContent="dataContent"
:isShowPackCount="isShowPackCount"
:handleQty="dataContent.handleQty" :isShowPackUnit="false"
></itemCompareQty> ></itemCompareQty>
<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" --> <!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
<div class="u-p-l-10"> <div class="u-p-l-10">
@ -15,7 +17,6 @@
<level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined && dataContent.priority !== null "> <level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined && dataContent.priority !== null ">
</level> </level>
</view> </view>
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode"> <to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
</to-location> </to-location>
@ -74,6 +75,10 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
isShowPackCount: {
type: Boolean,
default: false
}
}, },

8
src/pages/package/coms/comOverPackJobCard.vue

@ -1,9 +1,12 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :dataContent="dataContent" :isShowPackCount="true"></jobComMainDetailCard>
<view class='split_line' v-show="dataContent.acceptUserName"></view> <view class='split_line' v-show="dataContent.acceptUserName"></view>
<jobAccept :dataContent="dataContent" v-show="dataContent.acceptUserName"></jobAccept> <jobAccept :dataContent="dataContent" v-show="dataContent.acceptUserName"></jobAccept>
</job-com-main-card> </job-com-main-card>
</template> </template>
<script> <script>
@ -17,7 +20,8 @@
jobAccept jobAccept
}, },
data() { data() {
return {}; return {
};
}, },
props: { props: {

7
src/pages/package/job/overPackageJob.vue

@ -243,10 +243,17 @@
this.loadingType = "nomore"; this.loadingType = "nomore";
return; return;
} }
if(list&&list.length>0){
list.forEach(item=>{
item.fromPackCount=Math.ceil(item.qty/item.fromPackQty)
item.toPackCount= Math.ceil(item.qty/item.toPackQty)
})
}
this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.jobList = type === "refresh" ? list : this.jobList.concat(list);
this.pageNo++; this.pageNo++;
updateTitle(this.title+"(" + this.totalCount + ")"); updateTitle(this.title+"(" + this.totalCount + ")");
}).catch(error => { }).catch(error => {
if (type === "refresh") { if (type === "refresh") {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();

Loading…
Cancel
Save