From 4c53353584901deff3f8e930ab4a1d5ec285e1c9 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Mon, 8 Dec 2025 15:32:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pleasetake/component/returnorder.vue | 9 +-
pages/Warehouse/finish.vue | 1969 ++++++++++++-----
pages/Warehouse/picking.vue | 45 +-
pages/login/login.vue | 2 +-
pages/procurement/components/calculator.vue | 15 +-
pages/procurement/material.vue | 4 +
pages/procurement/materialcar.vue | 13 +-
pages/watch/index.vue | 6 +-
8 files changed, 1441 insertions(+), 622 deletions(-)
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index e2c578f..4bdb55a 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -21,7 +21,7 @@
回退单
-
+
@@ -220,10 +220,11 @@
-
-
+
+
+
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 4a36528..d41a200 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -1,14 +1,50 @@
-
+
+
+
+
+
+
+
+
+
+ {{ item.suppliersName }}
+
+
+ 暂无数据
+
+
+
+
+
+
+
+ {{ item.cgBy }}
+
+
+ 暂无数据
+
+
+
+
+
+
采购单价:
- ￥1.50
+ ￥{{ gaijia }}
@@ -16,17 +52,17 @@
到货单价
-
- ¥1500.00
+
+ ¥ {{ gaijia }}
-
取消
-
确定
@@ -35,162 +71,166 @@
-
+
1
-
+
2
-
+
3
-
+
4
-
+
5
-
+
6
-
+
7
-
+
8
-
+
9
-
- AC
+
+ 清零
-
+
0
-
+
.
-
+
- 留置针敷贴（医用透明敷料）
+ {{showvalue.wlName}}
物料信息
-
- ￥10.12
+
+ ￥{{showvalue.totalPrice}}
-
-
+
+
物料编码
-
- FLYP001
+
+ {{showvalue.wlMaterialNo}}
-
-
+
+
规格型号
-
- 800mm*680mm
+
+ {{showvalue.wlSpecificationModel}}
-
-
-
+
+
+
采购单价
-
- ￥0.1
+
+ ￥{{showvalue.arrivalPrice?Number(showvalue.arrivalPrice).toFixed(2):Number(showvalue.procurementPrice).toFixed(2)}}
-
-
+
+
采购数量
-
- 30
+
+ {{showvalue.purchaseQuantity}}
-
-
+
+
采购单位
-
- 个
+
+ {{showvalue.wlUnits}}
-
+
入库信息
-
-
+
+
入库数量
-
- 0
+
+ {{showvalue.rksl}}
-
-
+
+
挂账数量
-
- 0
+
+ {{showvalue.wrksl}}
-
-
+
+
销账数量
-
- 0
+
+ {{showvalue.xzsl}}
-
+
拣货拍照
-
-
-
-
-
+
+ style="width: 1.6vw;height: 1.6vw;z-index: 20;position: absolute; right: 0.1vw;top: 0.1vw;background: rgba(255, 255, 255, 0.7);display: flex;justify-content: center;align-items: center;"
+ @click.stop="deldex=index;open=1">
+
+
+
+
+
+
@@ -199,7 +239,7 @@
+ style="width: 87%;height: 0.5rpx; background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
@@ -207,28 +247,30 @@
数量
-
-
+
+
-
-
- 1500
+
+ {{v}}
-
+
+
+
-
关闭
-
销账
-
入库
@@ -236,51 +278,51 @@
-
+
1
-
+
2
-
+
3
-
+
4
-
+
5
-
+
6
-
+
7
-
+
8
-
+
9
-
- AC
+
+ 清零
-
+
0
-
- .
+
+
@@ -290,27 +332,29 @@
{{ !topbuttontarget?`拣货照片`:`随行单` }}
-
采购单号：
- 10120251024012
+ {{plsbuy[lefttarget]?.cgdNo}}
-
-
-
+
+
+
上传时间:
- 2025.10.11 10:12:56
+ {{item.createTime.replace(/-/g, '.')}}
@@ -318,14 +362,55 @@
上传人:
- 赵晓璇
+ {{item.createBy}}
-
-
+
+
+
+
+
+
-
+
重置
-
+
确定
-
- (10+采购单)
+
+ (99+采购单)
@@ -353,59 +443,66 @@
采购单状态
-
+
全部
-
+
待入库
-
+
待完结
-->
-
+
+
+
采购日期
-
-
+
+
开始日期
+
+ {{ plzinfo.startTime }}
+
+
至
-
+
结束日期
+
+ {{ plzinfo.endTime }}
+
采购人
-
-
- 请输入采购人
-
+
+
供应商
-
-
- 请输入供应商
-
+
+
-
-
-
+
+
+
检索
@@ -416,38 +513,36 @@
-
+ -->
+
@@ -865,87 +919,109 @@
销账数量
- 0
+ {{showvalue.xzsl}}
-
-
- 留置针敷贴(医用...
-
-
-
- 采购数量：
-
-
-
- 100
-
-
- 片
-
-
-
+
-
-
- 拣货数量：
-
- 20
-
-
- 片
-
-
-
-
- {{ index?`销账`:`入库` }}
-
+ style="width: 100%;display: flex;justify-content: space-between;margin-top: 30rpx;margin-bottom: 10rpx;">
+
+ {{showvalue.wlName}}
-
-
- 采购单价：
+
+
+ 采购数量：
+
-
- ￥1.50
-
-
-
-
- 拣货人：
-
- 梁嘉豪
-
-
-
-
-
-
- 到货单价：
-
-
- ￥1.50
-
-
-
-
- 2025.10.03 10:10:30
-
-
+
+ {{showvalue.purchaseQuantity}}
+
+ {{showvalue.wlUnits}}
-
-
+
+
+
+ 拣货数量：
+
+ {{item.crkNum}}
+
+
+ {{showvalue.materialUnits}}
+
+
+
+
+ {{ item.crkStatus_dictText}}
+
+
+
+
+ 采购单价：
+
+
+ ￥{{Number(item.oldPrice).toFixed(2)}}
+
+
+
+
+ 拣货人：
+
+ {{item.createBy}}
+
+
+
+
+
+
+ 到货单价：
+
+ ￥{{Number(item.newPrice).toFixed(2)}}
+
+
+
+
+ {{item.createTime.replace(/-/g, '.')}}
+
+
+
+
+
+
+
+
- 点击加载更多
+ 上划加载更多
+ 已加载全部~
+ 加载中~
+
+
+
+
+ 暂无拣货记录
+
@@ -999,67 +1075,263 @@
-
-
-
-
-
- 取消
- 确定
-
-
- 作废
-
- 确定要作废这个采购单吗
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 2b4d519..0c04948 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1,7 +1,7 @@
@@ -255,7 +255,6 @@
{{v}}
-
+
@@ -414,8 +413,6 @@
-
-
@@ -428,7 +425,6 @@
(99+采购单)
-
@@ -449,7 +445,6 @@
-
采购日期
@@ -591,8 +586,6 @@
-
-
@@ -628,7 +621,6 @@
物料信息
-
@@ -670,7 +662,6 @@
-
{{ v.wlName }}
@@ -802,15 +793,6 @@
{{showvalue.wlName}}
-
@@ -860,7 +842,6 @@
-
@@ -888,7 +869,6 @@
-
@@ -987,16 +967,6 @@
-
{
+ console.log("?????????")
filteredCgrList.value = [];
cgrvalue.value = plzinfo.cgBy;
}
@@ -1497,7 +1468,7 @@
middletarget.value = index;
showvalue.value = InvoicingList.value[index];
showvalue.value.jianhuobtn = false;
- Invoiscroll.value = (index - 2) * 205;
+ Invoiscroll.value = (index - 2) * 172;
if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
showvalue.value.num = showvalue.value.maxnum;
@@ -2524,21 +2495,19 @@
margin-top: 20rpx;
.middle-Y {
- width: 100%;
+ width: 97%;
height: 100%;
+ margin-left: 3%;
.middle-Y-father {
display: flex;
- // flex-wrap: wrap;
- // width: 100%;
- padding-left: 20rpx;
-
+
.middle-one {
min-width: 325rpx;
height: 450rpx;
background-color: #F9F9F9;
border-radius: 30rpx;
- margin-left: 20rpx;
+ margin-right: 20rpx;
margin-bottom: 30rpx;
display: flex;
flex-direction: column;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d3101e9..60a3d94 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -191,7 +191,7 @@
return typeof str === 'string' && str.length === 11;
}
const jumpTo = (url : string) => {
- uni.redirectTo({
+ uni.navigateTo({
url: url
});
}
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index fe39f1a..d8ebebe 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -156,7 +156,7 @@
()=>props.show,
()=>{
if(props.show){
- console.log(props.caigouobj)
+ // console.log(props.caigouobj)
let a = [
{
multiUnitType:1,
@@ -172,16 +172,17 @@
},
{
multiUnitType:3,
- price:props.caigouobj.referenceUnitPrice,
+ price:props.caigouobj.unitPrice,
unit:props.caigouobj.materialUnits,
num:1
}
];
+
if(props.caigouobj.wlUnits){
type.value = a.find(item=>
item.unit == props.caigouobj.wlUnits
);
- console.log(props.caigouobj.wlUnits,type.value)
+ // console.log(props.caigouobj.wlUnits,type.value)
}else{
type.value = a.find(item=>
item.multiUnitType == props.caigouobj.multiUnitType
@@ -190,13 +191,15 @@
cgdwarr.value = []
downslength.value = 0;
+ // console.log("a",a)
a.forEach((element:any)=>{
if(element.unit&&element.num){
cgdwarr.value.push(element)
+ // console.log("!!!!",element)
}
})
- console.log("a",a)
+ // console.log("a",a)
let n = [];
let id = [];
gysarr.value = [];
@@ -252,7 +255,10 @@
console.log(sx.value,num,bl)
}
const cd =(v,i)=>{
+
+ // return
type.value = v;
+ // console.log("cd",type.value,cgdwarr.value)
cgdwflag.value = false;
cgdwec.value = false;
jssl()
@@ -334,6 +340,7 @@
return
}
+
emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
}
const colse = ()=>{
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 5887979..64d6ef1 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -379,6 +379,7 @@
return
}
timers.value = false;
+
let dt = {
nuId: form.nuId,
purchaseQuantity: num,
@@ -390,7 +391,10 @@
referenceUnitPrice: type.price,
dhbl: type.num
}
+ console.log("注意",dt)
+
addShoppingCartList([dt]).then(res => {
+
uni.showToast({
icon: res.success ? 'success' : 'none',
title: res.message
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index f9c265a..8e9edec 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -105,7 +105,7 @@
item.zk = false;
item.scrollleft = 0;
})
- console.log(res.result.records)
+ // console.log(`最上层`,res.result.records)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
})
@@ -118,8 +118,9 @@
}
const addcartory =(e:any)=>{
- console.log(e)
+ console.log(`eeeeeeeeeee`,e)
caigouobj.value = e;
+
addflag.value = true;
}
const confirm =(e:any)=>{
@@ -187,7 +188,10 @@
})
}
const right = (n:number,nm:any,type:Object) => {
- connfig(nm,n,type)
+ setTimeout(()=>{
+ connfig(nm,n,type)
+ },30)
+
}
const timers = ref(true)
const connfig = (nm:any,num:Number,type:Object) =>{
@@ -206,7 +210,8 @@
dhbl:type.num
}
- console.log(dt)
+ console.log(`111111111111111111111111111111`,dt)
+
eddShoppingCartList(dt).then(res=>{
uni.showToast({
icon:res.success?'success':'none',
diff --git a/pages/watch/index.vue b/pages/watch/index.vue
index cade83c..5431f2d 100644
--- a/pages/watch/index.vue
+++ b/pages/watch/index.vue
@@ -232,7 +232,7 @@