diff --git a/src/views/invoicing/components/operatingDetail.vue b/src/views/invoicing/components/operatingDetail.vue
index d643e4e..86dbc1b 100644
--- a/src/views/invoicing/components/operatingDetail.vue
+++ b/src/views/invoicing/components/operatingDetail.vue
@@ -13,6 +13,13 @@
- {{ scope.row.number }} {{ scope.row.unitName }}
+
+
+ {{ returnNowHasNumbr( scope.row)}}
+
+
+
+
@@ -43,6 +50,10 @@ export default {
}
},
methods: {
+ //返回现有库存数量
+ returnNowHasNumbr(row){
+ return row.stockNumber*1 + row.number*1 +row.unitName
+ },
show(id) {
this.dialogVisible = true
this.getTableData(id)
diff --git a/src/views/invoicing/goods_stoks.vue b/src/views/invoicing/goods_stoks.vue
index e2f7470..2466b51 100644
--- a/src/views/invoicing/goods_stoks.vue
+++ b/src/views/invoicing/goods_stoks.vue
@@ -96,7 +96,7 @@
-
@@ -149,7 +149,7 @@ export default {
warnLine: null, // 警戒线
tableData: {
page: 0,
- size: 5,
+ size: 10,
total: 0,
sort: 'id',
loading: false,
@@ -297,8 +297,16 @@ export default {
console.log(error);
}
},
+ // 每页条数改变是回调
+ paginationSizeChange(e){
+ console.log(e);
+ this.tableData.size = e
+ this.getTableData()
+
+ },
// 分页回调
paginationChange(e) {
+ console.log(e)
this.tableData.page = e - 1
this.tableData.list = []
this.getTableData()