Merge remote-tracking branch 'origin/master'

hw-ui/src/assets/styles/sidebar.scss

@@ -14,7 +14,8 @@
   .sidebar-container {
     -webkit-transition: width .28s;
     transition: width 0.28s;
-    width: $base-sidebar-width !important;
+    //width: $base-sidebar-width !important;
+    width: $base-sidebar-width ;
     background-color: $base-menu-background;
     height: 100%;
     position: fixed;
@@ -109,7 +110,7 @@
 
   .hideSidebar {
     .sidebar-container {
-      width: 54px !important;
+      //width: 54px !important;
     }
 
     .main-container {
@@ -169,7 +170,8 @@
 
     .sidebar-container {
       transition: transform .28s;
-      width: $base-sidebar-width !important;
+      width: $base-sidebar-width ;
+      //width: $base-sidebar-width !important;
     }
 
     &.hideSidebar {

hw-ui/src/layout/index.vue

@@ -1,8 +1,10 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
+    <sidebar v-if="!sidebar.hide" class="sidebar-container" :style="`width:${sidebarWidth}px`"/>
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container"
+         :style="`margin-left:${sidebarWidth}px`"
+    >
       <div :class="{'fixed-header':fixedHeader}">
         <navbar/>
         <tags-view v-if="needTagsView"/>
@@ -12,6 +14,9 @@
         <settings/>
       </right-panel>
     </div>
+    <div v-if="!sidebar.hide" class="layout-line" :style="`left:${sidebarWidth}px`" ref="layoutLine"
+         @mousedown="layoutLineMouseDown"
+    ></div>
   </div>
 </template>
 
@@ -24,6 +29,11 @@ import variables from '@/assets/styles/variables.scss'
 
 export default {
   name: 'Layout',
+  data: () => {
+    return {
+      sidebarWidth: 54
+    }
+  },
   components: {
     AppMain,
     Navbar,
@@ -33,6 +43,18 @@ export default {
     TagsView
   },
   mixins: [ResizeMixin],
+  watch: {
+    'sidebar.opened': {
+      handler: function() {
+        console.log(this.sidebar.opened)
+        if (this.sidebar.opened) {
+          this.sidebarWidth = 200
+        } else {
+          this.sidebarWidth = 54
+        }
+      }
+    }
+  },
   computed: {
     ...mapState({
       theme: state => state.settings.theme,
@@ -51,22 +73,53 @@ export default {
       }
     },
     variables() {
-      return variables;
+      return variables
     }
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    },
+    setLineLeft(e) {
+      console.log(e)
+      let left = e.pageX
+      if (left < 54) {
+        left = 54
+      }
+      if (left > 1000) {
+        left = 1000
       }
+      // if(left <100){
+      //   this.needTagsView = true
+      // }
+      // if(left >210){
+      //   this.needTagsView = false
+      // }
+      this.sidebarWidth = left
+    },
+    layoutLineMouseDown(e) {
+      window.addEventListener('mousemove', this.setLineLeft)
+      window.addEventListener('mouseup', ()=>{window.removeEventListener('mousemove', this.setLineLeft)})
+    },
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
+
+.layout-line {
+  //transition: all .28s;
+  position: absolute;
+  top: 0;
+  width: 3px;
+  height: 100%;
+  background-color: #00afff;
+  cursor: ew-resize;
+}
 
-  .app-wrapper {
+.app-wrapper {
   @include clearfix;
   position: relative;
   height: 100%;
@@ -76,9 +129,9 @@ export default {
     position: fixed;
     top: 0;
   }
-  }
+}
 
-  .drawer-bg {
+.drawer-bg {
   background: #000;
   opacity: 0.3;
   width: 100%;
@@ -86,26 +139,26 @@ export default {
   height: 100%;
   position: absolute;
   z-index: 999;
-  }
+}
 
-  .fixed-header {
+.fixed-header {
   position: fixed;
   top: 0;
   right: 0;
   z-index: 9;
   width: calc(100% - #{$base-sidebar-width});
   transition: width 0.28s;
-  }
+}
 
-  .hideSidebar .fixed-header {
+.hideSidebar .fixed-header {
   width: calc(100% - 54px);
-  }
+}
 
-  .sidebarHide .fixed-header {
+.sidebarHide .fixed-header {
   width: 100%;
-  }
+}
 
-  .mobile .fixed-header {
+.mobile .fixed-header {
   width: 100%;
-  }
+}
 </style>

hw-ui/src/views/mes/productplan/editProductPlan.vue

@@ -203,9 +203,6 @@
                 size="mini"
                 type="primary"
                 @click="handleApplyRawOutstock(scope.row)"
-                v-if="scope.row.processType === PROCESS_TYPE.AUTO && scope.row.planId!=null && scope.row.planId!==''
-                      && scope.row.planStatus !== PLAN_STATUS.FINISHED
-                      && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"
               >投料
               </el-button>
 
@@ -1408,14 +1405,14 @@ export default {
     },
 
     handleApplyRawOutstock(row) {
-      if (row.processType === this.PROCESS_TYPE.AUTO) {
+      // if (row.processType === this.PROCESS_TYPE.AUTO) {
         this.applyRawOutstockOpen = true;
         this.productPlanData.planCode = row.planCode;
         this.productPlanData.planId = row.planId;
         this.productPlanData.dispatchAmount = row.dispatchAmount;
         this.productPlanData.saleOrderId = this.form.saleOrderId;
         this.productPlanData.materialBomId = this.form.materialBomId;
-      }
+      // }
     },
 
     closeRawOutstockDialog() {