From b86f23004ebf5955ad694f740845a57b92f2988b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 30 Jun 2022 09:43:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E9=85=8D?=
 =?UTF-8?q?=E8=B4=A7=E7=AE=A1=E7=90=86=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=202.=E8=B0=83=E6=95=B4=E5=88=A4?=
 =?UTF-8?q?=E7=A9=BA=E6=96=B9=E6=B3=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/strUtil.js                              | 6 +++++-
 src/views/business/stockOrderEditDistribution.vue | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/utils/strUtil.js b/src/utils/strUtil.js
index 255ec28..c5a88ce 100644
--- a/src/utils/strUtil.js
+++ b/src/utils/strUtil.js
@@ -1,7 +1,11 @@
 //封装字符串相关的方法
 export function isBlank(value) {
+    if (value === "" || value === null) {
+        return true;
+    }
+
     value = value.trim();
-    if (value === "" || value === null || value === "string") {
+    if (value === "string" || value === "undefined") {
         return true;
     }
 }
diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue
index de5ad96..d579d1b 100644
--- a/src/views/business/stockOrderEditDistribution.vue
+++ b/src/views/business/stockOrderEditDistribution.vue
@@ -43,10 +43,11 @@
                             <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
                             <el-date-picker
                                 v-model="formData.billdate"
-                                type="date"
+                                type="datetime"
                                 placeholder="选择日期"
                                 style="width: 100%"
                                 :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
                             >
                             </el-date-picker>
                         </el-form-item>