diff --git a/api/watchGoods/watchGoods.js b/api/watchGoods/watchGoods.js new file mode 100644 index 0000000..30892ad --- /dev/null +++ b/api/watchGoods/watchGoods.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + + +/** +* 短批次号 +* @param {查询条件} data +*/ +export function GetGoodsNowProduction_List(query) { + return request({ + url: '/mes/wm/WmGoodsNowProduction/shortPatchsearch', + method: 'get', + params: query, + }) +} + +/** +* 查询详细信息 +* @param {查询条件} data +*/ +export function GetGoodsNowProduction_detail(query) { + return request({ + url: '/mes/wm/WmGoodsNowProduction/patchsearchdetail', + method: 'get', + params: query, + }) +} + diff --git a/pages.json b/pages.json index 6d01e68..b22c19a 100644 --- a/pages.json +++ b/pages.json @@ -122,6 +122,22 @@ "navigationBarTitleText" : "创建AGV任务", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/watchGoods/watchGoods", + "style" : + { + "navigationBarTitleText" : "货物查看", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/watchGoods/goodsdetail/goodsdetail", + "style" : + { + "navigationBarTitleText" : "货物详情", + "enablePullDownRefresh" : false + } } ] diff --git a/pages/index/index.vue b/pages/index/index.vue index 5d5f844..538402e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -23,182 +23,190 @@ \ No newline at end of file +.text { + font-size: 24px; + color: white; +} + diff --git a/pages/login/login.vue b/pages/login/login.vue index b634c58..48802be 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,5 +1,6 @@ + WMS-移动端 diff --git a/pages/watchGoods/goodsdetail/goodsdetail.vue b/pages/watchGoods/goodsdetail/goodsdetail.vue new file mode 100644 index 0000000..ccfc979 --- /dev/null +++ b/pages/watchGoods/goodsdetail/goodsdetail.vue @@ -0,0 +1,68 @@ + + + + {{ item.packageCodeClient }} + + 库位 + {{ item.locationCode }} + + + 零件号 + {{ item.partnumber }} + + + 数量 + {{ item.goodsNumLogic }} + + + 入库时间 + {{ item.entryWarehouseTime }} + + + 备注 + {{ item.remark }} + + + + + + + + diff --git a/pages/watchGoods/watchGoods.vue b/pages/watchGoods/watchGoods.vue new file mode 100644 index 0000000..1e22109 --- /dev/null +++ b/pages/watchGoods/watchGoods.vue @@ -0,0 +1,107 @@ + + + + + + + + 批次号{{ item.packageCodeClient_son }} + + + + + + + + + + 零件号: + + {{ item.partnumber }} + + + + 箱数: + + {{ item.pack_num }} + + + + 总数量: + + {{ item.goodsNumLogic }} + + + + + + + + + + + + diff --git a/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue index 20fd54e..19c08d7 100644 --- a/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue +++ b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue @@ -68,7 +68,7 @@ } - diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue index 86e7444..7da5356 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -1,24 +1,28 @@ - {{unicode}} + {{unicode}} - + + +