|
@@ -24,13 +24,13 @@
|
|
<a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
|
|
<a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="收货客户名称">
|
|
|
|
+ <dealerSearchList ref="receiverSn" @change="custChange"/>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="收货客户名称">
|
|
|
|
- <dealerSearchList ref="receiverSn" @change="custChange"/>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
<a-form-item label="业务状态">
|
|
<a-form-item label="业务状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.state"
|
|
v-model="queryParam.state"
|
|
@@ -42,12 +42,12 @@
|
|
></v-select>
|
|
></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="调拨单号">
|
|
<a-form-item label="调拨单号">
|
|
<a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
|
|
<a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24" v-if="currentTab == 1">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
<a-form-item label="打印状态">
|
|
<a-form-item label="打印状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.printState"
|
|
v-model="queryParam.printState"
|
|
@@ -59,12 +59,21 @@
|
|
></v-select>
|
|
></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="调出仓库">
|
|
|
|
+ <warehouse
|
|
|
|
+ v-model="queryParam.warehouseSn"
|
|
|
|
+ id="allocateBillList-warehouseSn"
|
|
|
|
+ placeholder="请选择调出仓库"
|
|
|
|
+ />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="所在区域">
|
|
<a-form-item label="所在区域">
|
|
<subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
<subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="地区">
|
|
<a-form-item label="地区">
|
|
<Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
<Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -176,6 +185,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
import dealerSearchList from '@/views/common/dealerSearchList.vue'
|
|
import dealerSearchList from '@/views/common/dealerSearchList.vue'
|
|
import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
|
|
import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
|
+import warehouse from '@/views/common/chooseWarehouse.js'
|
|
import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
|
|
import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
|
|
import recordModal from './recordModal.vue'
|
|
import recordModal from './recordModal.vue'
|
|
import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
|
|
import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
|
|
@@ -183,7 +193,7 @@ import { printFun } from '@/libs/JGPrint.js'
|
|
export default {
|
|
export default {
|
|
name: 'TransfersPrintList',
|
|
name: 'TransfersPrintList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, commonModal, allocationDetailModal },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, commonModal, allocationDetailModal, warehouse },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -206,6 +216,7 @@ export default {
|
|
allocateNo: '', // 调拨单号
|
|
allocateNo: '', // 调拨单号
|
|
receiverSn: undefined,
|
|
receiverSn: undefined,
|
|
checkStatus: undefined,
|
|
checkStatus: undefined,
|
|
|
|
+ warehouseSn: undefined,
|
|
printState: 'NO_PRINT',
|
|
printState: 'NO_PRINT',
|
|
subareaArea:{
|
|
subareaArea:{
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|
|
@@ -246,15 +257,16 @@ export default {
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
|
|
{ title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
|
|
- { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
- { title: '发货说明', dataIndex: 'explainInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '打印状态', scopedSlots: { customRender: 'printStatus' }, width: '6%', align: 'center' },
|
|
{ title: '打印状态', scopedSlots: { customRender: 'printStatus' }, width: '6%', align: 'center' },
|
|
{ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -305,6 +317,7 @@ export default {
|
|
this.queryParam.allocateNo = ''
|
|
this.queryParam.allocateNo = ''
|
|
this.queryParam.receiverName = ''
|
|
this.queryParam.receiverName = ''
|
|
this.queryParam.receiverSn = undefined
|
|
this.queryParam.receiverSn = undefined
|
|
|
|
+ this.queryParam.warehouseSn = undefined
|
|
this.queryParam.subareaArea.subareaSn = undefined
|
|
this.queryParam.subareaArea.subareaSn = undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
this.queryParam.shippingAddrProvinceSn = undefined
|
|
this.queryParam.shippingAddrProvinceSn = undefined
|