diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 8dc9fcf..951a311 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -256,7 +256,6 @@ // 变更菜单 const changeMenu = (index) => { - console.log(index) if (index === menuIndex.value) { return } diff --git a/pages/material/component/carditem.vue b/pages/material/component/carditem.vue index a8fcf40..08e0b7d 100644 --- a/pages/material/component/carditem.vue +++ b/pages/material/component/carditem.vue @@ -60,7 +60,7 @@ --> - 盘点 + 盘点 出入库 @@ -77,12 +77,18 @@ - + + + + + + + diff --git a/pages/material/component/gress.vue b/pages/material/component/gress.vue new file mode 100644 index 0000000..b32be51 --- /dev/null +++ b/pages/material/component/gress.vue @@ -0,0 +1,205 @@ + + + + + \ No newline at end of file diff --git a/pages/material/component/inventory.vue b/pages/material/component/inventory.vue new file mode 100644 index 0000000..8a4f7bf --- /dev/null +++ b/pages/material/component/inventory.vue @@ -0,0 +1,1024 @@ + + + + + diff --git a/pages/material/component/price.vue b/pages/material/component/price.vue index 3db0897..eed5e86 100644 --- a/pages/material/component/price.vue +++ b/pages/material/component/price.vue @@ -1,19 +1,456 @@ - - diff --git a/pages/material/component/sxd.vue b/pages/material/component/sxd.vue new file mode 100644 index 0000000..f26341b --- /dev/null +++ b/pages/material/component/sxd.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/pages/material/component/torytor.vue b/pages/material/component/torytor.vue new file mode 100644 index 0000000..a4b1487 --- /dev/null +++ b/pages/material/component/torytor.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/pages/material/material.vue b/pages/material/material.vue index 9370add..835649e 100644 --- a/pages/material/material.vue +++ b/pages/material/material.vue @@ -11,18 +11,12 @@ 检索 - 重置 - - + 出入库 @@ -36,6 +30,9 @@ + + + @@ -43,7 +40,12 @@ import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent, inject, watch } from 'vue'; import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import carditem from './component/carditem.vue' + import gress from './component/gress.vue' + import crkval from './component/crkval.vue' + const percent = ref(0); const transition = ref(false) + const crkshow = ref(false) + const props = defineProps({ isShow: { type: Boolean @@ -54,6 +56,9 @@ (newVal, oldVal) => { if (!oldVal && newVal) { transition.value = false; + setTimeout(()=>{ + percent.value = 55 + },1000) setTimeout(() => { transition.value = true; }, 50) @@ -97,6 +102,15 @@