|
@@ -64,6 +64,17 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="对单状态">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.checkStatus"
|
|
|
|
+ ref="printStatus"
|
|
|
|
+ id="pushOrder-printStatus"
|
|
|
|
+ code="CHECK_STATUS"
|
|
|
|
+ placeholder="请选择对单状态"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="所在区域">
|
|
<a-form-model-item label="所在区域">
|
|
<subarea id="pushOrder-subarea" v-model="queryParam.subareaSn"></subarea>
|
|
<subarea id="pushOrder-subarea" v-model="queryParam.subareaSn"></subarea>
|
|
@@ -93,7 +104,7 @@
|
|
<!-- alert -->
|
|
<!-- alert -->
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
<div slot="message">
|
|
<div slot="message">
|
|
- 下推总单数::<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
|
|
|
|
+ 下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
<span v-if="$hasPermissions('B_isShowPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;</span>
|
|
<span v-if="$hasPermissions('B_isShowPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;</span>
|
|
</div>
|
|
</div>
|
|
@@ -107,7 +118,7 @@
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
- :scroll="{ y:tableHeight, x:1800 }"
|
|
|
|
|
|
+ :scroll="{ y:tableHeight, x:1950 }"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
bordered>
|
|
<!-- 销售单号 -->
|
|
<!-- 销售单号 -->
|
|
@@ -120,30 +131,44 @@
|
|
<span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
<span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
<span v-else>{{ record.dispatchBillNo }}</span>
|
|
<span v-else>{{ record.dispatchBillNo }}</span>
|
|
</template>
|
|
</template>
|
|
|
|
+ <!-- 发货说明 -->
|
|
|
|
+ <template slot="explainInfo" slot-scope="text, record">
|
|
|
|
+ <span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
|
|
|
|
+ </template>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<template slot="action" slot-scope="text, record">
|
|
<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.voidFlag=='0'&&$hasPermissions('B_UNABLE_PRINT')"
|
|
|
|
- @click="handlePrint(record)"
|
|
|
|
- >允许备货打印</a-button>
|
|
|
|
- <span v-else>--</span>
|
|
|
|
|
|
+ <div>
|
|
|
|
+ <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>
|
|
|
|
+ </div>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
|
|
|
|
<!-- 操作提示 -->
|
|
<!-- 操作提示 -->
|
|
<commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
<commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
<div style="text-align: center;">
|
|
<div style="text-align: center;">
|
|
- <div style="margin-bottom: 15px;font-size: 14px;"><strong>确认允许此单进行备货打印吗?</strong></div>
|
|
|
|
|
|
+ <div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
|
|
<div style="line-height: 24px;">
|
|
<div style="line-height: 24px;">
|
|
<div>备货单号:{{ tipData&&tipData.dispatchBillNo }}</div>
|
|
<div>备货单号:{{ tipData&&tipData.dispatchBillNo }}</div>
|
|
<div>客户名称:{{ tipData&&tipData.buyerName }}</div>
|
|
<div>客户名称:{{ tipData&&tipData.buyerName }}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</commonModal>
|
|
</commonModal>
|
|
|
|
+
|
|
<!-- 查看销售单或备货单详情 -->
|
|
<!-- 查看销售单或备货单详情 -->
|
|
<commonModal
|
|
<commonModal
|
|
modalTit="销售单详情"
|
|
modalTit="销售单详情"
|
|
@@ -154,6 +179,8 @@
|
|
@cancel="showDetailModal = false">
|
|
@cancel="showDetailModal = false">
|
|
<salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
<salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
</commonModal>
|
|
</commonModal>
|
|
|
|
+ <!-- 发货说明 -->
|
|
|
|
+ <explainInfoModal :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
</a-spin>
|
|
</a-spin>
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
@@ -169,17 +196,19 @@ import Area from '@/views/common/area.js'
|
|
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 explainInfoModal from './explainInfoModal.vue'
|
|
import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
|
|
import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
|
|
export default {
|
|
export default {
|
|
name: 'PushOrderManagementList',
|
|
name: 'PushOrderManagementList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail },
|
|
|
|
|
|
+ components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
showDetailModal: false,
|
|
showDetailModal: false,
|
|
|
|
+ showInfoModal: false,
|
|
bizSn: null,
|
|
bizSn: null,
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
time: [
|
|
time: [
|
|
@@ -198,7 +227,8 @@ export default {
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|
|
voidFlag: undefined,
|
|
voidFlag: undefined,
|
|
shippingAddrProvinceSn: undefined,
|
|
shippingAddrProvinceSn: undefined,
|
|
- printStatus: undefined
|
|
|
|
|
|
+ printStatus: undefined,
|
|
|
|
+ checkStatus: undefined
|
|
},
|
|
},
|
|
totalData: {
|
|
totalData: {
|
|
totalAmount: 0,
|
|
totalAmount: 0,
|
|
@@ -239,6 +269,7 @@ export default {
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { 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: '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: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '产品款数', dataIndex: 'totalCategory', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品款数', dataIndex: 'totalCategory', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -281,17 +312,24 @@ export default {
|
|
this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
|
|
this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ // 查看发货说明
|
|
|
|
+ handleExplainInfo (row) {
|
|
|
|
+ this.tipData = row
|
|
|
|
+ this.showInfoModal = true
|
|
|
|
+ },
|
|
// 允许备货打印
|
|
// 允许备货打印
|
|
- handlePrint (row) {
|
|
|
|
|
|
+ handlePrint (row, type) {
|
|
this.tipData = row
|
|
this.tipData = row
|
|
|
|
+ this.tipData.printType = type
|
|
this.showTipModal = true
|
|
this.showTipModal = true
|
|
},
|
|
},
|
|
canselModal () {
|
|
canselModal () {
|
|
this.tipData = null
|
|
this.tipData = null
|
|
this.showTipModal = false
|
|
this.showTipModal = false
|
|
|
|
+ this.showInfoModal = false
|
|
},
|
|
},
|
|
updatePrintStatus () {
|
|
updatePrintStatus () {
|
|
- dispatchPrintStatus({ dispatchBillSn: this.tipData.dispatchBillSn, printStatus: 'NO_PRINT' }).then(res => {
|
|
|
|
|
|
+ dispatchPrintStatus({ dispatchBillSn: this.tipData.dispatchBillSn, printStatus: this.tipData && this.tipData.printType == 1 ? 'NO_PRINT' : 'CANCEL_PRINT' }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.canselModal()
|
|
this.canselModal()
|
|
this.$message.info(res.message)
|
|
this.$message.info(res.message)
|
|
@@ -315,6 +353,7 @@ export default {
|
|
this.queryParam.subareaSn = undefined
|
|
this.queryParam.subareaSn = undefined
|
|
this.queryParam.shippingAddrProvinceSn = undefined
|
|
this.queryParam.shippingAddrProvinceSn = undefined
|
|
this.queryParam.printStatus = undefined
|
|
this.queryParam.printStatus = undefined
|
|
|
|
+ this.queryParam.checkStatus = undefined
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
pageInit () {
|
|
pageInit () {
|