|
@@ -1,121 +1,121 @@
|
|
|
<template>
|
|
|
<a-card size="small" :bordered="false" class="chainStockReportList-wrap">
|
|
|
- <!-- 搜索条件 -->
|
|
|
- <div class="table-page-search-wrapper">
|
|
|
- <a-form-model
|
|
|
- id="chainStockReportList-form"
|
|
|
- ref="ruleForm"
|
|
|
- :model="queryParam"
|
|
|
- :rules="rules"
|
|
|
- :labelCol="labelCol"
|
|
|
- :wrapperCol="wrapperCol"
|
|
|
- @keyup.enter.native="handleSearch" >
|
|
|
- <a-row :gutter="15">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="连锁店" prop="targetName">
|
|
|
- <a-select
|
|
|
- placeholder="请选择连锁店"
|
|
|
- id="chainStockReportList-targetName"
|
|
|
- allowClear
|
|
|
- v-model="queryParam.targetName"
|
|
|
- :showSearch="true"
|
|
|
- option-filter-prop="children"
|
|
|
- :filter-option="filterOption">
|
|
|
- <a-select-option v-for="item in allocateTypeList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品编码">
|
|
|
- <a-input id="productInfoList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品名称">
|
|
|
- <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <template v-if="advanced">
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
+ <!-- 搜索条件 -->
|
|
|
+ <div class="table-page-search-wrapper">
|
|
|
+ <a-form-model
|
|
|
+ id="chainStockReportList-form"
|
|
|
+ ref="ruleForm"
|
|
|
+ :model="queryParam"
|
|
|
+ :rules="rules"
|
|
|
+ :labelCol="labelCol"
|
|
|
+ :wrapperCol="wrapperCol"
|
|
|
+ @keyup.enter.native="handleSearch" >
|
|
|
+ <a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="原厂编码">
|
|
|
- <a-input id="productInfoList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品品牌">
|
|
|
+ <a-form-model-item label="连锁店" prop="targetName">
|
|
|
<a-select
|
|
|
- placeholder="请选择产品品牌"
|
|
|
- id="productInfoList-productBrandSn"
|
|
|
+ placeholder="请选择连锁店"
|
|
|
+ id="chainStockReportList-targetName"
|
|
|
allowClear
|
|
|
- v-model="queryParam.productBrandSn"
|
|
|
+ v-model="queryParam.targetName"
|
|
|
:showSearch="true"
|
|
|
option-filter-prop="children"
|
|
|
:filter-option="filterOption">
|
|
|
- <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
|
|
|
+ <a-select-option v-for="item in allocateTypeList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品分类">
|
|
|
- <a-cascader
|
|
|
- @change="changeProductType"
|
|
|
- change-on-select
|
|
|
- v-model="productType"
|
|
|
- expand-trigger="hover"
|
|
|
- :options="productTypeList"
|
|
|
- :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
|
|
|
- id="productInfoList-productType"
|
|
|
- placeholder="请选择产品分类"
|
|
|
- allowClear />
|
|
|
+ <a-form-model-item label="产品编码">
|
|
|
+ <a-input id="productInfoList-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- </template>
|
|
|
- <a-col :md="6" :sm="24" style="margin-top: 3px;">
|
|
|
- <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainStockReportList-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainStockReportList-reset">重置</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
- </a-col>
|
|
|
- </a-row>
|
|
|
- </a-form-model>
|
|
|
- </div>
|
|
|
- <!-- 合计 -->
|
|
|
- <a-alert type="info" showIcon style="margin-bottom:15px">
|
|
|
- <div class="ftext" slot="message">现有库存总数量(个):
|
|
|
- <strong>
|
|
|
- <!-- {{ currentStock.currentQty || 0 }} -->207
|
|
|
- </strong>;现有库存总成本(¥):
|
|
|
- <strong>
|
|
|
- <!-- {{ currentStock.putCost || 0 }} -->1550.5
|
|
|
- </strong>。</div>
|
|
|
- </a-alert>
|
|
|
- <!-- 列表 -->
|
|
|
- <s-table
|
|
|
- class="sTable"
|
|
|
- ref="table"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :scroll="{ x: 1170 }"
|
|
|
- bordered>
|
|
|
- <!-- 现有库存数量 -->
|
|
|
- <template slot="currentStockQty" slot-scope="text, record">
|
|
|
- {{ (record.currentStockQty + record.freezeQty) || 0 }}
|
|
|
- <span v-if="record.freezeQty">(冻结{{ record.freezeQty }})</span>
|
|
|
- </template>
|
|
|
- <template slot="currentStockCost" slot-scope="text, record">
|
|
|
- {{ (Number(record.currentStockCost)*100 + Number(record.freezeCost)*100)/100 || 0 }}
|
|
|
- </template>
|
|
|
- <!-- 操作 -->
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
- <a-button size="small" type="link" class="button-success" @click="goDetail(record)" id="chainStockReportList-detail-btn">详情</a-button>
|
|
|
- </template>
|
|
|
- </s-table>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="产品名称">
|
|
|
+ <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <template v-if="advanced">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="原厂编码">
|
|
|
+ <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="产品品牌">
|
|
|
+ <a-select
|
|
|
+ placeholder="请选择产品品牌"
|
|
|
+ id="productInfoList-productBrandSn"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.productBrandSn"
|
|
|
+ :showSearch="true"
|
|
|
+ option-filter-prop="children"
|
|
|
+ :filter-option="filterOption">
|
|
|
+ <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="产品分类">
|
|
|
+ <a-cascader
|
|
|
+ @change="changeProductType"
|
|
|
+ change-on-select
|
|
|
+ v-model="productType"
|
|
|
+ expand-trigger="hover"
|
|
|
+ :options="productTypeList"
|
|
|
+ :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
|
|
|
+ id="productInfoList-productType"
|
|
|
+ placeholder="请选择产品分类"
|
|
|
+ allowClear />
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ </template>
|
|
|
+ <a-col :md="6" :sm="24" style="margin-top: 3px;">
|
|
|
+ <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainStockReportList-refresh">查询</a-button>
|
|
|
+ <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainStockReportList-reset">重置</a-button>
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
+ </a>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
+ </a-form-model>
|
|
|
+ </div>
|
|
|
+ <!-- 合计 -->
|
|
|
+ <a-alert type="info" showIcon style="margin-bottom:15px">
|
|
|
+ <div class="ftext" slot="message">
|
|
|
+ 现有库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
|
|
|
+ 现有库存总成本(¥):<strong> {{ (currentStock && currentStock.totalCost) || 0 }} </strong>。
|
|
|
+ </div>
|
|
|
+ </a-alert>
|
|
|
+ <!-- 列表 -->
|
|
|
+ <a-table
|
|
|
+ class="sTable"
|
|
|
+ ref="table"
|
|
|
+ size="small"
|
|
|
+ :rowKey="(record) => record.productSn + record.stockSn"
|
|
|
+ :columns="columns"
|
|
|
+ :dataSource="loadData"
|
|
|
+ :scroll="{ x: 1170 }"
|
|
|
+ :pagination="paginationProps"
|
|
|
+ bordered>
|
|
|
+ <!-- 现有库存数量 -->
|
|
|
+ <template slot="currentStockQty" slot-scope="text, record">
|
|
|
+ {{ (Number(record.currentStockQty) + Number(record.freezeQty)) || 0 }}
|
|
|
+ <span v-if="Number(record.freezeQty)">(冻结{{ record.freezeQty }})</span>
|
|
|
+ </template>
|
|
|
+ <template slot="currentStockCost" slot-scope="text, record">
|
|
|
+ {{ (Number(record.currentStockCost)*1000 + Number(record.freezeCost)*1000)/1000 || 0 }}
|
|
|
+ </template>
|
|
|
+ <!-- 操作 -->
|
|
|
+ <template slot="action" slot-scope="text, record">
|
|
|
+ <a-button size="small" type="link" class="button-success" @click="goDetail(record)" id="chainStockReportList-detail-btn">详情</a-button>
|
|
|
+ </template>
|
|
|
+ </a-table>
|
|
|
+ </a-spin>
|
|
|
<!-- 详情 -->
|
|
|
- <chain-stock-report-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
|
|
|
+ <chain-stock-report-detail-modal :openModal="openModal" :productSn="productSn" @close="closeModal" />
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -124,23 +124,23 @@ import { STable, VSelect } from '@/components'
|
|
|
import chainStockReportDetailModal from './detailModal.vue'
|
|
|
import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
|
|
|
import { dealerProductTypeList } from '@/api/dealerProductType'
|
|
|
-// import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport } from '@/api/allocateBill'
|
|
|
-// import { allocateTypeAllList } from '@/api/allocateType'
|
|
|
+import { reportStockList, reportStockCount } from '@/api/reportStock'
|
|
|
export default {
|
|
|
components: { STable, VSelect, chainStockReportDetailModal },
|
|
|
data () {
|
|
|
return {
|
|
|
+ spinning: false,
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
tableHeight: 0,
|
|
|
queryParam: { // 查询条件
|
|
|
targetName: undefined,
|
|
|
- code: '', // 产品编码
|
|
|
- name: '', // 产品名称
|
|
|
- origCode: '', // 原厂编码
|
|
|
+ productCode: '', // 产品编码
|
|
|
+ productName: '', // 产品名称
|
|
|
+ productOrigCode: '', // 原厂编码
|
|
|
productBrandSn: undefined, // 产品品牌
|
|
|
- productTypeSn1: '', // 产品一级分类
|
|
|
- productTypeSn2: '', // 产品二级分类
|
|
|
- productTypeSn3: '' // 产品三级分类
|
|
|
+ productTypeSn1: '', // 产品分类1
|
|
|
+ productTypeSn2: '', // 产品分类2
|
|
|
+ productTypeSn3: '' // 产品分类3
|
|
|
},
|
|
|
labelCol: { span: 8 },
|
|
|
wrapperCol: { span: 16 },
|
|
@@ -151,83 +151,112 @@ export default {
|
|
|
exportLoading: false,
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
|
|
|
- { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '现有库存数量(个)', dataIndex: 'currentStockQty', scopedSlots: { customRender: 'currentStockQty' }, width: 165, align: 'center', sorter: true },
|
|
|
{ title: '现有库存成本(¥)', dataIndex: 'currentStockCost', scopedSlots: { customRender: 'currentStockCost' }, width: 165, align: 'center', sorter: true },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
- // 加载数据方法 必须为 Promise 对象
|
|
|
- loadData: parameter => {
|
|
|
- this.disabled = true
|
|
|
- // return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
- // const data = res.data
|
|
|
- // const no = (data.pageNo - 1) * data.pageSize
|
|
|
- // for (var i = 0; i < data.list.length; i++) {
|
|
|
- // data.list[i].no = no + i + 1
|
|
|
- // }
|
|
|
- // this.disabled = false
|
|
|
- // return data
|
|
|
- // })
|
|
|
- const _this = this
|
|
|
- return new Promise(function (resolve, reject) {
|
|
|
- const data = {
|
|
|
- pageNo: 1,
|
|
|
- pageSize: 10,
|
|
|
- list: [
|
|
|
- { id: '1', code: 'GA-11078N', name: '冠牌空气滤清器 丰田新款佳美2.4 12款逸致1.8', origCode: '17807-20040', currentStockQty: '207', freezeQty: '', currentStockCost: '1550.50', freezeCost: '' }
|
|
|
- ],
|
|
|
- count: 10
|
|
|
- }
|
|
|
- for (var i = 0; i < data.list.length; i++) {
|
|
|
- data.list[i].no = i + 1
|
|
|
- }
|
|
|
- _this.disabled = false
|
|
|
- resolve(data)
|
|
|
- })
|
|
|
+ loadData: [],
|
|
|
+ pageNo: 1, // 分页页码
|
|
|
+ pageSize: 10, // 分页 每页多少条
|
|
|
+ paginationProps: {
|
|
|
+ showSizeChanger: true, // 是否可以改变 pageSize
|
|
|
+ total: 0, // 分页总条数
|
|
|
+ current: 1,
|
|
|
+ onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
|
|
|
+ onChange: (current) => this.changePage(current)
|
|
|
},
|
|
|
productType: [],
|
|
|
productBrandList: [], // 品牌下拉数据
|
|
|
productTypeList: [], // 分类下拉数据
|
|
|
allocateTypeList: [], // 调拨类型
|
|
|
- itemId: '', // 当前id
|
|
|
+ currentStock: null, // 合计
|
|
|
+ productSn: '',
|
|
|
openModal: false // 弹框
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- // 查询
|
|
|
- handleSearch () {
|
|
|
- this.$refs.ruleForm.validate(valid => {
|
|
|
- if (valid) {
|
|
|
- this.$refs.table.refresh(true)
|
|
|
+ // 列表数据
|
|
|
+ getList (pageNo) {
|
|
|
+ this.disabled = true
|
|
|
+ this.pageNo = pageNo || this.pageNo
|
|
|
+ const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
|
|
|
+ this.spinning = true
|
|
|
+ reportStockList(params).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.getCount(params)
|
|
|
+ const data = res.data
|
|
|
+ this.paginationProps.total = Number(res.data.count) || 0
|
|
|
+ this.paginationProps.current = data.pageNo
|
|
|
+ const no = (data.pageNo - 1) * data.pageSize
|
|
|
+ for (var i = 0; i < data.list.length; i++) {
|
|
|
+ data.list[i].no = no + i + 1
|
|
|
+ }
|
|
|
+ this.loadData = data.list
|
|
|
+ this.disabled = false
|
|
|
+ } else {
|
|
|
+ this.paginationProps.total = 0
|
|
|
+ this.paginationProps.current = 1
|
|
|
+ this.loadData = []
|
|
|
+ }
|
|
|
+ this.spinning = false
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 分页 一页多少条change
|
|
|
+ changePageSize (current, pageSize) {
|
|
|
+ this.pageNo = current
|
|
|
+ this.pageSize = pageSize
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+ // 分页 页码change
|
|
|
+ changePage (current) {
|
|
|
+ this.pageNo = current
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+ // 合计
|
|
|
+ getCount (params) {
|
|
|
+ reportStockCount(params).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.currentStock = res.data
|
|
|
} else {
|
|
|
- console.log('error submit!!')
|
|
|
- return false
|
|
|
+ this.currentStock = null
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 查询
|
|
|
+ handleSearch () {
|
|
|
+ // this.$refs.ruleForm.validate(valid => {
|
|
|
+ // if (valid) {
|
|
|
+ this.getList(1)
|
|
|
+ // } else {
|
|
|
+ // console.log('error submit!!')
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ },
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.queryParam.targetName = undefined
|
|
|
- this.queryParam.code = ''
|
|
|
- this.queryParam.name = ''
|
|
|
- this.queryParam.origCode = ''
|
|
|
+ this.queryParam.productCode = ''
|
|
|
+ this.queryParam.productName = ''
|
|
|
+ this.queryParam.productOrigCode = ''
|
|
|
this.queryParam.productBrandSn = undefined
|
|
|
this.queryParam.productTypeSn1 = ''
|
|
|
this.queryParam.productTypeSn2 = ''
|
|
|
this.queryParam.productTypeSn3 = ''
|
|
|
this.productType = []
|
|
|
- this.$refs.table.refresh(true)
|
|
|
+ this.getList(1)
|
|
|
},
|
|
|
// 详情
|
|
|
goDetail (row) {
|
|
|
- this.itemId = row.stockSn
|
|
|
+ this.productSn = row.productSn
|
|
|
this.openModal = true
|
|
|
},
|
|
|
// 关闭弹框
|
|
|
closeModal () {
|
|
|
- this.itemId = ''
|
|
|
+ this.productSn = ''
|
|
|
this.openModal = false
|
|
|
},
|
|
|
// 产品分类 change
|