|
|
@@ -779,9 +779,10 @@
|
|
|
let id = $(e.target).attr('data_id');
|
|
|
_this.selectingId=id;
|
|
|
if(e.key==='Enter'){
|
|
|
- this.放置焦点光标至正确位置()
|
|
|
+ this.放置焦点光标至正确位置();
|
|
|
let re=true;
|
|
|
_this.提交新增并盘点().then(function(result){
|
|
|
+ console.log(result)
|
|
|
if(!result){
|
|
|
_this.提交盘点();
|
|
|
}
|
|
|
@@ -944,8 +945,10 @@
|
|
|
if (inventoryMission.stockInventoryPersons.length > 0 && inventoryMission.id === _this.selectingId) {
|
|
|
_this.lastStockInventoryRecord = inventoryMission;
|
|
|
_this.stockInventoryPersons = inventoryMission.stockInventoryPersons;
|
|
|
- if (_this.inventory.status !== '复盘中') $("#lastStockInventoryRecord").modal('show');
|
|
|
- return;
|
|
|
+ if (_this.inventory.status !== '复盘中'){
|
|
|
+ $("#lastStockInventoryRecord").modal('show');
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
_this.盘点(选定盘点记录id,库位,条码,_this.inventory.id,盘点数);
|
|
|
_this.清空指定盘点记录列();
|
|
|
@@ -1039,17 +1042,21 @@
|
|
|
_this.已复盘无差异列 = _this.按库位排序_且合并SKU一起(_this.已复盘无差异列);
|
|
|
_this.无差异列 = _this.按库位排序_且合并SKU一起(_this.无差异列);
|
|
|
_this.未盘列 = _this.按库位排序_且合并SKU一起(_this.未盘列);
|
|
|
- if (!_this.分割位置id) _this.分割位置id = _this.未盘列[0].id;
|
|
|
- _this.分割位置id = _this.更新分割位置(_this.未盘分隔列2, _this.分割位置id);
|
|
|
- _this.未盘分隔列 = _this.分隔_基于分割位置(_this.未盘列, _this.分割位置id);
|
|
|
- _this.未盘分隔列1 = _this.按库位排序_且合并SKU一起(_this.未盘分隔列[0]);
|
|
|
- _this.未盘分隔列2 = _this.按库位排序_且合并SKU一起(_this.未盘分隔列[1]);
|
|
|
+ if (_this.inventory.status!=='复盘中'){
|
|
|
+ if (!_this.分割位置id) _this.分割位置id = _this.未盘列[0].id;
|
|
|
+ _this.分割位置id = _this.更新分割位置(_this.未盘分隔列2, _this.分割位置id);
|
|
|
+ _this.未盘分隔列 = _this.分隔_基于分割位置(_this.未盘列, _this.分割位置id);
|
|
|
+ _this.未盘分隔列1 = _this.按库位排序_且合并SKU一起(_this.未盘分隔列[0]);
|
|
|
+ _this.未盘分隔列2 = _this.按库位排序_且合并SKU一起(_this.未盘分隔列[1]);
|
|
|
+ }
|
|
|
_this.跳过列 = _this.按库位排序_且合并SKU一起(_this.跳过列);
|
|
|
_this.inventoryMissions = [];
|
|
|
_this.重推入(_this.inventoryMissions, _this.已复盘有差异列);
|
|
|
_this.重推入(_this.inventoryMissions, _this.未复盘有差异列);
|
|
|
- _this.重推入(_this.inventoryMissions, _this.未盘分隔列2);
|
|
|
- _this.重推入(_this.inventoryMissions, _this.未盘分隔列1);
|
|
|
+ if (_this.inventory.status!=='复盘中') {
|
|
|
+ _this.重推入(_this.inventoryMissions, _this.未盘分隔列2);
|
|
|
+ _this.重推入(_this.inventoryMissions, _this.未盘分隔列1);
|
|
|
+ }
|
|
|
_this.重推入(_this.inventoryMissions, _this.已复盘无差异列);
|
|
|
_this.重推入(_this.inventoryMissions, _this.无差异列);
|
|
|
_this.重推入(_this.inventoryMissions, _this.跳过列);
|
|
|
@@ -1170,9 +1177,8 @@
|
|
|
跳过盘点记录(inventoryAccountMissionId, inventoryAccountId, name) {
|
|
|
let _this = this;
|
|
|
if (!confirm('确定要跳过商品为：“' + name + '”的盘点记录吗？')) {
|
|
|
- return
|
|
|
+ return ;
|
|
|
}
|
|
|
- ;
|
|
|
let url = '{{url('inventory/跳过盘点记录')}}';
|
|
|
axios.post(url, {
|
|
|
inventoryAccountMissionId: inventoryAccountMissionId,
|
|
|
@@ -1202,9 +1208,8 @@
|
|
|
完结盘点任务(id, owner_name, type) {
|
|
|
let _this = this;
|
|
|
if (!confirm('确定完结货主为：“' + owner_name + '”的“' + type + '”任务吗？')) {
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
- ;
|
|
|
let url = '{{url('inventory/完结盘点任务')}}/' + id;
|
|
|
axios.get(url).then(function (response) {
|
|
|
if (!response.data.success) {
|
haozi