|
@@ -19,7 +19,7 @@
|
|
|
<rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="收款单号">
|
|
|
<a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
|
|
|
</a-form-item>
|
|
@@ -29,7 +29,7 @@
|
|
|
<dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="4" :sm="24" v-if="currentTab == 1">
|
|
|
+ <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
|
<a-form-item label="收款打印状态">
|
|
|
<v-select
|
|
|
v-model="queryParam.printStatus"
|
|
@@ -41,7 +41,7 @@
|
|
|
></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="足额打款">
|
|
|
<v-select
|
|
|
v-model="queryParam.fullPaymentFlag"
|
|
@@ -52,8 +52,13 @@
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="出库仓库">
|
|
|
+ <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="currentTab==2?4:24" :sm="24">
|
|
|
- <span style="float:right;" class="table-page-search-submitButtons">
|
|
|
+ <span class="table-page-search-submitButtons">
|
|
|
<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>
|
|
|
</span>
|
|
@@ -110,7 +115,7 @@
|
|
|
|
|
|
<!-- 收款打印 -->
|
|
|
<commonModal modalTit="收款打印预览" width="700pt" :showFooter="false" :openModal="showTipModal" @cancel="closeTipModal">
|
|
|
- <printModel ref="printModel" @cancel="closeTipModal" @printOk="printOk"></printModel>
|
|
|
+ <printModel ref="printModel" @cancel="closeTipModal" @printOk="printOk"></printModel>
|
|
|
</commonModal>
|
|
|
<!-- 打印记录 -->
|
|
|
<recordModal v-drag ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
|
|
@@ -137,11 +142,12 @@ import dealerSearchList from '@/views/common/dealerSearchList.vue'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
import recordModal from './recordModal.vue'
|
|
|
import printModel from './printModel.vue'
|
|
|
+import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInstance, checkPrintStatus } from '@/api/financeBook'
|
|
|
export default {
|
|
|
name: 'ReceiptPrintList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel },
|
|
|
+ components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel, chooseWarehouse },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -156,7 +162,7 @@ export default {
|
|
|
endDate: '',
|
|
|
bookNo: '',
|
|
|
payerName: '',
|
|
|
- dealerSn:undefined,
|
|
|
+ dealerSn: undefined,
|
|
|
subareaSn: undefined,
|
|
|
billStatus: undefined,
|
|
|
dealerProvinceSn: undefined,
|
|
@@ -206,6 +212,7 @@ export default {
|
|
|
{ title: '收款单号', dataIndex: 'bookNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '收款日期', dataIndex: 'receiptDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '客户名称', dataIndex: 'payerName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '出库仓库', dataIndex: 'warehouse', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '订单金额', dataIndex: 'orderAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
|
|
|
{ title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
|
|
@@ -223,6 +230,10 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 选择出库仓库
|
|
|
+ handleWarehouse (val) {
|
|
|
+
|
|
|
+ },
|
|
|
changeTab (v) {
|
|
|
this.currentTab = v
|
|
|
this.pageInit()
|
|
@@ -252,9 +263,9 @@ export default {
|
|
|
})
|
|
|
|
|
|
// 检查是否有已打印数据
|
|
|
- if(this.currentTab == 2){
|
|
|
+ if (this.currentTab == 2) {
|
|
|
const hasPrintData = await checkPrintStatus(bookDetailSn).then(res => res.data)
|
|
|
- if(!hasPrintData){
|
|
|
+ if (!hasPrintData) {
|
|
|
_this.$info({
|
|
|
title: '操作提示',
|
|
|
centered: true,
|
|
@@ -263,10 +274,10 @@ export default {
|
|
|
_this.resetSearchForm()
|
|
|
}
|
|
|
})
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
const retArr = []
|
|
|
const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
|
|
|
console.log(auditInfo)
|
|
@@ -305,9 +316,9 @@ export default {
|
|
|
let auditInfo = null
|
|
|
if (type == 0) {
|
|
|
// 是否已打印
|
|
|
- if(this.currentTab == 2){
|
|
|
- let hasPrintData = await checkPrintStatus([list.bookDetailSn]).then(res => res.data)
|
|
|
- if(!hasPrintData){
|
|
|
+ if (this.currentTab == 2) {
|
|
|
+ const hasPrintData = await checkPrintStatus([list.bookDetailSn]).then(res => res.data)
|
|
|
+ if (!hasPrintData) {
|
|
|
_this.$info({
|
|
|
title: '操作提示',
|
|
|
centered: true,
|
|
@@ -316,17 +327,17 @@ export default {
|
|
|
_this.resetSearchForm()
|
|
|
}
|
|
|
})
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data)
|
|
|
}
|
|
|
console.log(auditInfo)
|
|
|
this.spinning = true
|
|
|
this.showTipModal = true
|
|
|
let detailItemUseStr = ''
|
|
|
-
|
|
|
+
|
|
|
this.$nextTick(() => {
|
|
|
if (type == 0 && row.detailItemUseList) {
|
|
|
row.detailItemUseList.map(k => {
|
|
@@ -339,7 +350,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
printOk (res) {
|
|
|
- if(res){
|
|
|
+ if (res) {
|
|
|
this.spinning = false
|
|
|
this.$refs.table.refresh()
|
|
|
this.$refs.table.clearSelected()
|
|
@@ -352,10 +363,10 @@ export default {
|
|
|
},
|
|
|
custChange (val) {
|
|
|
console.log(val)
|
|
|
- if(val.row){
|
|
|
+ if (val.row) {
|
|
|
this.queryParam.dealerSn = val.row.dealerSn
|
|
|
this.queryParam.payerName = undefined
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.queryParam.dealerSn = undefined
|
|
|
this.queryParam.payerName = val.key
|
|
|
}
|
|
@@ -402,7 +413,7 @@ export default {
|
|
|
endDate: '',
|
|
|
bookNo: '',
|
|
|
payerName: '',
|
|
|
- dealerSn:undefined,
|
|
|
+ dealerSn: undefined,
|
|
|
subareaSn: undefined,
|
|
|
billStatus: undefined,
|
|
|
dealerProvinceSn: undefined,
|