|
@@ -121,6 +121,16 @@
|
|
|
<span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
|
<span v-else>{{ record.dispatchBillNo }}</span>
|
|
|
</template>
|
|
|
+ <!-- 发货说明 -->
|
|
|
+ <template slot="explainInfo" slot-scope="text, record">
|
|
|
+ <span v-if="record.explainInfo" class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
+ </template>
|
|
|
+ <!-- 备货打印状态 -->
|
|
|
+ <template slot="printStatus" slot-scope="text, record">
|
|
|
+ <span v-if="record.printStatus=='NO_PRINT'&&$hasPermissions('B_noPrintStatus')" class="link-bule" @click="handlePrintStatus(record)">{{ record.printStatusDictValue }}</span>
|
|
|
+ <span v-else>{{ record.printStatusDictValue }}</span>
|
|
|
+ </template>
|
|
|
<div slot="costTitle">
|
|
|
<a-tooltip placement="top">
|
|
|
<template slot="title">
|
|
@@ -163,6 +173,18 @@
|
|
|
<salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
|
<dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
|
|
|
</commonModal>
|
|
|
+ <!-- 操作提示 -->
|
|
|
+ <commonModal modalTit="操作提示" okText="暂不打印" :openModal="showPrintModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
|
+ <div style="text-align: center;">
|
|
|
+ <div style="margin-bottom: 15px;font-size: 14px;">如需将打印状态回退至<strong>【暂不打印】</strong>,请点击下方按钮</div>
|
|
|
+ <div style="line-height: 24px;">
|
|
|
+ <div>备货单号:{{ tipData&&tipData.dispatchBillNo }}</div>
|
|
|
+ <div>客户名称:{{ tipData&&tipData.buyerName }}</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </commonModal>
|
|
|
+ <!-- 发货说明 -->
|
|
|
+ <explainInfoModal mode="view" :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
|
</a-spin>
|
|
|
</a-card>
|
|
|
</div>
|
|
@@ -180,12 +202,13 @@ import recordModal from './recordModal.vue'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
|
import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
|
-import { dispatchlList, dispatchDetailPrint } from '@/api/dispatch'
|
|
|
+import explainInfoModal from '@/views/salesManagement/pushOrderManagement/explainInfoModal.vue'
|
|
|
+import { dispatchlList, dispatchDetailPrint, dispatchPrintStatus } from '@/api/dispatch'
|
|
|
import { printFun } from '@/libs/JGPrint.js'
|
|
|
export default {
|
|
|
name: 'StockPrintList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail },
|
|
|
+ components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail, explainInfoModal },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -230,7 +253,10 @@ export default {
|
|
|
this.spinning = false
|
|
|
return data
|
|
|
})
|
|
|
- }
|
|
|
+ },
|
|
|
+ tipData: null,
|
|
|
+ showPrintModal: false,
|
|
|
+ showInfoModal: false
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -240,7 +266,8 @@ export default {
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
|
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
|
|
|
- { title: '发货编号', dataIndex: 'sendNo', width: '70px', align: 'center' },
|
|
|
+ { title: '发货编号', dataIndex: 'sendNo', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', 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: 'totalCategory', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -251,7 +278,7 @@ export default {
|
|
|
// { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '业务状态', dataIndex: 'billStatusDictValue', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单据状态', dataIndex: 'voidFlagDictValue', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '备货打印状态', width: '100px', align: 'center', scopedSlots: { customRender: 'printStatus' } },
|
|
|
{ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
|
|
@@ -333,6 +360,30 @@ export default {
|
|
|
billSn: row.dispatchBillSn
|
|
|
})
|
|
|
},
|
|
|
+ // 允许备货打印
|
|
|
+ handlePrintStatus (row) {
|
|
|
+ this.tipData = row
|
|
|
+ this.showPrintModal = true
|
|
|
+ },
|
|
|
+ canselModal () {
|
|
|
+ this.tipData = null
|
|
|
+ this.showPrintModal = false
|
|
|
+ this.showInfoModal = false
|
|
|
+ },
|
|
|
+ updatePrintStatus () {
|
|
|
+ dispatchPrintStatus({ dispatchBillSn: this.tipData.dispatchBillSn, printStatus: 'UNABLE_PRINT' }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.canselModal()
|
|
|
+ this.$message.info(res.message)
|
|
|
+ this.$refs.table.refresh()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 查看发货说明
|
|
|
+ handleExplainInfo (row) {
|
|
|
+ this.tipData = row
|
|
|
+ this.showInfoModal = true
|
|
|
+ },
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.time = []
|