diff --git a/.gitignore b/.gitignore index 7ce6e50..68e1aef 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ dist *.ntvs* *.njsproj *.sln -*.sw? \ No newline at end of file +*.sw? +vite.config.js diff --git a/src/pages.json b/src/pages.json index a8ccd95..e760154 100644 --- a/src/pages.json +++ b/src/pages.json @@ -64,18 +64,40 @@ } }, /* 领料及其页面 */ + + // 1. 主列表 { "path": "pages/picking/outbound/index", "style": { "navigationBarTitleText": "领料出库" } }, - { "path": "pages/back/index", "style": { "navigationBarTitleText": "退料任务" } + }, + // 2. 详情 + { + "path": "pages/picking/outbound/details", + "style": { + "navigationBarTitleText": "出库详情" + } + }, + // 3. 编码出库 + { + "path": "pages/picking/outbound/code-outbound", + "style": { + "navigationBarTitleText": "编码出库" + } + }, + // 4. 数量出库 + { + "path": "pages/picking/outbound/num-outbound", + "style": { + "navigationBarTitleText": "数量出库" + } } ], "tabBar": { diff --git a/src/pages/picking/outbound/code-outbound.vue b/src/pages/picking/outbound/code-outbound.vue new file mode 100644 index 0000000..8c6f68b --- /dev/null +++ b/src/pages/picking/outbound/code-outbound.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/pages/picking/outbound/details.vue b/src/pages/picking/outbound/details.vue new file mode 100644 index 0000000..d33453e --- /dev/null +++ b/src/pages/picking/outbound/details.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/pages/picking/outbound/index.vue b/src/pages/picking/outbound/index.vue index ccf7b8d..d2d764e 100644 --- a/src/pages/picking/outbound/index.vue +++ b/src/pages/picking/outbound/index.vue @@ -1,9 +1,5 @@ diff --git a/src/pages/picking/outbound/num-outbound.vue b/src/pages/picking/outbound/num-outbound.vue new file mode 100644 index 0000000..432a549 --- /dev/null +++ b/src/pages/picking/outbound/num-outbound.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/services/picking/outbound.js b/src/services/picking/outbound.js index 6d49af8..3cd6c98 100644 --- a/src/services/picking/outbound.js +++ b/src/services/picking/outbound.js @@ -10,3 +10,12 @@ export const getPickingOutboundListAPI = (data) => { data, }) } +/** + * 领料出库 ---- 列表详情 + */ +export const getOutboundDetailsAPI = (id) => { + return http({ + method: 'GET', + url: `/material/lease_apply_info/${id}`, + }) +} diff --git a/src/utils/http.js b/src/utils/http.js index 5ee699a..b4b4a4f 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -88,7 +88,7 @@ export const http = (options) => { fail(err) { uni.showToast({ icon: 'none', - title: err, + title: '请求失败', }) console.log(err, '请求失败') reject(err) diff --git a/vite.config.js b/vite.config.js index 0b37f6c..4f23216 100644 --- a/vite.config.js +++ b/vite.config.js @@ -20,7 +20,7 @@ export default defineConfig({ proxy: { // 在此处编写代理规则 '/api': { - target: 'http://192.168.2.246:18080', + target: 'http://192.168.2.76:18080', changeOrigin: true, rewrite: (path) => { return path.replace(/\/api/, '')