|
|
@@ -16,12 +16,12 @@
|
|
|
</nuxt-link>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="order-nav">
|
|
|
- <div :class="activeType === 'all' ? 'active': ''" @click="ChangeList('all')"><span>未对账</span></div>
|
|
|
+ <!--<div class="order-nav">-->
|
|
|
+ <!--<div :class="activeType === 'all' ? 'active': ''" @click="ChangeList('all')"><span>未对账</span></div>-->
|
|
|
<!--<div :class="activeType === 'todo' ? 'active' : ''" @click="ChangeList('todo')"><span>待确认</span></div>-->
|
|
|
- <div :class="activeType === 'done' ? 'active': ''" @click="ChangeList('done')"><span>已对账</span></div>
|
|
|
- <div :class="activeType === 'end' ? 'active' : ''" @click="ChangeList('end')"><span>已作废</span></div>
|
|
|
- </div>
|
|
|
+ <!--<div :class="activeType === 'done' ? 'active': ''" @click="ChangeList('done')"><span>已对账</span></div>-->
|
|
|
+ <!--<div :class="activeType === 'end' ? 'active' : ''" @click="ChangeList('end')"><span>已作废</span></div>-->
|
|
|
+ <!--</div>-->
|
|
|
<div v-show="activeType !== 'all'">
|
|
|
<div class="search-content mi-search-content">
|
|
|
<input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="单据编号/客户名称/物料名称">
|
|
|
@@ -94,14 +94,37 @@
|
|
|
</div>
|
|
|
<div class="invoice-btob-wrapper-middle">
|
|
|
<div v-if="item.thisMonthCount && item.thisMonthCount.length > 0">
|
|
|
- <span class="inline-block" style="vertical-align: top">本期间应收:</span>
|
|
|
+ <span class="inline-block" style="vertical-align: top">本月应收:</span>
|
|
|
<div class="inline-block" style="vertical-align: top" >
|
|
|
<div v-for="count in item.thisMonthCount" v-if="count.amount > 0">
|
|
|
<span>{{count.currency}}:{{count.amount | computeNum(2)}}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-else><span>本期间应收:0</span></div>
|
|
|
+ <div v-else><span>本月应收:0</span></div>
|
|
|
+
|
|
|
+ <div v-if="item.thisMonthDoneCount && item.thisMonthDoneCount.length > 0">
|
|
|
+ <span class="inline-block" style="vertical-align: top">本月已对:</span>
|
|
|
+ <div class="inline-block" style="vertical-align: top" >
|
|
|
+ <div v-for="count in item.thisMonthDoneCount" v-if="count.amount > 0">
|
|
|
+ <span>{{count.currency}}:{{count.amount | computeNum(2)}}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div v-else><span>本月已对:0</span></div>
|
|
|
+
|
|
|
+
|
|
|
+ <div v-if="item.thisMonthTodoCount && item.thisMonthTodoCount.length > 0">
|
|
|
+ <span class="inline-block" style="vertical-align: top">本月未对:</span>
|
|
|
+ <div class="inline-block" style="vertical-align: top" >
|
|
|
+ <div v-for="count in item.thisMonthTodoCount" v-if="count.amount > 0">
|
|
|
+ <span>{{count.currency}}:{{count.amount | computeNum(2)}}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div v-else><span>本月未对:0</span></div>
|
|
|
+
|
|
|
+
|
|
|
<div v-if="item.totalCount && item.totalCount.length > 0">
|
|
|
<span class="inline-block" style="vertical-align: top">应收总额:</span>
|
|
|
<div class="inline-block" style="vertical-align: top" >
|
|
|
@@ -113,7 +136,7 @@
|
|
|
<div v-else><span>应收总额:0</span></div>
|
|
|
</div>
|
|
|
<div class="invoice-btob-wrapper-middle" @click="showApcheckList(item)">
|
|
|
- <div class="middle_btn">对账明细</div>
|
|
|
+ <div class="middle_btn">明细</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -177,14 +200,14 @@
|
|
|
<div>
|
|
|
<div class="choosescreen-result-list-content">
|
|
|
<div style="border-bottom: 1px solid #D3D3D3;padding-bottom: 0.2rem">
|
|
|
- <span class="item inline-block" @click="checkItem(item, index)" v-show="!isShowApcheckList.showApcheck">
|
|
|
+ <span class="item inline-block" @click="checkItem(item, index)" v-show="!isShowApcheckList.showApcheck && !item.haveChecked">
|
|
|
<label class="mobile-cart-check" :class="{active: item.check}"></label>
|
|
|
</span>
|
|
|
<div class="inline-block" style="margin-left: 0.15rem">
|
|
|
<div class="OverHidden">采购单:<span>{{item.ordercode}}</span></div>
|
|
|
- <div class="OverHidden">物料名称:<span>{{item.prodtitle}}</span></div>
|
|
|
- <div class="OverHidden">规格型号:<span>{{item.prodspec}}</span></div>
|
|
|
<div class="OverHidden">发货单:<span>{{item.sendcode}}</span></div>
|
|
|
+ <div class="OverHidden">验收单:<span>{{item.inoutno}}</span></div>
|
|
|
+
|
|
|
<!--<div class="OverHidden">序号:<span>{{index + 1}}</span></div>-->
|
|
|
<!--<div class="OverHidden">类型:<span>{{item.piclass}}</span></div>-->
|
|
|
<!--<div class="OverHidden">单据日期:<span>{{item.pidate | time}}</span></div>-->
|
|
|
@@ -195,12 +218,14 @@
|
|
|
<label class="mobile-cart-check"></label>
|
|
|
</span>
|
|
|
<div class="inline-block" style="margin-left: 0.15rem">
|
|
|
+ <div class="OverHidden">物料名称:<span>{{item.prodtitle}}</span></div>
|
|
|
+ <div class="OverHidden">规格型号:<span>{{item.prodspec}}</span></div>
|
|
|
<div class="OverHidden">发货数量:<span>{{item.qty}}</span></div>
|
|
|
- <div class="OverHidden">验收单:<span>{{item.inoutno}}</span></div>
|
|
|
<div class="OverHidden">验收数量:<span>{{item.thischeckqty}}</span></div>
|
|
|
<div class="OverHidden">单价:<span>{{item.currency}}:{{item.orderprice}}</span></div>
|
|
|
<!--<div class="OverHidden">发货单:<span>{{item.sendcode}}</span></div>-->
|
|
|
<div class="OverHidden">税率:<span>{{item.taxrate}}%</span></div>
|
|
|
+ <div class="OverHidden" v-if="item.haveChecked === 1">对账人:<span>{{item.recorder}}</span></div>
|
|
|
<!--<div class="OverHidden">客户料号:<span>{{item.prodcode}}</span></div>-->
|
|
|
<!--<div class="OverHidden">金额:<span>{{}}</span></div>-->
|
|
|
</div>
|
|
|
@@ -231,68 +256,6 @@
|
|
|
<!--<div class="fr bbgoresult cancel" v-show="isShowApcheckList.showApcheck" @click="deleteCheck">取消</div>-->
|
|
|
</div>
|
|
|
</modal-wrapper>
|
|
|
- <modal-wrapper :title="'新增对账单'" :showModal="showModal" @closeAction="showModal = false">
|
|
|
- <div class="btobapCheck-modal">
|
|
|
- <div class="search-content mi-search-content">
|
|
|
- <input type="text" placeholder="选择对账客户">
|
|
|
- <span @click="toChooseUser"><i class="iconfont icon-sousuo"></i></span>
|
|
|
- </div>
|
|
|
- <div style="padding-left: 0.15rem">
|
|
|
- <span class="title inline-block" style="font-size: 0.28rem;color: #666666;line-height: 0.5rem;margin-top:0.18rem">单据时间:</span>
|
|
|
- <div class="date-wrap">
|
|
|
- <label>
|
|
|
- <i class="iconfont icon-ico-date"></i>
|
|
|
- <input type="date" v-model="dateObj.fromDate" @change="setDate('fromDate')">
|
|
|
- <p v-if="dateObj.fromDate">{{dateObj.fromDate | date}}</p>
|
|
|
- </label>
|
|
|
- <span>—</span>
|
|
|
- <label>
|
|
|
- <i class="iconfont icon-ico-date"></i>
|
|
|
- <input type="date" v-model="dateObj.toDate" @change="setDate('toDate')">
|
|
|
- <p v-if="dateObj.toDate">{{dateObj.toDate | date}}</p>
|
|
|
- </label>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="choosescreen clearfix">
|
|
|
- <div class="fr">{{'收起'}}筛选条件<i class="iconfont icon-arrow-up"></i></div>
|
|
|
- </div>
|
|
|
- <div class="choosescreen-list">
|
|
|
- <div><span>应付供应商:</span><input type="text" v-model="screenObj.key" placeholder="可用应付供应商名称筛选" /></div>
|
|
|
- <div><span>物料名称:</span><input type="text" placeholder="请输入物料名称" /></div>
|
|
|
- <div><span>税率:</span><input type="text" placeholder="请输入税率" /></div>
|
|
|
- <div><span>送货工厂:</span><input type="text" placeholder="请输入送货工厂名称" /></div>
|
|
|
- <div><span>规格:</span><input type="text" placeholder="请输入物料规格" /></div>
|
|
|
- </div>
|
|
|
- <div class="choosescreen-result">
|
|
|
- <div class="clearfix choosescreen-result-list">
|
|
|
- <span class="item inline-block">
|
|
|
- <label class="mobile-cart-check"></label>
|
|
|
- </span>
|
|
|
- <div class="choosescreen-result-list-content">
|
|
|
- <div>本次对账数:<span>1</span></div>
|
|
|
- <div>客户名称:<span>1</span></div>
|
|
|
- <div>单据编号:<span>1</span></div>
|
|
|
- <div>发货单号:<span>1</span></div>
|
|
|
- <div>序号:<span>1</span></div>
|
|
|
- <div>类型:<span>1</span></div>
|
|
|
- <div>单据日期:<span>1</span></div>
|
|
|
- <div>应付供应商:<span>1</span></div>
|
|
|
- <div>客户采购单:<span>1</span></div>
|
|
|
- <div>客户料号:<span>1</span></div>
|
|
|
- <div>客户物料名称:<span>1</span></div>
|
|
|
- <div>客户规格型号:<span>1</span></div>
|
|
|
- <div>送货工厂:<span>1</span></div>
|
|
|
- <div>数量:<span>1</span></div>
|
|
|
- <div>单价:<span>1</span></div>
|
|
|
- <div>币别:<span>1</span></div>
|
|
|
- <div>税率:<span>1</span></div>
|
|
|
- <div>金额:<span>1</span></div>
|
|
|
- <div>本次对账金额:<span>1</span></div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </modal-wrapper>
|
|
|
<remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
|
|
|
<div class="fixedPicker" v-show="isShowMonthChoose">
|
|
|
<picker :slots="slots" @change="onValuesChange" :showToolbar="true" ref="picker">
|
|
|
@@ -411,7 +374,8 @@
|
|
|
id: '',
|
|
|
startTime: '',
|
|
|
endTime: '',
|
|
|
- objTime: {}
|
|
|
+ objTime: {},
|
|
|
+ customerUU: ''
|
|
|
},
|
|
|
ApcheckfilterOptions: [
|
|
|
{
|
|
|
@@ -504,7 +468,7 @@
|
|
|
setDate (type) {
|
|
|
if (this.dateObj[type]) {
|
|
|
// 初始化为00:00:00
|
|
|
- alert(this.dateObj[type])
|
|
|
+ // alert(this.dateObj[type])
|
|
|
this.dateObj[type] = new Date(this.dateObj[type]).getTime() - 8 * 60 * 60 * 1000
|
|
|
if (this.dateObj.fromDate && this.dateObj.toDate && this.dateObj.fromDate > this.dateObj.toDate) {
|
|
|
if (type === 'fromDate') {
|
|
|
@@ -594,6 +558,7 @@
|
|
|
this.isShowApcheckList.show = true
|
|
|
this.isShowApcheckList.enName = item ? item.myEnterprise.enName : this.isShowApcheckList.enName
|
|
|
this.isShowApcheckList.thisMonth = this.outTimeMonth
|
|
|
+ this.isShowApcheckList.customerUU = item.myEnterprise.uu
|
|
|
this.getApcheckDetailsinfo()
|
|
|
},
|
|
|
// 未对账详情获取数据
|
|
|
@@ -602,7 +567,8 @@
|
|
|
let _params = {
|
|
|
params: {
|
|
|
checkDate: this.isShowApcheckList.thisMonth,
|
|
|
- suuorname: this.isShowApcheckList.enName
|
|
|
+ suuorname: this.isShowApcheckList.enName,
|
|
|
+ customerUU: this.isShowApcheckList.customerUU
|
|
|
}
|
|
|
}
|
|
|
// 是否打开自定义时间选项 且
|
|
|
@@ -613,7 +579,8 @@
|
|
|
params: {
|
|
|
fromDate: objTime[1].fromDate,
|
|
|
endDate: objTime[1].toDate,
|
|
|
- suuorname: this.isShowApcheckList.enName
|
|
|
+ suuorname: this.isShowApcheckList.enName,
|
|
|
+ customerUU: this.isShowApcheckList.customerUU
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -646,7 +613,7 @@
|
|
|
}
|
|
|
},
|
|
|
// 对账按钮
|
|
|
- goTopayfor() {
|
|
|
+ goTopayfor() {
|
|
|
let apCheck = {
|
|
|
custUu: '',
|
|
|
custName: '',
|
|
|
@@ -706,7 +673,7 @@
|
|
|
}
|
|
|
|
|
|
// 此次对账后新的已转数
|
|
|
- if (check.check === true) {
|
|
|
+ if (check.check === true && !check.haveChecked) {
|
|
|
_list.push(check)
|
|
|
apCheck.custName = check.custname
|
|
|
apCheck.enUu = check.enuu
|
|
|
@@ -1034,9 +1001,9 @@
|
|
|
allMoney() {
|
|
|
let sum = 0
|
|
|
this.isShowApcheckList.list.forEach(obj => {
|
|
|
- if (obj.check) {
|
|
|
+ // if (obj.check) {
|
|
|
sum += obj.qty * (obj.orderprice || 0)
|
|
|
- }
|
|
|
+ // }
|
|
|
})
|
|
|
return sum
|
|
|
},
|
|
|
@@ -1220,10 +1187,10 @@
|
|
|
}
|
|
|
}
|
|
|
.btobapCheck-wrapper-scroll {
|
|
|
- height: calc(100vh - 1.26rem - 0.98rem - 0.82rem - 1.06rem - 0.92rem);
|
|
|
+ height: calc(100vh - 1.26rem - 0.98rem - 1.06rem - 0.92rem);
|
|
|
overflow-y: auto;
|
|
|
&.btobapCheck-wrapper-scroll2 {
|
|
|
- height: calc(100vh - 1.26rem - 0.98rem - 0.82rem - 1.06rem - 0.92rem - 1.3rem);
|
|
|
+ height: calc(100vh - 1.26rem - 0.98rem - 1.06rem - 0.92rem - 1.3rem);
|
|
|
}
|
|
|
}
|
|
|
.filter-wrapper{
|