From c209a83db60548dff867b9159ae2a333c04fa096 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 22 Mar 2024 10:54:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=81=E4=B9=A6=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E5=A4=B1=E6=95=88=E6=A0=B9=E6=8D=AE=E5=A4=B1=E6=95=88=E6=97=A5?=
=?UTF-8?q?=E6=9C=9F=E5=81=9A=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supManufacturerAuditDialog.vue | 41 ++++++++++++++-----
.../product/supProductAuditDialog.vue | 41 +++++++++++++------
2 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 49b0c15..9249a56 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -187,11 +187,18 @@
-
+
+
+
+
+
+
+
- {{ supStatus[scope.row.status] }}
+ {{ supStatus[scope.row.expireDate >= DATE_DAY ? 0:1 ] }}
+
@@ -284,14 +291,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -370,6 +377,7 @@ export default {
},
data() {
return {
+ DATE_DAY: "",
BASE_URL: process.env.VUE_APP_BASE_API,
loading: false,
classesDisplay: false,
@@ -510,13 +518,24 @@ export default {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.fileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+ this.DATE_DAY = this.getDate();
},
components: {
draggable,
companyAddCert, ElImageViewer
},
methods: {
-
+ getDate() {
+ const nowDate = new Date();
+ const date = {
+ year: nowDate.getFullYear(),
+ month: nowDate.getMonth() + 1,
+ date: nowDate.getDate(),
+ };
+ const newmonth = date.month >= 10 ? date.month : "0" + date.month;
+ const day = date.date >= 10 ? date.date : "0" + date.date;
+ return date.year + "-" + newmonth + "-" + day;
+ },
onPassSubmit(val) {
this.inputQuery.auditStatus = 1;
this.$confirm("是否审核通过?", "提示", {
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index c4bd39e..c9fcd64 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -221,11 +221,17 @@
-
+
+
+
+
+
+
- {{ supStatus[scope.row.status] }}
+ {{ supStatus[scope.row.expireDate >= DATE_DAY ? 0:1 ] }}
+
@@ -318,14 +324,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -410,6 +416,7 @@ export default {
},
data() {
return {
+ DATE_DAY: "",
BASE_URL: process.env.VUE_APP_BASE_API,
fromOptions: [],
fromPMOptions: [],
@@ -547,13 +554,23 @@ export default {
this.findMethod();
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-
+ this.DATE_DAY = this.getDate();
},
components: {
draggable, companyAddCert, ElImageViewer
},
methods: {
-
+ getDate() {
+ const nowDate = new Date();
+ const date = {
+ year: nowDate.getFullYear(),
+ month: nowDate.getMonth() + 1,
+ date: nowDate.getDate(),
+ };
+ const newmonth = date.month >= 10 ? date.month : "0" + date.month;
+ const day = date.date >= 10 ? date.date : "0" + date.date;
+ return date.year + "-" + newmonth + "-" + day;
+ },
onPassSubmit() {
this.$confirm("是否审核通过?", "提示", {
confirmButtonText: "确定",