|
@@ -51,7 +51,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="grainMoney" label="粮款(元)"> </el-table-column>
|
|
<el-table-column prop="grainMoney" label="粮款(元)"> </el-table-column>
|
|
<el-table-column prop="storageFeeNew" label="代储费(元)"> </el-table-column>
|
|
<el-table-column prop="storageFeeNew" label="代储费(元)"> </el-table-column>
|
|
- <el-table-column width='120' prop="total" label="合计应收(元)">
|
|
|
|
|
|
+ <el-table-column width='120' prop="total" label="合计应收(元)">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="received" label="已收(元)"> </el-table-column>
|
|
<el-table-column prop="received" label="已收(元)"> </el-table-column>
|
|
<el-table-column width='120' prop="goodsNames" label="已开发票(元)"> </el-table-column>
|
|
<el-table-column width='120' prop="goodsNames" label="已开发票(元)"> </el-table-column>
|
|
@@ -363,7 +363,7 @@
|
|
pageSize: this.pageSize,
|
|
pageSize: this.pageSize,
|
|
searchType: this.searchType,
|
|
searchType: this.searchType,
|
|
searchKeyWord: this.searchKeyWord,
|
|
searchKeyWord: this.searchKeyWord,
|
|
- agreementType:'代储合同',
|
|
|
|
|
|
+ agreementType: '代储合同',
|
|
startDate: this.startDate,
|
|
startDate: this.startDate,
|
|
endDate: this.endDate,
|
|
endDate: this.endDate,
|
|
contrPage: this.contrPage,
|
|
contrPage: this.contrPage,
|
|
@@ -374,18 +374,18 @@
|
|
if (response.records[i].completedQuantity) {
|
|
if (response.records[i].completedQuantity) {
|
|
response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
|
|
response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
|
|
}
|
|
}
|
|
- if(response.records[i].grainMoney&&response.records[i].storageFeeNew){
|
|
|
|
- response.records[i].total = response.records[i].grainMoney+response.records[i].storageFeeNew
|
|
|
|
- }else if(response.records[i].grainMoney){
|
|
|
|
|
|
+ if (response.records[i].grainMoney && response.records[i].storageFeeNew) {
|
|
|
|
+ response.records[i].total = response.records[i].grainMoney + response.records[i].storageFeeNew
|
|
|
|
+ } else if (response.records[i].grainMoney) {
|
|
response.records[i].total = response.records[i].grainMoney
|
|
response.records[i].total = response.records[i].grainMoney
|
|
- }else if(response.records[i].storageFeeNew){
|
|
|
|
|
|
+ } else if (response.records[i].storageFeeNew) {
|
|
response.records[i].total = response.records[i].storageFeeNew
|
|
response.records[i].total = response.records[i].storageFeeNew
|
|
}
|
|
}
|
|
- if(response.records[i].grainMoneyEd&&response.records[i].depositReceived){
|
|
|
|
- response.records[i].received = response.records[i].grainMoneyEd+response.records[i].depositReceived
|
|
|
|
- }else if(response.records[i].grainMoneyEd){
|
|
|
|
|
|
+ if (response.records[i].grainMoneyEd && response.records[i].depositReceived) {
|
|
|
|
+ response.records[i].received = response.records[i].grainMoneyEd + response.records[i].depositReceived
|
|
|
|
+ } else if (response.records[i].grainMoneyEd) {
|
|
response.records[i].received = response.records[i].grainMoneyEd
|
|
response.records[i].received = response.records[i].grainMoneyEd
|
|
- }else if(response.records[i].depositReceived){
|
|
|
|
|
|
+ } else if (response.records[i].depositReceived) {
|
|
response.records[i].received = response.records[i].depositReceived
|
|
response.records[i].received = response.records[i].depositReceived
|
|
}
|
|
}
|
|
if (response.records[i].addressUrl != null) {
|
|
if (response.records[i].addressUrl != null) {
|
|
@@ -517,17 +517,17 @@
|
|
const {
|
|
const {
|
|
data
|
|
data
|
|
} = await export3({
|
|
} = await export3({
|
|
- compId: localStorage.getItem('ws-pf_compId'),
|
|
|
|
- contractType: this.contractType,
|
|
|
|
- goodsType: this.goodsType,
|
|
|
|
- currentPage: this.currentPage,
|
|
|
|
- pageSize: this.pageSize,
|
|
|
|
- searchType: this.searchType,
|
|
|
|
- searchKeyWord: this.searchKeyWord,
|
|
|
|
- agreementType:'代储合同',
|
|
|
|
- startDate: this.startDate,
|
|
|
|
- endDate: this.endDate,
|
|
|
|
- contrPage: this.contrPage,
|
|
|
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
|
+ contractType: this.contractType,
|
|
|
|
+ goodsType: this.goodsType,
|
|
|
|
+ currentPage: this.currentPage,
|
|
|
|
+ pageSize: this.pageSize,
|
|
|
|
+ searchType: this.searchType,
|
|
|
|
+ searchKeyWord: this.searchKeyWord,
|
|
|
|
+ agreementType: '代储合同',
|
|
|
|
+ startDate: this.startDate,
|
|
|
|
+ endDate: this.endDate,
|
|
|
|
+ contrPage: this.contrPage,
|
|
}, {}, {
|
|
}, {}, {
|
|
responseType: 'blob',
|
|
responseType: 'blob',
|
|
}).toPromise()
|
|
}).toPromise()
|
|
@@ -577,7 +577,12 @@
|
|
this.$router.push({
|
|
this.$router.push({
|
|
name: 'storageContractRecord',
|
|
name: 'storageContractRecord',
|
|
query: {
|
|
query: {
|
|
- id: row.id,
|
|
|
|
|
|
+ contractNo: row.contractNo,
|
|
|
|
+ buyer: row.buyer,
|
|
|
|
+ weight: row.weight,
|
|
|
|
+ completedQuantity: row.completedQuantity,
|
|
|
|
+ total: row.total,
|
|
|
|
+ received: row.received,
|
|
},
|
|
},
|
|
})
|
|
})
|
|
},
|
|
},
|