From 0392fc7d2522c5a2608a254f0605ddfbe9e89a57 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 21 Jun 2024 14:35:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8?=
=?UTF-8?q?=EF=BC=8C=E5=85=85=E5=80=BC=E5=92=8C=E6=94=AF=E4=BB=98=E9=87=91?=
=?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/home/data_forms.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index d487188..2da8c3c 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -81,6 +81,16 @@
￥{{ scope.row.cash }}
+
+
+ ￥{{ scope.row.recharge }}
+
+
+
+
+ ￥{{ scope.row.refund }}
+
+
From 776ad6dc266a83a1691cb7b168edc6c9ed2e25fe Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 21 Jun 2024 14:42:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?=
=?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/invoicing/goods_stoks.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/views/invoicing/goods_stoks.vue b/src/views/invoicing/goods_stoks.vue
index fcfb2ab..64a141c 100644
--- a/src/views/invoicing/goods_stoks.vue
+++ b/src/views/invoicing/goods_stoks.vue
@@ -41,11 +41,17 @@
+
+
+ {{scope.row.specSnap }}
+
+
{{ `${scope.row.number} ${scope.row.unitName}` }}
+
Date: Fri, 21 Jun 2024 17:41:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../invoicing/components/invoicingDetail.vue | 15 ++++++++++++---
.../invoicing/components/operatingDetail.vue | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/invoicing/components/invoicingDetail.vue b/src/views/invoicing/components/invoicingDetail.vue
index 81de082..1013ead 100644
--- a/src/views/invoicing/components/invoicingDetail.vue
+++ b/src/views/invoicing/components/invoicingDetail.vue
@@ -9,7 +9,7 @@
+ end-placeholder="结束日期" value-format="yyyy-MM-dd">
查询
重置
@@ -38,7 +38,7 @@
- {{ scope.row.leftNumber - scope.row.stockNumber }} {{ scope.row.unitName }}
+ {{ scope.row.leftNumber + scope.row.stockNumber }} {{ scope.row.unitName }}
@@ -81,6 +81,13 @@ export default {
methods: {
async getTableData() {
this.tableData.loading = true
+ console.log(this.query.createdAt, '调试111')
+ let arr = []
+ if (this.query.createdAt.length) {
+ arr = [this.query.createdAt[0] + ' 00:00:00', this.query.createdAt[1] + ' 23:59:59']
+ } else {
+ arr = []
+ }
try {
const res = await tbProductStockDetail({
page: this.tableData.page,
@@ -89,7 +96,7 @@ export default {
shopId: localStorage.getItem('shopId'),
productId: this.goods.proId,
type: this.query.type,
- createdAt: this.query.createdAt
+ createdAt: arr
})
this.tableData.loading = false
this.tableData.list = res.content
@@ -109,6 +116,8 @@ export default {
this.query.blurry = ''
this.tableData.page = 0
this.tableData.list = []
+ this.query.type = ''
+ this.query.createdAt = []
this.getTableData()
},
async show(obj) {
diff --git a/src/views/invoicing/components/operatingDetail.vue b/src/views/invoicing/components/operatingDetail.vue
index 641b755..0b09180 100644
--- a/src/views/invoicing/components/operatingDetail.vue
+++ b/src/views/invoicing/components/operatingDetail.vue
@@ -7,6 +7,7 @@
+
{{ scope.row.number }} {{ scope.row.unitName }}