|
|
@ -1,128 +1,167 @@ |
|
|
<!-- 盘点任务详情 --> |
|
|
<!-- 盘点任务详情 --> |
|
|
<template> |
|
|
<template> |
|
|
<page-meta root-font-size="18px" :page-style="'overflow:'+(isShowScanPopup?'hidden':'visible')"></page-meta> |
|
|
<page-meta root-font-size="18px" :page-style="'overflow:'+(isShowScanPopup?'hidden':'visible')"></page-meta> |
|
|
<view class=""> |
|
|
<view class="" style="display:flex;flex-direction: column;"> |
|
|
<scroll-view scroll-y="true" class="scroll-detail" :scroll-top="scrollTop" @scrolltoupper="upper" |
|
|
<view class=""> |
|
|
@scrolltolower="lower" @scroll="scroll"> |
|
|
|
|
|
<view class="top_card"> |
|
|
<view class="top_card"> |
|
|
<com-count-scan-detail :jobContent="datacontent" :allCount="allCount" :scanCount="scanCount" |
|
|
<com-count-scan-detail :jobContent="datacontent" :allCount="allCount" :scanCount="scanCount" |
|
|
:newCount="newCount" :location="location"> |
|
|
:newCount="newCount" :location="location"> |
|
|
</com-count-scan-detail> |
|
|
</com-count-scan-detail> |
|
|
</view> |
|
|
</view> |
|
|
<view class="detail-list" v-for="(item, index) in details" :key="item.id"> |
|
|
</view> |
|
|
<uni-swipe-action> |
|
|
|
|
|
<uni-swipe-action-item :right-options="options" :auto-close="false" |
|
|
<view class="" v-if="allDetails.length>0"> |
|
|
@click="swipeClick($event,item,index)"> |
|
|
<z-paging ref="paging" use-virtual-list @query="queryList"> |
|
|
<view class="detail-content common_card"> |
|
|
<template #top> |
|
|
<view class="choose_main"> |
|
|
<com-count-scan-detail :jobContent="datacontent" :allCount="allCount" :scanCount="scanCount" |
|
|
<view class="ljh_box"> |
|
|
:newCount="newCount" :location="location"> |
|
|
<view class="ljh_info"> |
|
|
</com-count-scan-detail> |
|
|
<view class="tit_ljh">{{ item.itemCode }}</view> |
|
|
</template> |
|
|
<view class="label_xm font_sm fr">{{ item.packingCode }}</view> |
|
|
|
|
|
</view> |
|
|
<template #cell="{item,index}"> |
|
|
<view class="desc_card uni-flex space-between"> |
|
|
<view> |
|
|
<view class="desc_ljh"> |
|
|
<uni-swipe-action> |
|
|
<view class="font_xs text_lightblue"> {{ item.itemName }}</view> |
|
|
<uni-swipe-action-item :right-options="options" :auto-close="false" |
|
|
<view class="font_xs text_lightblue">{{ item.itemDesc1 }} |
|
|
@click="swipeClick($event,item,index)"> |
|
|
|
|
|
<view class="detail-content common_card"> |
|
|
|
|
|
<view class="choose_main"> |
|
|
|
|
|
<view class="ljh_box"> |
|
|
|
|
|
<view class="ljh_info"> |
|
|
|
|
|
<view class="tit_ljh">{{index+1+'.'+item.itemCode }}</view> |
|
|
|
|
|
<view class="label_xm font_sm fr">{{ item.packingCode }}</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="desc_card uni-flex space-between"> |
|
|
|
|
|
<view class="desc_ljh"> |
|
|
|
|
|
<view class="font_xs text_lightblue"> {{ item.itemName }}</view> |
|
|
|
|
|
<view class="font_xs text_lightblue">{{ item.itemDesc1 }} |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view class="list_form"> |
|
|
</view> |
|
|
<view> |
|
|
<view class="list_form"> |
|
|
<uni-table style="overflow-x: hidden;"> |
|
|
<view> |
|
|
<uni-tr> |
|
|
<uni-table style="overflow-x: hidden;"> |
|
|
<uni-th width="100"></uni-th> |
|
|
<uni-tr> |
|
|
<uni-th width="100" align="center">库存</uni-th> |
|
|
<uni-th width="100"></uni-th> |
|
|
<uni-th width="100" align="center">盘点</uni-th> |
|
|
<uni-th width="100" align="center">库存</uni-th> |
|
|
</uni-tr> |
|
|
<uni-th width="100" align="center">盘点</uni-th> |
|
|
<uni-tr> |
|
|
</uni-tr> |
|
|
<uni-th width="100">数量({{item.uom}})</uni-th> |
|
|
<uni-tr> |
|
|
<uni-th width="100" align="center"> |
|
|
<uni-th width="100">数量({{item.inventoryUom}})</uni-th> |
|
|
<text class="text_black">{{item.inventoryQty}}</text> |
|
|
<uni-th width="100" align="center"> |
|
|
</uni-th> |
|
|
<text class="text_black">{{item.inventoryQty}}</text> |
|
|
<uni-th width="100" align="center"> |
|
|
</uni-th> |
|
|
<!-- <com-number-box v-if="item.scaned && item.packingCode" |
|
|
<uni-th width="100" align="center"> |
|
|
v-model="item.countQty" :max="99999" :min="0" |
|
|
<com-number-box v-if="item.scaned && item.packingCode" |
|
|
@change="qtyChanged($event,item)" |
|
|
v-model="item.countQty" :max="99999" :min="0" |
|
|
style='margin-right: 10px;padding: 2px;'> |
|
|
@change="qtyChanged($event,item)" |
|
|
</com-number-box> |
|
|
style='margin-right: 10px;padding: 2px;'> |
|
|
<com-number-box v-if="item.packingCode==''" |
|
|
</com-number-box> |
|
|
v-model="item.countQty" |
|
|
<com-number-box v-if="item.packingCode==''" v-model="item.countQty" |
|
|
@change="qtyChanged($event,item)" :max="99999" |
|
|
@change="qtyChanged($event,item)" :max="99999" :min="0" |
|
|
:min="0" style='margin-right: 10px;padding: 2px;'> |
|
|
style='margin-right: 10px;padding: 2px;'> |
|
|
</com-number-box> --> |
|
|
</com-number-box> |
|
|
<view class="flex" |
|
|
<text class="text_black" |
|
|
style="align-items: center;justify-content: center;" |
|
|
v-else-if="!item.scaned">{{item.countQty}}</text> |
|
|
v-if="item.scaned && item.packingCode"> |
|
|
|
|
|
<text class="text_black">{{item.countQty}} </text> |
|
|
<!-- <text class="text_black" v-if="item.packingCode" |
|
|
<view class="photo_btn fr" @click="openEditCount(item)"> |
|
|
style="font-size: 1rem;">{{item.countQty}}</text> |
|
|
<text class="fl font_xs">修改</text> |
|
|
<com-number-box v-else v-model="item.countQty" :max="99999" :min="0" |
|
|
</view> |
|
|
style='margin-right: 10px;padding: 2px;'> |
|
|
</view> |
|
|
</com-number-box> --> |
|
|
<view class="flex" |
|
|
|
|
|
style="align-items: center;justify-content: center;" |
|
|
<!--<uni-easyinput v-model="item.countQty" type="digit" |
|
|
v-if="item.packingCode==''"> |
|
|
@input="qtyInput($event,item)"> |
|
|
<text class="text_black">{{item.countQty}} </text> |
|
|
</uni-easyinput> --> |
|
|
<view class="photo_btn fr" @click="openEditCount(item)"> |
|
|
</uni-th> |
|
|
<text class="fl font_xs">修改</text> |
|
|
</uni-tr> |
|
|
</view> |
|
|
</uni-table> |
|
|
</view> |
|
|
</view> |
|
|
<view class="" v-else-if="!item.scaned"> |
|
|
</view> |
|
|
<text class="text_black">{{item.countQty}}</text> |
|
|
<view style="margin:0 20rpx 20rpx;"> |
|
|
</view> |
|
|
<view class="uni-flex uni-row bot_card"> |
|
|
|
|
|
<view class="bot_card_item"> |
|
|
|
|
|
<label class="icon_bg icon_bg_kw"> |
|
|
<!-- <text class="text_black" v-if="item.packingCode" |
|
|
<image class="icon_normal" src="@/static/icons_ui/icon_kw.svg"> |
|
|
style="font-size: 1rem;">{{item.countQty}}</text> --> |
|
|
</image> |
|
|
<!-- <com-number-box v-else v-model="item.countQty" |
|
|
</label> |
|
|
:max="99999" :min="0" |
|
|
<text>{{ item.locationCode }}</text> |
|
|
style='margin-right: 10px;padding: 2px;'> |
|
|
</view> |
|
|
</com-number-box> --> |
|
|
<view class="bot_card_item"> |
|
|
|
|
|
<label class="icon_bg icon_bg_pc"> |
|
|
</uni-th> |
|
|
<image class="icon_normal" src="@/static/icons_ui/icon_pc.svg"> |
|
|
</uni-tr> |
|
|
</image> |
|
|
</uni-table> |
|
|
</label> |
|
|
</view> |
|
|
<text>{{item.lot}}</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
<view class="bot_card_item" style="width: 25%;"> |
|
|
<view style="margin:0 20rpx 20rpx;"> |
|
|
<view class="uni-flex" v-if="item.isNew "> |
|
|
<view class="uni-flex uni-row bot_card"> |
|
|
<!-- picker的index默认是0 --> |
|
|
<view class="bot_card_item"> |
|
|
<picker @change="bindPickerChange($event,item)" :value="item.status-1" |
|
|
<label class="icon_bg icon_bg_kw" style="text-align: center;"> |
|
|
:range="statusArray"> |
|
|
<text |
|
|
<view class="uni-flex " style="padding:5px 0px;"> |
|
|
style=" display: block; color: white;text-align: center;font-size: 28rpx;">库</text> |
|
|
<text class="state_point" |
|
|
<!-- <image class="icon_normal" |
|
|
:class="item.status | statusStyle">{{statusArray[item.status-1]}}</text> |
|
|
src="@/static/icons_ui/icon_kw.svg"> --> |
|
|
<image class="icon_normal" |
|
|
|
|
|
src="@/static/icons_ui/icon_down.svg"> |
|
|
|
|
|
</image> |
|
|
</image> |
|
|
|
|
|
</label> |
|
|
|
|
|
<text>{{ item.locationCode }}</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="bot_card_item"> |
|
|
|
|
|
<label class="icon_bg icon_bg_pc"> |
|
|
|
|
|
<text |
|
|
|
|
|
style=" display: block; color: white;text-align: center;font-size: 28rpx;">批</text> |
|
|
|
|
|
<!-- <image class="icon_normal" |
|
|
|
|
|
src="@/static/icons_ui/icon_pc.svg"> |
|
|
|
|
|
</image> --> |
|
|
|
|
|
</label> |
|
|
|
|
|
<text>{{item.lot}}</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="bot_card_item" style="width: 25%;"> |
|
|
|
|
|
<view class="uni-flex" v-if="item.isNew "> |
|
|
|
|
|
<!-- picker的index默认是0 --> |
|
|
|
|
|
<picker @change="bindPickerChange($event,item)" |
|
|
|
|
|
:value="item.status-1" :range="statusArray"> |
|
|
|
|
|
<view class="uni-flex " style="padding:5px 0px;"> |
|
|
|
|
|
<text class="state_point" |
|
|
|
|
|
:class="item.status | statusStyle">{{statusArray[item.status-1]}}</text> |
|
|
|
|
|
<image class="icon_normal" |
|
|
|
|
|
src="@/static/icons_ui/icon_down.svg"> |
|
|
|
|
|
</image> |
|
|
|
|
|
</view> |
|
|
|
|
|
</picker> |
|
|
</view> |
|
|
</view> |
|
|
</picker> |
|
|
<text v-else class="state_point" :class="item.status | statusStyle"> |
|
|
|
|
|
{{ item.status | statusColor}} |
|
|
|
|
|
</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<text v-else class="state_point" :class="item.status | statusStyle"> |
|
|
|
|
|
{{ item.status | statusColor}} |
|
|
|
|
|
</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
<view class="uni-flex space-between" style="margin:0 20rpx 20rpx;" |
|
|
|
|
|
v-if="item.scaned || item.packingCode==''"> |
|
|
|
|
|
<text class="font_xs" |
|
|
|
|
|
style="padding: 5px 2px; text-overflow: ellipsis; overflow: hidden;">{{item.countDescription}}</text> |
|
|
|
|
|
<view class="photo_btn fr" @click="openEditCountDesc(item)"> |
|
|
|
|
|
<text class="fl font_xs" style="width:65px;">盘点描述</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
<view v-if="item.scaned" class="choose_marked_count" |
|
|
|
|
|
style="background-color: #5FCB94; opacity: 0.65"> |
|
|
|
|
|
<view class="" style="background-color: #5FCB94; width: 200rpx;height: 300rpx;"> |
|
|
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
|
|
<!-- <image src="@/static/image_marked.svg"></image> --> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</uni-swipe-action-item> |
|
|
|
|
|
</uni-swipe-action> |
|
|
<view class="uni-flex space-between" style="margin:0 20rpx 20rpx;" |
|
|
</view> |
|
|
v-if="item.scaned || item.packingCode==''"> |
|
|
</template> |
|
|
<text class="font_xs" |
|
|
</z-paging> |
|
|
style="padding: 5px 2px; text-overflow: ellipsis; overflow: hidden;">{{item.countDescription}}</text> |
|
|
</view> |
|
|
<view class="photo_btn fr" @click="openEditCountDesc(item)"> |
|
|
|
|
|
<text class="fl font_xs" style="width:65px;">盘点描述</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
<view v-if="item.scaned" class="choose_marked"> |
|
|
|
|
|
<image src="@/static/image_marked.svg"></image> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
</uni-swipe-action-item> |
|
|
|
|
|
</uni-swipe-action> |
|
|
|
|
|
</view> |
|
|
|
|
|
</scroll-view> |
|
|
|
|
|
|
|
|
|
|
|
<view class="new_btn_bot"> |
|
|
<view class="new_btn_bot"> |
|
|
<button class="new_save_btn" @click="submit()">提交</button> |
|
|
<button class="new_save_btn" @click="submit()">提交</button> |
|
|
@ -131,9 +170,11 @@ |
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' @close='closeScanPopup()'></win-scan-by-pack> |
|
|
<win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' @close='closeScanPopup()'></win-scan-by-pack> |
|
|
<com-easy-input ref="descPopup" @confirm='closeEditCountDesc'></com-easy-input> |
|
|
<com-easy-input ref="descPopup" @confirm='closeEditCountDesc'></com-easy-input> |
|
|
|
|
|
<com-easy-input-count ref="countPopup" @confirm='closeEditCount'></com-easy-input-count> |
|
|
<win-inventory-status ref="statusPopup"></win-inventory-status> |
|
|
<win-inventory-status ref="statusPopup"></win-inventory-status> |
|
|
<!-- com-message必须放在最下层 --> |
|
|
<!-- com-message必须放在最下层 --> |
|
|
<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></com-message> |
|
|
<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></com-message> |
|
|
|
|
|
<!-- <uni-load-more :status="loadingType" v-if="details.length>0"></uni-load-more> --> |
|
|
</view> |
|
|
</view> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -159,7 +200,8 @@ |
|
|
goHome, |
|
|
goHome, |
|
|
getISODateTime, |
|
|
getISODateTime, |
|
|
compare, |
|
|
compare, |
|
|
getRemoveOption |
|
|
getRemoveOption, |
|
|
|
|
|
getCurrDateTime |
|
|
} from '@/common/basic.js'; |
|
|
} from '@/common/basic.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
@ -174,8 +216,11 @@ |
|
|
import comCountScanDetail from '@/mycomponents/coms/task/comCountScanDetail.vue'; |
|
|
import comCountScanDetail from '@/mycomponents/coms/task/comCountScanDetail.vue'; |
|
|
import comNumberBox from '@/mycomponents/common/comNumberBox.vue'; |
|
|
import comNumberBox from '@/mycomponents/common/comNumberBox.vue'; |
|
|
import comEasyInput from '@/mycomponents/common/comEasyInput.vue'; |
|
|
import comEasyInput from '@/mycomponents/common/comEasyInput.vue'; |
|
|
|
|
|
import comEasyInputCount from '@/mycomponents/common/comEasyInputCount.vue'; |
|
|
|
|
|
|
|
|
import winInventoryStatus from '@/mycomponents/wincom/winInventoryStatus.vue'; |
|
|
import winInventoryStatus from '@/mycomponents/wincom/winInventoryStatus.vue'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
components: { |
|
|
components: { |
|
|
// comCountItems, |
|
|
// comCountItems, |
|
|
@ -185,6 +230,7 @@ |
|
|
comCountScanDetail, |
|
|
comCountScanDetail, |
|
|
comNumberBox, |
|
|
comNumberBox, |
|
|
comEasyInput, |
|
|
comEasyInput, |
|
|
|
|
|
comEasyInputCount, |
|
|
winInventoryStatus |
|
|
winInventoryStatus |
|
|
}, |
|
|
}, |
|
|
data() { |
|
|
data() { |
|
|
@ -192,9 +238,11 @@ |
|
|
type: '', |
|
|
type: '', |
|
|
id: '', |
|
|
id: '', |
|
|
datacontent: {}, |
|
|
datacontent: {}, |
|
|
details: {}, |
|
|
details: [], |
|
|
|
|
|
allDetails: [], //所以的明细 |
|
|
currentItem: {}, |
|
|
currentItem: {}, |
|
|
editDescItem: {}, |
|
|
editDescItem: {}, |
|
|
|
|
|
editCountItem: {}, |
|
|
scrollTop: 0, |
|
|
scrollTop: 0, |
|
|
old: { |
|
|
old: { |
|
|
scrollTop: 0 |
|
|
scrollTop: 0 |
|
|
@ -208,7 +256,14 @@ |
|
|
topItem: '', |
|
|
topItem: '', |
|
|
isShowScanPopup: false, |
|
|
isShowScanPopup: false, |
|
|
statusArray: [], |
|
|
statusArray: [], |
|
|
allStatusArray: [] |
|
|
allStatusArray: [], |
|
|
|
|
|
ipage: 1, |
|
|
|
|
|
iSize: 20, |
|
|
|
|
|
testList: [], |
|
|
|
|
|
isload: true, |
|
|
|
|
|
loadingType: "", |
|
|
|
|
|
currentPage: 0, |
|
|
|
|
|
pageSize: 20, |
|
|
// array: [{ |
|
|
// array: [{ |
|
|
// text: '待检', |
|
|
// text: '待检', |
|
|
// value: 1 |
|
|
// value: 1 |
|
|
@ -246,6 +301,8 @@ |
|
|
onNavigationBarButtonTap(e) { |
|
|
onNavigationBarButtonTap(e) { |
|
|
if (e.index === 0) { |
|
|
if (e.index === 0) { |
|
|
goHome(); |
|
|
goHome(); |
|
|
|
|
|
} else if (e.index === 1) { |
|
|
|
|
|
window.location.reload(); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
//拦截返回按钮事件 |
|
|
//拦截返回按钮事件 |
|
|
@ -259,13 +316,15 @@ |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
onReachBottom() {}, |
|
|
|
|
|
|
|
|
filters: { |
|
|
filters: { |
|
|
statusStyle: function(val) { |
|
|
statusStyle: function(val) { |
|
|
return getJobStatuStyle(val); |
|
|
return getJobStatuStyle(val); |
|
|
}, |
|
|
}, |
|
|
statusColor: function(val) { |
|
|
// statusColor: function(val) { |
|
|
return getJobStatuDesc(val); |
|
|
// return getJobStatuDesc(val); |
|
|
}, |
|
|
// }, |
|
|
statusStyle: function(val) { |
|
|
statusStyle: function(val) { |
|
|
return getInventoryTypeStyle(val); |
|
|
return getInventoryTypeStyle(val); |
|
|
}, |
|
|
}, |
|
|
@ -312,7 +371,14 @@ |
|
|
getCountJobDetail(params) |
|
|
getCountJobDetail(params) |
|
|
.then(async res => { |
|
|
.then(async res => { |
|
|
that.datacontent = res; |
|
|
that.datacontent = res; |
|
|
that.allCount = res.details.length |
|
|
// var test = res.details[0] |
|
|
|
|
|
// for (var i = 0; i < 10000; i++) { |
|
|
|
|
|
// var detail = {} |
|
|
|
|
|
// var detail = Object.assign(detail, test) |
|
|
|
|
|
// detail.id = i; |
|
|
|
|
|
// res.details.push(detail) |
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
if (res.details != null) { |
|
|
if (res.details != null) { |
|
|
res.details.forEach(r => { |
|
|
res.details.forEach(r => { |
|
|
r.scaned = false |
|
|
r.scaned = false |
|
|
@ -321,7 +387,9 @@ |
|
|
r.countQty = 0; |
|
|
r.countQty = 0; |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
that.details = res.details; |
|
|
that.allDetails = res.details; |
|
|
|
|
|
that.allCount = res.details.length |
|
|
|
|
|
|
|
|
//查询库位信息 |
|
|
//查询库位信息 |
|
|
let locationCode = that.datacontent.locationCode; |
|
|
let locationCode = that.datacontent.locationCode; |
|
|
let location = await locationsAsync(locationCode); |
|
|
let location = await locationsAsync(locationCode); |
|
|
@ -334,6 +402,16 @@ |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
getDataPage(pageNo, pageSize) { |
|
|
|
|
|
//计算总页数 |
|
|
|
|
|
var totalPages = Math.ceil(this.allCount / pageSize); |
|
|
|
|
|
//当前页起始索引 |
|
|
|
|
|
const start = (pageNo - 1) * pageSize; |
|
|
|
|
|
const end = start + pageSize; //当前页结束索引 |
|
|
|
|
|
return this.allDetails.slice(start, end) |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
getScanResult(result) { |
|
|
getScanResult(result) { |
|
|
let that = this; |
|
|
let that = this; |
|
|
this.scanResult = result; |
|
|
this.scanResult = result; |
|
|
@ -343,12 +421,12 @@ |
|
|
let lot = result.data.lot === null ? '' : result.data.lot; |
|
|
let lot = result.data.lot === null ? '' : result.data.lot; |
|
|
// let items = this.details.filter(r => r.itemCode === itemCode && |
|
|
// let items = this.details.filter(r => r.itemCode === itemCode && |
|
|
// r.packingCode === packingCode && r.lot === lot) |
|
|
// r.packingCode === packingCode && r.lot === lot) |
|
|
let items = this.details.filter(r => |
|
|
let items = this.allDetails.filter(r => |
|
|
r.packingCode === packingCode) |
|
|
r.packingCode === packingCode) |
|
|
if (items.length === 0) { |
|
|
if (items.length === 0) { |
|
|
//按零件盘点，不能添加其他零件为明细 |
|
|
//按零件盘点，不能添加其他零件为明细 |
|
|
if (this.datacontent.countMethod === 2) { |
|
|
if (this.datacontent.countMethod === 2) { |
|
|
if (this.details[0].itemCode === itemCode) { |
|
|
if (this.allDetails[0].itemCode === itemCode) { |
|
|
this.addNewDetail(result); |
|
|
this.addNewDetail(result); |
|
|
} else { |
|
|
} else { |
|
|
this.showMessage('扫描的库存不在列表中'); |
|
|
this.showMessage('扫描的库存不在列表中'); |
|
|
@ -360,40 +438,62 @@ |
|
|
let item = items[0]; |
|
|
let item = items[0]; |
|
|
this.currentItem = item; |
|
|
this.currentItem = item; |
|
|
if (item.scaned) { |
|
|
if (item.scaned) { |
|
|
this.setQty(item, item.countQty); |
|
|
// this.setQty(item, item.countQty); |
|
|
// this.showMessage('该库存已经完成盘点,请扫描下一标签'); |
|
|
this.$refs.comMessage.showMessage('箱码【' + packingCode + '】已经完成盘点,请扫描下一标签') |
|
|
} else { |
|
|
} else { |
|
|
this.setQty(item, item.inventoryQty); |
|
|
this.setQty(item, item.inventoryQty); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
this.showMessage('盘点数量异常,箱码【' + packingCode + '】的出现多条数据'); |
|
|
this.showMessage('盘点数量异常,箱码【' + packingCode + '】的出现多条数据'); |
|
|
} |
|
|
} |
|
|
this.scrollToTop(); |
|
|
// this.scrollToTop(); |
|
|
this.calcScanCount(); |
|
|
this.calcScanCount(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
addNewDetail(result) { |
|
|
async addNewDetail(result) { |
|
|
if (this.location == null) { |
|
|
if (this.location == null) { |
|
|
this.showMessage('未查找到库位信息,不可以添加为任务明细'); |
|
|
this.showMessage('未查找到库位信息,不可以添加为任务明细'); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
showConfirmMsg('扫描的库存在任务中不存在,是否要添加为任务明细?', async confirm => { |
|
|
let balanceItem = await this.getBalanceAsync(result); |
|
|
if (confirm) { |
|
|
let detail = this.creatDetail(result); |
|
|
let balanceItem = await this.getBalanceAsync(result); |
|
|
if (balanceItem == null || balanceItem == undefined) { |
|
|
let detail = this.creatDetail(result); |
|
|
setTimeout(res => { |
|
|
if (balanceItem != null) { |
|
|
showConfirmMsg('扫描的库存在任务中不存在,是否要添加为任务明细?', async confirm => { |
|
|
this.setDetailByBalance(detail, balanceItem); |
|
|
if (confirm) { |
|
|
} else { |
|
|
this.setDetailNoBalance(detail, result) |
|
|
this.setDetailNoBalance(detail, result) |
|
|
this.allDetails.unshift(detail); |
|
|
} |
|
|
// this.details.unshift(detail); |
|
|
this.details.unshift(detail); |
|
|
this.calcAllCount(); |
|
|
this.calcAllCount(); |
|
|
this.calcScanCount(); |
|
|
this.calcScanCount(); |
|
|
this.$forceUpdate(); |
|
|
this.$forceUpdate(); |
|
|
} else { |
|
|
|
|
|
this.scanPopupGetfocus(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, 100) |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
if (balanceItem.locationCode != this.location.code) { |
|
|
|
|
|
this.showMessage("箱码【" + result.data.code + "】在库位【" + balanceItem.locationCode + "】不在库位【" + |
|
|
|
|
|
this.location.code + "】不可以添加为任务明细"); |
|
|
} else { |
|
|
} else { |
|
|
this.scanPopupGetfocus(); |
|
|
setTimeout(res => { |
|
|
|
|
|
showConfirmMsg('扫描的库存在任务中不存在,是否要添加为任务明细?', async confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
this.setDetailByBalance(detail, balanceItem); |
|
|
|
|
|
this.allDetails.unshift(detail); |
|
|
|
|
|
// this.details.unshift(detail); |
|
|
|
|
|
this.calcAllCount(); |
|
|
|
|
|
this.calcScanCount(); |
|
|
|
|
|
this.$forceUpdate(); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.scanPopupGetfocus(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, 100) |
|
|
} |
|
|
} |
|
|
}); |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
async getBalanceAsync(result) { |
|
|
async getBalanceAsync(result) { |
|
|
@ -430,7 +530,7 @@ |
|
|
number: this.datacontent.number, |
|
|
number: this.datacontent.number, |
|
|
|
|
|
|
|
|
inventoryQty: 0, |
|
|
inventoryQty: 0, |
|
|
inventoryUom: result.data.uom, |
|
|
uom: result.data.uom, |
|
|
|
|
|
|
|
|
packingCode: result.data.packingCode, |
|
|
packingCode: result.data.packingCode, |
|
|
lot: result.data.lot, |
|
|
lot: result.data.lot, |
|
|
@ -460,6 +560,7 @@ |
|
|
|
|
|
|
|
|
setDetailByBalance(detail, balanceItem) { |
|
|
setDetailByBalance(detail, balanceItem) { |
|
|
detail.InventoryLocationCode = balanceItem.locationCode; |
|
|
detail.InventoryLocationCode = balanceItem.locationCode; |
|
|
|
|
|
detail.inventoryQty = balanceItem.qty; |
|
|
detail.countQty = balanceItem.qty; |
|
|
detail.countQty = balanceItem.qty; |
|
|
detail.status = balanceItem.status; |
|
|
detail.status = balanceItem.status; |
|
|
return detail; |
|
|
return detail; |
|
|
@ -467,6 +568,7 @@ |
|
|
|
|
|
|
|
|
setDetailNoBalance(detail, result) { |
|
|
setDetailNoBalance(detail, result) { |
|
|
detail.InventoryLocationCode = ""; |
|
|
detail.InventoryLocationCode = ""; |
|
|
|
|
|
detail.inventoryQty = 0; |
|
|
detail.countQty = result.data.qty; |
|
|
detail.countQty = result.data.qty; |
|
|
detail.status = 2; |
|
|
detail.status = 2; |
|
|
return detail; |
|
|
return detail; |
|
|
@ -477,7 +579,10 @@ |
|
|
item.countQty = Number(qty); |
|
|
item.countQty = Number(qty); |
|
|
item.countTime = new Date(); |
|
|
item.countTime = new Date(); |
|
|
item.countOperator = localStorage.userId; |
|
|
item.countOperator = localStorage.userId; |
|
|
this.details.sort(compare('countTime')); //按扫描信息排序 |
|
|
|
|
|
|
|
|
this.allDetails.sort(compare('countTime')); //按扫描信息排序 |
|
|
|
|
|
this.$refs.paging.reload(); |
|
|
|
|
|
this.scanPopupGetfocus(); |
|
|
this.$forceUpdate(); |
|
|
this.$forceUpdate(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
@ -495,7 +600,7 @@ |
|
|
content: '是否移除选择的行?', |
|
|
content: '是否移除选择的行?', |
|
|
success: res => { |
|
|
success: res => { |
|
|
if (res.confirm) { |
|
|
if (res.confirm) { |
|
|
that.details.splice(index, 1); |
|
|
that.allDetails.splice(index, 1); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
@ -536,8 +641,10 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
submit() { |
|
|
submit() { |
|
|
|
|
|
// let params = JSON.stringify(this.allDetails); |
|
|
|
|
|
// console.log('params', params); |
|
|
let that = this; |
|
|
let that = this; |
|
|
let unCheckedItems = that.details.filter(r => { |
|
|
let unCheckedItems = that.allDetails.filter(r => { |
|
|
return r.scaned === false |
|
|
return r.scaned === false |
|
|
}) |
|
|
}) |
|
|
if (unCheckedItems.length > 0) { |
|
|
if (unCheckedItems.length > 0) { |
|
|
@ -556,24 +663,28 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
finish() { |
|
|
finish() { |
|
|
if (this.details.length == 0) { |
|
|
this.finishJob(); |
|
|
showConfirmMsg('还没有要盘点的任务详情,是否要继续提交?', confirm => { |
|
|
// if (this.details.length == 0) { |
|
|
if (confirm) { |
|
|
// showConfirmMsg('还没有要盘点的任务详情,是否要继续提交?', confirm => { |
|
|
this.finishJob(); |
|
|
// if (confirm) { |
|
|
} |
|
|
// this.finishJob(); |
|
|
}); |
|
|
// } |
|
|
} else { |
|
|
// }); |
|
|
this.finishJob(); |
|
|
// } else { |
|
|
} |
|
|
// this.finishJob(); |
|
|
|
|
|
// } |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
finishJob() { |
|
|
finishJob() { |
|
|
let that=this; |
|
|
let that = this; |
|
|
uni.showLoading({ |
|
|
uni.showLoading({ |
|
|
title: "提交中...", |
|
|
title: "提交中...", |
|
|
mask: true |
|
|
mask: true |
|
|
}); |
|
|
}); |
|
|
this.datacontent.details = this.details; |
|
|
this.datacontent.details = this.allDetails; |
|
|
|
|
|
that.datacontent.completeUserId = localStorage.getItem('userId') |
|
|
|
|
|
that.datacontent.completeUserName = localStorage.getItem('userName_CN') |
|
|
|
|
|
that.datacontent.completeTime = getCurrDateTime() |
|
|
let params = JSON.stringify(this.datacontent); |
|
|
let params = JSON.stringify(this.datacontent); |
|
|
finishCountJob(this.id, params) |
|
|
finishCountJob(this.id, params) |
|
|
.then(res => { |
|
|
.then(res => { |
|
|
@ -608,12 +719,12 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
calcAllCount() { |
|
|
calcAllCount() { |
|
|
this.allCount = this.details.length; |
|
|
this.allCount = this.allDetails.length; |
|
|
this.newCount = this.details.filter(r => r.isNew).length; |
|
|
this.newCount = this.allDetails.filter(r => r.isNew).length; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
calcScanCount() { |
|
|
calcScanCount() { |
|
|
this.scanCount = this.details.filter(r => r.scaned === true).length; |
|
|
this.scanCount = this.allDetails.filter(r => r.scaned === true).length; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
bindPickerChange(e, item) { |
|
|
bindPickerChange(e, item) { |
|
|
@ -628,8 +739,10 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
openScanPopup() { |
|
|
openScanPopup() { |
|
|
this.isShowScanPopup = true; |
|
|
setTimeout(r => { |
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
this.isShowScanPopup = true; |
|
|
|
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
|
|
|
}, 0) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
closeScanPopup() { |
|
|
closeScanPopup() { |
|
|
@ -649,6 +762,16 @@ |
|
|
this.editDescItem.countDescription = content; |
|
|
this.editDescItem.countDescription = content; |
|
|
this.$forceUpdate(); |
|
|
this.$forceUpdate(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
openEditCount(item) { |
|
|
|
|
|
this.editCountItem = item; |
|
|
|
|
|
this.$refs.countPopup.openPopup(item.countQty); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
closeEditCount(content) { |
|
|
|
|
|
this.editCountItem.countQty = content; |
|
|
|
|
|
this.$forceUpdate(); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
showCommitSuccessMessage() { |
|
|
showCommitSuccessMessage() { |
|
|
this.$refs.comMessage.showCommitSuccess(); |
|
|
this.$refs.comMessage.showCommitSuccess(); |
|
|
@ -686,6 +809,12 @@ |
|
|
console.log(e) |
|
|
console.log(e) |
|
|
this.old.scrollTop = e.detail.scrollTop |
|
|
this.old.scrollTop = e.detail.scrollTop |
|
|
}, |
|
|
}, |
|
|
|
|
|
queryList(pageNo, pageSize) { |
|
|
|
|
|
var list = [] |
|
|
|
|
|
this.currentPage = pageNo |
|
|
|
|
|
list = this.getDataPage(pageNo, pageSize) |
|
|
|
|
|
this.$refs.paging.complete(list) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
} |
|
|
} |
|
|
|
李俊城
聂喜婷