diff --git a/src/components/header.vue b/src/components/header.vue
new file mode 100644
index 0000000..1c16046
--- /dev/null
+++ b/src/components/header.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
diff --git a/src/pages/modules/semifinished/index.vue b/src/pages/modules/semifinished/index.vue
new file mode 100644
index 0000000..2e13ff4
--- /dev/null
+++ b/src/pages/modules/semifinished/index.vue
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
diff --git a/src/pages/modules/semifinished/semi-finished-check-search.vue b/src/pages/modules/semifinished/semi-finished-check-search.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/modules/semifinished/semi-finished-check.vue b/src/pages/modules/semifinished/semi-finished-check.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/modules/semifinished/semi-finished-compose-search.vue b/src/pages/modules/semifinished/semi-finished-compose-search.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/modules/semifinished/semi-finished-compose.vue b/src/pages/modules/semifinished/semi-finished-compose.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/modules/semifinished/semi-finished-instore-search.vue b/src/pages/modules/semifinished/semi-finished-instore-search.vue
new file mode 100644
index 0000000..40c1d0f
--- /dev/null
+++ b/src/pages/modules/semifinished/semi-finished-instore-search.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 单据号 |
+ 状态 |
+ 类型 |
+ 物料编号 |
+ 物料规格 |
+ 数量(个) |
+ 单重(g) |
+ 重量(kg) |
+ 载具号 |
+ 入库点 |
+ 货位 |
+ 创建时间 |
+ 创建人 |
+
+
+
+
+ | 序号 |
+ 单据号 |
+ 状态 |
+ 类型 |
+ 物料编号 |
+ 物料规格 |
+ 数量(个) |
+ 单重(g) |
+ 重量(kg) |
+ 载具号 |
+ 入库点 |
+ 货位 |
+ 创建时间 |
+ 创建人ldjlfjlfjl劳动纪律放假了 |
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/modules/semifinished/semi-finished-instore.vue b/src/pages/modules/semifinished/semi-finished-instore.vue
new file mode 100644
index 0000000..b5dd003
--- /dev/null
+++ b/src/pages/modules/semifinished/semi-finished-instore.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/modules/semifinished/semi-finished-outstore-search.vue b/src/pages/modules/semifinished/semi-finished-outstore-search.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/modules/semifinished/semi-finished-outstore.vue b/src/pages/modules/semifinished/semi-finished-outstore.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/router/index.js b/src/router/index.js
index 1323977..a7886b4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,10 +2,19 @@ import Vue from 'vue'
import Router from 'vue-router'
const Login = r => require.ensure([], () => r(require('@page/Login')), 'Login')
-const modulesIndex = r => require.ensure([], () => r(require('@page/modules/workorder/index')), 'modules')
-const workOrderAssignment = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-assignment')), 'modules')
-const workReportQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-report-query')), 'modules')
-const workOrderQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-query')), 'modules')
+const workorderIndex = r => require.ensure([], () => r(require('@page/modules/workorder/index')), 'workorder')
+const workOrderAssignment = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-assignment')), 'workorder')
+const workReportQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-report-query')), 'workorder')
+const workOrderQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-query')), 'workorder')
+const semifinishedIndex = r => require.ensure([], () => r(require('@page/modules/semifinished/index')), 'semifinished')
+const semiFinishedInstore = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-instore')), 'semifinished')
+const semiFinishedInstoreSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-instore-search')), 'semifinished')
+const semiFinishedOutstore = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-outstore')), 'semifinished')
+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')
const Home = r => require.ensure([], () => r(require('@page/homeset/Home')), 'Home')
@@ -32,8 +41,8 @@ export default new Router({
component: Login
},
{
- path: '/modulesindex',
- component: modulesIndex,
+ path: '/workorderindex',
+ component: workorderIndex,
children: [{
path: '/workorderassignment', // 工单作业
component: workOrderAssignment
@@ -45,6 +54,43 @@ export default new Router({
component: workOrderQuery
}]
},
+ {
+ path: '/semifinishedindex',
+ component: semifinishedIndex,
+ children: [{
+ path: '/semifinishedinstore', // 半成品入库
+ component: semiFinishedInstore,
+ meta: {guidePath: '1'}
+ }, {
+ path: '/semifinishedinstoresearch',
+ component: semiFinishedInstoreSearch,
+ meta: {guidePath: '2'}
+ }, {
+ path: '/semifinishedoutstore', // 半成品入库
+ component: semiFinishedOutstore,
+ meta: {guidePath: '3'}
+ }, {
+ path: '/semifinishedoutstoresearch', // 半成品出库
+ component: semiFinishedOutstoreSearch,
+ meta: {guidePath: '4'}
+ }, {
+ path: '/semifinishedcheck', // 半成品盘点
+ component: semiFinishedCheck,
+ meta: {guidePath: '5'}
+ }, {
+ path: '/semifinishedchecksearch',
+ component: semiFinishedCheckSearch,
+ meta: {guidePath: '6'}
+ }, {
+ path: '/semifinishedcompose', // 半成品拼盘
+ component: semiFinishedCompose,
+ meta: {guidePath: '7'}
+ }, {
+ path: '/semifinishedcomposesearch',
+ component: semiFinishedComposeSearch,
+ meta: {guidePath: '8'}
+ }]
+ },
{
path: '/workordermanage',
component: workordermanage
diff --git a/src/style/layout.styl b/src/style/layout.styl
index db417d5..efde320 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -48,6 +48,7 @@
// 选择器
.el-select
width 100%
+ display block
.el-input
line-height 30px
font-size 12px
@@ -230,7 +231,6 @@ header
top -1px
z-index 1
color #606266
- border 1px solid #8B90A6
padding 5px 0
font-weight bold
background-color #8B90A6
@@ -239,8 +239,12 @@ header
font-size 12px
color #fff
word-break break-all
+ border-right 1px solid #8B90A6
+ border-bottom 1px solid #8B90A6
+ box-sizing border-box
+ &:first-child
+ border-left 1px solid #8B90A6
td
- border 1px solid #8B90A6
padding 5px
.input
width 1.8rem
@@ -249,6 +253,38 @@ header
font-size .13rem
color #606266
text-indent .05rem
+.slide_new
+ width: 100%
+ height: 100%
+ overflow-y: auto
+.zd_wrapper
+ height calc(100% - 95px)
+ overflow hidden
+ .grid_wraper
+ table-layout fixed
+ width auto
+ min-width 100%
+ height 100%
+ th
+ position sticky
+ top -1px
+ z-index 49
+ &:first-child
+ position sticky
+ left -1px
+ z-index 51
+ th,td
+ overflow hidden
+ white-space nowrap
+ text-overflow ellipsis
+ td
+ &:first-child
+ position sticky
+ left -1px
+ z-index 50
+ background-color #8b90a6
+ color #fff
+
.message-box__wrapper
position fixed
top 0
@@ -364,6 +400,43 @@ input::-webkit-input-placeholder
transition: border-color .2s cubic-bezier(.645,.045,.355,1);
width: 100%;
+// 半成品
+.search-confirm-wrap
+ margin 0 auto
+ border-radius 5px
+ padding-bottom 15px
+.search-wrap
+ width 100%
+ padding 0 10px
+ _fj(flex-start)
+ flex-wrap wrap
+.search-item
+ _fj()
+ width 32%
+ margin-top 10px
+ &:nth-child(3n+2)
+ margin-left 2%
+ margin-right 2%
+ .button+.button
+ margin-left 5px
+.search-label
+ _wh(60px, 30px)
+ _font(12px, 30px,#fff,,)
+.filter_input_wraper
+ width calc(100% - 60px)
+ height 30px
+ line-height 30px
+.search-item_2
+ _fj(flex-end)
+ width 64%
+ margin-top 10px
+ margin-left 4%
+ .button+.button
+ margin-left 5px
+.flexend
+ justify-content flex-end
+
+// 颜色切换
.overall_orange
background linear-gradient(#ff7a31 0%,#ff6b00 20%,#ff5200 100%)
.body-container