From 5d68c3d6b2c6fe5b2110bdc355805117043655e3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 12 Jun 2024 09:34:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
=?UTF-8?q?=E7=A5=A8=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 9e679d66b..438b35df3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -148,7 +148,7 @@
:apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
:apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail"
:Echo="Echo"
- :detailButtonIsShowEdit="false"
+ :detailButtonIsShowEdit="true"
:detailButtonIsShowDelete="false"
:detailButtonIsShowAdd="false"
@buttonBaseClick="detailButtonBaseClick"
From 298fb1cdda48d18aa08e4f7accd59aeca51a5f7e Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Wed, 12 Jun 2024 09:34:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
=?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/index.html b/index.html
index 847a1533b..e322068ed 100644
--- a/index.html
+++ b/index.html
@@ -6,14 +6,8 @@
-
-
+
+
%VITE_APP_TITLE%
From 6803f440b4e1d95c2643c555cc187ffdcb7ae07a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 12 Jun 2024 09:44:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 438b35df3..25d20fbaf 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -149,6 +149,7 @@
:apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail"
:Echo="Echo"
:detailButtonIsShowEdit="true"
+ :detailButtonIsShowAddStatusArray="['1','6']"
:detailButtonIsShowDelete="false"
:detailButtonIsShowAdd="false"
@buttonBaseClick="detailButtonBaseClick"
From 5e919fb10938f4d468c6d7a5577bbb4e34759829 Mon Sep 17 00:00:00 2001
From: bjang03
Date: Wed, 12 Jun 2024 09:45:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81SCP?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=9B=9E=EF=BC=8C=E4=BE=9B=E5=BA=94?=
=?UTF-8?q?=E5=95=86=E5=8F=AF=E4=BB=A5=E5=AF=B9=E6=98=8E=E7=BB=86=E8=BF=9B?=
=?UTF-8?q?=E8=A1=8C=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=90=A6=E5=88=99=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E5=B7=A5=E4=BD=9C=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 25d20fbaf..47b084d41 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -443,11 +443,11 @@ const handleImport = () => {
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type : string, row ?: number) => {
- if(type=='update'){
- SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
- }else{
+ // if(type=='update'){
+ // SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
+ // }else{
SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
- }
+ // }
if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
// 校验是否可以开票
SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => {