diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js index 35419fc6b..7f41f8a1e 100644 --- a/fe/PDA/api/index.js +++ b/fe/PDA/api/index.js @@ -14,8 +14,8 @@ export function getlogin(params) { // }) } -export function getMenus() { // - return promise(devUrl + "/api/pda/account/menus", { // +export function getMenus(params) { // + return promise(devUrl + "/api/pda/account/menus/"+params, { // data: {}, method: "get" }) diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue index f6aa8d108..7368fd260 100644 --- a/fe/PDA/pages/index/index.vue +++ b/fe/PDA/pages/index/index.vue @@ -190,7 +190,9 @@ }); let that = this; // let userWorkgroups = await getWorkgroups(); - let menus = await getMenus(); + let param =localStorage.getItem('userId') + + let menus = await getMenus(param); if (menus.length > 0) { that.userMenus = menus; that.selectedMenus = menus[0].list; diff --git a/fe/PDA/pages/task/receipt.vue b/fe/PDA/pages/task/receipt.vue index 443dddbec..02272146a 100644 --- a/fe/PDA/pages/task/receipt.vue +++ b/fe/PDA/pages/task/receipt.vue @@ -138,6 +138,7 @@ }, getList(type) { + this.isToday=false; let that = this; uni.showLoading({ title: "加载中....", diff --git a/fe/PDA/static/config.json b/fe/PDA/static/config.json index d9e2df70e..7e9d3b7f5 100644 --- a/fe/PDA/static/config.json +++ b/fe/PDA/static/config.json @@ -8,7 +8,7 @@ }, { "name": "服务地址", - "value": "http://dev.ccwin-in.com:21296" + "value": "http://dev.ccwin-in.com:21093" }, { "name": "原料报废扫描库位", @@ -25,7 +25,7 @@ "warehouseCode": "T8", "putawayLocationTypes": "1,2,3,4", "putawayInventoryStatus": "2", - "dev": "http://dev.ccwin-in.com:21296", + "dev": "http://dev.ccwin-in.com:21093", "print_url": "http://dev.ccwin-in.com:59095", "version_update_url": "http://dev.ccwin-in.com:59081", "isScrapScanToLocation": false,