Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/layout/components/Navbar.vue

@@ -8,6 +8,9 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
+        <div class="right-menu-item hover-effect" @click="gotoTodo" title="代办事项">
+          <el-icon class="el-icon-document-checked" />
+        </div>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -93,6 +96,9 @@ export default {
       window.location.reload(true)
       // this.$store.dispatch('app/refresh')
     },
+    gotoTodo() {
+      this.$router.push({ path: '/wms/todo' })
+    },
     async logout() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',

klp-ui/src/router/index.js

@@ -51,6 +51,7 @@ export const constantRoutes = [
     component: () => import('@/views/register'),
     hidden: true
   },
+
   {
     path: '/404',
     component: () => import('@/views/error/404'),
@@ -102,43 +103,31 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/aps',
+    path: '/wms',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: 'lineCapability',
+        path: 'todo',
-        component: () => import('@/views/aps/lineCapability/index'),
+        component: () => import('@/views/wms/todo/index'),
-        name: 'ApsLineCapability',
+        name: 'Task',
-        meta: { title: '产线能力' }
+        meta: { title: '待办任务', icon: 'checkbox' }
-      },
-      {
-        path: 'processManage',
-        component: () => import('@/views/aps/processManage/index'),
-        name: 'ApsProcessManage',
-        meta: { title: '工序管理' }
-      },
-      {
-        path: 'factory-calendar',
-        component: () => import('@/views/aps/factoryCalendar'),
-        name: 'ApsFactoryCalendarPage',
-        meta: { title: '工厂总日历' }
       }
-    ]
+    ],
   },
-  {
+  // {
-    path: '/wms/seal',
+  //   path: '/wms/seal',
-    component: Layout,
+  //   component: Layout,
-    hidden: true,
+  //   hidden: true,
-    children: [
+  //   children: [
-      {
+  //     {
-        path: 'sealDetail/:bizId',
+  //       path: 'sealDetail/:bizId',
-        component: () => import('@/views/wms/seal/sealDetail'),
+  //       component: () => import('@/views/wms/seal/sealDetail'),
-        name: 'WmsSealDetail',
+  //       name: 'WmsSealDetail',
-        meta: { title: '用印详情' }
+  //       meta: { title: '用印详情' }
-      }
+  //     }
-    ]
+  //   ]
-  }
+  // }
 ]
 
 // 动态路由，基于用户权限动态去加载

klp-ui/src/views/wms/coil/do/split.vue

@@ -37,6 +37,7 @@
             '脱脂工序': [
               {value: '1988150545175736322', label: '脱脂原料库'}, 
               {value: '1988150586938421250', label: '脱脂成品库'},
+              {value: "1988150648993148929", label: '罩式退火原料库'},
             ],
             '退火工序': [
               {value: '1988150648993148929', label: '罩式退火原料库'}, 

klp-ui/src/views/wms/report/js/config.js

@@ -62,6 +62,7 @@ export const tuozhiConfig = {
   },
   warehouseOptions: [
     { value: '1988150586938421250', label: '脱脂成品库' },
+    { value: "1988150648993148929", label: '罩式退火原料库' },
     { label: '技术部', value: '2019583656787259393' },
     { label: '小钢卷库', value: '2019583325311414274' },
     { label: '废品库', value: '2019583429955104769' },
@@ -112,7 +113,7 @@ export const zincConfig = {
 
 export const splitConfig = {
   actionTypes: [506],
-   actionQueryParams: {
+  actionQueryParams: {
     createBys: 'fenjiankuguan'
   },
   baseQueryParams: {

klp-ui/src/views/wms/todo/index.vue

@@ -0,0 +1,26 @@
+<template>
+  <el-tabs v-model="activeTab" type="card">
+    <el-tab-pane label="待贴标签" name="first">
+      <TranferCoilTable />
+    </el-tab-pane>
+    <el-tab-pane label="其他代办" name="second">
+      更多代办事项开发中...
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+  import TranferCoilTable from '@/views/wms/coil/views/base/tranfer.vue'
+
+  export default {
+    name: 'TodoIndex',
+    components: {
+      TranferCoilTable,
+    },
+    data() {
+      return {
+        activeTab: 'first',
+      }
+    }
+  }
+</script>