|
@@ -1,50 +1,50 @@
|
|
<template>
|
|
<template>
|
|
<div>
|
|
<div>
|
|
- <a-card size="small" :bordered="false" class="pushOrder-wrap">
|
|
|
|
|
|
+ <a-card size="small" :bordered="false" class="salesList-wrap">
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<a-form layout="inline">
|
|
<a-form layout="inline">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="提交时间">
|
|
<a-form-item label="提交时间">
|
|
- <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
|
|
|
+ <rangeDate ref="rangeDate" :value="time" @change="submitDateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="销售单号">
|
|
<a-form-item label="销售单号">
|
|
- <a-input id="pushOrder-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
|
|
|
+ <a-input id="salesList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24" v-if="pageType!='viewDealers'">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="所属区域/分区">
|
|
<a-form-item label="所属区域/分区">
|
|
- <subarea id="chooseDealer-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
|
|
|
|
+ <subarea id="salesList-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
<a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
- <dealerSubareaScopeList ref="dealerSubareaScopeList" id="pushOrder-buyerName" @change="custChange" />
|
|
|
|
|
|
+ <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesList-buyerName" @change="custChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</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="是否收款">
|
|
|
|
|
|
+ <a-form-item label="财务状态">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.billStatus"
|
|
|
|
- ref="billStatus"
|
|
|
|
- id="pushOrder-billStatus"
|
|
|
|
- code="DISPATCH_BILL_STATUS"
|
|
|
|
- placeholder="请选择是否收款"
|
|
|
|
|
|
+ v-model="queryParam.financialStatus"
|
|
|
|
+ ref="financialStatus"
|
|
|
|
+ id="salesList-financialStatus"
|
|
|
|
+ code="FINANCIAL_RECEIVE_STATUS"
|
|
|
|
+ placeholder="请选择财务状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="审核时间">
|
|
<a-form-item label="审核时间">
|
|
- <rangeDate ref="rangeDate" :value="examineTime" @change="dateChange" />
|
|
|
|
|
|
+ <rangeDate ref="processRangeDate" :value="examineTime" @change="processDateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="收款时间">
|
|
<a-form-item label="收款时间">
|
|
- <rangeDate ref="rangeDate" :value="paymentTime" @change="dateChange" />
|
|
|
|
|
|
+ <rangeDate ref="collectionRangeDate" :value="paymentTime" @change="collectionDateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -52,8 +52,8 @@
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.billStatus"
|
|
v-model="queryParam.billStatus"
|
|
ref="billStatus"
|
|
ref="billStatus"
|
|
- id="pushOrder-billStatus"
|
|
|
|
- code="DISPATCH_BILL_STATUS"
|
|
|
|
|
|
+ id="salesList-billStatus"
|
|
|
|
+ code="SALES_OVERVIEW_BILL_STATUS"
|
|
placeholder="请选择业务状态"
|
|
placeholder="请选择业务状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -70,8 +70,8 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="省份" prop="shippingAddrProvinceSn">
|
|
|
|
- <Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
|
|
|
|
+ <a-form-model-item label="省份" prop="provinceSn">
|
|
|
|
+ <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
@@ -79,14 +79,6 @@
|
|
<div class="table-page-search-submitButtons" style="text-align:center;">
|
|
<div class="table-page-search-submitButtons" style="text-align:center;">
|
|
<a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
- <a-button
|
|
|
|
- style="margin-left: 5px"
|
|
|
|
- type="primary"
|
|
|
|
- class="button-warning"
|
|
|
|
- @click="handleExport"
|
|
|
|
- :disabled="disabled"
|
|
|
|
- :loading="exportLoading"
|
|
|
|
- id="salsesList-export">导出</a-button>
|
|
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
{{ advanced ? '收起' : '展开' }}
|
|
{{ advanced ? '收起' : '展开' }}
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
@@ -105,7 +97,8 @@
|
|
ref="table"
|
|
ref="table"
|
|
:style="{ height: tableHeight+84.5+'px' }"
|
|
:style="{ height: tableHeight+84.5+'px' }"
|
|
size="small"
|
|
size="small"
|
|
- :rowKey="(record) => record.id"
|
|
|
|
|
|
+ :rowKey="(record) => record.no"
|
|
|
|
+ rowKeyName="no"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:scroll="{ y:tableHeight, x:1890 }"
|
|
:scroll="{ y:tableHeight, x:1890 }"
|
|
@@ -113,15 +106,16 @@
|
|
bordered>
|
|
bordered>
|
|
<!-- 超时环节提示 -->
|
|
<!-- 超时环节提示 -->
|
|
<template slot="tip" slot-scope="text, record">
|
|
<template slot="tip" slot-scope="text, record">
|
|
- <a-tooltip placement="top">
|
|
|
|
|
|
+ <a-tooltip placement="top" v-if="record.dispatchOverDay*1!=0&&record.sendOverDay*1!=0&&record.settleOverDay*1!=0">
|
|
<template slot="title">
|
|
<template slot="title">
|
|
- <span>已超时{{ record.sendOverDay }}天(要求销售单下推后2天内备货)</span>
|
|
|
|
|
|
+ <span>已超时{{ record.dispatchOverDay }}天(要求销售单下推后2天内备货)</span>
|
|
</template>
|
|
</template>
|
|
<div>
|
|
<div>
|
|
<a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
|
|
<a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
|
|
- <span>{{ record.billStatusDictValue }}</span>
|
|
|
|
|
|
+ <span>{{ record.dispatchOverDay*1>0?'未备货':record.dispatchOverDay*1>0 &&record.sendOverDay*1>0?'未备货/未付款' :record.sendOverDay*1>0?'未付款':record.settleOverDay*1>0?'未结算':'--' }}</span>
|
|
</div>
|
|
</div>
|
|
</a-tooltip>
|
|
</a-tooltip>
|
|
|
|
+ <span v-else>--</span>
|
|
</template>
|
|
</template>
|
|
<!-- 销售单号 -->
|
|
<!-- 销售单号 -->
|
|
<template slot="salesBillNo" slot-scope="text, record">
|
|
<template slot="salesBillNo" slot-scope="text, record">
|
|
@@ -135,38 +129,8 @@
|
|
<template slot="sendBillNo" slot-scope="text, record">
|
|
<template slot="sendBillNo" slot-scope="text, record">
|
|
<span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
|
|
<span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
|
|
</template>
|
|
</template>
|
|
- <!-- 操作 -->
|
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
|
- <a-button
|
|
|
|
- size="small"
|
|
|
|
- type="link"
|
|
|
|
- class="button-warning"
|
|
|
|
- :loading="!!tipData"
|
|
|
|
- v-if="(record.printStatus=='UNABLE_PRINT'||record.printStatus=='CANCEL_PRINT')&&record.voidFlag=='0'&&$hasPermissions('B_UNABLE_PRINT')"
|
|
|
|
- @click="handlePrint(record,1)"
|
|
|
|
- >允许打印</a-button>
|
|
|
|
- <a-button
|
|
|
|
- size="small"
|
|
|
|
- type="link"
|
|
|
|
- class="button-error"
|
|
|
|
- :loading="!!tipData"
|
|
|
|
- v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_CANSEL_PRINT')"
|
|
|
|
- @click="handlePrint(record,0)"
|
|
|
|
- >取消打印</a-button>
|
|
|
|
- </template>
|
|
|
|
</s-table>
|
|
</s-table>
|
|
|
|
|
|
- <!-- 操作提示 -->
|
|
|
|
- <!-- <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
|
|
- <div style="display:flex;flex-direction: column;align-items: center;">
|
|
|
|
- <div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
|
|
|
|
- <div style="line-height: 24px;">
|
|
|
|
- <div>备货单号:{{ tipData&&tipData.dispatchBillNo }}</div>
|
|
|
|
- <div>客户名称:{{ tipData&&tipData.buyerName }}</div>
|
|
|
|
- </div>
|
|
|
|
- </div>
|
|
|
|
- </commonModal> -->
|
|
|
|
-
|
|
|
|
<!-- 查看销售单或备货单详情 -->
|
|
<!-- 查看销售单或备货单详情 -->
|
|
<commonModal
|
|
<commonModal
|
|
:modalTit="detailType?'备货单详情':'销售单详情'"
|
|
:modalTit="detailType?'备货单详情':'销售单详情'"
|
|
@@ -174,13 +138,10 @@
|
|
width="70%"
|
|
width="70%"
|
|
:showFooter="false"
|
|
:showFooter="false"
|
|
:openModal="showDetailModal"
|
|
:openModal="showDetailModal"
|
|
- @cancel="cancelDetail">
|
|
|
|
|
|
+ @cancel="closeDetailModal">
|
|
<salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
<salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
<dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
|
|
<dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
|
|
- <financialDetailModal v-if="detailType==3" ref="financialDetail" :bizSn="bizSn"></financialDetailModal>
|
|
|
|
</commonModal>
|
|
</commonModal>
|
|
- <!-- 发货说明 -->
|
|
|
|
- <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
|
|
<!-- 发货单详情 -->
|
|
<!-- 发货单详情 -->
|
|
<detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
|
|
<detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
|
|
</a-spin>
|
|
</a-spin>
|
|
@@ -196,21 +157,16 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import subarea from '@/views/common/subarea.js'
|
|
import subarea from '@/views/common/subarea.js'
|
|
import Area from '@/views/common/area.js'
|
|
import Area from '@/views/common/area.js'
|
|
-import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
|
-import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
|
|
import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
|
|
-import financialDetailModal from '@/views/financialManagement/financialCollection/detail.vue'
|
|
|
|
-
|
|
|
|
-// import explainInfoModal from './explainInfoModal.vue'
|
|
|
|
import { salesOverviewQueryPage } from '@/api/sales'
|
|
import { salesOverviewQueryPage } from '@/api/sales'
|
|
export default {
|
|
export default {
|
|
- name: 'PushOrderManagementList',
|
|
|
|
|
|
+ name: 'SalesListManagementList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, dispatchDetail, detailModal, financialDetailModal, chooseWarehouse },
|
|
|
|
|
|
+ components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, dispatchDetail, commonModal, Area, salesDetail, detailModal },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -218,8 +174,6 @@ export default {
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
showDetailModal: false,
|
|
showDetailModal: false,
|
|
showTipModal: false,
|
|
showTipModal: false,
|
|
- showInfoModal: false,
|
|
|
|
- exportLoading: false,
|
|
|
|
bizSn: null,
|
|
bizSn: null,
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
detailType: 0,
|
|
detailType: 0,
|
|
@@ -231,29 +185,22 @@ export default {
|
|
paymentTime: [],
|
|
paymentTime: [],
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
- beginDate: getDate.getThreeMonthDays().starttime,
|
|
|
|
- endDate: getDate.getCurrMonthDays().endtime,
|
|
|
|
- buyerSn: undefined, // 客户名称
|
|
|
|
- receiverSn: undefined, // 收货客户
|
|
|
|
|
|
+ submitBeginDate: getDate.getCurrMonthDays().starttime,
|
|
|
|
+ submitEndDate: getDate.getCurrMonthDays().endtime,
|
|
salesBillNo: '', // 销售单号
|
|
salesBillNo: '', // 销售单号
|
|
- dispatchBillNo: '', // 备货单号
|
|
|
|
|
|
+ subareaSn: undefined,
|
|
|
|
+ subareaAreaSn: undefined,
|
|
|
|
+ buyerSn: undefined, // 收货客户
|
|
|
|
+ buyerName: undefined,
|
|
|
|
+ financialStatus: undefined, // 财务状态
|
|
|
|
+ auditBeginDate: undefined, // 审核时间
|
|
|
|
+ auditEndDate: undefined,
|
|
|
|
+ beginDate: undefined, // 收款开始时间
|
|
|
|
+ endDate: undefined,
|
|
billStatus: undefined, // 业务状态
|
|
billStatus: undefined, // 业务状态
|
|
- subareaArea: {
|
|
|
|
- subareaSn: undefined,
|
|
|
|
- subareaAreaSn: undefined
|
|
|
|
- },
|
|
|
|
- voidFlag: undefined,
|
|
|
|
- shippingAddrProvinceSn: undefined,
|
|
|
|
- printStatus: undefined,
|
|
|
|
- checkStatus: undefined,
|
|
|
|
- warehouseSn: undefined
|
|
|
|
- },
|
|
|
|
- totalData: {
|
|
|
|
- totalAmount: 0,
|
|
|
|
- totalQty: 0,
|
|
|
|
- totalRecord: 0
|
|
|
|
|
|
+ sendFlag: '', // 发货状态
|
|
|
|
+ provinceSn: undefined// 省份
|
|
},
|
|
},
|
|
- tipData: null,
|
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
@@ -293,130 +240,111 @@ export default {
|
|
|
|
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '下推数量', dataIndex: 'dispatchTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '下推数量', dataIndex: 'dispatchTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
- { title: '下推金额', dataIndex: 'dispatchSettledAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
|
- { title: '备货允许打印时间', dataIndex: 'dispatchPushedDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '下推金额', dataIndex: 'dispatchTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
|
+ { title: '备货允许打印时间', dataIndex: 'dispatchAllowPrintTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '备货时间', dataIndex: 'dispatchAuditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '备货时间', dataIndex: 'dispatchAuditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '发货创建时间', dataIndex: 'sendCreateDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '发货创建时间', dataIndex: 'sendCreateDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
- { title: '业务状态', dataIndex: 'billStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '业务状态', dataIndex: 'billStatus', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '收款金额', dataIndex: 'dispatchTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
|
- { title: '收款时间', dataIndex: 'sendDate1', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '收款金额', dataIndex: 'dispatchSettledAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
|
+ { title: '收款时间', dataIndex: 'dispatchSettleTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '托运日期', dataIndex: 'sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '托运日期', dataIndex: 'sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '收货人', dataIndex: 'receiverName', width: '80px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '收货人', dataIndex: 'sendCustomerContactName', width: '80px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '物流电话', dataIndex: 'sendTransportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流电话', dataIndex: 'sendTransportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流单号', dataIndex: 'sendTransportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流单号', dataIndex: 'sendTransportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
{ title: '总件数', dataIndex: 'sendTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总件数', dataIndex: 'sendTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '运费合计', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
{ title: '运费合计', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
{ title: '收货状态', dataIndex: 'sendReceiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收货状态', dataIndex: 'sendReceiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '收货时间', dataIndex: 'submitDate1', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '收货时间', dataIndex: 'sendReceiveDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流情况', dataIndex: 'sendTransportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '物流情况', dataIndex: 'sendTransportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '备注', dataIndex: 'checkStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
|
|
|
|
+ { title: '备注', dataIndex: 'sendRemarks', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
]
|
|
]
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- handleExport () {
|
|
|
|
- const _this = this
|
|
|
|
- this.$store.state.app.curActionPermission = 'B_transferOut_export'
|
|
|
|
- const params = this.queryParam
|
|
|
|
- this.exportLoading = true
|
|
|
|
- this.spinning = true
|
|
|
|
- hdExportExcel(allocateBillExport, params, '调拨列表', function () {
|
|
|
|
- _this.exportLoading = false
|
|
|
|
- _this.spinning = false
|
|
|
|
- _this.$store.state.app.curActionPermission = ''
|
|
|
|
- })
|
|
|
|
|
|
+ // 提交时间 change
|
|
|
|
+ submitDateChange (date) {
|
|
|
|
+ this.queryParam.submitBeginDate = date[0]
|
|
|
|
+ this.queryParam.submitEndDate = date[1]
|
|
|
|
+ },
|
|
|
|
+ // 审核时间 change
|
|
|
|
+ processDateChange (date) {
|
|
|
|
+ this.queryParam.auditBeginDate = date[0]
|
|
|
|
+ this.queryParam.auditEndDate = date[1]
|
|
},
|
|
},
|
|
- // 时间 change
|
|
|
|
- dateChange (date) {
|
|
|
|
|
|
+ // 收款开始时间 change
|
|
|
|
+ collectionDateChange (date) {
|
|
this.queryParam.beginDate = date[0]
|
|
this.queryParam.beginDate = date[0]
|
|
this.queryParam.endDate = date[1]
|
|
this.queryParam.endDate = date[1]
|
|
},
|
|
},
|
|
custChange (val) {
|
|
custChange (val) {
|
|
- this.queryParam.buyerSn = val.key
|
|
|
|
- },
|
|
|
|
- shcustChange (val) {
|
|
|
|
- this.queryParam.receiverSn = val.key
|
|
|
|
|
|
+ if (val.row) {
|
|
|
|
+ this.queryParam.buyerSn = val.row.dealerSn
|
|
|
|
+ this.queryParam.buyerName = undefined
|
|
|
|
+ } else {
|
|
|
|
+ this.queryParam.buyerSn = undefined
|
|
|
|
+ this.queryParam.buyerName = val.key
|
|
|
|
+ }
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
handleDetail (row, type) {
|
|
handleDetail (row, type) {
|
|
this.detailType = type
|
|
this.detailType = type
|
|
if (type != 2) {
|
|
if (type != 2) {
|
|
- this.showDetailModal = true
|
|
|
|
- if (type == 3) {
|
|
|
|
- this.$refs.financialDetail.getDetail()
|
|
|
|
- }
|
|
|
|
|
|
+ this.bizSn = type == 0 ? row.salesBillSn : row.dispatchBillSn
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.showDetailModal = true
|
|
|
|
+ })
|
|
} else {
|
|
} else {
|
|
this.showTipModal = true
|
|
this.showTipModal = true
|
|
- this.$refs.detailModal.getDetail(row, 1, '发货单详情')
|
|
|
|
|
|
+ const infoObj = {
|
|
|
|
+ sendBillSn: row.sendBillSn,
|
|
|
|
+ customeName: row.buyerName
|
|
|
|
+ }
|
|
|
|
+ this.$refs.detailModal.getDetail(infoObj, 1, '发货单详情')
|
|
}
|
|
}
|
|
},
|
|
},
|
|
closeDetailModal () {
|
|
closeDetailModal () {
|
|
this.showDetailModal = false
|
|
this.showDetailModal = false
|
|
- this.$store.state.app.curActionPermission = ''
|
|
|
|
|
|
+ this.bizSn = null
|
|
},
|
|
},
|
|
sendSuccess () {
|
|
sendSuccess () {
|
|
this.showTipModal = false
|
|
this.showTipModal = false
|
|
this.$refs.table.refresh()
|
|
this.$refs.table.refresh()
|
|
},
|
|
},
|
|
- // 查看发货说明
|
|
|
|
- handleExplainInfo (row) {
|
|
|
|
- this.tipData = row
|
|
|
|
- this.showInfoModal = true
|
|
|
|
- },
|
|
|
|
- // 允许备货打印
|
|
|
|
- handlePrint (row, type) {
|
|
|
|
- this.tipData = row
|
|
|
|
- this.tipData.printType = type
|
|
|
|
- this.showTipModal = true
|
|
|
|
- },
|
|
|
|
- canselModal () {
|
|
|
|
- this.tipData = null
|
|
|
|
- this.showTipModal = false
|
|
|
|
- this.showInfoModal = false
|
|
|
|
- },
|
|
|
|
- updatePrintStatus () {
|
|
|
|
- dispatchPrintStatus({ dispatchBillSn: this.tipData.dispatchBillSn, printStatus: this.tipData && this.tipData.printType == 1 ? 'NO_PRINT' : 'CANCEL_PRINT' }).then(res => {
|
|
|
|
- if (res.status == 200) {
|
|
|
|
- this.canselModal()
|
|
|
|
- this.$message.info(res.message)
|
|
|
|
- this.$refs.table.refresh()
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
subareaChange (val) {
|
|
subareaChange (val) {
|
|
- this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
|
|
- this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
|
|
|
|
+ this.queryParam.subareaSn = val[0] ? val[0] : undefined
|
|
|
|
+ this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- // this.$refs.rangeDate.resetDate(this.time)
|
|
|
|
- // this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
|
|
|
|
- // this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
|
|
- // this.queryParam.buyerSn = undefined
|
|
|
|
- // this.queryParam.receiverSn = undefined
|
|
|
|
- // this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
|
- // this.$refs.shbuyerName.resetForm()
|
|
|
|
- // this.queryParam.salesBillNo = ''
|
|
|
|
- // this.queryParam.dispatchBillNo = ''
|
|
|
|
- // this.queryParam.billStatus = undefined
|
|
|
|
- // this.queryParam.voidFlag = undefined
|
|
|
|
- // this.queryParam.subareaArea.subareaSn = undefined
|
|
|
|
- // this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
|
|
- // this.queryParam.shippingAddrProvinceSn = undefined
|
|
|
|
- // this.queryParam.printStatus = undefined
|
|
|
|
- // this.queryParam.checkStatus = undefined
|
|
|
|
- // this.queryParam.warehouseSn = undefined
|
|
|
|
- // this.queryParam.subareaArea.subareaSn = undefined
|
|
|
|
- // this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
|
|
-
|
|
|
|
- // if (this.advanced) {
|
|
|
|
- // this.$refs.subarea.clearData()
|
|
|
|
- // }
|
|
|
|
|
|
+ this.$refs.rangeDate.resetDate(this.time)
|
|
|
|
+ this.queryParam.submitBeginDate = getDate.getCurrMonthDays().starttime
|
|
|
|
+ this.queryParam.submitEndDate = getDate.getCurrMonthDays().endtime
|
|
|
|
+ this.queryParam.salesBillNo = ''
|
|
|
|
+ this.queryParam.subareaSn = undefined
|
|
|
|
+ this.queryParam.subareaAreaSn = undefined
|
|
|
|
+ this.queryParam.buyerName = ''
|
|
|
|
+ this.queryParam.buyerSn = undefined
|
|
|
|
+ this.queryParam.financialStatus = undefined
|
|
|
|
+ this.queryParam.auditBeginDate = undefined
|
|
|
|
+ this.queryParam.auditEndDate = undefined
|
|
|
|
+ this.queryParam.settleBeginDate = undefined
|
|
|
|
+ this.queryParam.settleEndDate = undefined
|
|
|
|
+ this.queryParam.billStatus = undefined
|
|
|
|
+ this.queryParam.sendFlag = ''
|
|
|
|
+ this.queryParam.provinceSn = undefined
|
|
|
|
+ this.examineTime = []
|
|
|
|
+ this.paymentTime = []
|
|
|
|
+ this.$refs.subarea.clearData()
|
|
|
|
+ if (this.advanced) {
|
|
|
|
+ this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
|
+ this.$refs.processRangeDate.resetDate()
|
|
|
|
+ this.$refs.collectionRangeDate.resetDate()
|
|
|
|
+ }
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
pageInit () {
|
|
pageInit () {
|
|
@@ -464,7 +392,7 @@ export default {
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
<style lang="less">
|
|
<style lang="less">
|
|
- .pushOrder-wrap{
|
|
|
|
|
|
+ .salesList-wrap{
|
|
.sTable{
|
|
.sTable{
|
|
margin-top: 10px;
|
|
margin-top: 10px;
|
|
}
|
|
}
|