|
@@ -95,6 +95,7 @@
|
|
|
:customRow="handleClickRow"
|
|
|
:dataSource="loadData"
|
|
|
:scroll="{ x: 1880, y: 300 }"
|
|
|
+ :loading="loading"
|
|
|
:pagination="paginationProps"
|
|
|
bordered>
|
|
|
<!-- 产品分类 -->
|
|
@@ -178,6 +179,7 @@
|
|
|
:columns="chooseColumns"
|
|
|
:dataSource="chooseLoadData"
|
|
|
:scroll="{ x: 1680, y: 300 }"
|
|
|
+ :loading="chooseLoading"
|
|
|
:pagination="choosePaginationProps"
|
|
|
bordered>
|
|
|
<!-- 产品分类 -->
|
|
@@ -243,6 +245,8 @@ export default {
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
|
+ loading: false,
|
|
|
+ chooseLoading: false,
|
|
|
queryParam: {
|
|
|
productCode: '',
|
|
|
productName: '',
|
|
@@ -480,11 +484,13 @@ export default {
|
|
|
// 产品列表数据
|
|
|
getProductList (pageNo) {
|
|
|
this.disabled = true
|
|
|
+ this.loading = true
|
|
|
this.pageNo = pageNo || this.pageNo
|
|
|
const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
|
|
|
params.enabledFlag = 1
|
|
|
params.warehouseSn = this.basicInfoData.outWarehouseSn
|
|
|
productQuery(params).then(res => {
|
|
|
+ this.loading = false
|
|
|
if (res.status == 200) {
|
|
|
const data = res.data
|
|
|
this.paginationProps.total = Number(res.data.count) || 0
|
|
@@ -528,12 +534,14 @@ export default {
|
|
|
getChooseProductList (pageNo) {
|
|
|
this.choosePageNo = this.choosePageNo || pageNo
|
|
|
this.chooseDisabled = true
|
|
|
+ this.chooseLoading = true
|
|
|
const params = {
|
|
|
pageNo: this.choosePageNo,
|
|
|
pageSize: this.choosePageSize,
|
|
|
allocationWarehouseSn: this.$route.params.sn
|
|
|
}
|
|
|
allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
|
|
|
+ this.chooseLoading = false
|
|
|
if (res.status == 200) {
|
|
|
// 合计
|
|
|
this.getDetailCount(Object.assign(params, this.chooseQueryParam))
|