yangjun
/
hldy_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app合并

This commit is contained in:
Teng 2025-10-29 17:27:16 +08:00
parent 86fa4cc4bf
commit afff25429b
5 changed files with 165 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/Warehouse/Warehouse.vue
View File

@ -104,13 +104,19 @@
console.log('选中' + housedex.value) console.log('选中' + housedex.value)
if (housedex.value == 1) { if (housedex.value == 1) {
navurl.value = 'pages/Warehouse/procurement' navurl.value = 'pages/Warehouse/procurement'
uni.navigateTo({
url: '/' + navurl.value
})
} }
if (housedex.value == 3) { if (housedex.value == 2) {
navurl.value = 'pages/Warehouse/purchaseorder' navurl.value = 'pages/Warehouse/purchaseorder'
uni.navigateTo({
url: '/' + navurl.value
})
} }
uni.navigateTo({ // uni.navigateTo({
url: '/' + navurl.value // url: '/' + navurl.value
}) // })
break; break;
case 5: case 5:
// 返回 // 返回

2
pages/Warehouse/procurecart.vue
View File

@ -477,7 +477,7 @@
const getMaterial = () => { const getMaterial = () => {
getGwcMaterialTreeData(form).then(res => { getGwcMaterialTreeData(form).then(res => {
console.log(res)
TreeData.value = res.result TreeData.value = res.result
}) })
} }

1
pages/Warehouse/procurement.vue
View File

@ -576,6 +576,7 @@
} }
const getMaterial = () => { const getMaterial = () => {
getMaterialTreeData(form).then(res => { getMaterialTreeData(form).then(res => {
console.log("!!TreeData",form,res.result)
TreeData.value = res.result TreeData.value = res.result
}) })
} }

212
pages/Warehouse/purchaseorder.vue
View File

@ -14,7 +14,8 @@
@scrolltolower="plsbuytolower" :lower-threshold="200"> @scrolltolower="plsbuytolower" :lower-threshold="200">
<view class="margin-height"></view> <view class="margin-height"></view>
<view class="boxitem" v-for="(v,i) in plsbuy" :key='i' <view class="boxitem" v-for="(v,i) in plsbuy" :key='i'
:class="{'yujing':v?.cgdType=='9','active':leftitem==i}" @click="getmiddle(v,i);saveleftgo = i;"> :class="{'yujing':v?.cgdType=='9','active':leftitem==i}"
@click="getmiddle(v,i);saveleftgo = i;">
<view>{{ v.cgdNo }}</view> <view>{{ v.cgdNo }}</view>
<view>供应商:{{ v.gysId_dictText }}</view> <view>供应商:{{ v.gysId_dictText }}</view>
@ -33,6 +34,8 @@
￥ ￥
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="fxj"> <view class="fxj">
@ -71,7 +74,7 @@
</view> </view>
<view> <!-- <view>
<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}"> <view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill" <image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill"
v-if="v.tagType==1"></image> v-if="v.tagType==1"></image>
@ -90,7 +93,7 @@
<view>{{v.kcsl}}</view> <view>{{v.kcsl}}</view>
<view>库存数量</view> <view>库存数量</view>
</view> </view>
</view> </view> -->
</view> </view>
<view style="height: 23vw;padding-top: 10vw;"> <view style="height: 23vw;padding-top: 10vw;">
<u-loadmore :status="status" /> <u-loadmore :status="status" />
@ -125,7 +128,7 @@
<view class="scroltype"> <view class="scroltype">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop3" <scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop3"
class="scroll-Y"> class="scroll-Y">
<view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})" >全部</view> <view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})">全部</view>
<view :class="scroll.act3==i?'act':''" <view :class="scroll.act3==i?'act':''"
v-for="(v,i) in TreeData[scroll.act1]?.children[scroll.act2]?.children" v-for="(v,i) in TreeData[scroll.act1]?.children[scroll.act2]?.children"
@click="typescroll(3,i,v)"> @click="typescroll(3,i,v)">
@ -135,7 +138,7 @@
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop2" <scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop2"
class="scroll-Y"> class="scroll-Y">
<view :class="scroll.act2==-1?'act':''" @click="typescroll(2,-1,{})" >全部</view> <view :class="scroll.act2==-1?'act':''" @click="typescroll(2,-1,{})">全部</view>
<view :class="scroll.act2==i?'act':''" v-for="(v,i) in TreeData[scroll.act1]?.children" <view :class="scroll.act2==i?'act':''" v-for="(v,i) in TreeData[scroll.act1]?.children"
@click="typescroll(2,i,v)"> @click="typescroll(2,i,v)">
{{v.title}} {{v.title}}
@ -144,7 +147,7 @@
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop1" <scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop1"
class="scroll-Y scrl1"> class="scroll-Y scrl1">
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})" >全部</view> <view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})">全部</view>
<view :class="scroll.act1==i?'act':''" v-for="(v,i) in TreeData" @click="typescroll(1,i,v)"> <view :class="scroll.act1==i?'act':''" v-for="(v,i) in TreeData" @click="typescroll(1,i,v)">
<image :src="serverUrl + v.appCheckIconPath" mode="aspectFill" v-if="scroll.act1==i"> <image :src="serverUrl + v.appCheckIconPath" mode="aspectFill" v-if="scroll.act1==i">
</image> </image>
@ -262,21 +265,44 @@
<view v-show="shareShow" class="popup-share" @click="shareShow=false"> <view v-show="shareShow" class="popup-share" @click="shareShow=false">
<view class="popup-share-content" :style="{ opacity: deletedownisopacity ? 1 : 0 }" @click.stop> <view class="popup-share-content" :style="{ opacity: deletedownisopacity ? 1 : 0 }" @click.stop>
<view class="share-other"> <view class="share-other">
<view class="share-title"> <view class="share-main">
<image style="width: 50rpx;height: 50rpx;" src="/static/index/sharelogo.png" /> <view class="">
<view style="font-weight: 600;margin-left: 15rpx;"> <view class="share-weight">
护理单元 {{ plsbuy[leftitem]?.cgdNo }}
</view>
<view class="share-font">
供应商：{{ plsbuy[leftitem]?.gysId_dictText }}
</view>
<view class="share-font">
采购时间：{{ plsbuy[leftitem]?.qgDate }}
</view>
</view> </view>
<view class="right-flex">
<view style="font-weight: 600;">
<text style="vertical-align: 4rpx;">
￥
</text>
<text class="dollar-text">
{{plsbuy[leftitem]?.totalPrice}}
</text>
</view>
<view class="caigou-font">
采购金额
</view>
</view>
</view> </view>
<view class="share-others"> <view class="share-bottom">
<view style="font-weight: 600;font-size: 45rpx;"> <view style="display: flex;align-items: center;">
护理流程 <image class="share-bottom-img" src="/static/index/youngman.png"></image>
</view> <view class="share-name">
<view style="margin-top: 30rpx;"> {{ plsbuy[leftitem]?.createBy_dictText }}
护理单元01 </view>
<text style="color: #1083F8;"> <view class="share-font">
王金凤 采购人
</text> </view>
</view> </view>
<view class="blue-button" @click="clickshare"> <view class="blue-button" @click="clickshare">
分享 分享
@ -341,7 +367,8 @@
typeId: '', typeId: '',
medicationId: '', medicationId: '',
wlParamInfo: '', wlParamInfo: '',
cgdId: "" cgdId: "",
isWaring: 0
}) })
const mobanform = { const mobanform = {
nuId: '', nuId: '',
@ -351,7 +378,8 @@
typeId: '', typeId: '',
medicationId: '', medicationId: '',
wlParamInfo: '', wlParamInfo: '',
cgdId: "" cgdId: "",
isWaring: 0
} }
const getmiddle = (item : any, i : number) => { const getmiddle = (item : any, i : number) => {
let num = Math.ceil((i + 1)) let num = Math.ceil((i + 1))
@ -420,7 +448,7 @@
} }
const shopclick = (i : number) => { const shopclick = (i : number) => {
let num = Math.ceil((i + 1) / 2) let num = Math.ceil((i + 1) / 2)
scrolltop.value = (num - 2) * 270; scrolltop.value = (num - 2) * 167;
shopitem.value = i; shopitem.value = i;
// console.log(InvoicingList.value[i].wlId, uni.getStorageSync('nuId')) // console.log(InvoicingList.value[i].wlId, uni.getStorageSync('nuId'))
detailform.wlId = InvoicingList.value[i]?.wlId detailform.wlId = InvoicingList.value[i]?.wlId
@ -481,6 +509,7 @@
form.nuId = uni.getStorageSync('nuId'); form.nuId = uni.getStorageSync('nuId');
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/'; serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
firstgetqueryCgdList(); firstgetqueryCgdList();
cell()
}) })
const init = () => { const init = () => {
@ -549,15 +578,17 @@
} }
const cell = () => { const cell = () => {
queryNuInfoByNuId(form).then(res => { queryNuInfoByNuId(form).then(res => {
console.log("ceshi", form, cellobj.value)
cellobj.value = res.result; cellobj.value = res.result;
shyp.value = res.result.status == 5 ? false : true shyp.value = res.result.status == 5 ? false : true
}) })
} }
const getMaterial = () => { const getMaterial = () => {
getCgdMaterialTreeData(form).then(res => { getCgdMaterialTreeData(form).then(res => {
console.log(form) // console.log(form)
console.log(res) // console.log(res)
TreeData.value = res.result TreeData.value = res.result;
console.log("TreeData.value", TreeData.value)
}) })
} }
const setout = ref(true) const setout = ref(true)
@ -701,7 +732,7 @@
const anmidex = ref(-1) const anmidex = ref(-1)
const admiclick = (i : number) => { const admiclick = (i : number) => {
anmidex.value = i; anmidex.value = i;
if(plsbuy.value[leftitem.value]?.cgdType == '9'){ if (plsbuy.value[leftitem.value]?.cgdType == '9') {
uni.showToast({ uni.showToast({
title: '该表单已经作废', title: '该表单已经作废',
icon: 'none', // 'none' 表示不带图标 icon: 'none', // 'none' 表示不带图标
@ -735,7 +766,6 @@
const badshow = ref(false); const badshow = ref(false);
const donghuacs = ref(false); const donghuacs = ref(false);
const bebad = () => { const bebad = () => {
console.log("leftitem", leftitem.value)
if (leftitem.value == -1) { if (leftitem.value == -1) {
uni.showToast({ uni.showToast({
title: '请选择想要作废的采购单', title: '请选择想要作废的采购单',
@ -744,11 +774,9 @@
}) })
return return
} else { } else {
badshow.value = true; badshow.value = true;
donghuacs.value = false; donghuacs.value = false;
setTimeout(() => donghuacs.value = true, 50) setTimeout(() => donghuacs.value = true, 50)
// setTimeout(()=>donghua.value = true,50)
} }
} }
const zuofei = () => { const zuofei = () => {
@ -766,12 +794,21 @@
}) })
} }
const shareToWeixin = () => { const shareToWeixin = () => {
if (leftitem.value == -1) {
uni.showToast({
title: '请选择想要分享的采购单',
icon: 'none', // 'none' 表示不带图标
duration: 2000
})
return
} else {
shareShow.value = true;
deletedownisopacity.value = false;
setTimeout(() => {
deletedownisopacity.value = true
}, 100)
}
shareShow.value = true;
deletedownisopacity.value = false;
setTimeout(() => {
deletedownisopacity.value = true
}, 100)
} }
const clickshare = () => { const clickshare = () => {
@ -1733,10 +1770,10 @@
.boxitem { .boxitem {
width: 22vw; width: 22vw;
height: 19.3vw; height: 12vw;
background: rgba(255, 255, 255, .7); background: rgba(255, 255, 255, .7);
border-radius: 1.6vw; border-radius: 1.6vw;
margin: 0 1.3vw 1.2vw 0; margin: 0 1.3vw 1.4vw 0;
border: 2px dashed #fff; border: 2px dashed #fff;
display: inline-block; display: inline-block;
padding: 1.5vw; padding: 1.5vw;
@ -1774,14 +1811,14 @@
font-weight: 400; font-weight: 400;
font-size: 1.2vw; font-size: 1.2vw;
color: #555555; color: #555555;
margin-top: .2vw; margin-top: .4vw;
} }
&:nth-child(3) { &:nth-child(3) {
font-weight: 400; font-weight: 400;
font-size: 1.2vw; font-size: 1.2vw;
color: #666666; color: #666666;
margin-top: .2vw; margin-top: .4vw;
// z-index: 9999; // z-index: 9999;
} }
@ -1789,7 +1826,7 @@
font-weight: 400; font-weight: 400;
font-size: 1.2vw; font-size: 1.2vw;
color: #666666; color: #666666;
margin-top: .2vw; margin-top: .4vw;
} }
@ -2223,13 +2260,7 @@
margin-top: .6vw; margin-top: .6vw;
} }
.special-pos {
width: 100%;
height: 10vw;
position: absolute;
left: 0;
bottom: 0;
}
// >&:nth-child(5) { // >&:nth-child(5) {
// width: 100%; // width: 100%;
@ -2465,25 +2496,23 @@
z-index: 1; z-index: 1;
width: 100%; width: 100%;
height: 100%; height: 100%;
} padding: 50rpx;
position: relative;
.share-title { .share-main {
padding-left: 50rpx; display: flex;
height: 150rpx; justify-content: space-between;
display: flex;
align-items: center;
}
.share-others { .share-weight {
display: flex; font-weight: 600;
justify-content: center; font-size: 30rpx;
align-items: center; }
flex-direction: column;
.other-img { .share-font {
width: 150rpx; color: #666666;
height: 150rpx; font-size: 30rpx;
margin-left: 100rpx; margin-top: 20rpx;
}
} }
} }
@ -2491,8 +2520,8 @@
position: absolute; position: absolute;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 800rpx; width: 1000rpx;
height: 450rpx; height: 500rpx;
background-color: #fff; background-color: #fff;
border-radius: 30rpx; border-radius: 30rpx;
transition: opacity 0.4s ease; transition: opacity 0.4s ease;
@ -2672,6 +2701,61 @@
.margin-height { .margin-height {
height: 10rpx; height: 10rpx;
} }
.special-pos {
width: 100%;
height: 10vw;
position: absolute;
left: 0;
bottom: 0;
}
.right-flex {
display: flex;
flex-direction: column;
align-items: flex-end;
.dollar-text {
font-size: 2.2vw;
}
.caigou-font {
color: #999999;
margin-top: -5rpx;
font-size: 24rpx;
}
}
.share-bottom {
position: absolute;
width: 100%;
padding: 0 50rpx;
height: 120rpx;
bottom: 70rpx;
left: 0;
display: flex;
justify-content: space-between;
align-items: center;
.share-bottom-img {
width: 150rpx;
height: 140rpx;
}
.share-name {
margin: 0 20rpx;
font-size: 35rpx;
color: #555555;
font-weight: 600;
}
.share-font {
color: #555555;
margin-top: 10rpx;
font-size: 24rpx;
}
}
</style> </style>
<style> <style>
page { page {

BIN
static/index/youngman.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB