|
@@ -20,7 +20,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="散件单号">
|
|
|
- <a-input id="bulkIn-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
|
|
|
+ <a-input id="bulkIn-sparePartsPurchaseNo" v-model.trim="queryParam.sparePartsPurchaseNo" allowClear placeholder="请输入单号"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -50,7 +50,7 @@
|
|
|
@click="handleExport"
|
|
|
:disabled="disabled"
|
|
|
:loading="exportLoading"
|
|
|
- v-if="$hasPermissions('B_salesReportExport')"
|
|
|
+ v-if="$hasPermissions('M_bulkWarehousingReportExport')"
|
|
|
class="button-warning"
|
|
|
id="bulkIn-export-btn">导出</a-button>
|
|
|
<a @click="advanced=!advanced" style="margin-left: 5px">
|
|
@@ -65,8 +65,8 @@
|
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
|
<div class="ftext" slot="message">
|
|
|
总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
|
|
|
- 产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
|
|
|
- 散件总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>;
|
|
|
+ 产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
|
|
|
+ 散件总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+totalData.productTotalCost : '--' }}</strong>;
|
|
|
</div>
|
|
|
</a-alert>
|
|
|
<!-- 列表 -->
|
|
@@ -90,7 +90,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import { downloadExcel } from '@/libs/JGPrint.js'
|
|
|
import { sparePartsPutTypeAllList } from '@/api/sparePartsPutType'
|
|
|
import supplier from '@/views/common/supplier'
|
|
|
-import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from '@/api/reportData'
|
|
|
+import { reportBlukPageList, reportBlukTotal, reportBlukExport } from '@/api/reportData'
|
|
|
export default {
|
|
|
components: { STable, VSelect, rangeDate, supplier },
|
|
|
mixins: [commonMixin],
|
|
@@ -105,10 +105,10 @@ export default {
|
|
|
time: [],
|
|
|
beginDate: '',
|
|
|
endDate: '',
|
|
|
- sparePartsPutTypeSn: undefined,
|
|
|
+ sparePartsType: undefined,
|
|
|
supplierSn: undefined,
|
|
|
- salesBillNo: '',
|
|
|
- salesManName: ''
|
|
|
+ sparePartsPurchaseNo: '',
|
|
|
+ supplierName: ''
|
|
|
},
|
|
|
rules: {
|
|
|
'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
|
|
@@ -117,13 +117,13 @@ export default {
|
|
|
exportLoading: false,
|
|
|
columns: [
|
|
|
{ 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: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '审核时间', dataIndex: 'salesAuditDate', width: '13%', 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: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '审核时间', dataIndex: 'auditTime', width: '13%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -131,7 +131,7 @@ export default {
|
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
|
this.spinning = true
|
|
|
delete params.time
|
|
|
- return reportSalesBillList(params).then(res => {
|
|
|
+ return reportBlukPageList(params).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -154,7 +154,7 @@ export default {
|
|
|
methods: {
|
|
|
// 合计
|
|
|
getCount (params) {
|
|
|
- reportSalesBillCount(params).then(res => {
|
|
|
+ reportBlukTotal(params).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.totalData = res.data
|
|
|
} else {
|
|
@@ -185,10 +185,10 @@ export default {
|
|
|
this.queryParam.time = []
|
|
|
this.queryParam.beginDate = ''
|
|
|
this.queryParam.endDate = ''
|
|
|
- this.queryParam.salesTargetType = undefined
|
|
|
- this.queryParam.sparePartsPutTypeSn = undefined
|
|
|
- this.queryParam.salesBillNo = ''
|
|
|
- this.queryParam.salesManName = ''
|
|
|
+ this.queryParam.supplierSn = undefined
|
|
|
+ this.queryParam.sparePartsType = undefined
|
|
|
+ this.queryParam.sparePartsPurchaseNo = ''
|
|
|
+ this.queryParam.supplierName = ''
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
this.totalData = null
|
|
|
this.$refs.table.clearTable()
|
|
@@ -201,7 +201,7 @@ export default {
|
|
|
const params = _this.queryParam
|
|
|
_this.exportLoading = true
|
|
|
_this.spinning = true
|
|
|
- reportSalesBillExport(params).then(res => {
|
|
|
+ reportBlukExport(params).then(res => {
|
|
|
downloadExcel(res, '散件入库报表')
|
|
|
_this.exportLoading = false
|
|
|
_this.spinning = false
|