|
@@ -20,7 +20,7 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="散件单号">
|
|
<a-form-model-item label="散件单号">
|
|
- <a-input id="bulkInList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
|
|
|
|
|
|
+ <a-input id="bulkInList-sparePartsPurchaseNo" v-model.trim="queryParam.sparePartsPurchaseNo" allowClear placeholder="请输入单号"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -70,7 +70,7 @@
|
|
@click="handleExport"
|
|
@click="handleExport"
|
|
:disabled="disabled"
|
|
:disabled="disabled"
|
|
:loading="exportLoading"
|
|
:loading="exportLoading"
|
|
- v-if="$hasPermissions('B_salesDetailExport')"
|
|
|
|
|
|
+ v-if="$hasPermissions('M_bulkWarehousingReportExport')"
|
|
class="button-warning"
|
|
class="button-warning"
|
|
id="bulkInList-export-btn">导出</a-button>
|
|
id="bulkInList-export-btn">导出</a-button>
|
|
<a @click="advanced=!advanced" style="margin-left: 5px">
|
|
<a @click="advanced=!advanced" style="margin-left: 5px">
|
|
@@ -84,8 +84,8 @@
|
|
<!-- 合计 -->
|
|
<!-- 合计 -->
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
<div class="ftext" slot="message">
|
|
<div class="ftext" slot="message">
|
|
- 产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
|
|
|
|
- 散件总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>;
|
|
|
|
|
|
+ 产品总数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
|
|
|
|
+ 散件总成本:<strong>{{ (totalData && (totalData.putTotalCost || totalData.putTotalCost==0)) ? '¥'+totalData.putTotalCost : '--' }}</strong>;
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
@@ -111,7 +111,7 @@ import { sparePartsPutTypeAllList } from '@/api/sparePartsPutType'
|
|
import ProductType from '../../common/productType.js'
|
|
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 { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
|
|
|
|
|
|
+import { reportBlukDetailPageList, reportBlukDetailTotal, reportBlukDetailExport } from '@/api/reportData'
|
|
export default {
|
|
export default {
|
|
components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier },
|
|
components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -138,7 +138,7 @@ export default {
|
|
name: '' // 产品名称
|
|
name: '' // 产品名称
|
|
},
|
|
},
|
|
productType: undefined,
|
|
productType: undefined,
|
|
- salesBillNo: '',
|
|
|
|
|
|
+ sparePartsPurchaseNo: '',
|
|
salesManName: ''
|
|
salesManName: ''
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
@@ -148,15 +148,15 @@ export default {
|
|
exportLoading: false,
|
|
exportLoading: false,
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
- { title: '散件单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '供应商', dataIndex: 'salesTargetName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '散件入库类型', dataIndex: 'settleStyleName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '散件单号', dataIndex: 'sparePartsPurchaseNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '供应商', dataIndex: 'supplierName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '散件入库类型', dataIndex: 'sparePartsTypeName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ 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: 'productQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '成本', dataIndex: 'productCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '审核时间', dataIndex: 'salesAuditDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
|
|
|
+ { title: '数量', dataIndex: 'putQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '成本', dataIndex: 'putTotalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '审核时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
@@ -165,7 +165,7 @@ export default {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
delete params.time
|
|
delete params.time
|
|
delete params.warehouseCascade
|
|
delete params.warehouseCascade
|
|
- return reportSalesBillDetailList(params).then(res => {
|
|
|
|
|
|
+ return reportBlukDetailPageList(params).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
data = res.data
|
|
data = res.data
|
|
@@ -188,7 +188,7 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
// 合计
|
|
// 合计
|
|
getCount (params) {
|
|
getCount (params) {
|
|
- reportSalesBillDetailCount(params).then(res => {
|
|
|
|
|
|
+ reportBlukDetailTotal(params).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.totalData = res.data
|
|
this.totalData = res.data
|
|
} else {
|
|
} else {
|
|
@@ -219,8 +219,7 @@ export default {
|
|
this.queryParam.time = []
|
|
this.queryParam.time = []
|
|
this.queryParam.beginDate = ''
|
|
this.queryParam.beginDate = ''
|
|
this.queryParam.endDate = ''
|
|
this.queryParam.endDate = ''
|
|
- this.queryParam.salesBillNo = ''
|
|
|
|
- this.queryParam.salesTargetName = ''
|
|
|
|
|
|
+ this.queryParam.sparePartsPurchaseNo = ''
|
|
this.queryParam.sparePartsPutTypeSn = undefined
|
|
this.queryParam.sparePartsPutTypeSn = undefined
|
|
this.queryParam.supplierSn = undefined
|
|
this.queryParam.supplierSn = undefined
|
|
this.queryParam.productEntity.productBrandSn = undefined
|
|
this.queryParam.productEntity.productBrandSn = undefined
|
|
@@ -241,7 +240,7 @@ export default {
|
|
const params = _this.queryParam
|
|
const params = _this.queryParam
|
|
_this.exportLoading = true
|
|
_this.exportLoading = true
|
|
_this.spinning = true
|
|
_this.spinning = true
|
|
- reportSalesBillDetailExport(params).then(res => {
|
|
|
|
|
|
+ reportBlukDetailExport(params).then(res => {
|
|
downloadExcel(res, '散件入库明细报表')
|
|
downloadExcel(res, '散件入库明细报表')
|
|
_this.exportLoading = false
|
|
_this.exportLoading = false
|
|
_this.spinning = false
|
|
_this.spinning = false
|