diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue index cefa0fc..8a22892 100644 --- a/pages/Warehouse/Warehouse.vue +++ b/pages/Warehouse/Warehouse.vue @@ -127,12 +127,12 @@ break case 2: - - break - case 3: uni.navigateTo({ url:"/pages/watch/full" }) + break + case 3: + break } } @@ -177,6 +177,18 @@ width: '26vw', height: '16vw' }, + { + url: genPaths( + '/static/index/warehouse/animation', + 'Pick0', + 4, // 张数 + 'png', + 1, // 起始索引为 1 + false // 不补零 + ), + width: '17vw', + height: '13vw' + }, { url: genPaths( '/static/index/warehouse/animation', @@ -189,18 +201,7 @@ width: '24vw', height: '16vw' }, - { - url: genPaths( - '/static/index/warehouse/animation', - 'Pick0', - 4, // 张数 - 'png', - 1, // 起始索引为 1 - false // 不补零 - ), - width: '17vw', - height: '13vw' - } + ]) @@ -318,7 +319,7 @@ z-index: 27; } - .itemact3 { + .itemact4 { width: 24vw; height: 16vw; top: 28vw; @@ -326,7 +327,7 @@ z-index: 55; } - .itemact4 { + .itemact3{ width: 17vw; height: 13vw; top: 22vw; diff --git a/pages/Warehouse/api/lunpan.js b/pages/Warehouse/api/lunpan.js index 77d9c36..8bad07f 100644 --- a/pages/Warehouse/api/lunpan.js +++ b/pages/Warehouse/api/lunpan.js @@ -10,13 +10,32 @@ export const queryInvoicingList = (params) => { }) } - -export const getMaterialTreeData = () => { +// 获取物料分类树(请购列表使用) +export const getMaterialTreeData = (params) => { return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData`, - method: 'get' + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=`+params.nuId, + method: 'get', + data: params, }) } + +// (业务)获取物料分类树(购物车使用) +export const getGwcMaterialTreeData = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=`+params.nuId, + method: 'get', + data: params + }) +} +// (业务)获取物料分类树(采购单使用) +export const getCgdMaterialTreeData = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=`+params.nuId, + method: 'get', + data: params, + }) +} + export const queryNuInfoByNuId = (params) => { return request({ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryNuInfoByNuId`, diff --git a/pages/Warehouse/procurecart.vue b/pages/Warehouse/procurecart.vue index 3461b84..4994cde 100644 --- a/pages/Warehouse/procurecart.vue +++ b/pages/Warehouse/procurecart.vue @@ -96,15 +96,14 @@ 生活用品库 - - + @@ -140,6 +139,7 @@ + 全部 @@ -149,6 +149,7 @@ + 全部 {{v.title}} @@ -157,6 +158,7 @@ + 全部 @@ -313,7 +315,7 @@