From 5eff7a0dc11a17b8ff34b40e919fbbd8745103d5 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 8 Jul 2024 17:42:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/invoicing/operating_record.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/invoicing/operating_record.vue b/src/views/invoicing/operating_record.vue
index 6a804ca..47e2c47 100644
--- a/src/views/invoicing/operating_record.vue
+++ b/src/views/invoicing/operating_record.vue
@@ -19,7 +19,7 @@
- {{ scope.row.stockSnap.length }}
+ {{ scope.row.stockSnap && scope.row.stockSnap.length }}
@@ -46,7 +46,9 @@
+ @current-change="paginationChange"
+ @size-change="e => { tableData.size = e; tableData.page = 0; getTableData() }"
+ layout="total, sizes, prev, pager, next, jumper">
@@ -82,7 +84,7 @@ export default {
async getTableData() {
this.tableData.loading = true
let arr = []
- console.log(this.query,'tiaoshi1')
+ console.log(this.query, 'tiaoshi1')
if (this.query.createdAt.length) {
arr = [this.query.createdAt[0] + ' 00:00:00', this.query.createdAt[1] + ' 23:59:59']
} else {
From 0be152311929d71210a54268f67d5345ed440372 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 8 Jul 2024 17:49:23 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=97=E6=9D=90?=
=?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/invoicing/operation_in.vue | 3 ++-
src/views/invoicing/operation_out.vue | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index dbd9e9c..8eca44d 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -297,10 +297,11 @@ export default {
methods: {
// 切换入库内容
tabChange(value, type) {
+ console.log(type);
this.inTabValue = value
this.shopTypesActive = 0
- this.queryForm.type = type
this.resetHandle()
+ this.queryForm.type = type
},
// 计算耗材总价
consCountTotal() {
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 438afe2..d55592f 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -295,8 +295,8 @@ export default {
tabChange(value, type) {
this.inTabValue = value
this.shopTypesActive = 0
- this.queryForm.type = type
this.resetHandle()
+ this.queryForm.type = type
},
// 计算耗材总价
consCountTotal() {
From dd77b5e154a8973520ee32df7643d31a59bf717c Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 8 Jul 2024 18:15:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=8C=E5=8F=B0?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=8C=E6=9B=B2=E6=96=87=E5=AD=97=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/home/data_tables.vue | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/home/data_tables.vue b/src/views/home/data_tables.vue
index 7d03389..a7249b1 100644
--- a/src/views/home/data_tables.vue
+++ b/src/views/home/data_tables.vue
@@ -48,13 +48,19 @@
-->
-
-
+
+
+
+
+
-
+
-
+
+
@@ -37,6 +38,7 @@ export default {
data() {
return {
dayjs,
+ row: '',
dialogVisible: false,
tableData: {
loading: false,
@@ -51,12 +53,13 @@ export default {
},
methods: {
//返回现有库存数量
- returnNowHasNumbr(row){
- return row.stockNumber*1 + row.number*1 +row.unitName
+ returnNowHasNumbr(row) {
+ return row.stockNumber * 1 + row.number * 1 + row.unitName
},
- show(id) {
+ show(row) {
this.dialogVisible = true
- this.getTableData(id)
+ this.row = row
+ this.getTableData(row.id)
},
async getTableData(id) {
this.tableData.loading = true
diff --git a/src/views/invoicing/operating_record.vue b/src/views/invoicing/operating_record.vue
index 47e2c47..817cd55 100644
--- a/src/views/invoicing/operating_record.vue
+++ b/src/views/invoicing/operating_record.vue
@@ -33,9 +33,9 @@
{{ dayjs(scope.row.stockTime).format('YYYY-MM-DD HH:mm:ss') }}
-
+
-
+
详情