diff --git a/src/api/materialsStation/index.js b/src/api/materialsStation/index.js index 868c9b9b..8cafd96b 100644 --- a/src/api/materialsStation/index.js +++ b/src/api/materialsStation/index.js @@ -274,6 +274,15 @@ export function getApplyInfo(id) { }) } +// 获取领料单 +export function getPickListApi(data) { + return request({ + url: '/material/material_lease_apply_info/getPickList', + method: 'get', + params: data + }) +} + // 领料申请-删除 export function applyRemove(ids) { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index eaa679e9..d8915fcd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -24,7 +24,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 15000 + timeout: 30000 }) // request 拦截器 diff --git a/src/views/material/lease/materialConfirm/index.vue b/src/views/material/lease/materialConfirm/index.vue index b723f9ad..d374a666 100644 --- a/src/views/material/lease/materialConfirm/index.vue +++ b/src/views/material/lease/materialConfirm/index.vue @@ -68,13 +68,11 @@ - + + + - + @@ -278,22 +278,22 @@
审核:
+
-
- -
+ +
@@ -336,14 +336,18 @@
库管:
- + > + +
@@ -741,4 +745,7 @@ export default { border-collapse: collapse; } } +.is-rotate { + transform: rotate(-90deg); +} diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue index 731d2524..60cd6466 100644 --- a/src/views/material/ma/type/index.vue +++ b/src/views/material/ma/type/index.vue @@ -688,7 +688,7 @@ - + diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue index 48d9e9af..daeca755 100644 --- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue @@ -195,11 +195,12 @@
-
领料:
+
领料:
@@ -256,7 +257,7 @@