From fee6f3c7aed726b2ed1242682b942787896be0c4 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 19 Aug 2023 14:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicdata/brand/basicStorageServices.vue         | 2 +-
 .../inventory/delivery/distributionStockArticle.vue        | 5 +++++
 .../inventory/delivery/distributionStockArticleDiscuss.vue | 5 +++++
 .../inventory/delivery/distributionStockArticleMarket.vue  | 7 ++++++-
 .../inventory/delivery/distributionStockArticleSelf.vue    | 5 +++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/basicdata/brand/basicStorageServices.vue b/src/views/basicdata/brand/basicStorageServices.vue
index 2ff8fd2b..abefd1a9 100644
--- a/src/views/basicdata/brand/basicStorageServices.vue
+++ b/src/views/basicdata/brand/basicStorageServices.vue
@@ -109,7 +109,7 @@
 <!--              />-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="发站仓库" prop="sendWarehouseIds">
+          <el-form-item label="发站仓库">
 <!--            <el-input v-model="form.forwardingUnit" placeholder="请输入发货单位"/>-->
 
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 956eb515..a189f660 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
  <!--         <el-form-item label="货物名称:">
@@ -832,6 +833,10 @@ export default {
       municipal:true, // 市
       taker:true, // 自提
       stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
       shortcuts :[
         {
           text: '最近一周',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index d5913d6e..4bc6dd4f 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
 <!--          <el-form-item label="货物名称:">-->
@@ -807,6 +808,10 @@ export default {
       municipal:true, // 市
       taker:true, // 自提
       stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
       shortcuts :[
         {
           text: '最近一周',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 9ca07847..60a8320b 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
           <!--         <el-form-item label="货物名称:">
@@ -796,7 +797,11 @@ export default {
       trade:false, // 商
       municipal:true, // 市
       taker:true, // 自提
-      stockupDate: [],
+      stockupDate: [],defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
+
       shortcuts :[
         {
           text: '最近一周',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index a80215e9..b939e1c0 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
    <!--       <el-form-item label="货物名称:">
@@ -965,6 +966,10 @@ export default {
       municipal:true, // 市
       taker:true, // 自提
       stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
       shortcuts :[
         {
           text: '最近一周',