diff --git a/common/style/layout.css b/common/style/layout.css
index 6991250..78c03fd 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -37,6 +37,9 @@ uni-button:after {
width: 48%;
margin-top: 15px;
}
+.search-item-btns {
+ justify-content: flex-end;
+}
.search-label{
width: 70px;
height: 35px;
@@ -77,8 +80,13 @@ uni-button:after {
border: 1px solid #d1d1d1;
border-radius: 4px;
text-indent: 10px;
+}
+.search-input-l .uni-input-input {
padding-right: 10px;
}
+.search-input-l .uni-input-input:disabled {
+ background-color: #e1e1e1;
+}
.confirm-button-wrap{
display: flex;
justify-content: flex-end;
@@ -95,6 +103,9 @@ uni-button:after {
color: #fff;
line-height: 35px;
}
+.confirm-button_disabled {
+ background-color: #c9c9c9;
+}
.grid-wrap{
width: 100%;
height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */
@@ -136,13 +147,11 @@ uni-button:after {
padding: 0 5px;
}
.status-wrap {
- width: 48%;
+ width: 100%;
height: 35px;
- padding: 0 15px;
display: flex;
- justify-content: flex-end;
align-items: center;
- margin-top: 15px;
+ margin-bottom: 15px;
}
.status-item {
display: flex;
@@ -173,18 +182,22 @@ uni-button:after {
background-color: #ff6a00;
}
.material-wrap {
+ width: calc(100% - 30px);
+ height: calc(100% - 152px);/** 42+15*5+35 */
+ margin: 15px auto;
+ padding: 15px 15px 0 15px;
+ background-color: #fff;
+ border-radius: 12px;
+}
+.material-item-wrap {
+ width: 100%;
+ height: calc(100% - 50px);
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
align-content: flex-start;
align-items: flex-start;
- width: calc(100% - 30px);
- height: calc(100% - 152px);/** 42+15*5+35 */
- margin: 15px auto;
- padding: 15px 15px 0 15px;
overflow-y: auto;
- background-color: #fff;
- border-radius: 12px;
}
.material-item {
width: 8.2%;
diff --git a/pages.json b/pages.json
index 04d6c66..eabc633 100644
--- a/pages.json
+++ b/pages.json
@@ -65,6 +65,12 @@
"style": {
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "pages/management/searchMater",
+ "style": {
+ "navigationStyle": "custom"
+ }
}
],
"globalStyle": {
diff --git a/pages/management/agvinerror.vue b/pages/management/agvinerror.vue
index 8d6d32d..9cba8a3 100644
--- a/pages/management/agvinerror.vue
+++ b/pages/management/agvinerror.vue
@@ -119,5 +119,5 @@
\ No newline at end of file
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index a700977..8655d31 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -1,18 +1,26 @@
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -31,11 +39,11 @@
异常
-
-
-
- {{e.vehicle_code}}
- {{e.material_spec}}
+
+
+ {{e.vehicle_code}}
+ {{e.material_spec}}
+
+
+
+
+
-
+
@@ -82,12 +86,16 @@
disabled: false
};
},
+ created() {
+ this._getCacheLine('A1')
+ },
methods: {
/** 选择器1 */
selectChange1(e) {
this.index1 = e
if (this.index1) {
this._getCacheLine(e)
+ this.index2 = ''
}
},
/** 选择器2 */
@@ -138,9 +146,3 @@
}
}
-
-
\ No newline at end of file
diff --git a/pages/management/searchMater.vue b/pages/management/searchMater.vue
new file mode 100644
index 0000000..dfa8b5f
--- /dev/null
+++ b/pages/management/searchMater.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 选择 |
+ 编码 |
+ 名称 |
+ 规格 |
+ 系列 |
+
+
+
+
+ |
+
+ |
+ {{e.material_code}} |
+ {{e.material_name}} |
+ {{e.material_spec}} |
+ {{e.class_name}} |
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index 30aa58a..4a3a1f8 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -34,4 +34,41 @@ export const inOutExceptionInstConfirm = (obj) => request({
data: {
form: obj
}
+})
+
+/** 缓存线盘点 */
+// 1.1工序下拉框查询
+export const workprocedureQuery = () => request({
+ url:'api/cacheLineHand/workprocedureQuery',
+ data: {}
+})
+// 1.2缓存线盘点-缓存线物料信息盘点
+export const getCacheLineMaterialInfo = (area, code) => request({
+ url:'api/cacheLineHand/getCacheLineMaterialInfo',
+ data: {
+ product_area: area,
+ wcsdevice_code: code
+ }
+})
+// 1.3物料查询
+export const materialQuery = (bar) => request({
+ url:'api/cacheLineHand/materialQuery',
+ data: {
+ search_bar: bar
+ }
+})
+// 1.4缓存线盘点-设置满箱
+export const setfullBox = (obj) => request({
+ url:'api/cacheLineHand/setfullBox',
+ data: obj
+})
+// 1.5缓存线盘点-设置空箱
+export const setEmptyBox = (obj) => request({
+ url:'api/cacheLineHand/setEmptyBox',
+ data: obj
+})
+// 1.6缓存线盘点-删除空箱
+export const deleteBox = (obj) => request({
+ url:'api/cacheLineHand/deleteBox',
+ data: obj
})
\ No newline at end of file
diff --git a/vuex/modules/data.js b/vuex/modules/data.js
new file mode 100644
index 0000000..4a2f01d
--- /dev/null
+++ b/vuex/modules/data.js
@@ -0,0 +1,23 @@
+import * as types from '../types'
+const state = {
+ publicObj: ''
+}
+const getters = {
+ publicObj: state => state.publicObj
+}
+const actions = {
+ setPublicObj ({commit}, res) {
+ commit(types.PUBLIC_OBJ, res)
+ }
+}
+const mutations = {
+ [types.PUBLIC_OBJ] (state, res) {
+ state.publicObj = res
+ }
+}
+export default {
+ state,
+ getters,
+ actions,
+ mutations
+}
\ No newline at end of file
diff --git a/vuex/store.js b/vuex/store.js
index 095161f..f8cd813 100644
--- a/vuex/store.js
+++ b/vuex/store.js
@@ -2,11 +2,13 @@ import Vue from 'vue'
import Vuex from 'vuex'
import user from './modules/user'
+import data from './modules/data'
Vue.use(Vuex)
export default new Vuex.Store({
modules: {
- user
+ user,
+ data
}
})
diff --git a/vuex/types.js b/vuex/types.js
index 96dad99..4770ef4 100644
--- a/vuex/types.js
+++ b/vuex/types.js
@@ -5,4 +5,5 @@ export const SAVE_LOGIN_NAME = 'SAVE_LOGIN_NAME'
export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME'
export const COM_CONFIG = 'COM_CONFIG'
export const SAVE_USER_INFO = 'SAVE_USER_INFO'
-export const DEL_USER_INFO = 'DEL_USER_INFO'
\ No newline at end of file
+export const DEL_USER_INFO = 'DEL_USER_INFO'
+export const PUBLIC_OBJ = 'PUBLIC_OBJ'
\ No newline at end of file