|
@@ -53,6 +53,19 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="所在区域">
|
|
|
|
+ <subarea id="sendOut-subarea" v-model="queryParam.subareaSn"></subarea>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="地区">
|
|
|
|
+ <a-form-model-item >
|
|
|
|
+ <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
</template>
|
|
</template>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<span class="table-page-search-submitButtons">
|
|
<span class="table-page-search-submitButtons">
|
|
@@ -117,11 +130,13 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import detailModal from './detailModal.vue'
|
|
import detailModal from './detailModal.vue'
|
|
import sendGoodModal from '../outboundOrder/sendGoodModal.vue'
|
|
import sendGoodModal from '../outboundOrder/sendGoodModal.vue'
|
|
|
|
+import Area from '@/views/common/area.js'
|
|
|
|
+import subarea from '@/views/common/subarea.js'
|
|
import { sendBillQueryPageList } from '@/api/sendBill'
|
|
import { sendBillQueryPageList } from '@/api/sendBill'
|
|
export default {
|
|
export default {
|
|
name: 'SendOutOrderList',
|
|
name: 'SendOutOrderList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, rangeDate, detailModal, sendGoodModal },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate, detailModal, sendGoodModal, Area, subarea },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -140,7 +155,9 @@ export default {
|
|
sendBillNo: '', // 发货单号
|
|
sendBillNo: '', // 发货单号
|
|
bizNos: '', // 业务单号
|
|
bizNos: '', // 业务单号
|
|
transportState: undefined, // 物流状态
|
|
transportState: undefined, // 物流状态
|
|
- receiveFlag: undefined // 收货状态
|
|
|
|
|
|
+ receiveFlag: undefined, // 收货状态
|
|
|
|
+ subareaSn: undefined,
|
|
|
|
+ provinceSn: undefined
|
|
},
|
|
},
|
|
totalData: {
|
|
totalData: {
|
|
totalAmount: 0,
|
|
totalAmount: 0,
|
|
@@ -174,12 +191,18 @@ export default {
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '10%', align: 'center' },
|
|
|
|
- { title: '客户名称', dataIndex: 'customeName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '12%', align: 'center' },
|
|
|
|
+ { title: '所在区域', dataIndex: 'subareaNameSet', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '地区', dataIndex: 'provinceName ', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '客户名称', dataIndex: 'customeName', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
{ title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '收货人', dataIndex: 'customerCacateName', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '物流电话', dataIndex: 'transportTele', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '物流单号', dataIndex: 'transportNo', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
{ title: '总件数', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总件数', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '运费合计', dataIndex: 'totalSendAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '运费合计', dataIndex: 'totalSendAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '收货状态', dataIndex: 'receiveFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收货状态', dataIndex: 'receiveFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '收款时间', dataIndex: 'settleTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收货时间', dataIndex: 'receiveDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收货时间', dataIndex: 'receiveDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流情况', dataIndex: 'transportStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流情况', dataIndex: 'transportStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '备注', dataIndex: 'transportRemark', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '备注', dataIndex: 'transportRemark', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|