|
|
|
@ -7,6 +7,7 @@ |
|
|
|
:newCount="newCount" :location="location" :countOrder="datacontent.inventoryStage"> |
|
|
|
</com-count-scan-detail> |
|
|
|
</view> |
|
|
|
<!-- <button @click="open">打开</button> --> |
|
|
|
<scroll-view scroll-y="true" style="margin-bottom: 50rpx;"> |
|
|
|
<view v-for="(item ,index) in showList" :key="index"> |
|
|
|
<view class="detail-content common_card"> |
|
|
|
@ -144,6 +145,7 @@ |
|
|
|
<!-- com-message必须放在最下层 --> |
|
|
|
<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></com-message> |
|
|
|
<!-- <uni-load-more :status="loadingType" v-if="details.length>0"></uni-load-more> --> |
|
|
|
<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" /> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -242,7 +244,12 @@ |
|
|
|
pageSize: 20, |
|
|
|
jobStatus: "", |
|
|
|
index: 0, |
|
|
|
showList: [] |
|
|
|
showList: [], |
|
|
|
userForm: { |
|
|
|
names: [], |
|
|
|
values: [], |
|
|
|
origin: [] |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
props: {}, |
|
|
|
@ -338,6 +345,43 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
open() { |
|
|
|
this.$refs.wzSelectPopup.open({ |
|
|
|
mode: 'radio', //radio checkbox 单选、多选 |
|
|
|
// dataList:[], //如果dataList传入了数组则直接使用传入的数组渲染，无需再配置proxyConfig |
|
|
|
selected: this.userForm.values, //已选中的数据 |
|
|
|
proxyConfig: { //组件内部代理请求数据配置 |
|
|
|
reqFun: this.reqGetList, //请求方法,在方法中请返回Promise.resolve([]) |
|
|
|
localPaging: false //前端本地分页 |
|
|
|
}, |
|
|
|
search: { |
|
|
|
type: 'remote', //local本地数据搜索 | remote请求接口 |
|
|
|
}, |
|
|
|
fields: { |
|
|
|
label: 'name', |
|
|
|
value: 'code' |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
selectCheckbox(mode, data) { |
|
|
|
console.log(mode, data) |
|
|
|
}, |
|
|
|
reqGetList(data) { |
|
|
|
|
|
|
|
let params = { |
|
|
|
pageSize: data.pageSize, |
|
|
|
pageIndex: data.pageIndex, |
|
|
|
itemCode:data.searchValue |
|
|
|
}; |
|
|
|
return getBalancesByFilterAsync(params); |
|
|
|
// return simulationReqGetList({ |
|
|
|
// pageIndex: data.pageIndex, |
|
|
|
// pageSize: data.pageSize, |
|
|
|
// name: data.searchValue |
|
|
|
// }) |
|
|
|
}, |
|
|
|
|
|
|
|
initList() { |
|
|
|
this.index = 1; |
|
|
|
this.showList = [] |
|
|
|
@ -360,12 +404,12 @@ |
|
|
|
that.originalDetails = res.details; |
|
|
|
that.allCount = res.details.length |
|
|
|
|
|
|
|
that.scanAllDetails = res.depDetails.filter(r=>r.inventoryStage==res.inventoryStage); |
|
|
|
that.scanAllDetails = res.depDetails.filter(r => r.inventoryStage == res.inventoryStage); |
|
|
|
that.scanCount = that.scanAllDetails.length |
|
|
|
|
|
|
|
that.scanAllDetails.forEach(res=>{ |
|
|
|
|
|
|
|
that.scanAllDetails.forEach(res => { |
|
|
|
res.IsDelete = false; |
|
|
|
res.modified=false; |
|
|
|
res.modified = false; |
|
|
|
}) |
|
|
|
|
|
|
|
this.initList() |
|
|
|
@ -388,7 +432,7 @@ |
|
|
|
//当前页起始索引 |
|
|
|
const start = (pageNo - 1) * pageSize; |
|
|
|
const end = start + pageSize; //当前页结束索引 |
|
|
|
var list =this.scanAllDetails.filter((r=>r.IsDelete==false)) |
|
|
|
var list = this.scanAllDetails.filter((r => r.IsDelete == false)) |
|
|
|
return list.slice(start, end) |
|
|
|
|
|
|
|
}, |
|
|
|
@ -398,7 +442,7 @@ |
|
|
|
let itemCode = result.data.itemCode; |
|
|
|
let packingCode = result.data.code === null ? '' : result.data.code; |
|
|
|
var itemScan = this.scanAllDetails.filter(r => |
|
|
|
r.packingCode == packingCode&&r.inventoryStage==this.datacontent.inventoryStage) |
|
|
|
r.packingCode == packingCode && r.inventoryStage == this.datacontent.inventoryStage) |
|
|
|
if (itemScan.length > 0) { |
|
|
|
setTimeout(res => { |
|
|
|
showConfirmMsg("箱码【" + packingCode + "】已经扫描,是否覆盖已经扫描的信息", res => { |
|
|
|
@ -413,12 +457,13 @@ |
|
|
|
} |
|
|
|
|
|
|
|
let items = this.originalDetails.filter(r => |
|
|
|
r.packingCode === packingCode&&r.inventoryStage==this.datacontent.inventoryStage) |
|
|
|
r.packingCode === packingCode && r.inventoryStage == this.datacontent.inventoryStage) |
|
|
|
//不在任务列表中，查询库存赋值 |
|
|
|
if (items.length == 0) { |
|
|
|
this.addNewDetail(result) |
|
|
|
} else if (items.length == 1) { |
|
|
|
var item = items[0]; |
|
|
|
item.isNew =true; |
|
|
|
this.setQty(item, item.inventoryQty, true); |
|
|
|
} else { |
|
|
|
this.showMessage('盘点数量异常,箱码【' + packingCode + '】的出现多条数据'); |
|
|
|
@ -497,13 +542,13 @@ |
|
|
|
creatDetail(result, balanceItem) { |
|
|
|
let detail = { |
|
|
|
isNew: true, |
|
|
|
IsDelete:false, |
|
|
|
modified:true, |
|
|
|
IsDelete: false, |
|
|
|
modified: true, |
|
|
|
countTime: new Date(), |
|
|
|
masterID: this.id, |
|
|
|
countLabel: "", |
|
|
|
number: this.datacontent.number, |
|
|
|
inventoryStage:this.datacontent.inventoryStage, |
|
|
|
inventoryStage: this.datacontent.inventoryStage, |
|
|
|
|
|
|
|
inventoryQty: 0, |
|
|
|
uom: result.data.uom, |
|
|
|
@ -539,7 +584,7 @@ |
|
|
|
detail.inventoryQty = balanceItem.qty; |
|
|
|
detail.countQty = balanceItem.qty; |
|
|
|
detail.status = balanceItem.status; |
|
|
|
|
|
|
|
|
|
|
|
return detail; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -554,13 +599,13 @@ |
|
|
|
setQty(item, qty, isAdd) { |
|
|
|
item.countQty = Number(qty); |
|
|
|
item.countTime = new Date(); |
|
|
|
item.IsDelete =false; |
|
|
|
item.modified =true; |
|
|
|
item.IsDelete = false; |
|
|
|
item.modified = true; |
|
|
|
item.countOperator = localStorage.userId; |
|
|
|
if (isAdd) { |
|
|
|
this.scanAllDetails.unshift(item) |
|
|
|
}else { |
|
|
|
item.countDescription="" |
|
|
|
} else { |
|
|
|
item.countDescription = "" |
|
|
|
} |
|
|
|
this.initList(); |
|
|
|
this.scanPopupGetfocus(); |
|
|
|
@ -573,8 +618,13 @@ |
|
|
|
content: '是否移除选择的行?', |
|
|
|
success: res => { |
|
|
|
if (res.confirm) { |
|
|
|
item.IsDelete = true; |
|
|
|
item.modified =true; |
|
|
|
if(item.isNew){ |
|
|
|
this.showList.splice(index, 1) |
|
|
|
this.scanAllDetails.splice(index, 1) |
|
|
|
}else { |
|
|
|
item.IsDelete = true; |
|
|
|
item.modified = true; |
|
|
|
} |
|
|
|
// this.scanAllDetails.splice(index, 1); |
|
|
|
this.initList(); |
|
|
|
this.scanPopupGetfocus(); |
|
|
|
@ -600,33 +650,33 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
submit() { |
|
|
|
|
|
|
|
|
|
|
|
if (this.scanAllDetails.length == 0) { |
|
|
|
this.showMessage("盘点数量为0,请先扫描") |
|
|
|
return; |
|
|
|
} |
|
|
|
var commitList=this.scanAllDetails.filter(r=>r.modified==true) |
|
|
|
var commitList = this.scanAllDetails.filter(r => r.modified == true) |
|
|
|
if (commitList.length == 0) { |
|
|
|
this.showMessage("没有修改的数据,请先扫描") |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var temp=""; |
|
|
|
|
|
|
|
|
|
|
|
var temp = ""; |
|
|
|
for (var i = 0; i < this.scanAllDetails.length; i++) { |
|
|
|
if(this.scanAllDetails[i].countQty==0){ |
|
|
|
temp=this.scanAllDetails[i]; |
|
|
|
break; |
|
|
|
} |
|
|
|
if (this.scanAllDetails[i].countQty == 0) { |
|
|
|
temp = this.scanAllDetails[i]; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if(temp!=""){ |
|
|
|
this.showMessage("箱码:["+temp.packingCode+"]盘点数量为0,请输入盘点数量") |
|
|
|
|
|
|
|
if (temp != "") { |
|
|
|
this.showMessage("箱码:[" + temp.packingCode + "]盘点数量为0,请输入盘点数量") |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.finishJob(); |
|
|
|
}, |
|
|
|
|
|
|
|
@ -636,13 +686,13 @@ |
|
|
|
title: "提交中...", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
this.datacontent.depDetails = this.scanAllDetails.filter(r=>r.modified==true); |
|
|
|
this.datacontent.details =[]; |
|
|
|
this.datacontent.depDetails = this.scanAllDetails.filter(r => r.modified == true); |
|
|
|
this.datacontent.details = []; |
|
|
|
that.datacontent.completeUserId = localStorage.getItem('userId') |
|
|
|
that.datacontent.completeUserName = localStorage.getItem('userName_CN') |
|
|
|
that.datacontent.completeTime = getCurrDateTime() |
|
|
|
let params = JSON.stringify(this.datacontent); |
|
|
|
console.log("提交参数",params) |
|
|
|
console.log("提交参数", params) |
|
|
|
finishCountJob(this.id, params) |
|
|
|
.then(res => { |
|
|
|
uni.hideLoading(); |
|
|
|
@ -661,19 +711,19 @@ |
|
|
|
item.countTime = new Date(); |
|
|
|
item.countOperator = localStorage.userId; |
|
|
|
this.calcScanCount(); |
|
|
|
if(value==item.countQty){ |
|
|
|
item.modified=false |
|
|
|
}else { |
|
|
|
item.modified=true |
|
|
|
if (value == item.countQty) { |
|
|
|
item.modified = false |
|
|
|
} else { |
|
|
|
item.modified = true |
|
|
|
} |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
this.showMessage("盘点数量必须大于0") |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
calcScanCount() { |
|
|
|
this.scanCount = this.scanAllDetails.length; |
|
|
|
this.scanCount = this.scanAllDetails.filter(r=>r.IsDelete==false).length; |
|
|
|
}, |
|
|
|
|
|
|
|
bindPickerChange(e, item) { |
|
|
|
|
