|
|
@ -242,7 +242,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
<template v-if="orderShow"> |
|
|
|
<template v-if="orderShow"> |
|
|
|
<el-dialog v-model="orderShow" title="在库订单信息" width="100%" :model="addvalue"> |
|
|
|
<el-dialog v-model="orderShow" title="在库订单信息" width="80%" :model="addvalue"> |
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
<!-- <el-form-item label="订单自编号:">--> |
|
|
|
<!-- <el-form-item label="订单自编号:">--> |
|
|
@ -273,6 +273,8 @@ |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<tablecmt |
|
|
|
<tablecmt |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class="tableNode" |
|
|
|
:columnList="stockArtcolumnList" |
|
|
|
:columnList="stockArtcolumnList" |
|
|
|
:tableData="stockArticleInfo" |
|
|
|
:tableData="stockArticleInfo" |
|
|
|
:checkselect="orderSelectList" |
|
|
|
:checkselect="orderSelectList" |
|
|
@ -390,7 +392,7 @@ |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<template v-if="stockListShow"> |
|
|
|
<template v-if="stockListShow"> |
|
|
|
<el-dialog v-model="stockListShow" title="库存品信息" width="100%"> |
|
|
|
<el-dialog v-model="stockListShow" title="库存品信息" width="80%"> |
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
<!-- <el-form-item label="商场名称:">--> |
|
|
|
<!-- <el-form-item label="商场名称:">--> |
|
|
@ -417,6 +419,7 @@ |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<tablecmt |
|
|
|
<tablecmt |
|
|
|
|
|
|
|
class="kcptableNode" |
|
|
|
:columnList="inventoryInfocolumnList" |
|
|
|
:columnList="inventoryInfocolumnList" |
|
|
|
:tableData="inventoryInfo" |
|
|
|
:tableData="inventoryInfo" |
|
|
|
:checkselect="inventorySelectList" |
|
|
|
:checkselect="inventorySelectList" |
|
|
@ -618,15 +621,16 @@ |
|
|
|
getClientList, |
|
|
|
getClientList, |
|
|
|
selectUpdateAvailableStockArticle, |
|
|
|
selectUpdateAvailableStockArticle, |
|
|
|
getZeroOrderDetail, |
|
|
|
getZeroOrderDetail, |
|
|
|
|
|
|
|
$_clientList, |
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
import { |
|
|
|
import { |
|
|
|
getInventoryList, |
|
|
|
getInventoryList, |
|
|
|
getStockListClient, |
|
|
|
getStockListClient, |
|
|
|
selectInventoryDetail |
|
|
|
selectInventoryDetail, |
|
|
|
} from '@/api/distribution/distributionStockList'; |
|
|
|
} from '@/api/distribution/distributionStockList'; |
|
|
|
|
|
|
|
import {setNodeHeight } from '@/utils/util'; |
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
@ -2070,6 +2074,7 @@ |
|
|
|
let params = {}; |
|
|
|
let params = {}; |
|
|
|
this.query.serviceType = '2'; |
|
|
|
this.query.serviceType = '2'; |
|
|
|
params.marketName = this.marketName; |
|
|
|
params.marketName = this.marketName; |
|
|
|
|
|
|
|
this.loading=true; |
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
res => { |
|
|
|
res => { |
|
|
|
const inventoryList = res.data.data; |
|
|
|
const inventoryList = res.data.data; |
|
|
@ -2102,7 +2107,16 @@ |
|
|
|
this.selectionClear(); |
|
|
|
this.selectionClear(); |
|
|
|
this.stockListShow = true; |
|
|
|
this.stockListShow = true; |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
).catch(error=>{ |
|
|
|
|
|
|
|
console.log(error); |
|
|
|
|
|
|
|
}).finally(()=>{ |
|
|
|
|
|
|
|
this.loading=false; |
|
|
|
|
|
|
|
let ctime= setTimeout(()=>{ |
|
|
|
|
|
|
|
const _node = document.querySelector('.kcptableNode'); |
|
|
|
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
|
|
|
clearTimeout(ctime) |
|
|
|
|
|
|
|
},50) |
|
|
|
|
|
|
|
}); |
|
|
|
this.query = {}; |
|
|
|
this.query = {}; |
|
|
|
this.inventoryList = []; |
|
|
|
this.inventoryList = []; |
|
|
|
}, |
|
|
|
}, |
|
|
@ -2368,6 +2382,7 @@ |
|
|
|
let params = {}; |
|
|
|
let params = {}; |
|
|
|
let page = this.page; |
|
|
|
let page = this.page; |
|
|
|
this.query.serviceType = 2; |
|
|
|
this.query.serviceType = 2; |
|
|
|
|
|
|
|
this.loading=true; |
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
res => { |
|
|
|
res => { |
|
|
|
const inventoryList = res.data.data; |
|
|
|
const inventoryList = res.data.data; |
|
|
@ -2381,10 +2396,21 @@ |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.page.total = inventoryList.total; |
|
|
|
this.page.total = inventoryList.total; |
|
|
|
this.inventoryInfo = inventoryList.records; |
|
|
|
this.inventoryInfo = inventoryList.records; |
|
|
|
|
|
|
|
|
|
|
|
this.loading = false; |
|
|
|
this.loading = false; |
|
|
|
this.selectionClear(); |
|
|
|
this.selectionClear(); |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
).catch(error=>{ |
|
|
|
|
|
|
|
console.log(error); |
|
|
|
|
|
|
|
}).finally(()=>{ |
|
|
|
|
|
|
|
this.loading=false; |
|
|
|
|
|
|
|
let ctime= setTimeout(()=>{ |
|
|
|
|
|
|
|
const _node = document.querySelector('.kcptableNode'); |
|
|
|
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
|
|
|
clearTimeout(ctime) |
|
|
|
|
|
|
|
},50) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
stockArticleSearchReset() { |
|
|
|
stockArticleSearchReset() { |
|
|
|
this.selectionList = []; |
|
|
|
this.selectionList = []; |
|
|
@ -2984,15 +3010,24 @@ |
|
|
|
if (this.orderData.length !== 0) { |
|
|
|
if (this.orderData.length !== 0) { |
|
|
|
this.query.orderIds = this.orderData.map(val => val.id).join(','); |
|
|
|
this.query.orderIds = this.orderData.map(val => val.id).join(','); |
|
|
|
} |
|
|
|
} |
|
|
|
const res = await getClientList( |
|
|
|
|
|
|
|
|
|
|
|
this.loading=true; |
|
|
|
|
|
|
|
const res = await $_clientList( |
|
|
|
page.currentPage, |
|
|
|
page.currentPage, |
|
|
|
page.pageSize, |
|
|
|
page.pageSize, |
|
|
|
Object.assign(params, this.query) |
|
|
|
Object.assign(params, this.query) |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.loading=false; |
|
|
|
console.log('res ===>>', res); |
|
|
|
console.log('res ===>>', res); |
|
|
|
const { records, total } = res.data.data; |
|
|
|
const { records, total } = res.data.data; |
|
|
|
|
|
|
|
|
|
|
|
this.stockArticleInfo = records; |
|
|
|
this.stockArticleInfo = records; |
|
|
|
|
|
|
|
let time= setTimeout(()=>{ |
|
|
|
|
|
|
|
const _node = document.querySelector('.tableNode'); |
|
|
|
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
|
|
|
clearTimeout(time) |
|
|
|
|
|
|
|
},50) |
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
//检查订单是否冻结 |
|
|
|
//检查订单是否冻结 |
|
|
|
this.checkOrder(item, index); |
|
|
|
this.checkOrder(item, index); |
|
|
|