diff --git a/common/style/layout.css b/common/style/layout.css
index 47573bb..51787af 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -20,47 +20,16 @@ uni-button{
.content{
width: 100%;
height: 100%;
- background-color: #f5f5f5;
+ background-color: #f8f8f8;
}
.search-confirm-wrap {
width: calc(100% - 30px);
background-color: #fff;
margin: 15px auto;
border-radius: 12px;
- padding-bottom: 15px;
-}
-.search-wrap{
- display: flex;
- flex-wrap: wrap;
- justify-content: flex-start;
- width: 100%;
- padding: 0 15px;
-}
-.search-item{
- display: flex;
- justify-content: space-between;
- width: 32%;
- margin-top: 15px;
-}
-.search-item:nth-child(3n+2) {
- margin-left: 2%;
- margin-right: 2%;
-}
-.search-item_2 {
- display: flex;
- justify-content: flex-end;
- width: 64%;
- margin-top: 15px;
- margin-left: 4%;
-}
-.flexend {
- justify-content: flex-end;
-}
-.search-item-btns {
- justify-content: flex-end;
+ padding: 15px;
}
.search-label{
- width: 80px;
height: 35px;
font-size: 16px;
line-height: 35px;
@@ -70,13 +39,12 @@ uni-button{
}
.search-label::after {
display: inline-block;
- content: '';
- width: 100%;
- height: 0;
- visibility: hidden;
+ content: '';
+ width: 100%;
+ height: 0;
+ visibility: hidden;
}
.filter_input_wraper {
- width: calc(100% - 85px);
height: 35px;
line-height: 35px;
}
@@ -86,7 +54,8 @@ uni-button{
line-height: 35px;
font-size: 14px;
color: #606266;
- border: 1px solid #d1d1d1;
+ border: 1px solid #dde9f7;
+ background-color: #fff;
border-radius: 4px;
text-indent: 10px;
}
@@ -106,29 +75,40 @@ uni-button{
.search-input-l .uni-input-input:disabled {
background-color: #e1e1e1;
}
-.confirm-button-wrap{
- display: flex;
- justify-content: flex-end;
- width: 100%;
- height: 35px;
- line-height: 35px;
- margin-top: 15px;
- padding: 0 15px;
-}
.confirm-button{
- margin-left: 15px !important;
- margin-right: 0 !important;
- background-color: #D7592F;
+ min-width: 80px;
+ height: 36px;
+ background-color: #ff6a00;
color: #fff;
- line-height: 35px;
+ padding: 0;
+ font-size: 14px;
+ margin-left: 6px;
+ margin-right: 0;
+ border-radius: 12px;
+ white-space: nowrap;
}
.confirm-button_disabled {
- background-color: #c9c9c9;
+ background-color: #fff;
+ color: #889dc7;
+ border: 1px solid #dde9f7;
+}
+.title-line {
+ width: calc(100% - 30px);
+ height: 1px;
+ background-color: #dde9f7;
+ margin: 10px auto 20px auto;
+}
+.table-title_wraper {
+ width: calc(100% - 30px);
+ margin: 0px auto;
+ font-size: 16px;
+ color: #000;
+ line-height: 35px;
}
.grid-wrap{
width: 100%;
- height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
- padding: 0 15px 15px 15px;
+ height: calc(100% - 206px); /** 42+ 98+35+31 */
+ padding: 0 15px 30px 15px;
overflow-y: scroll;
}
.grid-wrap .grid-table{
@@ -197,6 +177,77 @@ uni-button{
top: 0;
z-index: 49;
}
+.zd-th {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 15px;
+ line-height: 18px;
+ height: 40px;
+ color: #7d7d7d;
+ font-weight: bold;
+ padding: 12px 5px;
+ background-color: #dcdfea;
+ text-align: center;
+}
+.zd-sec-th {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 15px;
+ line-height: 18px;
+ height: 40px;
+ color: #7d7d7d;
+ background-color: #fff;
+ font-weight: bold;
+ padding: 12px 5px;
+ text-align: center;
+}
+.zd-td {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 14px;
+ line-height: 18px;
+ height: 46px;
+ color: #7d7d7d;
+ padding: 0 8px;
+ text-align: center;
+ border-bottom: 1px solid #ebeef5;
+ overflow: hidden;
+}
+.zd-th_fir {
+ border-top-left-radius: 12px;
+ border-bottom-left-radius: 12px;
+}
+.zd-th_last {
+ border-top-right-radius: 12px;
+ border-bottom-right-radius: 12px;
+}
+.zd-checkbox {
+ width: 22px;
+ height: 22px;
+ border: 1px solid #008deb;
+ background-color: #fff;
+ border-radius: 4px;
+}
+.fontcol1 {
+ color: #007de7;
+}
+.fontcol2 {
+ color: #000;
+}
+.fontbg1 {
+ background-color: #007de7;
+ color: #fff;
+ font-size: 12px;
+ padding: 2px 10px;
+ border-radius: 10px;
+}
+.zd-sec-table {
+ background-color: #fff;
+ padding: 15px 0;
+}
.status-wrap {
width: 100%;
height: 35px;
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..bd961fb 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -24,6 +24,10 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
appearance: none;
}
+.allwidth {
+ width: 100%;
+}
+
.relative {
position: relative;
}
@@ -40,4 +44,97 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+}
+.flexcol {
+ flex-direction: column;
+}
+.flexstart {
+ align-items: flex-start !important;
+}
+.jcflexstart {
+ justify-content: flex-start !important;
+}
+.jcflexend {
+ justify-content: flex-end !important;
+}
+
+.zd-row {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.zd-col-24 {
+ width: 100%;
+}
+.zd-col-23 {
+ width: 95.83333%
+}
+.zd-col-22 {
+ width: 91.66667%
+}
+.zd-col-21 {
+ width: 87.5%
+}
+.zd-col-20 {
+ width: 83.33333%
+}
+.zd-col-19 {
+ width: 79.16667%
+}
+.zd-col-18 {
+ width: 75%
+}
+.zd-col-17 {
+ width: 70.83333%
+}
+.zd-col-16 {
+ width: 66.66667%
+}
+.zd-col-15 {
+ width: 62.5%
+}
+.zd-col-14 {
+ width: 58.33333%
+}
+.zd-col-13 {
+ width: 54.16667%
+}
+.zd-col-12 {
+ width: 50%;
+}
+.zd-col-11 {
+ width: 45.83333%
+}
+.zd-col-10 {
+ width: 41.66667%
+}
+.zd-col-9 {
+ width: 37.5%
+}
+.zd-col-8 {
+ width: 33.33333%
+}
+.zd-col-7 {
+ width: 29.16667%
+}
+.zd-col-6 {
+ width: 25%
+}
+.zd-col-5 {
+ width: 20.83333%
+}
+.zd-col-4 {
+ width: 16.66667%
+}
+.zd-col-3 {
+ width: 12.5%
+}
+.zd-col-2 {
+ width: 8.33333%
+}
+.zd-col-1 {
+ width: 4.16667%
+}
+.mgr5 {
+ margin-right: 5px;
}
\ No newline at end of file
diff --git a/components/NavBar.vue b/components/NavBar.vue
index f37979e..1d03be6 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -53,19 +53,20 @@
.header
_fj()
_wh(100%, 42px)
- background-color $red
+ background-color #fff
z-index 200
padding 0 15px
+ box-shadow: 0 2px 4px 0 rgba(0,0,0,.05);
.page_name
- _font(16px, 20px, #fff,700,center)
+ _font(16px, 20px, #000,700,center)
.icon_back {
font-size: 30px;
line-height: 30px;
- color: #fff;
+ color: #666;
}
.icon_home {
font-size: 30px;
line-height: 30px;
- color: #fff;
+ color: #666;
}
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index a6b4fab..5323202 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -1,17 +1,18 @@
-
+
+
-
-
-
-
-
+
+
@@ -20,7 +21,8 @@
export default {
data() {
return {
- cur: ''
+ cur: '',
+ focusState: true
};
},
model: {
@@ -33,10 +35,6 @@
seaShow: {
type: Boolean,
default: false
- },
- focused: {
- type: Boolean,
- default: false
}
},
methods: {
@@ -46,7 +44,10 @@
this.$emit('handleChange', this.cur)
},
toSearch () {
- this.$emit('toSearch', this.cur)
+ // this.$emit('toSearch', this.cur)
+ this.$nextTick(() => {
+ this.focusState = true
+ })
},
toDel () {
this.$emit('input', '')
@@ -124,30 +125,30 @@
diff --git a/pages.json b/pages.json
index 5b1241e..71c8e38 100644
--- a/pages.json
+++ b/pages.json
@@ -142,10 +142,26 @@
"navigationStyle": "custom"
}
}
- ],
+ ,{
+ "path" : "pages/management/in-storage",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/management/out-storage",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
+ "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
diff --git a/pages/home/home.vue b/pages/home/home.vue
index abea9b4..08baef5 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,7 +4,7 @@
{{userName}}
- 欢迎进入海亮平板系统！
+ 欢迎进入诺力三期平板系统！
@@ -58,6 +58,11 @@
if (e.sonTree.length > 0) {
this.show = true
this.secM = e.sonTree
+ } else {
+ let url = e.router
+ uni.redirectTo({
+ url: url
+ })
}
},
toPage2 (e) {
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
new file mode 100644
index 0000000..3d2dc56
--- /dev/null
+++ b/pages/management/in-storage.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 采购入库
+
+
+
+
+ 序号
+
+ 入库单号
+ EAS单号
+ 状态
+ 去向
+ 入库日期
+ 领料人
+ 制单人
+
+
+
+ {{i+1}}
+
+ {{e.a}}
+ {{e.b}}
+ {{e.c}}
+ {{e.d}}
+ {{e.e}}
+ {{e.f}}
+ {{e.g}}
+
+
+ 序号
+
+ 入库单号
+ EAS单号
+ 状态
+ 去向
+ 入库日期
+ 领料人
+ 制单人
+
+
+
+
+
+
+
+
+
diff --git a/pages/management/out-storage.vue b/pages/management/out-storage.vue
new file mode 100644
index 0000000..239d03a
--- /dev/null
+++ b/pages/management/out-storage.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
index b38df79..9d13c90 100644
Binary files a/static/iconfont/iconfont.ttf and b/static/iconfont/iconfont.ttf differ
diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
index 7bf5ca0..ce7075e 100644
Binary files a/static/iconfont/iconfont.woff and b/static/iconfont/iconfont.woff differ
diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
index 17338ae..0262372 100644
Binary files a/static/iconfont/iconfont.woff2 and b/static/iconfont/iconfont.woff2 differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 368372d..29a58f9 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -25,17 +25,8 @@ export const pdaUpdate = () => request({
export const authority = () => {
let res = {
sonTree: [
- {menu_id: '1', path: 'RF01', name: '缓存线', sonTree: [
- {menu_id: '1', name: '扫码异常', path: '/pages/management/inscanerror'},
- {menu_id: '2', name: '缓存线盘点', path: '/pages/management/hcxcheck'},
- {menu_id: '3', name: '缓存线出箱异常', path: '/pages/management/HcxOutError'},
- {menu_id: '4', name: '缓存线异常处理', path: '/pages/management/HcxErrorHandle'}
- ]
- },
- {menu_id: '2', path: 'RF02', name: '生产管理', sonTree: [
- {menu_id: '1', name: '任务管理', path: '/pages/management/TaskOperate'},
- ]
- },
+ {menu_id: '1', path: 'RF01', name: '入库', router: '/pages/management/in-storage', sonTree: []},
+ {menu_id: '1', path: 'RF02', name: '出库', router: '/pages/management/out-storage', sonTree: []},
{menu_id: '3', path: 'RF03', name: '出入库管理', sonTree: [
{menu_id: '1', name: '半成品入库', path: '/pages/management/HalfFinishedInStore'},
{menu_id: '2', name: '成品入库', path: '/pages/management/FinishedInStore'},