diff --git a/public/favicon.ico b/public/favicon.ico index 3f919d8..3f05e35 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/materials/batchPlan/index.ts b/src/api/materials/batchPlan/index.ts index cd260a3..6c1c9f3 100644 --- a/src/api/materials/batchPlan/index.ts +++ b/src/api/materials/batchPlan/index.ts @@ -80,11 +80,20 @@ export const listBatch = (query?: any): AxiosPromise => { * @param data */ export const getBatch = (query: any) => { - return request({ + const config: any = { url: '/cailiaoshebei/materialbatchdemandplan/list', method: 'get', params: query - }); + }; + + // 如果 query.token 存在,就覆盖请求头里的 token + if (query.token) { + config.headers = { + Authorization: query.token + }; + } + + return request(config); }; /** diff --git a/src/api/materials/purchaseDoc/index.ts b/src/api/materials/purchaseDoc/index.ts index 9ce657f..6038750 100644 --- a/src/api/materials/purchaseDoc/index.ts +++ b/src/api/materials/purchaseDoc/index.ts @@ -61,3 +61,27 @@ export const delPurchaseDoc = (id: string | number | Array) => method: 'delete' }); }; + +export const uploadCode = (data: any) => { + const config: any = { + url: '/cailiaoshebei/ltn/link', + method: 'post', + data: data + }; + // 如果 query.token 存在,就覆盖请求头里的 token + if (data.token) { + config.headers = { + Authorization: data.token + }; + } + + return request(config); +}; + +export const listLink = (data: any) => { + return request({ + url: '/cailiaoshebei/ltn/list', + method: 'get', + params: data + }); +}; diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 3f919d8..3f05e35 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/permission.ts b/src/permission.ts index 6868529..9c632aa 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -18,7 +18,7 @@ const isWhiteList = (path: string) => { router.beforeEach(async (to, from, next) => { NProgress.start(); - if (to.path == '/indexEquipment') { + if (to.path == '/indexEquipment' || to.path == '/materials/purchaseDoc/uploadCode') { next(); } else if (getToken()) { to.meta.title && useSettingsStore().setTitle(to.meta.title); diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue index 327e512..24f22ee 100644 --- a/src/views/materials/purchaseDoc/index.vue +++ b/src/views/materials/purchaseDoc/index.vue @@ -3,55 +3,18 @@
- + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 搜索 重置 @@ -72,17 +35,6 @@ >修改 - - 删除 - @@ -91,26 +43,30 @@ - + - - + - - + + + + - + @@ -123,25 +79,24 @@ @@ -215,6 +170,20 @@ > + + + + + + + + + + + + + + + + + + + +
暂无文件
+ +
- + diff --git a/src/views/message/config/index.vue b/src/views/message/config/index.vue index 43159aa..c13db4a 100644 --- a/src/views/message/config/index.vue +++ b/src/views/message/config/index.vue @@ -271,7 +271,7 @@ const handleExport = () => { // }; /** 查询部门下拉树结构 */ const getDeptTree = async () => { - const res = await deptTreeSelect({ isShow: '1' }); + const res = await deptTreeSelect({ isShow: '1', deptId: 100 }); deptList.value = filterDisabledDept(res.data); };