From 4b04b59d7716412b2dbb68a4a582080e505be168 Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Sat, 25 Dec 2021 15:58:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue                              |  6 +++---
 src/components/Layout.vue                              | 10 +++++-----
 .../artStockResource/addOrEdit.vue                     |  7 ++++++-
 .../timeModel/dayModel/shiftCconfiguration.vue         |  8 ++++++++
 .../demandPlanning/articleDemand/index.vue             |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 8253b11..7461c28 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -133,7 +133,7 @@ export default {
     float: left;
     width: 40px;
     height: 40px;
-    margin-top: 20px;
+    margin-top: 10px;
     margin-left: 24px;
     cursor: pointer;
   }
@@ -163,7 +163,7 @@ export default {
     box-shadow: 0px 1px 3px 0px #1e514d;
     border-radius: 2px;
     border: 1px solid #2c998f;
-    margin-top: 12px;
+    margin-top: 2px;
     margin-right: 16px;
     .user-details-wrap {
       float: right;
@@ -213,7 +213,7 @@ export default {
     float: left;
     width: 185px;
     height: 26px;
-    margin-top: 27px;
+    margin-top: 17px;
     margin-left: 40px;
   }
   .customer-name {
diff --git a/src/components/Layout.vue b/src/components/Layout.vue
index 3d4fbbd..3605d90 100644
--- a/src/components/Layout.vue
+++ b/src/components/Layout.vue
@@ -39,7 +39,7 @@ export default {
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding-top: 80px;
+  padding-top: 62px;
   padding-left: 250px;
   background: #f3f3f3;
   #content-title {
@@ -47,16 +47,16 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    height: 80px;
-    line-height: 80px;
+    height: 62px;
+    line-height: 62px;
     background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
   }
   #content-nav-menu {
     position: absolute;
-    top: 80px;
+    top: 62px;
     left: 0;
     width: 250px;
-    height: calc(100% - 80px);
+    height: calc(100% - 62px);
     background: #eeeeee;
     box-sizing: border-box;
     padding-top: 12px;
diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
index 09f158d..6c8f857 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
@@ -510,7 +510,12 @@ data() {
     artList:[],
     loading: false,
     formData: {
-        "ArtStockResourceData-ArticleStockLevel":{},
+        "ArtStockResourceData-ArticleStockLevel":{
+          'AP_ArticleStockLevel-MinCoverPeriod':"",
+          'AP_ArticleStockLevel-MinCoverPeriodType':"",
+          'AP_ArticleStockLevel-MaxCoverPeriod':"",
+          'AP_ArticleStockLevel-MaxCoverPeriodType':"",
+        },
         "ArtStockResourceData-ArticleResource":{
             "AP_ArticleResource-RatePerHourToggle":true,
             "AP_ArticleResource-TimePerItemToggle":true,
diff --git a/src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue b/src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue
index 7d79ed3..5da7428 100644
--- a/src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue
+++ b/src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue
@@ -171,6 +171,14 @@ export default {
       end:"23:59"
     };
   },
+  watch: {
+    formData(data, oldValue) {
+      console.log('%cshiftCconfiguration.vue line:175 object1', 'color: #007acc;', this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]);
+      if(this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]){
+        this.end= "47:59"
+      }
+    }
+  },
   methods:{
     // 时间更新，清空后续所有已选时间
     clearTime(){
diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
index 9aed2cb..a7fc82a 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
@@ -496,7 +496,7 @@ export default {
     },
     // 设置选中行
     setSelectRow(row) {
-       
+
       if (row.Label == "净生产量") {
         this.SET_artId(row.artid)
         this.setRowStatus(row.key);