From 81ec232a36f3f510eee8012d32e7e47df983334e Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 12 Jul 2024 15:10:46 +0800
Subject: [PATCH] bug
---
fuintAdmin/src/components/Crontab/index.vue | 2 +-
fuintAdmin/src/components/DictTag/index.vue | 4 ++--
fuintAdmin/src/components/Hamburger/index.vue | 2 +-
fuintAdmin/src/components/Pagination/index.vue | 2 +-
fuintAdmin/src/components/PanThumb/index.vue | 2 +-
fuintAdmin/src/components/Screenfull/index.vue | 2 +-
fuintAdmin/src/components/SvgIcon/index.vue | 2 +-
fuintAdmin/src/components/local/selectStaff.vue | 10 +++++-----
.../EventMarketing/ManageCard/SaveBlock/index.vue | 2 +-
.../src/views/EventMarketing/SaveBlock/index.vue | 2 +-
.../src/views/EventMarketing/activeNewlyweds/index.vue | 2 +-
.../src/views/EventMarketing/cardFavorable/index.vue | 7 ++-----
fuintAdmin/src/views/EventMarketing/coupon/index.vue | 2 +-
.../src/views/EventMarketing/giftBlock/index.vue | 2 +-
.../src/views/EventMarketing/grantCoupon/index.vue | 2 +-
fuintAdmin/src/views/EventMarketing/online/index.vue | 2 +-
.../src/views/EventMarketing/storeOilBlock/index.vue | 2 +-
.../views/cashier/components/switchMemberDialog.vue | 2 +-
fuintAdmin/src/views/cashier/index.vue | 2 +-
fuintAdmin/src/views/commission/cash/index.vue | 2 +-
fuintAdmin/src/views/commission/log/index.vue | 2 +-
fuintAdmin/src/views/commission/relation/index.vue | 2 +-
fuintAdmin/src/views/commission/rule/index.vue | 2 +-
fuintAdmin/src/views/content/article/index.vue | 2 +-
fuintAdmin/src/views/content/banner/list.vue | 2 +-
.../src/views/convenienceStore/damage/details.vue | 2 +-
fuintAdmin/src/views/convenienceStore/damage/index.vue | 2 +-
.../src/views/convenienceStore/inventory/details.vue | 2 +-
.../src/views/convenienceStore/inventory/index.vue | 2 +-
.../src/views/convenienceStore/purchase/details.vue | 2 +-
.../src/views/convenienceStore/purchase/index.vue | 2 +-
.../src/views/convenienceStore/returns/details.vue | 2 +-
.../src/views/convenienceStore/returns/index.vue | 2 +-
.../src/views/convenienceStore/stockStatistic.vue | 2 +-
fuintAdmin/src/views/coupon/confirm/index.vue | 2 +-
fuintAdmin/src/views/coupon/coupon/index.vue | 2 +-
fuintAdmin/src/views/financialStatement/buy/list.vue | 2 +-
fuintAdmin/src/views/financialStatement/buy/tab/em.vue | 2 +-
.../src/views/financialStatement/buy/tab/gun.vue | 2 +-
.../src/views/financialStatement/buy/tab/oil.vue | 2 +-
.../views/financialStatement/reconciliation/list.vue | 2 +-
.../financialStatement/reconciliation/tab/ref.vue | 2 +-
.../financialStatement/reconciliation/tab/store.vue | 2 +-
.../financialStatement/reconciliation/tab/time.vue | 2 +-
.../financialStatement/reconciliation/tab/trading.vue | 2 +-
.../src/views/financialStatement/runningWater/list.vue | 2 +-
.../views/financialStatement/runningWater/tab/day.vue | 2 +-
.../financialStatement/runningWater/tab/instituion.vue | 2 +-
.../views/financialStatement/runningWater/tab/none.vue | 2 +-
.../financialStatement/runningWater/tab/oilDepot.vue | 2 +-
fuintAdmin/src/views/goods/cate/index.vue | 2 +-
fuintAdmin/src/views/handover/HandoverDetails.vue | 2 +-
fuintAdmin/src/views/indexcomponents/bottom_z.vue | 2 +-
fuintAdmin/src/views/indexcomponents/bottomindex.vue | 2 +-
fuintAdmin/src/views/indexcomponents/centenrindex.vue | 2 +-
.../src/views/indexcomponents/indexcomponents.vue | 2 +-
fuintAdmin/src/views/indexcomponents/topindex.vue | 2 +-
fuintAdmin/src/views/integral/gift/index.vue | 2 +-
fuintAdmin/src/views/integral/giftCategory/index.vue | 2 +-
fuintAdmin/src/views/integral/order/detail.vue | 2 +-
fuintAdmin/src/views/integral/order/outcome.vue | 10 +++++-----
fuintAdmin/src/views/integral/order/pointsCashier.vue | 2 +-
fuintAdmin/src/views/integral/order/pointsMall.vue | 2 +-
fuintAdmin/src/views/integral/settings/index.vue | 2 +-
fuintAdmin/src/views/member/index.vue | 2 +-
fuintAdmin/src/views/merchant/index.vue | 2 +-
fuintAdmin/src/views/oilConfig/oilGun/list.vue | 2 +-
fuintAdmin/src/views/oilConfig/oilInventory/list.vue | 2 +-
fuintAdmin/src/views/oilConfig/oilInventory/order.vue | 2 +-
fuintAdmin/src/views/oilConfig/oilPrice/index.vue | 2 +-
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue | 2 +-
.../src/views/oilConfig/oilPurchase/purchaseOrder.vue | 2 +-
fuintAdmin/src/views/oilConfig/oilStatistics/list.vue | 2 +-
fuintAdmin/src/views/order/index.vue | 2 +-
fuintAdmin/src/views/order/order_Added.vue | 2 +-
fuintAdmin/src/views/order/order_Cashier.vue | 2 +-
fuintAdmin/src/views/order/order_Goods.vue | 2 +-
fuintAdmin/src/views/order/order_Integral.vue | 2 +-
fuintAdmin/src/views/order/order_Oil.vue | 2 +-
fuintAdmin/src/views/order/order_Ordinary.vue | 2 +-
fuintAdmin/src/views/order/order_Unpaid.vue | 2 +-
fuintAdmin/src/views/order/order_Vip.vue | 2 +-
fuintAdmin/src/views/power/payment/index.vue | 2 +-
fuintAdmin/src/views/staff/list.vue | 2 +-
fuintAdmin/src/views/staff/tag/list.vue | 2 +-
fuintAdmin/src/views/store/list.vue | 2 +-
fuintAdmin/src/views/system/dict/data.vue | 2 +-
fuintAdmin/src/views/system/dict/index.vue | 2 +-
fuintAdmin/src/views/userGrade/index.vue | 2 +-
fuintAdmin_zt/src/views/store/list.vue | 2 +-
fuintCashier/src/renderer/views/cashier/index.vue | 2 +-
91 files changed, 101 insertions(+), 104 deletions(-)
diff --git a/fuintAdmin/src/components/Crontab/index.vue b/fuintAdmin/src/components/Crontab/index.vue
index 3963df28e..674393954 100644
--- a/fuintAdmin/src/components/Crontab/index.vue
+++ b/fuintAdmin/src/components/Crontab/index.vue
@@ -368,7 +368,7 @@ export default {
},
};
-
\ No newline at end of file
+
diff --git a/fuintAdmin/src/components/Hamburger/index.vue b/fuintAdmin/src/components/Hamburger/index.vue
index 5be110406..f82f9eeee 100644
--- a/fuintAdmin/src/components/Hamburger/index.vue
+++ b/fuintAdmin/src/components/Hamburger/index.vue
@@ -37,7 +37,7 @@ export default {
}
-
diff --git a/fuintAdmin/src/views/EventMarketing/online/index.vue b/fuintAdmin/src/views/EventMarketing/online/index.vue
index c22d6300a..ed477dbff 100644
--- a/fuintAdmin/src/views/EventMarketing/online/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/online/index.vue
@@ -99,7 +99,7 @@
}
-
-
diff --git a/fuintAdmin/src/views/integral/order/detail.vue b/fuintAdmin/src/views/integral/order/detail.vue
index c560845a4..9b1e93c15 100644
--- a/fuintAdmin/src/views/integral/order/detail.vue
+++ b/fuintAdmin/src/views/integral/order/detail.vue
@@ -109,6 +109,6 @@ export default {
}
-
diff --git a/fuintAdmin/src/views/integral/order/outcome.vue b/fuintAdmin/src/views/integral/order/outcome.vue
index 578db8712..1e063e704 100644
--- a/fuintAdmin/src/views/integral/order/outcome.vue
+++ b/fuintAdmin/src/views/integral/order/outcome.vue
@@ -6,7 +6,7 @@
-
@@ -147,7 +147,7 @@ export default {
}else {
this.flag = false
}
-
+
// 回显
if (!this.flagOrderStart) {
@@ -158,7 +158,7 @@ export default {
if (this.dataFormC.orderStatus == '已拒绝') {
this.editForm.processingResult='1' //处理结果
}
-
+
},
methods: {
@@ -196,12 +196,12 @@ export default {
cancel() {
this.$emit('send-data', 'Data from child');
}
-
+
}
}
-
diff --git a/fuintAdmin/src/views/integral/order/pointsCashier.vue b/fuintAdmin/src/views/integral/order/pointsCashier.vue
index c53a62af5..c8c6b61ed 100644
--- a/fuintAdmin/src/views/integral/order/pointsCashier.vue
+++ b/fuintAdmin/src/views/integral/order/pointsCashier.vue
@@ -274,7 +274,7 @@ export default {
}
-
-