|
@@ -97,47 +97,46 @@
|
|
|
</a-form>
|
|
|
</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+84.5+'px' }"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :scroll="{ y:tableHeight, x:1890 }"
|
|
|
- :defaultLoadData="false"
|
|
|
- bordered>
|
|
|
- <!-- 超时环节提示 -->
|
|
|
- <template slot="tip" slot-scope="text, record">
|
|
|
- <a-tooltip placement="top">
|
|
|
- <template slot="title">
|
|
|
- <span>已超时2天</span>
|
|
|
- </template>
|
|
|
- <div>
|
|
|
- <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'26px'}"/>
|
|
|
- <span>{{ record.salesBillNo }}</span>
|
|
|
- </div>
|
|
|
- </a-tooltip>
|
|
|
- </template>
|
|
|
- <!-- 销售单号 -->
|
|
|
- <template slot="salesBillNo" slot-scope="text, record">
|
|
|
- <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
|
|
|
- </template>
|
|
|
- <!-- 备货单号 -->
|
|
|
- <template slot="dispatchBillNo" slot-scope="text, record">
|
|
|
- <span class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
|
- </template>
|
|
|
- <!-- 发货单号 -->
|
|
|
- <template slot="sendBillNo" slot-scope="text, record">
|
|
|
- <span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
|
|
|
- </template>
|
|
|
- <!-- 操作 -->
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
- <div>
|
|
|
+ <a-card size="small" :bordered="false" style="margin-top:8px;">
|
|
|
+ <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="tip" slot-scope="text, record">
|
|
|
+ <a-tooltip placement="top">
|
|
|
+ <template slot="title">
|
|
|
+ <span>已超时{{ record.sendOverDay }}天(要求销售单下推后2天内备货)</span>
|
|
|
+ </template>
|
|
|
+ <div>
|
|
|
+ <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
|
|
|
+ <span>{{ record.billStatusDictValue }}</span>
|
|
|
+ </div>
|
|
|
+ </a-tooltip>
|
|
|
+ </template>
|
|
|
+ <!-- 销售单号 -->
|
|
|
+ <template slot="salesBillNo" slot-scope="text, record">
|
|
|
+ <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
|
|
|
+ </template>
|
|
|
+ <!-- 备货单号 -->
|
|
|
+ <template slot="dispatchBillNo" slot-scope="text, record">
|
|
|
+ <span class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
|
+ </template>
|
|
|
+ <!-- 发货单号 -->
|
|
|
+ <template slot="sendBillNo" slot-scope="text, record">
|
|
|
+ <span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
|
|
|
+ </template>
|
|
|
+ <!-- 操作 -->
|
|
|
+ <template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
|
size="small"
|
|
|
type="link"
|
|
@@ -154,12 +153,11 @@
|
|
|
v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_CANSEL_PRINT')"
|
|
|
@click="handlePrint(record,0)"
|
|
|
>取消打印</a-button>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </s-table>
|
|
|
+ </template>
|
|
|
+ </s-table>
|
|
|
|
|
|
- <!-- 操作提示 -->
|
|
|
- <!-- <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
|
+ <!-- 操作提示 -->
|
|
|
+ <!-- <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;">
|
|
@@ -169,24 +167,24 @@
|
|
|
</div>
|
|
|
</commonModal> -->
|
|
|
|
|
|
- <!-- 查看销售单或备货单详情 -->
|
|
|
- <commonModal
|
|
|
- :modalTit="detailType?'备货单详情':'销售单详情'"
|
|
|
- bodyPadding="10px"
|
|
|
- width="70%"
|
|
|
- :showFooter="false"
|
|
|
- :openModal="showDetailModal"
|
|
|
- @cancel="cancelDetail">
|
|
|
- <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
|
- <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
|
|
|
- <financialDetailModal v-if="detailType==3" ref="financialDetail" :bizSn="bizSn"></financialDetailModal>
|
|
|
- </commonModal>
|
|
|
- <!-- 发货说明 -->
|
|
|
- <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
|
- <!-- 发货单详情 -->
|
|
|
- <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
|
|
|
- </a-spin>
|
|
|
- <!-- </a-card> -->
|
|
|
+ <!-- 查看销售单或备货单详情 -->
|
|
|
+ <commonModal
|
|
|
+ :modalTit="detailType?'备货单详情':'销售单详情'"
|
|
|
+ bodyPadding="10px"
|
|
|
+ width="70%"
|
|
|
+ :showFooter="false"
|
|
|
+ :openModal="showDetailModal"
|
|
|
+ @cancel="cancelDetail">
|
|
|
+ <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
|
+ <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
|
|
|
+ <financialDetailModal v-if="detailType==3" ref="financialDetail" :bizSn="bizSn"></financialDetailModal>
|
|
|
+ </commonModal>
|
|
|
+ <!-- 发货说明 -->
|
|
|
+ <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
|
+ <!-- 发货单详情 -->
|
|
|
+ <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
|
|
|
+ </a-spin>
|
|
|
+ </a-card>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -208,7 +206,7 @@ import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
|
|
|
import financialDetailModal from '@/views/financialManagement/financialCollection/detail.vue'
|
|
|
|
|
|
// import explainInfoModal from './explainInfoModal.vue'
|
|
|
-import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
|
|
|
+import { salesOverviewQueryPage } from '@/api/sales'
|
|
|
export default {
|
|
|
name: 'PushOrderManagementList',
|
|
|
mixins: [commonMixin],
|
|
@@ -260,11 +258,7 @@ export default {
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- // 查询总计
|
|
|
- dispatchQueryCount(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
- this.totalData = Object.assign(this.totalData, res.data || {})
|
|
|
- })
|
|
|
- return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ return salesOverviewQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -284,41 +278,41 @@ export default {
|
|
|
columns () {
|
|
|
const _this = this
|
|
|
const arr = [
|
|
|
- { title: '超时环节提醒', scopedSlots: { customRender: 'tip' }, width: '120px', align: 'center', fixed: 'left' },
|
|
|
- { title: '提交时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
+ { title: '超时环节提醒', scopedSlots: { customRender: 'tip' }, width: '160px', align: 'center', fixed: 'left' },
|
|
|
+ { title: '提交时间', dataIndex: 'submitDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
{ title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
- { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
|
|
|
+ { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center', fixed: 'left' },
|
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
|
|
|
{ title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
|
|
|
{ title: '所在区域', dataIndex: 'subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '所在分区', dataIndex: 'subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '仓库', dataIndex: 'warehouseName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '收款方式', dataIndex: 'settlePrintStateDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
- { title: '审核时间', dataIndex: 'stockUpDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '下推数量', dataIndex: 'totalCategory', 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: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备货时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货创建时间', dataIndex: 'stockOutDate', width: '100px', 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: '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: 'dispatchAuditDate', 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: 'voidFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收款金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
- { title: '收款时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '托运日期', dataIndex: 'stockOutDate', 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: 'dispatchSendNo', width: '80px', 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: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '物流单号', dataIndex: 'stockOutDate', 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: 'totalQty', 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: 'printStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收货时间', dataIndex: 'financialStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '物流情况', dataIndex: 'settlePrintStateDictValue', 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: 'sendTransportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '备注', dataIndex: 'checkStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
|
]
|
|
|
return arr
|
|
@@ -400,29 +394,29 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
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
|
|
|
+ // 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()
|
|
|
- }
|
|
|
+ // if (this.advanced) {
|
|
|
+ // this.$refs.subarea.clearData()
|
|
|
+ // }
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
pageInit () {
|
|
@@ -430,10 +424,11 @@ export default {
|
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|
|
|
_this.setTableH()
|
|
|
})
|
|
|
+ _this.resetSearchForm()
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 320
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 236
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -450,14 +445,12 @@ export default {
|
|
|
mounted () {
|
|
|
if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
|
|
|
this.pageInit()
|
|
|
- this.resetSearchForm()
|
|
|
}
|
|
|
},
|
|
|
activated () {
|
|
|
// 如果是新页签打开,则重置当前页面
|
|
|
if (this.$store.state.app.isNewTab) {
|
|
|
this.pageInit()
|
|
|
- this.resetSearchForm()
|
|
|
}
|
|
|
// 仅刷新列表,不重置页面
|
|
|
if (this.$store.state.app.updateList) {
|