diff --git a/pages.json b/pages.json index cd0bf6c..e6e6781 100644 --- a/pages.json +++ b/pages.json @@ -148,6 +148,13 @@ "navigationBarTitleText" : "" } }, + { + "path" : "pages/procurement/inventory", + "style" : + { + "navigationBarTitleText" : "" + } + }, { "path" : "pages/Warehouse/warehome" }, diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue index a95a30b..71c0a8c 100644 --- a/pages/NursingNew/component/pleasetake/common/takerecord.vue +++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue @@ -127,12 +127,13 @@ const qglog = ()=>{ let obj = { nuId:uni.getStorageSync('nuId'), - elderId:uni.getStorageSync('NUall').id, + elderId:uni.getStorageSync('NUall').elderId, wlId:props.objtake.wlId, pageNo:pageNo.value, pageSize:20 } queryQlwcLog(obj).then(res=>{ + console.log("咋没有",obj,res) wcLog.value.push(...res.result.records); status.value = (res.result.total == wcLog.value.length ? 'nomore' : 'loadmore') }) diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue index e2d51a3..8392ca5 100644 --- a/pages/NursingNew/component/pleasetake/component/requestform.vue +++ b/pages/NursingNew/component/pleasetake/component/requestform.vue @@ -166,10 +166,10 @@ :src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"> - 耗材用品 + {{ item.materialInfo.categoryName}} - 支架 + {{ item.materialInfo.typeName}} @@ -221,7 +221,8 @@ import defaultr from '../common/default.vue' const props = defineProps({ isShow: { - type: Boolean + type: Boolean, + required: true, }, }); const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"]) @@ -234,6 +235,7 @@ // 当旧值为false,新值为true时延迟0.2秒调用方法 if (newVal) { transition.value = false; + chongzhi() firstgetqueryCgdList(); setTimeout(() => { transition.value = true; @@ -349,6 +351,7 @@ queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => { rightarray.value = [] + console.log("////",element.result) rightarray.value.push(...element.result) rightdonghua.value = true; }) diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue index 6cbe301..bd338ef 100644 --- a/pages/NursingNew/component/pleasetake/component/returnorder.vue +++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue @@ -87,11 +87,9 @@ - - + + + diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index e298159..163b403 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -422,8 +422,8 @@ 确定 - - (99+采购单) + + ({{ alltotal }}采购单) diff --git a/pages/Warehouse/warehome.vue b/pages/Warehouse/warehome.vue index 17ef2cc..5c22a2e 100644 --- a/pages/Warehouse/warehome.vue +++ b/pages/Warehouse/warehome.vue @@ -52,10 +52,10 @@ - + - + 库存盘点 @@ -206,8 +206,8 @@ url: '/' + navurl.value }) } - if (index == 8) { - navurl.value = 'pages/procurement/retstock' + if (index == 5) { + navurl.value = 'pages/procurement/inventory' uni.navigateTo({ url: '/' + navurl.value }) @@ -218,6 +218,13 @@ url: '/' + navurl.value }) } + if (index == 8) { + navurl.value = 'pages/procurement/retstock' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + } diff --git a/pages/login/login.vue b/pages/login/login.vue index 60a3d94..9f76016 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -219,6 +219,7 @@ }) } else { uni.setStorageSync('serverUrl', ""); + uni.setStorageSync('orgList', []); uni.setStorageSync('orgListName', ""); uni.setStorageSync('orgListCode', ""); allserve.value = []; diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue new file mode 100644 index 0000000..f664c22 --- /dev/null +++ b/pages/procurement/inventory.vue @@ -0,0 +1,1860 @@ + + + + + \ No newline at end of file diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue index 146394e..bf4796f 100644 --- a/pages/procurement/outbound.vue +++ b/pages/procurement/outbound.vue @@ -185,10 +185,10 @@ :src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"> - 耗材用品 + {{ item.materialInfo.categoryName}} - 支架 + {{ item.materialInfo.typeName}} @@ -241,6 +241,7 @@ +