|
@@ -14,32 +14,37 @@
|
|
@keyup.enter.native="handleSearch" >
|
|
@keyup.enter.native="handleSearch" >
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="入库时间" prop="time">
|
|
|
|
|
|
+ <a-form-model-item label="审核时间" prop="time">
|
|
<rangeDate ref="rangeDate" @change="dateChange" />
|
|
<rangeDate ref="rangeDate" @change="dateChange" />
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="连锁调入单号">
|
|
|
|
- <a-input id="chainTransferInReport-allocationLinkagePutNo" v-model.trim="queryParam.allocationLinkagePutNo" allowClear placeholder="请输入连锁调入单号"/>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
- <a-form-item label="调出对象">
|
|
|
|
- <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
|
|
|
|
|
|
+ <a-form-item label="出库时间">
|
|
|
|
+ <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
- <a-form-item label="调拨产品类型">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.allocationType"
|
|
|
|
- ref="allocationType"
|
|
|
|
- id="chainTransferInReport-allocationType"
|
|
|
|
- code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
|
|
|
|
- placeholder="请选择调拨产品类型"
|
|
|
|
- allowClear></v-select>
|
|
|
|
- </a-form-item>
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="连锁调出单号">
|
|
|
|
+ <a-input id="chainTransferInReport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调入单号"/>
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
|
+ <a-form-item label="调往对象">
|
|
|
|
+ <outTenant id="chainTransferInReport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
|
+ <a-form-item label="调拨产品类型">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.allocationType"
|
|
|
|
+ ref="allocationType"
|
|
|
|
+ id="chainTransferInReport-allocationType"
|
|
|
|
+ code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
|
|
|
|
+ placeholder="请选择调拨产品类型"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :md="4" :sm="24">
|
|
<a-col :md="4" :sm="24">
|
|
<a-form-model-item label="产品编码">
|
|
<a-form-model-item label="产品编码">
|
|
<a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
|
|
<a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
|
|
@@ -113,7 +118,7 @@ import ProductType from '../../common/productType.js'
|
|
import ProductBrand from '../../common/productBrand.js'
|
|
import ProductBrand from '../../common/productBrand.js'
|
|
import supplier from '@/views/common/supplier'
|
|
import supplier from '@/views/common/supplier'
|
|
import outTenant from '@/views/common/outTenant.js'
|
|
import outTenant from '@/views/common/outTenant.js'
|
|
-import { reportStoreCallOutDetailList, reportStoreCallOutDetailTotal, reportStoreCallOutDetailExport } from '@/api/reportData'
|
|
|
|
|
|
+import { reportAllocLinkageOutDetailList, reportAllocLinkageOutDetailCount, reportAllocLinkageOutDetailExport } from '@/api/reportData'
|
|
export default {
|
|
export default {
|
|
components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
|
|
components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -126,8 +131,11 @@ export default {
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
outWareTime: [],
|
|
outWareTime: [],
|
|
queryParam: { // 查询条件
|
|
queryParam: { // 查询条件
|
|
- beginDate: '',
|
|
|
|
- endDate: '',
|
|
|
|
|
|
+ time:[],
|
|
|
|
+ auditBeginDate: '',
|
|
|
|
+ auditEndDate: '',
|
|
|
|
+ outWarehouseBeginDate:'',
|
|
|
|
+ outWarehouseEndDate:'',
|
|
productEntity: {
|
|
productEntity: {
|
|
productBrandSn: undefined, // 产品品牌
|
|
productBrandSn: undefined, // 产品品牌
|
|
productTypeSn1: '', // 产品一级分类
|
|
productTypeSn1: '', // 产品一级分类
|
|
@@ -137,9 +145,9 @@ export default {
|
|
name: '' // 产品名称
|
|
name: '' // 产品名称
|
|
},
|
|
},
|
|
productType: undefined,
|
|
productType: undefined,
|
|
- outTenantSn:undefined,
|
|
|
|
|
|
+ putTenantSn:undefined,
|
|
allocationType: undefined,
|
|
allocationType: undefined,
|
|
- allocationLinkagePutNo: ''
|
|
|
|
|
|
+ allocationLinkageOutNo: ''
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
|
|
'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
|
|
@@ -152,7 +160,7 @@ export default {
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
this.spinning = true
|
|
this.spinning = true
|
|
delete params.time
|
|
delete params.time
|
|
- return reportStoreCallOutDetailList(params).then(res => {
|
|
|
|
|
|
+ return reportAllocLinkageOutDetailList(params).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
data = res.data
|
|
data = res.data
|
|
@@ -175,15 +183,15 @@ export default {
|
|
columns () {
|
|
columns () {
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
- { title: '连锁调入单号', dataIndex: 'allocationLinkagePutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '调出对象', dataIndex: 'outTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '调往对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '数量', dataIndex: 'outQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '数量', dataIndex: 'outQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
- { title: '入库时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
|
|
|
+ { title: '出库时间', dataIndex: 'outWarehouseTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
]
|
|
]
|
|
if (this.$hasPermissions('M_ShowAllCost')) {
|
|
if (this.$hasPermissions('M_ShowAllCost')) {
|
|
arr.splice(8, 0, { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
arr.splice(8, 0, { title: '成本', dataIndex: 'outCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
@@ -194,7 +202,7 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
// 合计
|
|
// 合计
|
|
getCount (params) {
|
|
getCount (params) {
|
|
- reportStoreCallOutDetailTotal(params).then(res => {
|
|
|
|
|
|
+ reportAllocLinkageOutDetailCount(params).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.totalData = res.data
|
|
this.totalData = res.data
|
|
} else {
|
|
} else {
|
|
@@ -204,8 +212,13 @@ export default {
|
|
},
|
|
},
|
|
// 创建时间 change
|
|
// 创建时间 change
|
|
dateChange (date) {
|
|
dateChange (date) {
|
|
- this.queryParam.beginDate = date[0] || ''
|
|
|
|
- this.queryParam.endDate = date[1] || ''
|
|
|
|
|
|
+ this.queryParam.time = date
|
|
|
|
+ this.queryParam.auditBeginDate = date[0] || ''
|
|
|
|
+ this.queryParam.auditEndDate = date[1] || ''
|
|
|
|
+ },
|
|
|
|
+ outWareDateChange (date) {
|
|
|
|
+ this.queryParam.outWarehouseBeginDate = date[0]
|
|
|
|
+ this.queryParam.outWarehouseEndDate = date[1]
|
|
},
|
|
},
|
|
// 查询
|
|
// 查询
|
|
handleSearch () {
|
|
handleSearch () {
|
|
@@ -220,11 +233,17 @@ export default {
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
this.$refs.rangeDate.resetDate()
|
|
this.$refs.rangeDate.resetDate()
|
|
- this.queryParam.beginDate = ''
|
|
|
|
- this.queryParam.endDate = ''
|
|
|
|
|
|
+ this.queryParam.time = []
|
|
|
|
+ this.queryParam.auditBeginDate = ''
|
|
|
|
+ this.queryParam.auditEndDate = ''
|
|
|
|
+ this.$refs.outWareRangeDate.resetDate('')
|
|
|
|
+ this.outWareTime = []
|
|
|
|
+ this.queryParam.outWarehouseBeginDate = ''
|
|
|
|
+ this.queryParam.outWarehouseEndDate = ''
|
|
|
|
+
|
|
this.queryParam.allocationType = undefined
|
|
this.queryParam.allocationType = undefined
|
|
- this.queryParam.outTenantSn = undefined
|
|
|
|
- this.queryParam.allocationLinkagePutNo = ''
|
|
|
|
|
|
+ this.queryParam.putTenantSn = undefined
|
|
|
|
+ this.queryParam.allocationLinkageOutNo = ''
|
|
this.queryParam.productEntity.productBrandSn = undefined
|
|
this.queryParam.productEntity.productBrandSn = undefined
|
|
this.queryParam.productEntity.productTypeSn1 = ''
|
|
this.queryParam.productEntity.productTypeSn1 = ''
|
|
this.queryParam.productEntity.productTypeSn2 = ''
|
|
this.queryParam.productEntity.productTypeSn2 = ''
|
|
@@ -242,11 +261,11 @@ export default {
|
|
this.$refs.ruleForm.validate(valid => {
|
|
this.$refs.ruleForm.validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
const params = _this.queryParam
|
|
const params = _this.queryParam
|
|
- params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
|
|
|
|
|
|
+ params.costFlag = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
|
|
_this.exportLoading = true
|
|
_this.exportLoading = true
|
|
_this.spinning = true
|
|
_this.spinning = true
|
|
- reportStoreCallOutDetailExport(params).then(res => {
|
|
|
|
- downloadExcel(res, '连锁调入细报表')
|
|
|
|
|
|
+ reportAllocLinkageOutDetailExport(params).then(res => {
|
|
|
|
+ downloadExcel(res, '连锁调出明细报表')
|
|
_this.exportLoading = false
|
|
_this.exportLoading = false
|
|
_this.spinning = false
|
|
_this.spinning = false
|
|
})
|
|
})
|