半成品拼盘查询

src/components/header.vue

@@ -43,6 +43,9 @@
                     <div class="popper__arrow"></div>
                 </div>
             </div>
+            <div class="home_tip_wrap" @click="backHome">
+                <div class="iconfont icon_home"></div>
+            </div>
         </div>
     </div>
 </template>
@@ -94,6 +97,9 @@ export default {
     },
     switchColor (type) {
       this.$emit('switchColor', type)
+    },
+    backHome () {
+      this.$router.push('/home')
     }
   }
 }
@@ -205,6 +211,12 @@ export default {
         padding 0
         &:nth-child(2)
             padding 0 10px
+.home_tip_wrap
+    _wh(18px, 45px)
+    _fj(center)
+    margin-left 15px
+    .icon_home
+        _font(18px, 45px, #fff,,center)
 .colors_3_wrap
     position relative
     _wh(18px, 18px)

src/pages/modules/semifinished/semi-finished-check-search.vue

@@ -152,8 +152,8 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-.grid_wraper
+.zd_wrapper
-    height calc(100% - 95px)
+    height calc(100% - 135px)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1

src/pages/modules/semifinished/semi-finished-compose-search.vue

@@ -0,0 +1,129 @@
+<template>
+    <div class="order-wraper">
+        <div class="search-confirm-wrap">
+            <div class="search-wrap">
+                <div class="search-item">
+                    <div class="search-label">仓库</div>
+                    <div class="filter_input_wraper">
+                        <el-select v-model="value1" filterable clearable placeholder="请选择">
+                          <el-option
+                              v-for="item in options1"
+                              :key="item.device_code"
+                              :label="item.device_name"
+                              :value="item.device_code">
+                          </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label search-label_1">日期</div>
+                    <div class="filter_input_wraper filter_input_wraper_1">
+                        <el-date-picker
+                        v-model="date"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                      </el-date-picker>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">业务类型</div>
+                    <div class="filter_input_wraper">
+                        <el-select v-model="value2" filterable clearable placeholder="请选择">
+                          <el-option
+                              v-for="item in options2"
+                              :key="item.device_code"
+                              :label="item.device_name"
+                              :value="item.device_code">
+                          </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">物料</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input">
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">载具号</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input">
+                    </div>
+                </div>
+                <div class="search-item">
+                    <button class="button button--primary">查询</button>
+                    <button class="button button--primary">拼盘完成</button>
+                </div>
+            </div>
+        </div>
+        <div class="zd_wrapper">
+            <div class="grid_wraper">
+                <div class="slide_new">
+                    <table class="filter-table">
+                        <thead>
+                            <tr>
+                                <th>序号</th>
+                                <th>单据号</th>
+                                <th>状态</th>
+                                <th>类型</th>
+                                <th>物料编号</th>
+                                <th>物料规格</th>
+                                <th>数量</th>
+                                <th>单重(g)</th>
+                                <th>转出货位</th>
+                                <th>转出载具</th>
+                                <th>转入货位</th>
+                                <th>转入载具</th>
+                                <th>创建时间</th>
+                                <th>创建人</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="(e, i) in [1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7]" :key="i">
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                                <td>序号</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      options1: [],
+      value1: '',
+      date: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
+      options2: [],
+      value2: '',
+      options3: [],
+      value3: ''
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.filter_input_wraper_1
+    width calc(100% - 45px)
+.search-label_1
+    width 45px
+</style>

src/pages/modules/semifinished/semi-finished-outstore.vue

@@ -66,12 +66,9 @@
                 </div>
                 <div class="search-item">
                     <div class="search-label">载具号</div>
-                    <div class="filter_input_wraper filter_input_wraper_1">
+                    <div class="filter_input_wraper">
                         <input type="text" class="filter-input">
                     </div>
-                    <div class="filter_button">
-                        <button class="button button--primary">呼叫空载具</button>
-                    </div>
                 </div>
                 <div class="search-item">
                     <div class="search-label">出库点</div>
@@ -127,10 +124,4 @@ export default {
 .search-item_2
     width 100%
     margin-left 0
-.filter_button
-    width 96px
-    height 30px
-.filter_input_wraper_1
-    width calc(100% - 156px)
-    padding-right 10px
 </style>

src/router/index.js

@@ -18,7 +18,6 @@ const semiFinishedOutstore = r => require.ensure([], () => r(require('@page/modu
 const semiFinishedOutstoreSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-outstore-search')), 'semifinished')
 const semiFinishedCheck = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-check')), 'semifinished')
 const semiFinishedCheckSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-check-search')), 'semifinished')
-const semiFinishedCompose = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-compose')), 'semifinished')
 const semiFinishedComposeSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-compose-search')), 'semifinished')
 
 const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset')
@@ -88,11 +87,11 @@ export default new Router({
         component: semiFinishedInstoreSearch,
         meta: {guidePath: '2'}
       }, {
-        path: '/semifinishedoutstore', // 半成品入库
+        path: '/semifinishedoutstore', // 半成品出库
         component: semiFinishedOutstore,
         meta: {guidePath: '3'}
       }, {
-        path: '/semifinishedoutstoresearch', // 半成品出库
+        path: '/semifinishedoutstoresearch',
         component: semiFinishedOutstoreSearch,
         meta: {guidePath: '4'}
       }, {
@@ -103,10 +102,6 @@ export default new Router({
         path: '/semifinishedchecksearch',
         component: semiFinishedCheckSearch,
         meta: {guidePath: '6'}
-      }, {
-        path: '/semifinishedcompose', // 半成品拼盘
-        component: semiFinishedCompose,
-        meta: {guidePath: '7'}
       }, {
         path: '/semifinishedcomposesearch',
         component: semiFinishedComposeSearch,

src/style/layout.styl

@@ -218,6 +218,7 @@ header
   background-color #fff
 .grid_wraper
   _wh(100%, calc(100% - 45px))
+  border-radius 5px
   overflow-y auto
 .filter-table
   width 100%

src/style/reset.css

@@ -60,20 +60,25 @@ li {
      height: 15px;
 }
  
+::-webkit-scrollbar-track {
+     background-color: rgba(255, 255, 255, 0.2);
+     -webkit-border-radius: 6px;
+}
+
 ::-webkit-scrollbar-track-piece {
-     background-color: rgba(0, 0, 0, 0.2);
+     background-color: rgba(255, 255, 255, 0.2);
      -webkit-border-radius: 6px;
 }
  
 ::-webkit-scrollbar-thumb:vertical {
      height: 15px;
-     background-color: rgba(125, 125, 125, 0.7);
+     background-color: rgba(255, 255, 255, .4);
      -webkit-border-radius: 6px;
 }
  
 ::-webkit-scrollbar-thumb:horizontal {
      width: 15px;
-     background-color: rgba(125, 125, 125, 0.7);
+     background-color: rgba(255, 255, 255, .4);
      -webkit-border-radius: 6px;
 }