|
@@ -106,7 +106,13 @@
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="contractNo" label="合同编号" width="130"></el-table-column>
|
|
|
|
|
|
+ <el-table-column prop="contractNo" label="合同编号" width="190">
|
|
|
|
+ <template scope="scope">
|
|
|
|
+ <span>
|
|
|
|
+ {{ scope.row.contractNo }} ({{ scope.row.inType }})
|
|
|
|
+ </span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column prop="buyer" label="买方" width="150"></el-table-column>
|
|
<el-table-column prop="buyer" label="买方" width="150"></el-table-column>
|
|
<el-table-column prop="goodsSource" label="货源" width="130">
|
|
<el-table-column prop="goodsSource" label="货源" width="130">
|
|
<template scope="scope">
|
|
<template scope="scope">
|
|
@@ -121,7 +127,7 @@
|
|
</el-table-column> -->
|
|
</el-table-column> -->
|
|
<el-table-column prop="goodsName" label="货名" width="120">
|
|
<el-table-column prop="goodsName" label="货名" width="120">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="inWarehouseWeight1" width="170" class="table_td" label="加权水分">
|
|
|
|
|
|
+ <el-table-column prop="inWarehouseWeight1" width="130" class="table_td" label="加权水分">
|
|
<template scope="scope">
|
|
<template scope="scope">
|
|
<span v-if='scope.row.edit == false'>{{ scope.row.weightedMoisture }}</span>
|
|
<span v-if='scope.row.edit == false'>{{ scope.row.weightedMoisture }}</span>
|
|
<el-input style='width:80%;' v-if='scope.row.edit' v-model='scope.row.weightedMoisture'></el-input>
|
|
<el-input style='width:80%;' v-if='scope.row.edit' v-model='scope.row.weightedMoisture'></el-input>
|
|
@@ -164,13 +170,13 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="avgCost" width="90" class="table_td" label="平均成本"></el-table-column>
|
|
<el-table-column prop="avgCost" width="90" class="table_td" label="平均成本"></el-table-column>
|
|
- <el-table-column prop="requestFunds" width="150" class="table_td tablerequestFunds" label="请款">
|
|
|
|
|
|
+ <el-table-column prop="requestFunds" width="100" class="table_td tablerequestFunds" label="请款">
|
|
<template scope="scope">
|
|
<template scope="scope">
|
|
<span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
|
|
<span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
|
|
<el-input @focus="qingkuan(scope.row, item.id)" v-else v-model='scope.row.requestFunds'></el-input>
|
|
<el-input @focus="qingkuan(scope.row, item.id)" v-else v-model='scope.row.requestFunds'></el-input>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="remark" width="150" class="table_td" label="请款备注">
|
|
|
|
|
|
+ <el-table-column prop="remark" width="100" class="table_td" label="请款备注">
|
|
<template scope="scope">
|
|
<template scope="scope">
|
|
<div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
|
|
<div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
|
|
<span class="text_css">查看</span>
|
|
<span class="text_css">查看</span>
|
|
@@ -187,7 +193,9 @@
|
|
</el-table>
|
|
</el-table>
|
|
</div>
|
|
</div>
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
|
|
- :page-size="pageSize" layout="total, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
|
|
|
|
|
|
+ style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
|
|
|
|
+ :total="deptBudgetTotal">
|
|
|
|
+ </el-pagination>
|
|
<el-dialog title="付款" :visible.sync="aduitshow" width="50%" :before-close="handleClose">
|
|
<el-dialog title="付款" :visible.sync="aduitshow" width="50%" :before-close="handleClose">
|
|
<div style='display:flex;'>
|
|
<div style='display:flex;'>
|
|
<div style='width:50%;'>
|
|
<div style='width:50%;'>
|
|
@@ -593,6 +601,7 @@ export default {
|
|
value1: '',
|
|
value1: '',
|
|
value: '',
|
|
value: '',
|
|
value2: '',
|
|
value2: '',
|
|
|
|
+ deptBudgetTotal: 0,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
searchType: '',
|
|
searchType: '',
|
|
searchTypeText: '待审核',
|
|
searchTypeText: '待审核',
|
|
@@ -617,7 +626,6 @@ export default {
|
|
goodsName:'',
|
|
goodsName:'',
|
|
reserves:'',
|
|
reserves:'',
|
|
goodsList:[],
|
|
goodsList:[],
|
|
- deptBudgetTotal: 0,
|
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
historyList: [],
|
|
historyList: [],
|
|
money: 0,
|
|
money: 0,
|
|
@@ -682,7 +690,7 @@ export default {
|
|
} else {
|
|
} else {
|
|
return prev;
|
|
return prev;
|
|
}
|
|
}
|
|
- }, 0).toFixed(2)
|
|
|
|
|
|
+ }, 0).toFixed(3)
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
@@ -1736,10 +1744,10 @@ export default {
|
|
for (let q = 0; q < data.length; q++) {
|
|
for (let q = 0; q < data.length; q++) {
|
|
if (data[q].inType == '收购入库') {
|
|
if (data[q].inType == '收购入库') {
|
|
data[q].inWarehouseWeight1 = Number((data[q].inWarehouseWeight).toFixed(3))
|
|
data[q].inWarehouseWeight1 = Number((data[q].inWarehouseWeight).toFixed(3))
|
|
- data[q].surplusWeight = (data[q].inWarehouseWeight) - data[q].outWarehouseWeight + data[q].profitAndLoss
|
|
|
|
|
|
+ data[q].surplusWeight = ((data[q].inWarehouseWeight) - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
|
|
} else {
|
|
} else {
|
|
data[q].inWarehouseWeight1 = data[q].inWarehouseWeight.toFixed(3)
|
|
data[q].inWarehouseWeight1 = data[q].inWarehouseWeight.toFixed(3)
|
|
- data[q].surplusWeight = data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss
|
|
|
|
|
|
+ data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
|
|
}
|
|
}
|
|
console.log(response.records[i].warehouseType)
|
|
console.log(response.records[i].warehouseType)
|
|
data[q].select = false
|
|
data[q].select = false
|