From c0ce07b146d07a89286b5ceaf462f0947a38b275 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Sun, 7 Apr 2024 19:05:18 +0800 Subject: [PATCH] =?UTF-8?q?wms:=E5=BA=93=E4=BD=8D=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/watchGoods/watchGoods.js | 27 + pages.json | 16 + pages/index/index.vue | 344 ++++----- pages/login/login.vue | 1 + pages/watchGoods/goodsdetail/goodsdetail.vue | 68 ++ pages/watchGoods/watchGoods.vue | 107 +++ .../uni-grid-item/uni-grid-item.vue | 2 +- .../uni-grid/components/uni-grid/uni-grid.vue | 2 +- uni_modules/uni-icons/changelog.md | 18 + .../components/uni-icons/uni-icons.uvue | 91 +++ .../components/uni-icons/uni-icons.vue | 48 +- .../components/uni-icons/uniicons.css | 65 +- .../components/uni-icons/uniicons.ttf | Bin 35760 -> 35824 bytes .../components/uni-icons/uniicons_file.ts | 664 ++++++++++++++++++ .../components/uni-icons/uniicons_file_vue.js | 649 +++++++++++++++++ uni_modules/uni-icons/package.json | 26 +- uni_modules/uview-ui/libs/config/config.js | 2 +- 17 files changed, 1898 insertions(+), 232 deletions(-) create mode 100644 api/watchGoods/watchGoods.js create mode 100644 pages/watchGoods/goodsdetail/goodsdetail.vue create mode 100644 pages/watchGoods/watchGoods.vue create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.uvue create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons_file.ts create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js 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 @@