|
@@ -74,7 +74,7 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
- <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-button type="primary" @click="getProductList(1)" :disabled="disabled" id="warehouseAllocationList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="getProductList(1)" :disabled="disabled" id="warehouseAllocationList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
@@ -96,7 +96,7 @@
|
|
:dataSource="loadData"
|
|
:dataSource="loadData"
|
|
:scroll="{ x: 1880, y: 300 }"
|
|
:scroll="{ x: 1880, y: 300 }"
|
|
:loading="loading"
|
|
:loading="loading"
|
|
- :pagination="paginationProps"
|
|
|
|
|
|
+ :pagination="false"
|
|
bordered>
|
|
bordered>
|
|
<!-- 产品分类 -->
|
|
<!-- 产品分类 -->
|
|
<template slot="productType" slot-scope="text, record">
|
|
<template slot="productType" slot-scope="text, record">
|
|
@@ -105,13 +105,14 @@
|
|
</template>
|
|
</template>
|
|
<!-- 调入仓位 -->
|
|
<!-- 调入仓位 -->
|
|
<template slot="putWarehouseLocationSn" slot-scope="text, record">
|
|
<template slot="putWarehouseLocationSn" slot-scope="text, record">
|
|
- <a-select id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" v-model="record.putWarehouseLocationSn" style="width: 100%;">
|
|
|
|
|
|
+ <a-select size="small" id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" v-model="record.putWarehouseLocationSn" style="width: 100%;">
|
|
<a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
|
|
<a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</template>
|
|
</template>
|
|
<!-- 调出数量 -->
|
|
<!-- 调出数量 -->
|
|
<template slot="outQty" slot-scope="text, record">
|
|
<template slot="outQty" slot-scope="text, record">
|
|
<a-input-number
|
|
<a-input-number
|
|
|
|
+ size="small"
|
|
id="warehouseAllocationEdit-outQty"
|
|
id="warehouseAllocationEdit-outQty"
|
|
v-model="record.outQty"
|
|
v-model="record.outQty"
|
|
:precision="0"
|
|
:precision="0"
|
|
@@ -126,6 +127,14 @@
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-table>
|
|
</a-table>
|
|
|
|
+ <!-- 分页 -->
|
|
|
|
+ <tablePagination
|
|
|
|
+ ref="tablePagination"
|
|
|
|
+ :total="paginationProps.total"
|
|
|
|
+ :current="paginationProps.current"
|
|
|
|
+ :pageSize="paginationProps.pageSize"
|
|
|
|
+ @changePageSize="changePageSize"
|
|
|
|
+ @changePage="changePage" />
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
</a-card>
|
|
</a-card>
|
|
@@ -134,7 +143,7 @@
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse-panel key="1" header="已选产品">
|
|
<a-collapse-panel key="1" header="已选产品">
|
|
<!-- 总计 -->
|
|
<!-- 总计 -->
|
|
- <a-alert type="info" showIcon style="margin-bottom:10px">
|
|
|
|
|
|
+ <a-alert type="info" style="margin-bottom:10px">
|
|
<div slot="message">
|
|
<div slot="message">
|
|
总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
|
|
总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
|
|
总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
|
|
总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
|
|
@@ -157,7 +166,7 @@
|
|
<a-input id="warehouseAllocationEdit-productName" v-model="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
|
|
<a-input id="warehouseAllocationEdit-productName" v-model="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-button type="primary" @click="getChooseProductList(1)" :disabled="chooseDisabled" id="warehouseAllocationList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="getChooseProductList(1)" :disabled="chooseDisabled" id="warehouseAllocationList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
<a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
</a-col>
|
|
</a-col>
|
|
@@ -182,7 +191,7 @@
|
|
:dataSource="chooseLoadData"
|
|
:dataSource="chooseLoadData"
|
|
:scroll="{ x: 1680, y: 300 }"
|
|
:scroll="{ x: 1680, y: 300 }"
|
|
:loading="chooseLoading"
|
|
:loading="chooseLoading"
|
|
- :pagination="choosePaginationProps"
|
|
|
|
|
|
+ :pagination="false"
|
|
bordered>
|
|
bordered>
|
|
<!-- 产品分类 -->
|
|
<!-- 产品分类 -->
|
|
<template slot="productType" slot-scope="text, record">
|
|
<template slot="productType" slot-scope="text, record">
|
|
@@ -192,6 +201,7 @@
|
|
<!-- 调入仓位 -->
|
|
<!-- 调入仓位 -->
|
|
<template slot="putWarehouseLocationSn" slot-scope="text, record">
|
|
<template slot="putWarehouseLocationSn" slot-scope="text, record">
|
|
<a-select
|
|
<a-select
|
|
|
|
+ size="small"
|
|
id="warehouseAllocationEdit-putWarehouseLocationSn"
|
|
id="warehouseAllocationEdit-putWarehouseLocationSn"
|
|
@change="chooseWarehouseLocChange(record)"
|
|
@change="chooseWarehouseLocChange(record)"
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
@@ -203,6 +213,7 @@
|
|
<!-- 调出数量 -->
|
|
<!-- 调出数量 -->
|
|
<template slot="outQty" slot-scope="text, record">
|
|
<template slot="outQty" slot-scope="text, record">
|
|
<a-input-number
|
|
<a-input-number
|
|
|
|
+ size="small"
|
|
id="warehouseAllocationEdit-outQty"
|
|
id="warehouseAllocationEdit-outQty"
|
|
v-model="record.outQty"
|
|
v-model="record.outQty"
|
|
:precision="0"
|
|
:precision="0"
|
|
@@ -217,6 +228,14 @@
|
|
<a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
|
|
<a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
|
|
</template>
|
|
</template>
|
|
</a-table>
|
|
</a-table>
|
|
|
|
+ <!-- 分页 -->
|
|
|
|
+ <tablePagination
|
|
|
|
+ ref="chooseTablePagination"
|
|
|
|
+ :total="choosePaginationProps.total"
|
|
|
|
+ :current="choosePaginationProps.current"
|
|
|
|
+ :pageSize="choosePaginationProps.pageSize"
|
|
|
|
+ @changePageSize="changeChoosePageSize"
|
|
|
|
+ @changePage="changeChoosePage" />
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
</a-card>
|
|
</a-card>
|
|
@@ -237,13 +256,14 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
|
|
+import tablePagination from '@/views/common/tablePagination.vue'
|
|
import { allocWarehouseDetailList, allocWarehouseDetail, productQuery, allocWarehouseDetailCount, allocWarehouseDetailSave, allocWarehouseDetailDel, allocWarehouseSubmit } from '@/api/allocWarehouse'
|
|
import { allocWarehouseDetailList, allocWarehouseDetail, productQuery, allocWarehouseDetailCount, allocWarehouseDetailSave, allocWarehouseDetailDel, allocWarehouseSubmit } from '@/api/allocWarehouse'
|
|
import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
|
|
import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
|
|
import { dealerProductTypeList } from '@/api/dealerProductType'
|
|
import { dealerProductTypeList } from '@/api/dealerProductType'
|
|
import { warehouseLocAllList } from '@/api/warehouse'
|
|
import { warehouseLocAllList } from '@/api/warehouse'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
- components: { STable, VSelect },
|
|
|
|
|
|
+ components: { STable, VSelect, tablePagination },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -288,14 +308,10 @@ export default {
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
],
|
|
],
|
|
loadData: [],
|
|
loadData: [],
|
|
- pageNo: 1, // 分页页码
|
|
|
|
- pageSize: 10, // 分页 每页多少条
|
|
|
|
paginationProps: {
|
|
paginationProps: {
|
|
- showSizeChanger: true, // 是否可以改变 pageSize
|
|
|
|
total: 0, // 分页总条数
|
|
total: 0, // 分页总条数
|
|
current: 1,
|
|
current: 1,
|
|
- onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
|
|
|
|
- onChange: (current) => this.changePage(current)
|
|
|
|
|
|
+ pageSize: 20
|
|
},
|
|
},
|
|
// 表头
|
|
// 表头
|
|
chooseColumns: [
|
|
chooseColumns: [
|
|
@@ -312,14 +328,10 @@ export default {
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
],
|
|
],
|
|
chooseLoadData: [],
|
|
chooseLoadData: [],
|
|
- choosePageNo: 1, // 分页页码
|
|
|
|
- choosePageSize: 10, // 分页 每页多少条
|
|
|
|
choosePaginationProps: {
|
|
choosePaginationProps: {
|
|
- showSizeChanger: true, // 是否可以改变 pageSize
|
|
|
|
total: 0, // 分页总条数
|
|
total: 0, // 分页总条数
|
|
current: 1,
|
|
current: 1,
|
|
- onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
|
|
|
|
- onChange: (current) => this.changeChoosePage(current)
|
|
|
|
|
|
+ pageSize: 20
|
|
},
|
|
},
|
|
basicInfoData: null, // 基本信息
|
|
basicInfoData: null, // 基本信息
|
|
productTotal: null // 合计
|
|
productTotal: null // 合计
|
|
@@ -337,10 +349,9 @@ export default {
|
|
this.queryParam.productTypeSn3 = undefined
|
|
this.queryParam.productTypeSn3 = undefined
|
|
this.queryParam.warehouseLocationSn = undefined
|
|
this.queryParam.warehouseLocationSn = undefined
|
|
this.productType = []
|
|
this.productType = []
|
|
- this.pageNo = 1
|
|
|
|
- this.pageSize = 10
|
|
|
|
this.paginationProps.total = 0
|
|
this.paginationProps.total = 0
|
|
this.paginationProps.current = 1
|
|
this.paginationProps.current = 1
|
|
|
|
+ this.paginationProps.pageSize = 20
|
|
this.getProductList(1)
|
|
this.getProductList(1)
|
|
},
|
|
},
|
|
// 双击快速添加
|
|
// 双击快速添加
|
|
@@ -357,10 +368,9 @@ export default {
|
|
chooseResetSearchForm () {
|
|
chooseResetSearchForm () {
|
|
this.chooseQueryParam.productCode = ''
|
|
this.chooseQueryParam.productCode = ''
|
|
this.chooseQueryParam.productName = ''
|
|
this.chooseQueryParam.productName = ''
|
|
- this.choosePageNo = 1
|
|
|
|
- this.choosePageSize = 10
|
|
|
|
this.choosePaginationProps.total = 0
|
|
this.choosePaginationProps.total = 0
|
|
this.choosePaginationProps.current = 1
|
|
this.choosePaginationProps.current = 1
|
|
|
|
+ this.choosePaginationProps.pageSize = 20
|
|
this.getChooseProductList(1)
|
|
this.getChooseProductList(1)
|
|
},
|
|
},
|
|
// 基本信息
|
|
// 基本信息
|
|
@@ -487,8 +497,8 @@ export default {
|
|
getProductList (pageNo) {
|
|
getProductList (pageNo) {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
this.loading = true
|
|
this.loading = true
|
|
- this.pageNo = pageNo || this.pageNo
|
|
|
|
- const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
|
|
|
|
|
|
+ this.paginationProps.current = pageNo || this.paginationProps.current
|
|
|
|
+ const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam)
|
|
params.enabledFlag = 1
|
|
params.enabledFlag = 1
|
|
params.warehouseSn = this.basicInfoData.outWarehouseSn
|
|
params.warehouseSn = this.basicInfoData.outWarehouseSn
|
|
productQuery(params).then(res => {
|
|
productQuery(params).then(res => {
|
|
@@ -496,7 +506,7 @@ export default {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
const data = res.data
|
|
const data = res.data
|
|
this.paginationProps.total = Number(res.data.count) || 0
|
|
this.paginationProps.total = Number(res.data.count) || 0
|
|
- this.paginationProps.current = this.pageNo
|
|
|
|
|
|
+ this.paginationProps.current = data.pageNo
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
@@ -506,40 +516,41 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.paginationProps.total = 0
|
|
this.paginationProps.total = 0
|
|
this.paginationProps.current = 1
|
|
this.paginationProps.current = 1
|
|
|
|
+ this.paginationProps.pageSize = 20
|
|
this.loadData = []
|
|
this.loadData = []
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 分页 一页多少条change
|
|
// 分页 一页多少条change
|
|
changePageSize (current, pageSize) {
|
|
changePageSize (current, pageSize) {
|
|
- this.pageNo = current
|
|
|
|
- this.pageSize = pageSize
|
|
|
|
|
|
+ this.paginationProps.current = current
|
|
|
|
+ this.paginationProps.pageSize = pageSize
|
|
this.getProductList()
|
|
this.getProductList()
|
|
},
|
|
},
|
|
// 分页 页码change
|
|
// 分页 页码change
|
|
changePage (current) {
|
|
changePage (current) {
|
|
- this.pageNo = current
|
|
|
|
|
|
+ this.paginationProps.current = current
|
|
this.getProductList()
|
|
this.getProductList()
|
|
},
|
|
},
|
|
// 已选产品 分页 一页多少条change
|
|
// 已选产品 分页 一页多少条change
|
|
changeChoosePageSize (current, pageSize) {
|
|
changeChoosePageSize (current, pageSize) {
|
|
- this.choosePageNo = current
|
|
|
|
- this.choosePageSize = pageSize
|
|
|
|
|
|
+ this.choosePaginationProps.current = current
|
|
|
|
+ this.choosePaginationProps.pageSize = pageSize
|
|
this.getChooseProductList()
|
|
this.getChooseProductList()
|
|
},
|
|
},
|
|
// 已选产品 分页 页码change
|
|
// 已选产品 分页 页码change
|
|
changeChoosePage (current) {
|
|
changeChoosePage (current) {
|
|
- this.choosePageNo = current
|
|
|
|
|
|
+ this.choosePaginationProps.current = current
|
|
this.getChooseProductList()
|
|
this.getChooseProductList()
|
|
},
|
|
},
|
|
// 已选产品列表数据
|
|
// 已选产品列表数据
|
|
getChooseProductList (pageNo) {
|
|
getChooseProductList (pageNo) {
|
|
- this.choosePageNo = this.choosePageNo || pageNo
|
|
|
|
|
|
+ this.choosePaginationProps.current = this.choosePaginationProps.current || pageNo
|
|
this.chooseDisabled = true
|
|
this.chooseDisabled = true
|
|
this.chooseLoading = true
|
|
this.chooseLoading = true
|
|
const params = {
|
|
const params = {
|
|
- pageNo: this.choosePageNo,
|
|
|
|
- pageSize: this.choosePageSize,
|
|
|
|
|
|
+ pageNo: this.choosePaginationProps.current,
|
|
|
|
+ pageSize: this.choosePaginationProps.pageSize,
|
|
allocationWarehouseSn: this.$route.params.sn
|
|
allocationWarehouseSn: this.$route.params.sn
|
|
}
|
|
}
|
|
allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
|
|
allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
|
|
@@ -561,6 +572,7 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.choosePaginationProps.total = 0
|
|
this.choosePaginationProps.total = 0
|
|
this.choosePaginationProps.current = 1
|
|
this.choosePaginationProps.current = 1
|
|
|
|
+ this.choosePaginationProps.pageSize = 20
|
|
this.chooseLoadData = []
|
|
this.chooseLoadData = []
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -634,10 +646,10 @@ export default {
|
|
<style lang="less">
|
|
<style lang="less">
|
|
.warehouseAllocationEdit-wrap{
|
|
.warehouseAllocationEdit-wrap{
|
|
.warehouseAllocationEdit-back{
|
|
.warehouseAllocationEdit-back{
|
|
- margin-bottom: 15px;
|
|
|
|
|
|
+ margin-bottom: 10px;
|
|
}
|
|
}
|
|
.warehouseAllocationEdit-cont{
|
|
.warehouseAllocationEdit-cont{
|
|
- margin-bottom: 15px;
|
|
|
|
|
|
+ margin-bottom: 10px;
|
|
.sub-title{
|
|
.sub-title{
|
|
font-size: 12px;
|
|
font-size: 12px;
|
|
color: #808695;
|
|
color: #808695;
|