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 0fba9e2..b9476da 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(["全部", "待出库", "已出库", "已收货 ", "已作废"])
@@ -231,10 +232,12 @@
watch(
() => props.isShow,
(newVal, oldVal) => {
+ console.log("??????",newVal, oldVal)
// 当旧值为false,新值为true时延迟0.2秒调用方法
if (!oldVal && newVal) {
transition.value = false;
- firstgetqueryCgdList();
+ chongzhi()
+ // firstgetqueryCgdList();
setTimeout(() => {
transition.value = true;
}, 50)
@@ -303,7 +306,7 @@
plzinfo.searchContent = ""
changetype(0)
- firstgetqueryCgdList()
+ // firstgetqueryCgdList()
setTimeout(() => chongzhiLock = false, 500)
}
@@ -349,6 +352,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;
})
@@ -754,6 +758,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ font-size: 25rpx;
}
}
}
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 5b43aca..81d8a61 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -87,11 +87,9 @@
-
-
+
+
+
@@ -286,10 +284,10 @@
cannomessage.value = false
plsbuy.value = [];
- console.log(res)
+ // console.log(res)
plsbuy.value.push(...res.result.records)
// console.log("入参", plzinfo)
- // console.log("查看数组", res.result.records)
+ console.log("查看数组", res.result.records)
alltotal.value = res.result.total
// console.log("请购单数据呢???", res)
@@ -709,6 +707,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ font-size: 25rpx;
}
}
}
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index abe45cc..b63f800 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -2382,7 +2382,7 @@
.end-font {
width: 100%;
height: 6vh;
- font-size: 23rpx;
+ font-size: 25rpx;
text-align: center;
color: #666666;
overflow: hidden;
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index e298159..63cc9a0 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -422,8 +422,8 @@
确定
-
- (99+采购单)
+
+ ({{ alltotal }}采购单)
@@ -2346,7 +2346,7 @@
.end-font {
width: 100%;
height: 6vh;
- font-size: 23rpx;
+ font-size: 25rpx;
text-align: center;
color: #666666;
overflow: hidden;
diff --git a/pages/Warehouse/purchaseorder.vue b/pages/Warehouse/purchaseorder.vue
index 7069010..91284b4 100644
--- a/pages/Warehouse/purchaseorder.vue
+++ b/pages/Warehouse/purchaseorder.vue
@@ -762,6 +762,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ font-size: 25rpx;
}
}
}
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/Warehouse/留档.vue b/pages/Warehouse/留档.vue
deleted file mode 100644
index 116ce74..0000000
--- a/pages/Warehouse/留档.vue
+++ /dev/null
@@ -1,694 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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/authorization.vue b/pages/procurement/authorization.vue
index 6c5ab09..a701439 100644
--- a/pages/procurement/authorization.vue
+++ b/pages/procurement/authorization.vue
@@ -325,7 +325,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- font-size: 23rpx;
+ font-size: 25rpx;
}
}
}
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index 3ddc497..f910202 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -616,7 +616,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- font-size: 23rpx;
+ font-size: 25rpx;
}
}
}
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
new file mode 100644
index 0000000..caec8c1
--- /dev/null
+++ b/pages/procurement/inventory.vue
@@ -0,0 +1,1862 @@
+
+
+
+
+
+
+
+ 检索
+
+
+
+
+
+ 筛选
+
+
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 101P20251020001
+
+
+
+ 盘盈
+
+
+ 盘亏
+
+
+
+ {{ index?`已完成`:`盘点中` }}
+
+
+
+
+
+
+
+ 2025.10.03
+
+
+
+
+
+
+
+
+ {{ `盘点中`}}
+
+
+
+ {{ `[ 王嘉尔 ]` }}
+
+
+
+
+
+
+ {{ index?`2025.10.03`: ``}}
+
+
+
+
+
+
+
+
+ 盘点结束
+
+
+ {{ index?`[ 王嘉尔 ]`: `` }}
+
+
+
+
+
+
+
+ 生活用品库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+
+
+ 确定
+
+ ({{ alltotal }}采购单)
+
+
+
+
+ 盘点状态
+
+
+
+ 全部
+
+
+ 盘点中
+
+
+ 已完成
+
+
+
+
+
+ 盘点单号
+
+
+
+
+
+
+ 盘点人
+
+
+
+
+
+
+ 盘点日期
+
+
+
+ 开始日期
+
+
+ {{ plzinfo.startTime }}
+
+
+
+ 至
+
+
+ 结束日期
+
+
+ {{ plzinfo.endTime }}
+
+
+
+
+ 盘盈/盘亏
+
+
+
+
+
+
+
+ √
+
+
+ 盘盈单
+
+
+
+
+
+
+
+ √
+
+
+ 盘亏单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 721a6ae..6f8e097 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -21,15 +21,16 @@
-->
-
-
+
批量选择
-
+
回退
@@ -147,7 +148,8 @@
-
@@ -184,10 +186,10 @@
:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
- 耗材用品
+ {{ item.materialInfo.categoryName}}
- 支架
+ {{ item.materialInfo.typeName}}
@@ -227,10 +229,10 @@
style="width: 30%;height: 30%;position: absolute;">
-
-
+
+
出库
@@ -239,6 +241,8 @@
+
+