|
@@ -1,169 +1,207 @@
|
|
|
<template>
|
|
|
- <a-card size="small" :bordered="false" class="pushOrder-wrap">
|
|
|
- <!-- 搜索条件 -->
|
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
- <a-form-model
|
|
|
- id="allocateBillList-form"
|
|
|
- ref="ruleForm"
|
|
|
- class="form-model-con"
|
|
|
- layout="inline"
|
|
|
- :rules="rules"
|
|
|
- :model="queryParam"
|
|
|
- @keyup.enter.native="handleSearch">
|
|
|
- <a-row :gutter="15">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="创建时间" prop="time">
|
|
|
- <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="调往对象">
|
|
|
- <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="费用/调拨类型">
|
|
|
- <AllocateType id="allocateBillList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <template v-if="advanced">
|
|
|
+ <div>
|
|
|
+ <a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
|
+ <!-- 搜索条件 -->
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
+ <a-form-model
|
|
|
+ id="allocateBillList-form"
|
|
|
+ ref="ruleForm"
|
|
|
+ class="form-model-con"
|
|
|
+ layout="inline"
|
|
|
+ :rules="rules"
|
|
|
+ :model="queryParam"
|
|
|
+ @keyup.enter.native="handleSearch">
|
|
|
+ <a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="收货客户名称">
|
|
|
- <dealerSearchList ref="receiverSn" @change="custChange" />
|
|
|
+ <a-form-model-item label="创建时间" prop="time">
|
|
|
+ <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="业务状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.state"
|
|
|
- ref="state"
|
|
|
- id="allocateBillList-state"
|
|
|
- code="ALLOCATE_STATUS2"
|
|
|
- placeholder="请选择业务状态"
|
|
|
+ <a-form-model-item label="调往对象">
|
|
|
+ <a-input
|
|
|
+ id="allocateBillList-targetName"
|
|
|
+ v-model.trim="queryParam.targetName"
|
|
|
allowClear
|
|
|
- ></v-select>
|
|
|
+ placeholder="请输入调往对象" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="调拨单号">
|
|
|
- <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
|
|
|
+ <a-form-model-item label="费用/调拨类型">
|
|
|
+ <AllocateType
|
|
|
+ id="allocateBillList-costTypeName"
|
|
|
+ v-model="allocateTypeVal"
|
|
|
+ :changeOnSelect="true"
|
|
|
+ placeholder="请选择费用/调拨类型"
|
|
|
+ @change="changeAllocatype"></AllocateType>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
+ <template v-if="advanced">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="收货客户名称">
|
|
|
+ <dealerSearchList ref="receiverSn" @change="custChange" />
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="业务状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.state"
|
|
|
+ ref="state"
|
|
|
+ id="allocateBillList-state"
|
|
|
+ code="ALLOCATE_STATUS2"
|
|
|
+ placeholder="请选择业务状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="调拨单号">
|
|
|
+ <a-input
|
|
|
+ id="allocateBillList-allocateNo"
|
|
|
+ v-model.trim="queryParam.allocateNo"
|
|
|
+ allowClear
|
|
|
+ placeholder="请输入调拨单号" />
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="调出仓库">
|
|
|
+ <warehouse v-model="queryParam.warehouseSn" id="allocateBillList-warehouseSn" placeholder="请选择调出仓库" />
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="打印状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.printState"
|
|
|
+ ref="printState"
|
|
|
+ id="allocateBillList-printState"
|
|
|
+ code="PRINT_STATUS"
|
|
|
+ placeholder="请选择打印状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="对单状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.checkStatus"
|
|
|
+ ref="checkStatus"
|
|
|
+ id="allocateBillList-checkStatus"
|
|
|
+ code="CHECK_STATUS"
|
|
|
+ placeholder="请选择对单状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ </template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="调出仓库">
|
|
|
- <warehouse
|
|
|
- v-model="queryParam.warehouseSn"
|
|
|
- id="allocateBillList-warehouseSn"
|
|
|
- placeholder="请选择调出仓库"
|
|
|
- />
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="打印状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.printState"
|
|
|
- ref="printState"
|
|
|
- id="allocateBillList-printState"
|
|
|
- code="PRINT_STATUS"
|
|
|
- placeholder="请选择打印状态"
|
|
|
- allowClear
|
|
|
- ></v-select>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="对单状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.checkStatus"
|
|
|
- ref="checkStatus"
|
|
|
- id="allocateBillList-checkStatus"
|
|
|
- code="CHECK_STATUS"
|
|
|
- placeholder="请选择对单状态"
|
|
|
- allowClear
|
|
|
- ></v-select>
|
|
|
- </a-form-model-item>
|
|
|
+ <a-button
|
|
|
+ type="primary"
|
|
|
+ @click="handleSearch"
|
|
|
+ :disabled="disabled"
|
|
|
+ id="allocateBillList-refresh">查询</a-button>
|
|
|
+ <a-button
|
|
|
+ style="margin-left: 5px"
|
|
|
+ @click="resetSearchForm"
|
|
|
+ :disabled="disabled"
|
|
|
+ id="allocateBillList-reset">重置</a-button>
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'" />
|
|
|
+ </a>
|
|
|
</a-col>
|
|
|
+ </a-row>
|
|
|
+ </a-form-model>
|
|
|
+ </div>
|
|
|
+ </a-card>
|
|
|
+ <a-card size="small" :bordered="false">
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
+ <!-- 列表 -->
|
|
|
+ <s-table
|
|
|
+ class="sTable fixPagination"
|
|
|
+ ref="table"
|
|
|
+ :style="{ height: tableHeight+70+'px' }"
|
|
|
+ size="small"
|
|
|
+ :rowKey="(record) => record.id"
|
|
|
+ :columns="columns"
|
|
|
+ :data="loadData"
|
|
|
+ :scroll="{ y:tableHeight, x:1890 }"
|
|
|
+ :defaultLoadData="false"
|
|
|
+ bordered>
|
|
|
+ <!-- 起止时间 -->
|
|
|
+ <template slot="promoDate" slot-scope="text, record">
|
|
|
+ <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~
|
|
|
+ {{ record.promoEndDate }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
- </a-col>
|
|
|
- </a-row>
|
|
|
- </a-form-model>
|
|
|
- </div>
|
|
|
-
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <!-- 列表 -->
|
|
|
- <s-table
|
|
|
- class="sTable fixPagination"
|
|
|
- ref="table"
|
|
|
- :style="{ height: tableHeight+84.5+'px' }"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :scroll="{ y:tableHeight, x:1890 }"
|
|
|
- :defaultLoadData="false"
|
|
|
- bordered>
|
|
|
- <!-- 起止时间 -->
|
|
|
- <template slot="promoDate" slot-scope="text, record">
|
|
|
- <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
|
|
|
- <span v-else>--</span>
|
|
|
- </template>
|
|
|
- <!-- 调拨单号 -->
|
|
|
- <template slot="allocateNo" slot-scope="text, record">
|
|
|
- <span class="link-bule" @click="handleDetail(record,2)">{{ record.allocateNo }}</span>
|
|
|
- </template>
|
|
|
- <!-- 发货单号 -->
|
|
|
- <template slot="sendBillNo" slot-scope="text, record">
|
|
|
- <span v-if="record.sendBill&&record.sendBill.sendBillNo" class="link-bule" @click="handleDetail(record,1)">{{ record.sendBill.sendBillNo }}</span>
|
|
|
- <span v-else>--</span>
|
|
|
- </template>
|
|
|
- <!-- 调拨类型 -->
|
|
|
- <template slot="allocateType" slot-scope="text, record">
|
|
|
- <div>
|
|
|
- <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
|
|
|
- <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
|
|
|
- <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </s-table>
|
|
|
- <!-- 查看详情 -->
|
|
|
- <commonModal
|
|
|
- modalTit="调拨单详情"
|
|
|
- bodyPadding="10px"
|
|
|
- width="70%"
|
|
|
- :showFooter="false"
|
|
|
- :openModal="showDetailModal"
|
|
|
- @cancel="showDetailModal = false">
|
|
|
- <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
|
|
|
- </commonModal>
|
|
|
- <!-- 发货单详情 -->
|
|
|
- <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false"></detailModal>
|
|
|
- </a-spin>
|
|
|
- </a-card>
|
|
|
- </div></template>
|
|
|
+ <!-- 调拨单号 -->
|
|
|
+ <template slot="allocateNo" slot-scope="text, record">
|
|
|
+ <span class="link-bule" @click="handleDetail(record,2)">{{ record.allocateNo }}</span>
|
|
|
+ </template>
|
|
|
+ <!-- 发货单号 -->
|
|
|
+ <template slot="sendBillNo" slot-scope="text, record">
|
|
|
+ <span
|
|
|
+ v-if="record.sendBill&&record.sendBill.sendBillNo"
|
|
|
+ class="link-bule"
|
|
|
+ @click="handleDetail(record,1)">{{ record.sendBill.sendBillNo }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
+ </template>
|
|
|
+ <!-- 调拨类型 -->
|
|
|
+ <template slot="allocateType" slot-scope="text, record">
|
|
|
+ <div>
|
|
|
+ <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
|
|
|
+ <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
|
|
|
+ <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </s-table>
|
|
|
+ <!-- 查看详情 -->
|
|
|
+ <commonModal
|
|
|
+ modalTit="调拨单详情"
|
|
|
+ bodyPadding="10px"
|
|
|
+ width="70%"
|
|
|
+ :showFooter="false"
|
|
|
+ :openModal="showDetailModal"
|
|
|
+ @cancel="showDetailModal = false">
|
|
|
+ <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
|
|
|
+ </commonModal>
|
|
|
+ <!-- 发货单详情 -->
|
|
|
+ <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false"></detailModal>
|
|
|
+ </a-spin>
|
|
|
+ </a-card>
|
|
|
+ </div>
|
|
|
+</template>
|
|
|
|
|
|
<script>
|
|
|
-import { commonMixin } from '@/utils/mixin'
|
|
|
+import {
|
|
|
+ commonMixin
|
|
|
+} from '@/utils/mixin'
|
|
|
import moment from 'moment'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { STable, VSelect } from '@/components'
|
|
|
+import {
|
|
|
+ STable,
|
|
|
+ VSelect
|
|
|
+} from '@/components'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
|
|
|
import AllocateType from '@/views/common/allocateType.js'
|
|
|
import dealerSearchList from '@/views/common/dealerSearchList.vue'
|
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
-import { queryOverviewPage } from '@/api/allocateBill'
|
|
|
+import {
|
|
|
+ queryOverviewPage
|
|
|
+} from '@/api/allocateBill'
|
|
|
import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
|
|
|
export default {
|
|
|
name: 'PushOrderManagementList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, allocationDetailModal, AllocateType, warehouse, dealerSearchList, rangeDate, commonModal, detailModal },
|
|
|
+ components: {
|
|
|
+ STable,
|
|
|
+ VSelect,
|
|
|
+ allocationDetailModal,
|
|
|
+ AllocateType,
|
|
|
+ warehouse,
|
|
|
+ dealerSearchList,
|
|
|
+ rangeDate,
|
|
|
+ commonModal,
|
|
|
+ detailModal
|
|
|
+ },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -195,7 +233,11 @@ export default {
|
|
|
warehouseSn: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
- 'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
|
|
|
+ 'time': [{
|
|
|
+ required: true,
|
|
|
+ message: '请选择退货完成时间',
|
|
|
+ trigger: 'change'
|
|
|
+ }]
|
|
|
},
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -220,39 +262,279 @@ export default {
|
|
|
computed: {
|
|
|
columns () {
|
|
|
const _this = this
|
|
|
- const arr = [
|
|
|
- { title: '创建时间', dataIndex: 'createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
- { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '150px', fixed: 'left' },
|
|
|
- { title: '调往对象', dataIndex: 'targetName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
|
|
|
- { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
- { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '120px', fixed: 'left' },
|
|
|
- { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
|
|
|
- { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '总成本', dataIndex: 'totalCost', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
- { title: '总售价', dataIndex: 'totalPrice', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
- { title: '总数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '费用类型', dataIndex: 'costTypeName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调拨类型', scopedSlots: { customRender: 'allocateType' }, width: '100px', align: 'center' },
|
|
|
- { title: '调出仓库', dataIndex: 'warehouseName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '审核时间', dataIndex: 'auditTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '业务状态', dataIndex: 'stateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货创建时间', dataIndex: 'sendBill.createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ const arr = [{
|
|
|
+ title: '创建时间',
|
|
|
+ dataIndex: 'createDate',
|
|
|
+ width: '130px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ },
|
|
|
+ fixed: 'left'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '起止时间',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'promoDate'
|
|
|
+ },
|
|
|
+ align: 'center',
|
|
|
+ width: '150px',
|
|
|
+ fixed: 'left'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '调往对象',
|
|
|
+ dataIndex: 'targetName',
|
|
|
+ width: '150px',
|
|
|
+ align: 'left',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ },
|
|
|
+ ellipsis: true,
|
|
|
+ fixed: 'left'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '省份',
|
|
|
+ dataIndex: 'provinceName',
|
|
|
+ align: 'center',
|
|
|
+ width: '80px',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ },
|
|
|
+ fixed: 'left'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '调拨单号',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'allocateNo'
|
|
|
+ },
|
|
|
+ align: 'center',
|
|
|
+ width: '120px',
|
|
|
+ fixed: 'left'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '发货单号',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'sendBillNo'
|
|
|
+ },
|
|
|
+ width: '120px',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '客户类型',
|
|
|
+ dataIndex: 'dealerLevelDictValue',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '收货客户名称',
|
|
|
+ dataIndex: 'receiverName',
|
|
|
+ width: '150px',
|
|
|
+ align: 'left',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ },
|
|
|
+ ellipsis: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '所在区域',
|
|
|
+ dataIndex: 'subareaArea.subareaName',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '所在分区',
|
|
|
+ dataIndex: 'subareaArea.subareaAreaName',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总成本',
|
|
|
+ dataIndex: 'totalCost',
|
|
|
+ width: '80px',
|
|
|
+ align: 'right',
|
|
|
+ customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总售价',
|
|
|
+ dataIndex: 'totalPrice',
|
|
|
+ width: '80px',
|
|
|
+ align: 'right',
|
|
|
+ customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总数量',
|
|
|
+ dataIndex: 'totalQty',
|
|
|
+ width: '80px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return ((text || text == 0) ? text : '--')
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '费用类型',
|
|
|
+ dataIndex: 'costTypeName',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '调拨类型',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'allocateType'
|
|
|
+ },
|
|
|
+ width: '100px',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '调出仓库',
|
|
|
+ dataIndex: 'warehouseName',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '审核时间',
|
|
|
+ dataIndex: 'auditTime',
|
|
|
+ width: '130px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '业务状态',
|
|
|
+ dataIndex: 'stateDictValue',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '发货创建时间',
|
|
|
+ dataIndex: 'sendBill.createDate',
|
|
|
+ width: '130px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
- { title: '发货状态', dataIndex: 'sendBill.sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '托运日期', dataIndex: 'sendBill.sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收货人', dataIndex: 'sendBill.customerCacateName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '物流电话', dataIndex: 'sendBill.transportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '物流单号', dataIndex: 'sendBill.transportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ {
|
|
|
+ title: '发货状态',
|
|
|
+ dataIndex: 'sendBill.sendFlagDictValue',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '发货编号',
|
|
|
+ dataIndex: 'sendNo',
|
|
|
+ width: '80px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '托运日期',
|
|
|
+ dataIndex: 'sendBill.sendDate',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '收货人',
|
|
|
+ dataIndex: 'sendBill.customerCacateName',
|
|
|
+ width: '80px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ },
|
|
|
+ ellipsis: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '物流电话',
|
|
|
+ dataIndex: 'sendBill.transportTele',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '物流单号',
|
|
|
+ dataIndex: 'sendBill.transportNo',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
- { title: '总件数', dataIndex: 'sendBill.totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '收货状态', dataIndex: 'sendBill.receiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收货时间', dataIndex: 'sendBill.receiveDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '物流情况', dataIndex: 'sendBill.transportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备注', dataIndex: 'sendBill.transportRemark', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
|
+ {
|
|
|
+ title: '总件数',
|
|
|
+ dataIndex: 'sendBill.totalQty',
|
|
|
+ width: '80px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return ((text || text == 0) ? text : '--')
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '收货状态',
|
|
|
+ dataIndex: 'sendBill.receiveFlagDictValue',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '收货时间',
|
|
|
+ dataIndex: 'sendBill.receiveDate',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '物流情况',
|
|
|
+ dataIndex: 'sendBill.transportStateDictValue',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '备注',
|
|
|
+ dataIndex: 'sendBill.transportRemark',
|
|
|
+ width: '100px',
|
|
|
+ align: 'center',
|
|
|
+ customRender: function (text) {
|
|
|
+ return text || '--'
|
|
|
+ },
|
|
|
+ ellipsis: true
|
|
|
+ }
|
|
|
]
|
|
|
return arr
|
|
|
}
|
|
@@ -340,7 +622,7 @@ export default {
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 210
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 200
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -376,8 +658,8 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="less">
|
|
|
- .pushOrder-wrap{
|
|
|
- .sTable{
|
|
|
+ .pushOrder-wrap {
|
|
|
+ .sTable {
|
|
|
margin-top: 10px;
|
|
|
}
|
|
|
}
|