diff --git a/App.vue b/App.vue index 797f513..4a445ec 100644 --- a/App.vue +++ b/App.vue @@ -1,34 +1,52 @@ diff --git a/api/warehouse/warehose.js b/api/warehouse/warehose.js new file mode 100644 index 0000000..efd1b36 --- /dev/null +++ b/api/warehouse/warehose.js @@ -0,0 +1,11 @@ +import upload from '@/utils/upload' +import request from '@/utils/request' + +// 获取仓库信息 +export function getWareHouseProfile(data) { + return request({ + url: '/wms/wareHouse/getWareHouseProfile', + method: 'pose', + data + }) +} \ No newline at end of file diff --git a/components/material-item/material-item.vue b/components/material-item/material-item.vue new file mode 100644 index 0000000..e036dcf --- /dev/null +++ b/components/material-item/material-item.vue @@ -0,0 +1,43 @@ + + + + + \ No newline at end of file diff --git a/components/pda-scan-input/index.vue b/components/pda-scan-input/index.vue new file mode 100644 index 0000000..b884890 --- /dev/null +++ b/components/pda-scan-input/index.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/main.js b/main.js index 3985b1b..1f7128c 100644 --- a/main.js +++ b/main.js @@ -3,6 +3,10 @@ import App from './App' import store from './store' // store import plugins from './plugins' // plugins import './permission' // permission +// 组件加载 +// PDA扫描获取仓库信息组件 +import PdaScanInput from '@/components/pda-scan-input/index.vue'; +Vue.component('PdaScanInput',PdaScanInput) Vue.use(plugins) Vue.config.productionTip = false @@ -11,7 +15,7 @@ Vue.prototype.$store = store App.mpType = 'app' const app = new Vue({ - ...App + ...App }) -app.$mount() +app.$mount() \ No newline at end of file diff --git a/manifest.json b/manifest.json index 00a9b93..18942ad 100644 --- a/manifest.json +++ b/manifest.json @@ -1,8 +1,8 @@ { - "name" : "若依移动端", - "appid" : "__UNI__25A9D80", + "name" : "干巷仓库PDF-APP", + "appid" : "__UNI__A67E78B", "description" : "", - "versionName" : "1.1.0", + "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, "app-plus" : { @@ -14,7 +14,9 @@ "autoclose" : true, "delay" : 0 }, - "modules" : {}, + "modules" : { + "Barcode" : {} + }, "distribute" : { "android" : { "permissions" : [ @@ -59,15 +61,15 @@ "devServer" : { "port" : 9090, "https" : false, - "disableHostCheck":true, - "proxy":{ - "/api":{ - "target":"http://localhost:8888", - "pathRewrite":{ - "^/api": "" - } - } - } + "disableHostCheck" : true, + "proxy" : { + "/api" : { + "target" : "http://localhost:8888", + "pathRewrite" : { + "^/api" : "" + } + } + } }, "title" : "RuoYi-App", "router" : { diff --git a/pages.json b/pages.json index 333251c..6b0ea1f 100644 --- a/pages.json +++ b/pages.json @@ -1,102 +1,52 @@ { - "pages": [{ - "path": "pages/login", - "style": { - "navigationBarTitleText": "登录" - } - }, { - "path": "pages/register", - "style": { - "navigationBarTitleText": "注册" - } - }, { - "path": "pages/index", - "style": { - "navigationBarTitleText": "若依移动端框架", - "navigationStyle": "custom" - } - }, { - "path": "pages/work/index", - "style": { - "navigationBarTitleText": "工作台" - } - }, { - "path": "pages/mine/index", - "style": { - "navigationBarTitleText": "我的" - } - }, { - "path": "pages/mine/avatar/index", - "style": { - "navigationBarTitleText": "修改头像" - } - }, { - "path": "pages/mine/info/index", - "style": { - "navigationBarTitleText": "个人信息" - } - }, { - "path": "pages/mine/info/edit", - "style": { - "navigationBarTitleText": "编辑资料" - } - }, { - "path": "pages/mine/pwd/index", - "style": { - "navigationBarTitleText": "修改密码" - } - }, { - "path": "pages/mine/setting/index", - "style": { - "navigationBarTitleText": "应用设置" - } - }, { - "path": "pages/mine/help/index", - "style": { - "navigationBarTitleText": "常见问题" - } - }, { - "path": "pages/mine/about/index", - "style": { - "navigationBarTitleText": "关于我们" - } - }, { - "path": "pages/common/webview/index", - "style": { - "navigationBarTitleText": "浏览网页" - } - }, { - "path": "pages/common/textview/index", - "style": { - "navigationBarTitleText": "浏览文本" - } - }], - "tabBar": { - "color": "#000000", - "selectedColor": "#000000", - "borderStyle": "white", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/index", - "iconPath": "static/images/tabbar/home.png", - "selectedIconPath": "static/images/tabbar/home_.png", - "text": "首页" - }, { - "pagePath": "pages/work/index", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/tabbar/work_.png", - "text": "工作台" - }, { - "pagePath": "pages/mine/index", - "iconPath": "static/images/tabbar/mine.png", - "selectedIconPath": "static/images/tabbar/mine_.png", - "text": "我的" - } - ] - }, - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "RuoYi", - "navigationBarBackgroundColor": "#FFFFFF" - } -} + "pages": [{ + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录" + } + }, { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "DOAN", + "navigationStyle": "custom" + } + }, + { + "path": "pages/inWarehouse/inWarehouse", + "style": { + "navigationBarTitleText": "入库", + // "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/outWarehouse/outWarehouse", + "style": { + "navigationBarTitleText": "出库", + // "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/stocktake/stocktake", + "style": { + "navigationBarTitleText": "盘点", + // "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/relocation/relocation", + "style": { + "navigationBarTitleText": "移库", + // "navigationStyle": "custom", + "enablePullDownRefresh": false + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "DOAN", + "navigationBarBackgroundColor": "#FFFFFF" + } +} \ No newline at end of file diff --git a/pages/common/textview/index.vue b/pages/common/textview/index.vue deleted file mode 100644 index e9b05fb..0000000 --- a/pages/common/textview/index.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/pages/common/webview/index.vue b/pages/common/webview/index.vue deleted file mode 100644 index 8388c76..0000000 --- a/pages/common/webview/index.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue new file mode 100644 index 0000000..9cff25c --- /dev/null +++ b/pages/inWarehouse/inWarehouse.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/pages/index.vue b/pages/index.vue deleted file mode 100644 index 4646807..0000000 --- a/pages/index.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/pages/index/index.vue b/pages/index/index.vue new file mode 100644 index 0000000..ecc0163 --- /dev/null +++ b/pages/index/index.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/pages/login.vue b/pages/login/login.vue similarity index 92% rename from pages/login.vue rename to pages/login/login.vue index f2b4b57..4467cbc 100644 --- a/pages/login.vue +++ b/pages/login/login.vue @@ -1,8 +1,8 @@