|
|
@@ -64,35 +64,6 @@
|
|
|
:value="item.id"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
-
|
|
|
- <!-- <el-row :gutter="10">
|
|
|
- <el-col :span="1">
|
|
|
- <el-checkbox
|
|
|
- :indeterminate="isIndeterminate"
|
|
|
- v-model="checkAll"
|
|
|
- @change="handleCheckAllChange"
|
|
|
- size="medium"
|
|
|
- >全选</el-checkbox>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-checkbox-group
|
|
|
- style="width:100%"
|
|
|
- v-model="form.incomeStatus"
|
|
|
- placeholder="请选择状态值"
|
|
|
- size="medium"
|
|
|
- :indeterminate="isIndeterminate"
|
|
|
- >
|
|
|
- <el-col :span="4">
|
|
|
- <el-checkbox style="width:100%;" border label="INVOICE">开票/应收</el-checkbox>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-checkbox style="width:100%;" border label="ARRIVAL">到账</el-checkbox>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-checkbox style="width:100%;" border label="INTERNAL">内部核算</el-checkbox>
|
|
|
- </el-col>
|
|
|
- </el-checkbox-group>
|
|
|
- </el-row>-->
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="归属产品"
|
|
|
@@ -283,7 +254,7 @@
|
|
|
<el-table-column label="发生项目/人" width="245px" align="right" prop="project.name"></el-table-column>
|
|
|
<el-table-column label="接收项目" width="235px" align="right" prop="toProject.name"></el-table-column>
|
|
|
<el-table-column label="接收部门" width="310px" align="right" prop="toDepartment.name"></el-table-column>
|
|
|
- <el-table-column label="备注" min-width="300px" align="right" prop="remark"></el-table-column>
|
|
|
+ <el-table-column label="备注" min-width="300px" align="right" prop="remark"></el-table-column>
|
|
|
<el-table-column
|
|
|
width="120px"
|
|
|
align="right"
|
|
|
@@ -419,7 +390,7 @@ export default {
|
|
|
// const sum = prev.toFixed(2) + cur.toFixed(2);
|
|
|
return (parseFloat(prev) + parseFloat(cur)).toFixed(2);
|
|
|
}, 0);
|
|
|
- sums[index] = this.moneyFormatNew(amountTemp);
|
|
|
+ sums[index] = this.moneyFormatNew(amountTemp);
|
|
|
break;
|
|
|
case "remark":
|
|
|
sums[index] = "全部合计:";
|
|
|
@@ -470,24 +441,27 @@ export default {
|
|
|
// this.totalNumber = 0;
|
|
|
this.searchResult = [];
|
|
|
if (this.form.type === "INCOME") {
|
|
|
- this.form.costTypeId = "";
|
|
|
+ this.form.costTypeId = [];
|
|
|
this.tableType = "INCOME";
|
|
|
}
|
|
|
if (this.form.type === "COST") {
|
|
|
- this.form.incomeStatus = "";
|
|
|
- this.form.productId = "";
|
|
|
+ this.form.incomeStatus = [];
|
|
|
+ this.form.productId = [];
|
|
|
this.tableType = "COST";
|
|
|
}
|
|
|
this.form.pageNo = 1;
|
|
|
this.$post("manageBase/manage/search", this.form).then(response => {
|
|
|
- this.searchResult = response.data.content;
|
|
|
- this.totalNumber = parseInt(response.data.totalElements);
|
|
|
- this.pageNo = parseInt(response.data.number) + 1;
|
|
|
- this.totalSum = this.moneyFormatNew(response.data.content[0].totalAmount)
|
|
|
- console.log("全部合计", response.data.content[0].totalAmount);
|
|
|
if (response.data && response.data.length == 0) {
|
|
|
+ this.totalSum = 0;
|
|
|
this.$message("未找到相应数据");
|
|
|
+ return
|
|
|
}
|
|
|
+ this.searchResult = response.data.content;
|
|
|
+ this.totalNumber = parseInt(response.data.totalElements);
|
|
|
+ this.pageNo = parseInt(response.data.number) + 1;
|
|
|
+ this.totalSum = this.moneyFormatNew(
|
|
|
+ response.data.content[0].totalAmount
|
|
|
+ );
|
|
|
});
|
|
|
},
|
|
|
onReset() {
|
