|
@@ -111,8 +111,8 @@
|
|
</el-table>
|
|
</el-table>
|
|
<!--</div>-->
|
|
<!--</div>-->
|
|
|
|
|
|
- <pagination :auto-scroll="false" :total="equipTotal" :page.sync="equipmentQueryParams.pageNum"
|
|
|
|
- :limit.sync="equipmentQueryParams.pageSize" @pagination="getProjectEquip" />
|
|
|
|
|
|
+<!-- <pagination :auto-scroll="false" :total="equipTotal" :page.sync="equipmentQueryParams.pageNum"
|
|
|
|
+ :limit.sync="equipmentQueryParams.pageSize" @pagination="getProjectEquip" />-->
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="others">
|
|
<div class="others">
|
|
@@ -1203,8 +1203,10 @@ export default {
|
|
// const { columns, data } = param;
|
|
// const { columns, data } = param;
|
|
const sums = [];
|
|
const sums = [];
|
|
sums[0] = this.$t('common.total');
|
|
sums[0] = this.$t('common.total');
|
|
- sums[4] = this.equipQuantityTotal || '-';
|
|
|
|
- sums[5] = this.toDecimal2(this.numFormat(this.equipPriceTotal))
|
|
|
|
|
|
+ // sums[4] = this.equipQuantityTotal || '-';
|
|
|
|
+ // sums[5] = this.toDecimal2(this.numFormat(this.equipPriceTotal))
|
|
|
|
+ sums[4] = this.form.deviceTotal ? this.form.deviceTotal : '-';
|
|
|
|
+ sums[5] = this.form.priceTotal ? this.form.priceTotal : '-';
|
|
return sums;
|
|
return sums;
|
|
},
|
|
},
|
|
|
|
|