|
|
@@ -127,13 +127,13 @@
|
|
|
</el-input>
|
|
|
<el-date-picker
|
|
|
style="margin-left: 20px;float: left;"
|
|
|
- v-model="planDate2"
|
|
|
+ v-model="realDate1"
|
|
|
type="daterange"
|
|
|
align="center"
|
|
|
unlink-panels
|
|
|
range-separator="至"
|
|
|
- start-placeholder="计划开票（开始）"
|
|
|
- end-placeholder="计划开票（结束）"
|
|
|
+ start-placeholder="实际开票（开始）"
|
|
|
+ end-placeholder="实际开票（结束）"
|
|
|
:picker-options="pickerOptions2" value-format="yyyy-MM-dd">
|
|
|
</el-date-picker>
|
|
|
<el-date-picker
|
|
|
@@ -205,9 +205,9 @@
|
|
|
<span>{{ row.planAmount }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="计划开票时间" align="center">
|
|
|
+ <el-table-column label="实际开票时间" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
- <span>{{ row.planMakeDate}}</span>
|
|
|
+ <span>{{ row.realMakeDate}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="备注" align="center" show-overflow-tooltip>
|
|
|
@@ -247,13 +247,13 @@
|
|
|
</el-input>
|
|
|
<el-date-picker
|
|
|
style="margin-left: 20px;float: left;"
|
|
|
- v-model="planDate3"
|
|
|
+ v-model="destroyDate1"
|
|
|
type="daterange"
|
|
|
align="center"
|
|
|
unlink-panels
|
|
|
range-separator="至"
|
|
|
- start-placeholder="计划开票（开始）"
|
|
|
- end-placeholder="计划开票（结束）"
|
|
|
+ start-placeholder="作废时间（开始）"
|
|
|
+ end-placeholder="作废时间（结束）"
|
|
|
:picker-options="pickerOptions3" value-format="yyyy-MM-dd">
|
|
|
</el-date-picker>
|
|
|
<el-date-picker
|
|
|
@@ -320,9 +320,9 @@
|
|
|
<span>{{ row.planAmount }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="计划开票时间" align="center">
|
|
|
+ <el-table-column label="作废时间" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
- <span>{{ row.planMakeDate}}</span>
|
|
|
+ <span>{{ row.modified}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="备注" align="center" show-overflow-tooltip>
|
|
|
@@ -599,9 +599,9 @@ export default {
|
|
|
},
|
|
|
planDate1:"",
|
|
|
applyDate1:"",
|
|
|
- planDate2:"",
|
|
|
+ realDate1:"",
|
|
|
applyDate2:"",
|
|
|
- planDate3:"",
|
|
|
+ destroyDate1:"",
|
|
|
applyDate3:"",
|
|
|
pickerOptions1: {
|
|
|
shortcuts: [{
|
|
|
@@ -732,7 +732,7 @@ export default {
|
|
|
},
|
|
|
resetSearch2() {
|
|
|
this.$router.push({ query: {} });
|
|
|
- this.planDate2 = '';
|
|
|
+ this.realDate1 = '';
|
|
|
this.applyDate2 = '';
|
|
|
this.listQuery2 = {
|
|
|
current: 1,
|
|
|
@@ -747,9 +747,9 @@ export default {
|
|
|
// 重置分页
|
|
|
this.listQuery2.page = 1
|
|
|
this.listQuery2.size = 1000
|
|
|
- if (this.planDate2){
|
|
|
- this.listQuery2.pStartDate = this.planDate2[0];
|
|
|
- this.listQuery2.pEndDate = this.planDate2[1];
|
|
|
+ if (this.realDate1){
|
|
|
+ this.listQuery2.rStartDate = this.realDate1[0];
|
|
|
+ this.listQuery2.rEndDate = this.realDate1[1];
|
|
|
}
|
|
|
if (this.applyDate2){
|
|
|
this.listQuery2.aStartDate = this.applyDate2[0]+' 00:00:00';
|
|
|
@@ -759,7 +759,7 @@ export default {
|
|
|
},
|
|
|
resetSearch3() {
|
|
|
this.$router.push({ query: {} });
|
|
|
- this.planDate3 = '';
|
|
|
+ this.destroyDate1 = '';
|
|
|
this.applyDate3 = '';
|
|
|
this.listQuery3 = {
|
|
|
current: 1,
|
|
|
@@ -774,9 +774,9 @@ export default {
|
|
|
// 重置分页
|
|
|
this.listQuery3.page = 1
|
|
|
this.listQuery3.size = 1000
|
|
|
- if (this.planDate3){
|
|
|
- this.listQuery3.pStartDate = this.planDate3[0];
|
|
|
- this.listQuery3.pEndDate = this.planDate3[1];
|
|
|
+ if (this.destroyDate1){
|
|
|
+ this.listQuery3.dStartDate = this.destroyDate1[0];
|
|
|
+ this.listQuery3.dEndDate = this.destroyDate1[1];
|
|
|
}
|
|
|
if (this.applyDate3){
|
|
|
this.listQuery3.aStartDate = this.applyDate3[0]+' 00:00:00';
|
