diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue
index 438c295..3e6aba4 100644
--- a/pages/Warehouse/Warehouse.vue
+++ b/pages/Warehouse/Warehouse.vue
@@ -6,8 +6,10 @@
@click.stop="housactive(index)">
-
+
+
+
+
@@ -62,6 +64,7 @@
},
});
const housedex = ref(-1);
+
const housactive = (index : number) => {
if (index > 5) { return }
housedex.value = index;
@@ -73,6 +76,9 @@
})
}
}
+ onMounted(()=>{
+ housedex.value = 1
+ })
const navurl = ref('');
const movecard = (type : number) => {
// console.log(type,housedex.value)
@@ -148,11 +154,12 @@
break
case 2:
- break
- case 3:
uni.navigateTo({
url: "/pages/watch/full"
})
+ break
+ case 3:
+
break
}
}
@@ -197,6 +204,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',
@@ -209,18 +228,7 @@
width: '24vw',
height: '16vw'
},
- {
- url: genPaths(
- '/static/index/warehouse/animation',
- 'Pick0',
- 4, // 张数
- 'png',
- 1, // 起始索引为 1
- false // 不补零
- ),
- width: '17vw',
- height: '13vw'
- }
+
])
@@ -339,7 +347,7 @@
z-index: 27;
}
- .itemact3 {
+ .itemact4 {
width: 24vw;
height: 16vw;
top: 28vw;
@@ -347,7 +355,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 bf7f172..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`,
@@ -108,3 +127,12 @@ export const voidedCgdMain = (params) => {
data: params,
})
}
+
+//修改库房物料是否启用
+export const updateWarehouserEnabled = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/updateWarehouserEnabled`,
+ method: 'post',
+ data: params,
+ })
+}
\ No newline at end of file
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 @@