This commit is contained in:
xd 2024-06-19 16:03:28 +08:00
parent f17502cf53
commit 19962d419b
2 changed files with 15 additions and 7 deletions

View File

@ -392,6 +392,8 @@ public class QuotController extends BaseController
if(Integer.valueOf(count)>=Integer.valueOf(quotCommitCount)){ if(Integer.valueOf(count)>=Integer.valueOf(quotCommitCount)){
return error("当前报价量已达极限,无法继续提供报价单"); return error("当前报价量已达极限,无法继续提供报价单");
} }
// 提交报价时间限制
} }
String quot_id = quot.getQuotId(); String quot_id = quot.getQuotId();

View File

@ -52,13 +52,15 @@
</el-form> </el-form>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<span>总条数:{{sumQuotMaterialsCount}}</span> 总条数:<span style="font-size: 18px">{{sumQuotMaterialsCount}}</span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<span>总价:{{sumQuotTotalPrice}}</span> 总价:<span style="font-size: 18px">{{sumQuotTotalPrice}}</span>
</el-col>
<el-col :span="4">
总单量:<span style="font-size: 18px">{{sumQuotCount}}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="quotList" style="width: 100%;margin-top: 10px;" :height="tableHeight"> <el-table v-loading="loading" :data="quotList" style="width: 100%;margin-top: 10px;" :height="tableHeight">
<el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px"/> <el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px"/>
<el-table-column fixed label="业务员" align="center" prop="quotSalesmanName" width="150px"/> <el-table-column fixed label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
@ -77,13 +79,13 @@
<span>{{ parseTime(scope.row.quotQuotationDate) }}</span> <span>{{ parseTime(scope.row.quotQuotationDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核人" align="center" prop="quotCheckUserNickname" width="160" />
<el-table-column label="创建人" align="center" prop="createName" width="150px"/> <el-table-column label="创建人" align="center" prop="createName" width="150px"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"> <el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核人" align="center" prop="quotCheckUserNickname" width="160" />
</el-table> </el-table>
</div> </div>
</template> </template>
@ -107,7 +109,7 @@ export default {
// //
quotList: [], quotList: [],
// //
tableHeight: window.innerHeight - 240, // tableHeight: window.innerHeight - 280, //
screenHeight: window.innerHeight, // screenHeight: window.innerHeight, //
// //
queryParams: { queryParams: {
@ -151,15 +153,19 @@ export default {
}, },
// //
sumQuotTotalPrice() { sumQuotTotalPrice() {
const quotTotalPrice = this.quotList.reduce((sum, row) => sum + parseFloat(row.quotTotalPrice==null?0:row.quotTotalPrice), 0); const quotTotalPrice = this.quotList.reduce((sum, row) => sum + parseFloat((isNaN(row.quotTotalPrice)||row.quotTotalPrice==null)?0:row.quotTotalPrice), 0);
return toDecimal(quotTotalPrice); return toDecimal(quotTotalPrice);
}, },
//
sumQuotCount() {
return this.quotList.length;
}
}, },
watch: { watch: {
// screenHeighttable // screenHeighttable
screenHeight(val) { screenHeight(val) {
this.screenHeight = val this.screenHeight = val
this.tableHeight = this.screenHeight - 260 this.tableHeight = this.screenHeight - 280
} }
}, },
mounted: function() { mounted: function() {