From 588f6f929f92e5ee03f80b2583a41aed6e6213d5 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 30 Oct 2025 17:38:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/Warehouse/Warehouse.vue | 13 +-
pages/Warehouse/components/equiment.vue | 225 +++++
pages/Warehouse/procurecart.vue | 620 ++++++++-----
pages/Warehouse/procurement.vue | 861 ++++++++----------
static/index/warehouse/ap.png | Bin 0 -> 1185 bytes
static/index/warehouse/l0.png | Bin 0 -> 576 bytes
.../index/warehouse/procurement/lie/2lr.png | Bin 0 -> 656 bytes
.../index/warehouse/procurement/lie/2ls.png | Bin 0 -> 599 bytes
.../index/warehouse/procurement/lie/3lr.png | Bin 0 -> 721 bytes
.../index/warehouse/procurement/lie/3ls.png | Bin 0 -> 631 bytes
static/index/warehouse/xz.png | Bin 0 -> 1254 bytes
static/index/warehouse/y2.png | Bin 0 -> 861 bytes
unpackage/dist/dev/.nvue/pages/camera.js | 2 +-
unpackage/dist/dev/.nvue/pages/fullcamera.js | 2 +-
.../.app-plus/tsc/app-android/.tsbuildInfo | 2 +-
15 files changed, 1016 insertions(+), 709 deletions(-)
create mode 100644 pages/Warehouse/components/equiment.vue
create mode 100644 static/index/warehouse/ap.png
create mode 100644 static/index/warehouse/l0.png
create mode 100644 static/index/warehouse/procurement/lie/2lr.png
create mode 100644 static/index/warehouse/procurement/lie/2ls.png
create mode 100644 static/index/warehouse/procurement/lie/3lr.png
create mode 100644 static/index/warehouse/procurement/lie/3ls.png
create mode 100644 static/index/warehouse/xz.png
create mode 100644 static/index/warehouse/y2.png
diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue
index 8f39983..5838cf8 100644
--- a/pages/Warehouse/Warehouse.vue
+++ b/pages/Warehouse/Warehouse.vue
@@ -4,13 +4,7 @@
-
-
-
-
-
@@ -31,7 +25,8 @@
{{v}}
-
+
+
@@ -231,6 +226,7 @@
diff --git a/pages/Warehouse/procurecart.vue b/pages/Warehouse/procurecart.vue
index 4994cde..8c887c0 100644
--- a/pages/Warehouse/procurecart.vue
+++ b/pages/Warehouse/procurecart.vue
@@ -37,13 +37,17 @@
-
-
-
- 长春市朝阳区久泰开运养老服务有限公司
-
-
+
+
+
+
+
+
+
+
+
+
@@ -51,29 +55,17 @@
:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}"
@click="shopclick(i)">
{{v.wlName}}
- 规格型号: {{v.wlSpecificationModel}}
+ 物料编码： {{v.wlMaterialNo}}
+ 规格型号： {{v.wlSpecificationModel}}
采购单位： {{v.wlUnits}}
- 库存数量： {{v.kcsl}}
-
-
-
-
-
- {{v.tagName}}
-
-
-
-
+
+ {{v.kcsl}}
+ 库存数量
采购数量：{{v.purchaseQuantity}}
- 供应商：{{v.suppliersName}}
+ {{v.suppliersName}}
@@ -86,23 +78,20 @@
-
-
-
- 长春市朝阳区久泰开运养老服务有限公司
-
生活用品库
-
@@ -119,26 +108,40 @@
{{cellobj?.fzrTel?cellobj?.fzrTel:'-'}}
-
-
-
-
- {{lie?'三列':'两列'}}
-
-
+
+
+
+
+ 待进行
+
+ 10:00 - 10:10
+ 物料采购
+
+
+
+ 协助执行
+
+
+
+ 王金福 / 李贵田
+
+
+
+ 开始服务
+ 服务结束
+
+
+
{{v+'级分类'}}
+ class="scroll-Y scrl3">
全部
+ class="scroll-Y scrl2">
全部
@@ -292,8 +295,8 @@
确定
-
-
+
+
+
@@ -319,6 +324,7 @@
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import shadowview from './components/ShadowView.vue';
import calculator from './components/calculator.vue';
+ import equiment from './components/equiment.vue';
const navurl = ref('');
const InvoicingList = ref([]);
const TreeData = ref([]);
@@ -344,7 +350,7 @@
const form = reactive({
nuId: '',
pageNo: 1,
- pageSize: 10,
+ pageSize: 13,
categoryId: '',
typeId: '',
medicationId: '',
@@ -368,6 +374,9 @@
}
})
}
+ const config = ()=>{
+ qingkong()
+ }
const timerflag = ref(true);
const connfig = () =>{
if(timerflag.value==false){return}
@@ -511,17 +520,20 @@
const queryInvo = () => {
queryShoppingCartList(form).then(res => {
res.result.records.forEach((item,i)=>{
- item.flag = false
- if(i==0&&form.pageNo == 1){
- item.flag = true
- }
+ item.flag = true
})
+ console.log(res.result.records)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
panduan();
})
}
+ const propsmove = ref(-1)
const movecard = (type : number, l : number) => {
+ if(tost.value == true){
+ propsmove.value = type;
+ return
+ }
if (l == 1) {
switch (type) {
case 0:
@@ -559,15 +571,15 @@
switch (type) {
case 0:
// 上
- shopitem.value = shopitem.value < 3 ? shopitem.value = 0 : shopitem.value - 3
+ shopitem.value = shopitem.value < 2 ? shopitem.value = 0 : shopitem.value - 3
break;
case 1:
// →
- shopitem.value = shopitem.value >= InvoicingList.value.length-1 ? shopitem.value = 0 : shopitem.value + 1
+ shopitem.value = shopitem.value >= InvoicingList.value.length -1? shopitem.value = 0 : shopitem.value + 1
break;
case 2:
// 下
- shopitem.value = shopitem.value >= InvoicingList.value.length-3 ? shopitem.value = InvoicingList.value.length-1 : shopitem.value + 3
+ shopitem.value = shopitem.value >= InvoicingList.value.length-3 ? shopitem.value = 0 : shopitem.value + 3
break;
case 3:
shopitem.value = shopitem.value == 0 ? shopitem.value = InvoicingList.value.length-1 : shopitem.value - 1
@@ -626,7 +638,7 @@
tmr.value = true;
},1000)
break;
- case 2:
+ case 1:
let arr = [];
InvoicingList.value.forEach(item=>{
if(item.flag){
@@ -648,10 +660,10 @@
})
cgd.value = true;
break;
- case 3:
+ case 2:
if(InvoicingList.value.length==0){
uni.showToast({
- title:'请选择物料~',
+ title:'购物车物料为空~',
icon:'none'
})
tmr.value = true;
@@ -661,16 +673,11 @@
tmr.value = true;
queryWlInfo();
break;
- case 4:
- let a = []
- InvoicingList.value.forEach((item,i)=>{
- if(item.flag){
- a.push(item.wlName)
- }
- })
- if(a.length==0){
+ case 3:
+
+ if(InvoicingList.value.length==0){
uni.showToast({
- title:'请选择物料~',
+ title:'购物车物料为空~',
icon:'none'
})
tmr.value = true;
@@ -678,13 +685,12 @@
return
}
tmr.value = true;
- delstr.value = a ;
tost.value = true;
break;
- case 5:
+ case 4:
if(InvoicingList.value.length==0){
uni.showToast({
- title:'购物车已清空~',
+ title:'购物车物料为空~',
icon:'none'
})
tmr.value = true;
@@ -694,70 +700,61 @@
tmr.value = true;
tost.value = true;
break;
- case 1:
- let arrs = [];
- if(InvoicingList.value.length==0){
- uni.showToast({
- title:'购物车为空~',
- icon:'none'
- })
- tmr.value = true;
- anmidex.value = -1;
- return
- }
- InvoicingList.value.forEach((item,i)=>{
- if(item.flag){
- arrs.push(i)
- }else{
- item.flag = true;
- }
+ case 5:
+ uni.navigateTo({
+ url:'/pages/Warehouse/purchaseorder'
})
- if(arrs.length==InvoicingList.value.length){
- InvoicingList.value.forEach((item,i)=>{
- item.flag = false;
- })
- }
- setTimeout(()=>{
- anmidex.value = -1;
- tmr.value = true;
- },1000)
- break;
+ anmidex.value = -1;
+ break;
+ // case 1:
+ //全选
+ // let arrs = [];
+ // if(InvoicingList.value.length==0){
+ // uni.showToast({
+ // title:'购物车为空~',
+ // icon:'none'
+ // })
+ // tmr.value = true;
+ // anmidex.value = -1;
+ // return
+ // }
+ // InvoicingList.value.forEach((item,i)=>{
+ // if(item.flag){
+ // arrs.push(i)
+ // }else{
+ // item.flag = true;
+ // }
+ // })
+ // if(arrs.length==InvoicingList.value.length){
+ // InvoicingList.value.forEach((item,i)=>{
+ // item.flag = false;
+ // })
+ // }
+ // setTimeout(()=>{
+ // anmidex.value = -1;
+ // tmr.value = true;
+ // },1000)
+ // break;
default:
break;
}
}
const del = (e:number)=>{
- if(e==4){
- let arr = [];
- let delstr = '';
- InvoicingList.value.forEach((item,i)=>{
- if(item.flag){
- delstr+=item.id+','
- arr.push(i)
- }
- })
- if(delstr.indexOf(",")>-1) delstr = delstr.substring(0,delstr.length-1)
+ if(e==3){
+ let delstr = InvoicingList.value[shopitem.value].id;
deleteQgInfoById(delstr).then(res=>{
uni.showToast({
icon:res.success?'success':'none',
title:res.message
})
if(res.success){
- form.pageNo = 1;
- queryShoppingCartList(form).then(res => {
- res.result.records.forEach((item,i)=>{
- item.flag = false
- if(i==0){
- item.flag = true
- }
- })
- InvoicingList.value = [];
- InvoicingList.value.push(...res.result.records);
- status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore'
- qingkong()
- })
+ InvoicingList.value.splice(shopitem.value,1)
+ if(shopitem.value == InvoicingList.value.length){
+ shopitem.value = InvoicingList.value.length-1
+ }
}
+ qingkong()
})
}else{
emptiedQgInfo().then(res=>{
@@ -801,18 +798,6 @@
name: '选择',
imgurl: '/static/index/warehouse/procurement/select/select1.png'
},
- {
- url: genPaths(
- '/static/index/warehouse/procurement/ctrl',
- 'Ctrl',
- 9, // 张数
- 'png',
- 0, // 起始索引为 1
- false // 不补零
- ),
- name: '全选',
- imgurl: '/static/index/warehouse/procurement/select/Ctrl0.png'
- },
{
url: genPaths(
'/static/index/warehouse/procurement/procure',
@@ -860,7 +845,19 @@
),
name: '清空',
imgurl: '/static/index/warehouse/procurement/dele/del1.png'
- }
+ },
+ {
+ url: genPaths(
+ '/static/index/warehouse/procurement/Purchase',
+ 'Purchase0',
+ 9, // 张数
+ 'png',
+ 1, // 起始索引为 1
+ false // 不补零
+ ),
+ name: '采购单',
+ imgurl: '/static/index/warehouse/procurement/Purchase/Purchase01.png'
+ },
])
@@ -1332,7 +1329,7 @@
width: 100%;
height: 9vw;
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
flex-wrap: wrap;
>view {
@@ -1345,7 +1342,7 @@
font-size: 1.3vw;
color: #212327;
background: #FFFFFF;
- margin: 0.25vw 0;
+ margin: 0.25vw 0.5vw 0 0;
border-radius: 1.6vw;
view {
margin-right: .4vw;
@@ -1369,20 +1366,30 @@
.typeitem {
width: 100%;
- height: 54vh;
+ height: 38vh;
.scroltype {
width: 100%;
- height: calc(54vh - 2vw);
+ height: calc(34vh - 2vw);
display: flex;
justify-content: space-around;
-
- .scroll-Y {
- width: 8.5vw;
- height: calc(54vh - 2vw);
-
+ .scrl1{
+ width: 9vw;
+ view {
+ width: 8.8vw;
+ }
+
+ }
+ .scrl2,.scrl3{
+ width: 8vw;
+ view {
+ width: 7.7vw;
+ }
+ }
+ .scroll-Y {
+ height: calc(38vh - 2vw);
+
view {
- width: 100%;
height: 3.8vw;
background: rgba(255, 255, 255, .5);
border-radius: 1.9vw;
@@ -1429,19 +1436,23 @@
justify-content: center;
align-items: center;
font-weight: 400;
- font-size: 1.2vw;
+ font-size: 1vw;
color: #333333;
+ margin-left: -1.5vw;
+ &:nth-child(1){
+ margin-left: -1vw;
+ }
}
}
}
.shitem {
width: 27vw;
- height: 10.3vw;
+ height: 6.8vw;
background: #E8E9ED;
border-radius: 1.6vw;
padding: 1.2vw 1.8vw;
-
+ position: relative;
.jqry {
width: 100%;
display: flex;
@@ -1484,27 +1495,41 @@
.shypk {
width: 100%;
display: flex;
- justify-content: space-between;
-
+ justify-content: flex-end;
+ position: absolute;
+ top: 0;
+ right: 0;
+
view {
&:nth-child(1) {
font-weight: bold;
font-size: 1.1vw;
color: #333333;
+ padding: 1vw;
}
&:nth-child(2) {
display: flex;
- flex-direction: column;
align-items: center;
-
- text {
- font-weight: 400;
- font-size: 1vw;
- color: #666666;
- }
-
-
+ width: 4.6vw;
+ height: 2.2vw;
+ border-radius: 0.4vw;
+ view{
+ width: 50%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: rgba(239, 240, 244, 1);
+ image{
+ width: 1.6vw;
+ height: 1.6vw;
+ }
+ }
+ .atve{
+ background: #fff;
+ }
+
}
}
}
@@ -1517,39 +1542,7 @@
height: calc(100%);
position: relative;
- .fxj {
- width: 23vw;
- height: 22vw;
- position: absolute;
- left: 0;
- bottom: 2vw;
- z-index: 11;
- border-radius: 1.6vw;
- text {
- width: 100%;
- font-weight: 400;
- font-size: .9vw;
- color: #999999;
- display: flex;
- justify-content: center;
- position: absolute;
- left: 0;
- bottom: 0vw;
- }
- }
-
- .mblbg {
- width: 24.5vw;
- height: 21vw;
- position: absolute;
- left: -1vw;
- bottom: 0.5vw;
- border-radius: 1.6vw;
- filter: blur(15rpx);
- background: RGBA(239, 240, 244, 1);
- z-index: 10;
- }
.scroll-Y {
width: 100%;
@@ -1569,17 +1562,38 @@
.boxitem {
width: 22vw;
- height: 19.3vw;
+ height: 14.3vw;
background: rgba(255, 255, 255, .7);
border-radius: 1.6vw;
margin: 0 1.3vw 1.2vw 0;
border: 2px dashed #fff;
display: inline-block;
- padding:1vw 2.3vw 2.3vw;
+ padding:1vw 1.6vw 0;
position: relative;
+ .kcsl{
+ position: absolute;
+ width: 4vw;
+ top: 1.5vw;
+ right: 1.7vw;
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
+ text{
+ &:nth-child(1){
+ font-weight: bold;
+ font-size: 1.8vw;
+ color: #555555;
+ }
+ &:nth-child(2){
+ font-weight: 400;
+ font-size: 1vw;
+ color: #999999;
+ }
+ }
+ }
.dbgys{
width: 100%;
- height: 5.3vw;
+ height: 4.5vw;
position: absolute;
left: 0;
bottom: 0vw;
@@ -1590,6 +1604,8 @@
padding: 0.4vw 1.5vw 0;
justify-content: space-between;
align-items: center;
+ box-sizing: border-box;
+ overflow: hidden;
.act{
background: rgba(231, 240, 251, 1) !important;
border: 1px solid rgba(0, 118, 214, 1) !important;
@@ -1616,7 +1632,14 @@
font-weight: 400;
font-size: 1vw;
color: #888888;
- width: 14vw;
+
+ view{
+ width:15vw;
+ height:1.9vw;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
text{
font-weight: bold;
font-size: 1.4vw;
@@ -1644,33 +1667,30 @@
&:nth-child(1) {
font-weight: bold;
- font-size: 1.5vw;
+ font-size: 1.4vw;
color: #333;
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
+ max-width: 15vw;
+
}
&:nth-child(2) {
font-weight: 400;
- font-size: 1.2vw;
+ font-size: 1.1vw;
color: #555555;
margin-top: .6vw;
}
&:nth-child(3) ,&:nth-child(4) {
font-weight: 400;
- font-size: 1.2vw;
+ font-size: 1.1vw;
color: #666666;
- margin-top: .6vw;
+ margin-top: .2vw;
}
- &:nth-child(5) {
- width: 100%;
- height: 7vw;
-
- }
@@ -1773,27 +1793,6 @@
height: calc(100%);
position: relative;
- .fxj {
- width: 30vw;
- height: 16vw;
- position: absolute;
- left: 1vw;
- bottom: 0vw;
- z-index: 111;
- border-radius: 1.6vw;
-
- text {
- width: 76%;
- font-weight: 400;
- font-size: .9vw;
- color: #999999;
- display: flex;
- justify-content: center;
- position: absolute;
- left: 0;
- bottom: 0vw;
- }
- }
.mblbg {
width: 35vw;
@@ -1948,6 +1947,173 @@
}
}
}
+ .mblbg {
+ width: 37.5vw;
+ height: 16.5vw;
+ position: absolute;
+ left: -1vw;
+ bottom: 0vw;
+ border-radius: 1.6vw;
+ filter: blur(15rpx);
+ background: RGBA(239, 240, 244, 1);
+ z-index: 1110;
+ }
+ .lmblbg {
+ width: 26.5vw;
+ height: 15vw;
+ position: absolute;
+ left: -1vw;
+ bottom: 0.5vw;
+ border-radius: 1.6vw;
+ filter: blur(15rpx);
+ background: RGBA(239, 240, 244, 1);
+ z-index: 1110;
+ }
+ .lfxj {
+ width: 30vw;
+ height: 16vw;
+ position: absolute;
+ left: 1vw;
+ bottom: 0vw;
+ z-index: 1111;
+ border-radius: 1.6vw;
+
+ text {
+ width: 76%;
+ font-weight: 400;
+ font-size: .9vw;
+ color: #999999;
+ display: flex;
+ justify-content: center;
+ position: absolute;
+ left: 0;
+ bottom: 0vw;
+ }
+ }
+ .fxj {
+ width: 23vw;
+ height: 22vw;
+ position: fixed;
+ left: 0;
+ bottom: 2vw;
+ z-index: 1111;
+ border-radius: 1.6vw;
+
+ text {
+ width: 100%;
+ font-weight: 400;
+ font-size: .9vw;
+ color: #999999;
+ display: flex;
+ justify-content: center;
+ position: absolute;
+ left: 0;
+ bottom: 0vw;
+ }
+ }
+
+
+ .ksfw{
+ width: 27vw;
+ height: 13.6vw;
+ background: rgba(255, 255, 255, 0.6);
+ border-radius: 1vw;
+ border: 1px solid #D9DADC;
+ padding: 0 1vw;
+ margin: 0.7vw auto 0;
+ position: relative;
+ .shjs{
+ width: 100%;
+ margin-top: 0.8vw;
+ display: flex;
+ justify-content: space-around;
+ view{
+ width: 7.2vw;
+ height: 2.5vw;
+ background: #E4E9F4;
+ border-radius: 1.25vw;
+ font-weight: 400;
+ font-size: 1.1vw;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid #E4E9F4;
+ }
+ .iacts{
+ background: rgba(168, 212, 255, .75);
+ border: 1px solid #A8D4FF;
+ color: #249BFA;
+ }
+
+ }
+ .zhxng{
+ width: 100%;
+ height: 2.8vw;
+ margin-top: 0.4vw;
+ display: flex;
+ padding: 1.1vw;
+ justify-content: space-between;
+ border-bottom: 2px solid #E5E5E5;
+ view{
+ display: flex;
+ align-items: center;
+ image{
+ width: 1.6vw;
+ height: 1.6vw;
+ margin-right: 0.3vw;
+ }
+ text{
+ font-weight: 400;
+ font-size: 1vw;
+ color: #555555;
+ }
+ }
+ }
+ .wul{
+ width: 100%;
+ height: 1.5vw;
+ font-weight: bold;
+ font-size: 1.5vw;
+ color: #555555;
+ text-align: center;
+ margin: 1vw auto 0;
+ }
+ .tm{
+ width: 100%;
+ height: 1.8vw;
+ font-size: 2.2vw;
+ font-weight: bolder;
+ color: #555555;
+ margin-top: 2vw;
+ text-align: center;
+ }
+ .jx{
+ width: 2.9vw;
+ height: 1.4vw;
+ position: absolute;
+ top: 0.9vw;
+ right: 1.5vw;
+ font-weight: 400;
+ font-size:0.7vw;
+ color: #FFFFFF;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ image{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: 0;
+ z-index: 1;
+ }
+ text{
+ position: relative;
+ z-index: 2;
+ }
+ }
+ }