From 4f12490bdd4c477953d20036485a597982f7bfe9 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 31 Jul 2023 16:22:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E4=B8=9A?=
=?UTF-8?q?=E8=B5=84=E8=B4=A8=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8=20?=
=?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=B8=8D?=
=?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supplier/company/basicCompany.vue | 34 +++++++++++++--------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/views/supplier/company/basicCompany.vue b/src/views/supplier/company/basicCompany.vue
index c626a0a..5a9f469 100644
--- a/src/views/supplier/company/basicCompany.vue
+++ b/src/views/supplier/company/basicCompany.vue
@@ -578,19 +578,29 @@ export default {
});
} else {
//编辑保存
- if (val == 0) {
- var str = "是否确定草稿保存？";
- } else if (val == 1) {
- var str = "是否确定提交审核？";
- } else if (val == 2) {
- var str = "企业信息已拒绝审核，是否确认重新提交审核？";
- } else if (val == 3) {
- var str = "企业信息更变未确认，是否确认重新提交审核？";
- } else if (val == 0) {
- var str = "企业信息未认证，是否确认提交审核？";
- }else {
- var str = "企业信息已通过审核，是否确认重新提交审核？";
+ if (val == 0 && this.inputQuery.auditStatus == 0 ) {
+ var str = "是否确定草稿保存？";
+ }else if(val == 3 && this.inputQuery.auditStatus == 0) {
+ var str = "是否确定提交审核？";
+ }else if(val == 3 && this.inputQuery.auditStatus == 2){
+ var str = "企业信息已拒绝审核，是否确认重新提交审核？";
+ }else if(val == 3 && this.inputQuery.auditStatus == 3){
+ var str = "企业信息更变未确认，是否确认重新提交审核？";
+ }else if(val ==6 && this.inputQuery.auditStatus == 1){
+ var str = "企业信息已通过审核，是否确认重新提交审核？";
}
+
+ // else if (val == 1) {
+ // var str = "是否确定提交审核？";
+ // } else if (val == 2) {
+ // var str = "企业信息已拒绝审核，是否确认重新提交审核？";
+ // } else if (val == 3) {
+ // var str = "企业信息更变未确认，是否确认重新提交审核？";
+ // } else if (val == 0) {
+ // var str = "企业信息未认证，是否确认提交审核？";
+ // }else {
+ // var str = "企业信息已通过审核，是否确认重新提交审核？";
+ // }
this.$refs["inputQuery"].validate((valid) => {
if (valid) {
this.$confirm(str, "提示", {
From 130ffcafb4659108d4fcd0876b92f9b166737dfc Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 31 Jul 2023 16:53:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8C=89=E5=8F=91=E7=A5=A8=E7=99=BB?=
=?UTF-8?q?=E8=AE=B0=20=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/InvoiceRegCkeck.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue
index 34af388..642222f 100644
--- a/src/views/inout/InvoiceRegCkeck.vue
+++ b/src/views/inout/InvoiceRegCkeck.vue
@@ -196,6 +196,7 @@
+
@@ -203,7 +204,7 @@
-
+
Date: Wed, 2 Aug 2023 17:59:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E9=80=81?=
=?UTF-8?q?=E4=BA=A7=E5=93=81=E8=B5=84=E8=B4=A8=E4=BF=A1=E6=81=AF=E5=AE=A1?=
=?UTF-8?q?=E6=A0=B8=E6=8B=92=E7=BB=9D=E5=90=8E=20=E9=87=8D=E6=96=B0?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BC=B9=E5=87=BA=E7=9A=84=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/InvoiceRegByOrder.vue | 11 ++++++-----
src/views/inout/InvoiceSelectRegByOrder.vue | 11 ++++++-----
src/views/purchase/product/supProductEditDialog.vue | 8 +-------
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 44939a1..1913a5b 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -263,6 +263,11 @@
prop="count"
width="100"
>
+
-
+
diff --git a/src/views/inout/InvoiceSelectRegByOrder.vue b/src/views/inout/InvoiceSelectRegByOrder.vue
index c9155e1..ce6aa4c 100644
--- a/src/views/inout/InvoiceSelectRegByOrder.vue
+++ b/src/views/inout/InvoiceSelectRegByOrder.vue
@@ -219,6 +219,11 @@
prop="count"
width="100"
>
+
-
+
{
+
this.$refs['inputQuery'].validate(valid => {
if (valid) {
// this.inputQuery.auditStatus = val;
@@ -580,7 +575,6 @@ export default {
return false;
}
});
- });
}else{
this.$refs['inputQuery'].validate(valid => {
if (valid) {