diff --git a/pages.json b/pages.json
index 981822b..ac2eb43 100644
--- a/pages.json
+++ b/pages.json
@@ -92,6 +92,14 @@
"navigationStyle": "custom"
}
+ },
+ // 大图
+ {
+ "path": "pages/Warehouse/Warehouse",
+ "style": {
+ "navigationStyle": "custom"
+ }
+
},
{
"path": "pages/NursingNew/index",
@@ -155,13 +163,7 @@
}
},
- {
- "path": "pages/Warehouse/Warehouse",
- "style": {
- "navigationStyle": "custom"
- }
-
- },
+
{
"path": "pages/Warehouse/procurement",
"style": {
diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue
index 8f9743a..583694d 100644
--- a/pages/Warehouse/Warehouse.vue
+++ b/pages/Warehouse/Warehouse.vue
@@ -1,5 +1,11 @@
-
+
+
+
+
+ 11111
+
+
-
+
- {{v}}
+ {{v}}
@@ -34,7 +41,7 @@
-
+
@@ -51,79 +58,74 @@
import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
const darkFans = ref(false);
const getblue = ref(false);
- const props = defineProps({
- isShow: {
- type: Boolean,
- required: true,
- },
- });
+
const housedex = ref(-1);
const lastTap = ref(0)
const DOUBLE_TAP_DELAY = 300;
const setout = ref(null)
const housactive = (index : number) => {
housedex.value = index;
- const now = Date.now()
- if (now - lastTap.value < DOUBLE_TAP_DELAY) {
- // 双击成立
- clearTimeout(setout.value)
- if (index == 0) {
- navurl.value = 'pages/Warehouse/paymoney'
+ const now = Date.now()
+ if (now - lastTap.value < DOUBLE_TAP_DELAY) {
+ // 双击成立
+ clearTimeout(setout.value)
+ if (index == 0) {
+ navurl.value = 'pages/Warehouse/paymoney'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ if (index == 1) {
+ navurl.value = 'pages/procurement/material'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ if (index == 2) {
+ navurl.value = 'pages/Warehouse/picking'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ if (index == 3) {
+ navurl.value = 'pages/Warehouse/finish'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ if (index === 5) {
+ uni.navigateTo({
+ url: "/pages/watch/full"
+ })
+ }
+ if (index == 6) {
+ navurl.value = 'pages/procurement/outbound?code=0'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ if (index == 7) {
+ navurl.value = 'pages/procurement/outbound?code=1'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ // 重置,避免多次触发
+ lastTap.value = 0
+ } else {
+ setout.value = setTimeout(() => {
+ console.log("点击哪个了", index)
+ if (index === 5) {
uni.navigateTo({
- url: '/' + navurl.value
+ url: "/pages/watch/full"
})
}
- if (index == 1) {
- navurl.value = 'pages/procurement/material'
- uni.navigateTo({
- url: '/' + navurl.value
- })
- }
- if (index == 2) {
- navurl.value = 'pages/Warehouse/picking'
- uni.navigateTo({
- url: '/' + navurl.value
- })
- }
- if (index == 3) {
- navurl.value = 'pages/Warehouse/finish'
- uni.navigateTo({
- url: '/' + navurl.value
- })
- }
- if (index === 5) {
- uni.navigateTo({
- url: "/pages/watch/full"
- })
- }
- if (index ==6) {
- navurl.value = 'pages/procurement/outbound?code=0'
- uni.navigateTo({
- url: '/' + navurl.value
- })
- }
- if (index ==7) {
- navurl.value = 'pages/procurement/outbound?code=1'
- uni.navigateTo({
- url: '/' + navurl.value
- })
- }
- // 重置,避免多次触发
- lastTap.value = 0
- } else {
- setout.value = setTimeout(()=>{
- console.log("点击哪个了",index)
- if (index === 5) {
- uni.navigateTo({
- url: "/pages/watch/full"
- })
- }
-
- },DOUBLE_TAP_DELAY)
- // 记录本次时间,等待下次点击
- lastTap.value = now
- }
-
+
+ }, DOUBLE_TAP_DELAY)
+ // 记录本次时间,等待下次点击
+ lastTap.value = now
+ }
+
}
onMounted(() => {
housedex.value = 1
@@ -132,11 +134,11 @@
const onlyjump = (index : number) => {
console.log("点击了哪个图标", index)
if (index > 5) {
- navurl.value = 'pages/Warehouse/finish'
- uni.navigateTo({
- url: '/' + navurl.value
- })
- return
+ navurl.value = 'pages/Warehouse/finish'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ return
}
if (index < 4) {
housedex.value = index;
@@ -246,14 +248,21 @@
\ No newline at end of file
diff --git a/pages/Warehouse/paymoney.vue b/pages/Warehouse/paymoney.vue
index 4a8061c..f92d009 100644
--- a/pages/Warehouse/paymoney.vue
+++ b/pages/Warehouse/paymoney.vue
@@ -1,2636 +1,11 @@
-
-
-
-
-
-
- 采购单价:
-
- ¥1.50
-
-
-
-
-
- 到货单价
-
-
- ¥1500.00
-
-
-
-
-
- 取消
-
-
- 确定
-
-
-
-
-
-
-
- 1
-
-
- 2
-
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
-
- 9
-
-
-
-
- AC
-
-
- 0
-
-
-
- .
-
-
-
-
-
-
-
- 留置针敷贴(医用透明敷料)
-
-
-
- 物料信息
-
-
- ¥10.12
-
-
-
-
-
- 物料编码
-
-
- FLYP001
-
-
-
-
- 规格型号
-
-
- 800mm*680mm
-
-
-
-
-
-
- 采购单价
-
-
- ¥0.1
-
-
-
-
- 采购数量
-
-
- 30
-
-
-
-
- 采购单位
-
-
- 个
-
-
-
-
-
-
-
- 入库信息
-
-
-
-
-
- 入库数量
-
-
- 0
-
-
-
-
- 挂账数量
-
-
- 0
-
-
-
-
- 销账数量
-
-
- 0
-
-
-
-
-
-
-
- 拣货拍照
-
-
-
-
-
-
-
-
-
-
-
- 点击拍照上传
-
-
-
-
-
-
-
-
- 数量
-
-
-
-
- -
-
-
- 1500
-
-
- +
-
-
-
-
-
- 关闭
-
-
- 销账
-
-
- 入库
-
-
-
-
-
-
- 1
-
-
- 2
-
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
-
- 9
-
-
-
-
- AC
-
-
- 0
-
-
-
- AE
-
-
-
-
-
-
-
-
- {{ !topbuttontarget?`拣货照片`:`随行单` }}
-
-
-
-
- 采购单号:
-
-
- 10120251024012
-
-
-
-
-
-
-
-
-
- 上传时间:
-
-
- 2025.10.11 10:12:56
-
-
-
-
- 上传人:
-
-
- 赵晓璇
-
-
-
-
-
-
-
-
- 点击拍照上传
-
-
-
-
-
-
-
-
-
- 重置
-
-
- 确定
-
- (10+采购单)
-
-
-
-
-
- 采购单状态
-
-
-
- 全部
-
-
- 待入库
-
-
- 待完结
-
-
-
- 采购日期
-
-
-
- 开始日期
-
-
- 至
-
-
- 结束日期
-
-
-
-
- 采购人
-
-
-
- 请输入采购人
-
-
-
-
- 供应商
-
-
-
- 请输入供应商
-
-
-
-
-
-
-
-
- 检索
-
-
-
-
- 筛选
-
-
-
-
-
- 单据状态
-
-
- 全部
-
-
- 待入库
-
-
- 待完结
-
-
-
-
-
-
-
-
-
- 物料信息
-
-
-
-
-
-
- 拣货照片
-
-
-
-
-
- 随行单
-
-
-
-
-
- 作废
-
-
-
-
-
-
- 返回
-
-
-
-
-
-
-
-
- {{ tagsArray[i] }}
-
-
-
-
-
- {{ i == 0 ? '留置针敷贴(医用…)'
- : i == 1 ? '纸尿裤-拉拉裤'
- : i == 2 ? '纸尿裤'
- : '纸尿裤'
- }}
-
-
-
-
-
- ¥
-
-
-
- {{ i==0 ? '15.30'
- : i==1 ? '86.16'
- : i==2 ? '189.55'
- : '46.80'
- }}
-
-
-
-
-
- 20
-
-
- 片
-
-
-
-
-
-
- 800mm*680mm
-
-
-
-
- 入库数量
-
-
-
-
- {{ i==0 ? 0 : i==1 ? 10 : i==2 ? 5 : 5 }}
-
-
-
-
-
-
-
- 挂账数量
-
-
-
-
- {{ i==0 ? 0 : i==1 ? 0 : i==2 ? 0 : 5 }}
-
-
-
-
-
-
-
- 销账数量
-
-
-
-
- {{ i==0 ? 0 : i==1 ? 0 : i==2 ? 5 : 0 }}
-
-
-
-
-
-
-
-
-
-
-
- 物料详情
-
-
-
- 拣货记录
-
-
-
-
-
-
-
-
-
-
- 改价
-
-
-
- 拣货
-
-
-
-
-
-
-
-
-
-
-
-
- 耗材用品
-
-
- 复健用品
-
-
- 支架
-
-
-
-
-
-
-
- 纸尿裤-拉拉裤纸尿裤
-
-
-
- ¥
-
- 100.55
-
-
-
-
-
-
- 物料编码
-
-
- ZHYP044
-
-
-
-
- 规格型号
-
-
- 800mm*680mm
-
-
-
-
-
-
-
-
- 采购单价
-
-
- ¥15
-
-
-
-
- 采购数量
-
-
- 200
-
-
-
-
- 采购单位
-
-
- 片
-
-
-
-
-
-
-
-
- 库存数量
-
-
- 853
-
-
-
-
- 物料上限 ↑
-
-
- 4000
-
-
-
-
- 物料下限 ↓
-
-
- 60
-
-
-
-
-
-
-
-
- 入库数量
-
-
- 0
-
-
-
-
- 挂账数量
-
-
- 0
-
-
-
-
- 销账数量
-
-
- 0
-
-
-
-
-
-
-
-
-
- 留置针敷贴(医用...
-
-
-
- 采购数量:
-
-
-
- 100
-
-
- 片
-
-
-
-
-
-
- 拣货数量:
-
- 20
-
-
- 片
-
-
-
-
- {{ index?`销账`:`入库` }}
-
-
-
-
- 采购单价:
-
-
- ¥1.50
-
-
-
-
- 拣货人:
-
- 梁嘉豪
-
-
-
-
-
-
- 到货单价:
-
-
- ¥1.50
-
-
-
-
- 2025.10.03 10:10:30
-
-
-
-
-
-
- 点击加载更多
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
- 作废
-
- 确定要作废这个采购单吗
-
-
-
+
+
-
\ No newline at end of file
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index da47482..f080e59 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1590,7 +1590,7 @@
}
const zuofei = () => {
voidedCgdMain({ id: plsbuy.value[lefttarget.value].id }).then((res : any) => {
- // console.log("res", res)
+ console.log("res", res)
if (res.success) {
uni.showToast({
title: res.message,
@@ -1603,6 +1603,13 @@
Object.assign(plzinfo, mobanplzinfo)
Object.assign(form, mobanform)
firstgetqueryCgdList();
+ }else{
+ uni.showToast({
+ title: res.message,
+ icon: 'none',
+ duration: 2000
+ })
+ badshow.value = false;
}
})
}
diff --git a/pages/watch/index.vue b/pages/watch/index.vue
index 129e695..c59992e 100644
--- a/pages/watch/index.vue
+++ b/pages/watch/index.vue
@@ -710,7 +710,7 @@
})
} else if (typeNow.value === 2) {
uni.navigateTo({
- url: '/pages/Warehousing/index'
+ url: '/pages/Warehouse/Warehouse'
})
}
}
@@ -763,7 +763,7 @@
})
} else if (typeNow.value === 2) {
uni.navigateTo({
- url: '/pages/Warehousing/index'
+ url: '/pages/Warehouse/Warehouse'
})
}
diff --git a/static/index/indeximage.png b/static/index/indeximage.png
new file mode 100644
index 0000000..3ba6899
Binary files /dev/null and b/static/index/indeximage.png differ
diff --git a/static/index/warehouse/ys.gif b/static/index/warehouse/ys.gif
index dfc51f6..099434d 100644
Binary files a/static/index/warehouse/ys.gif and b/static/index/warehouse/ys.gif differ