diff --git a/src/pages/picking/outbound/index.vue b/src/pages/picking/outbound/index.vue index 36e5266..e0d6b20 100644 --- a/src/pages/picking/outbound/index.vue +++ b/src/pages/picking/outbound/index.vue @@ -1,23 +1,268 @@ - + + + + + 已完成 + + + + 未完成 + + + - + - + - + - + 搜索 + + + + + 新购验收 + {{ + item.taskStatus == 2 ? '未完成' : '已完成' + }} + + + + 到货时间: + {{ item.arrivalTime }} + + + 采购单号: + {{ item.code }} + + + 采购物资: + {{ item.purchaseMaTypeName }} + + + 到货数量: + {{ item.purchaseMaNumber }} + + + 验收数量: + + + + - + + + diff --git a/src/services/picking/outbound.js b/src/services/picking/outbound.js new file mode 100644 index 0000000..6d49af8 --- /dev/null +++ b/src/services/picking/outbound.js @@ -0,0 +1,12 @@ +import { http } from '@/utils/http' + +/** + * 领料出库 ---- 列表查询接口 + */ +export const getPickingOutboundListAPI = (data) => { + return http({ + method: 'GET', + url: '/material/lease_apply_info/list', + data, + }) +} diff --git a/src/utils/http.js b/src/utils/http.js index 10f04b6..bac5bdb 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -6,7 +6,7 @@ import { useMemberStore } from '@/stores' * baseURL 设置请求ip地址和端口 */ const ENV = process.env.NODE_ENV -const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***' +const baseURL = ENV === 'development' ? '/api' : '***' /** * httpInterceptor 分别拦截 request 和 uploadFile 请求 @@ -51,7 +51,22 @@ export const http = (options) => { success(res) { // 1. 判断是否请求成功 if (res.statusCode >= 200 && res.statusCode < 300) { - resolve(res.data) + if (res.data.code >= 200 && res.data.code < 300) { + resolve(res.data) + } else if (res.data.code === 401) { + // 2. 401 表示token过期 去往登录页重新登录 + uni.showToast({ + icon: 'none', + title: `${res.data.msg}`, + }) + const memberStore = useMemberStore() + memberStore.clearUserInfo() + memberStore.clearToken() + uni.navigateTo({ + url: '/pages/login/index', + }) + reject(res) + } } else if (res.statusCode === 401) { // 2. 401 表示token过期 去往登录页重新登录 const memberStore = useMemberStore() diff --git a/vite.config.js b/vite.config.js index 8c8ff5f..0b37f6c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -16,4 +16,16 @@ export default defineConfig({ }, }, }, + server: { + proxy: { + // 在此处编写代理规则 + '/api': { + target: 'http://192.168.2.246:18080', + changeOrigin: true, + rewrite: (path) => { + return path.replace(/\/api/, '') + }, + }, + }, + }, })