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

合并

This commit is contained in:
Teng 2025-12-12 17:02:33 +08:00
parent f921484671
commit 3d1ec09229
13 changed files with 440 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
component/public/errorshow.vue
View File

@ -1,5 +1,5 @@
<!-- 使用示例 已经全局暴露了，直接用-->
<!-- <errorshow :show="openerror" font="确定将本次请领清单中的所有物料都移除吗？" @close="openerror=false" /> -->
<!-- <errorshow :show="openmessage" :font="errormessage" @close="openmessage=false" /> -->
<template>
<view>
<view class="addall" v-if="show">

2
component/zy-upgrade/zy-upgrade.vue
View File

@ -140,7 +140,7 @@
method: 'GET',
dataType:'json',
success: (res) => {
console.log("?????",res)
// console.log("?????",res)
// this.$emit('chuandinew',this.updated2version)
if(res.statusCode===404){
return

46
pages/NursingNew/component/pleasetake/common/addwl.vue
View File

@ -22,7 +22,7 @@
<view>-</view>
</view>
</view>
<view class="que" v-if="Material.length==0&&timeout">
<view class="que guodu" v-if="Material.length==0&&timeout" :style="qb?'width:65.8vw':'' " >
<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<view>暂无数据</view>
</view>
@ -30,19 +30,28 @@
style="position: absolute;width: 10vw;height: 10vw;"></defaultr> -->
</scroll-view>
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
v-if="Material.length>0">
>
<view @click="zksq" class="righ0">
{{!qb?'更多':'收起'}}
<image class="guodu" :style="qb?'transform: rotate(180deg);':''"
src="/static/index/procurement/zjt.png" mode="aspectFill"></image>
</view>
<view class="guodu" :class="qb?(moredex==1?'avt':''):'righ0'" @click="moredex = moredex==1?0:1; ">
<view class="guodu" v-if="Material.length" :class="qb?(moredex==1?'avt':''):'righ0'" @click="moredex = moredex==1?0:1; ">
批量移除
</view>
<view class="guodu" :class="qb?(moredex==2?'avt':''):'righ0'" @click="moredex=2; ">
<view class="guodu" v-if="Material.length" :class="qb?(moredex==2?'avt':''):'righ0'" @click="moredex=2; ">
清空列表
</view>
<view class="guodu" :class="qb?(moredex==3?'avt':''):'righ0'" @click="moredex=3;emit('submit')">
<view class="guodu" v-if="Material.length" :class="qb?(moredex==3?'avt':''):'righ0'" @click="moredex=3;emit('submit')">
提交请领单
</view>
<view class="guodu" v-if="!Material.length" style="background-color: #e8e8e8;" :class="qb?(moredex==1?'avt':''):'righ0'">
批量移除
</view>
<view class="guodu" v-if="!Material.length" style="background-color: #e8e8e8;" :class="qb?(moredex==2?'avt':''):'righ0'">
清空列表
</view>
<view class="guodu" v-if="!Material.length" style="background-color: #e8e8e8;" :class="qb?(moredex==3?'avt':''):'righ0'">
提交请领单
</view>
</view>
@ -63,7 +72,7 @@
});
const emit = defineEmits(['delall', 'del', 'submit'])
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const qb = ref(false)
const qb = ref(true)
const moredex = ref(0)
watch(() => props.Material,
() => {
@ -71,6 +80,11 @@
qb.value = false;
moredex.value = 0;
}
if(props.Material.length == 1) {
if(!qb.value){
qb.value = true;
}
}
})
const delall = () => {
emit('delall');
@ -83,13 +97,13 @@
emit('del', v)
}
const zksq = () => {
if (props.Material.length == 0) {
uni.showToast({
icon: 'none',
title: '请添加请领物料！'
})
return
}
// if (props.Material.length == 0) {
// uni.showToast({
// icon: 'none',
// title: '请添加请领物料！'
// })
// return
// }
qb.value = !qb.value;
moredex.value = 0;
moveleft();
@ -166,7 +180,7 @@
display: flex;
justify-content: center;
letter-spacing: 3px;
font-size: 1.4vw;
font-size: 1.5vw;
position: relative;
z-index: 10;
@ -199,8 +213,10 @@
position: relative;
background: RGBA(239, 240, 244, 1);
.righ0 {
right: 0 !important;
}
view {
@ -350,7 +366,7 @@
position: fixed;
top: 0;
left: 0;
width: 82.2vw;
width: 77.5vw;
height: 10vw;
background: rgba(245, 246, 248, 1);
display: flex;

4
pages/NursingNew/component/pleasetake/common/htditem.vue
View File

@ -27,11 +27,11 @@
<view>
<view>
<text>{{v.qlNum?v.qlNum:'--'}}</text>
<text>退货数量</text>
<text>请领数量</text>
</view>
<view>
<text>{{v.materialInfo?.materialUnits}}</text>
<text>退货单位</text>
<text>请领单位</text>
</view>
</view>
</view>

49
pages/NursingNew/component/pleasetake/common/takeing.vue
View File

@ -9,7 +9,9 @@
<view class="zuo">
<view class="carp">
<view class="zuoimg tp">
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
<image
:src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill" />
</view>
<view class="youcont">
<view>{{objtake?.materialName}}</view>
@ -26,7 +28,7 @@
<view>
<view>
规格型号
<text style="white-space: nowrap;">{{objtake?.specificationModel}}</text>
<text style="white-space: nowrap;width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text>
</view>
</view>
</view>
@ -35,7 +37,8 @@
数量
</view>
<view class="stringShow-father">
<view class="jj" @click="jjnum(-1)" @longpress="handleTouchStart(-1)" @touchend="handleTouchEnd">
<view class="jj" @click="jjnum(-1)" @longpress="handleTouchStart(-1)"
@touchend="handleTouchEnd">
-
</view>
<view class="stringShow-kuai">
@ -57,12 +60,11 @@
@click="clickKuai(item,index)">
清零
</view>
<view class="calculator-kuai" v-else-if="item==`AE`"
@click="clickKuai(item,index)">
<image src="/static/cleanone.png" mode="aspectFill" style="width: 50%;height: 50%;margin-left: -5rpx;"></image>
<view class="calculator-kuai" v-else-if="item==`AE`" @click="clickKuai(item,index)">
<image src="/static/cleanone.png" mode="aspectFill"
style="width: 50%;height: 50%;margin-left: -5rpx;"></image>
</view>
<view class="calculator-kuai" v-else
@click="clickKuai(item,index)">
<view class="calculator-kuai" v-else @click="clickKuai(item,index)">
{{item}}
</view>
</view>
@ -205,6 +207,7 @@
top: 13vw;
right: 23.4vw;
padding: 2vw;
.you {
.plsbuy-bottom {
width: 100%;
@ -213,6 +216,7 @@
display: flex;
justify-content: flex-end;
font-size: 35rpx;
view {
display: flex;
justify-content: center;
@ -225,16 +229,19 @@
border: 1px solid #EDEDEF;
margin-left: 1vw;
}
.quxiao {
background: #EDEDEF;
color: #888888;
}
.plsbuy-bottom-blue {
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
border: 1px solid rgba(3, 133, 250, 0.34);
color: #0385FA;
}
}
.calculator-father {
width: 19vw;
height: 20vw;
@ -242,6 +249,7 @@
flex-wrap: wrap;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
.calculator-kuai {
display: flex;
justify-content: center;
@ -254,6 +262,7 @@
width: 4.4vw;
height: 4.4vw;
}
.calculator-kuai:active {
background: linear-gradient(to bottom, #00C9FF, #0076FF);
color: #fff;
@ -263,6 +272,7 @@
}
}
}
.stringShow-father {
width: 100%;
height: 7vw;
@ -270,6 +280,7 @@
display: flex;
align-items: center;
justify-content: flex-end;
.jj {
width: 5vw;
height: 5vw;
@ -282,6 +293,7 @@
border-radius: 45rpx;
font-size: 42rpx;
}
.jj:active {
background: linear-gradient(to bottom, #00C9FF, #0076FF);
color: #fff;
@ -293,6 +305,7 @@
font-size: 45rpx;
font-weight: 500;
}
.stringShow-kuai {
display: flex;
align-items: center;
@ -303,6 +316,7 @@
border: 1px solid #CBCFD0;
justify-content: space-around;
box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset;
view {
display: flex;
justify-content: center;
@ -314,6 +328,7 @@
}
}
}
.qinggou-font {
font-size: 1.4vw;
font-weight: 500;
@ -327,25 +342,32 @@
display: flex;
justify-content: space-between;
padding-top: 1.7vw;
.zuo {
width: 27vw;
height: 100%;
.carp {
width: 100%;
height: 16vw;
display: flex;
justify-content: space-between;
padding-top: 1.8vw;
.youcont {
width: 17vw;
height: 100%;
>view {
&:nth-child(2),&:nth-child(3){
&:nth-child(2),
&:nth-child(3) {
width: 100%;
height: 3.6vw;
display: flex;
justify-content: space-between;
margin-top: 1.8vw;
>view {
font-weight: 400;
font-size: 1.1vw;
@ -353,6 +375,7 @@
display: flex;
flex-direction: column;
justify-content: space-between;
text {
font-weight: 300;
font-size: 1.4vw;
@ -360,6 +383,7 @@
}
}
}
&:nth-child(1) {
width: 17vw;
height: 1.8vw;
@ -373,9 +397,11 @@
}
}
}
.zuoimg {
width: 8vw;
height: 8vw;
image {
width: 100%;
height: 100%;
@ -396,6 +422,7 @@
line-height: 2.1vw;
}
}
.mengban {
width: 100vw;
height: 100vh;
@ -405,15 +432,19 @@
left: 0;
background: RGBA(239, 240, 244, 0.55);
}
.hei0 {
height: 0 !important;
view {
height: 0 !important;
}
}
.unclass {
opacity: 0 !important;
}
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;

27
pages/NursingNew/component/pleasetake/component/requestform.vue
View File

@ -93,9 +93,10 @@
</view>
<view class="middle-heng-father">
<image class="middle-ball-img" style="width: 32rpx;height: 32rpx;" v-if="v?.status === '2' || v?.status === '3'" src="/static/index/requestform/iserror.png" />
<view class="middle-ball"
v-else-if="v?.status === '1'">
<image class="middle-ball-img" style="width: 32rpx;height: 32rpx;"
v-if="v?.status === '2' || v?.status === '3'"
src="/static/index/requestform/iserror.png" />
<view class="middle-ball" v-else-if="v?.status === '1'">
</view>
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
</view>
@ -210,6 +211,7 @@
</defaultr>
</scroll-view>
</view>
<errorshow :show="openerror" :font="errormessage" @close="openerror=false" />
</view>
</template>
@ -235,6 +237,7 @@
// console.log("??????",newVal, oldVal)
// 当旧值为false，新值为true时延迟0.2秒调用方法
if (!oldVal && newVal) {
cannomessage.value = true
transition.value = false;
chongzhi()
// firstgetqueryCgdList();
@ -432,6 +435,9 @@
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
// getSelectList();
})
const openerror = ref(false);
const errormessage = ref("")
const badshow = ref(false)
const zuofei = () => {
@ -452,11 +458,17 @@
}
setTimeout(() => {
if (res.success) {
uni.showToast({
title: res.success?res.result.message:res.message,
title: res.result.message,
icon: 'none', // 'none' 表示不带图标
duration: 3000
})
} else {
openerror.value = true;
errormessage.value = res.message
}
}, 300)
})
@ -485,11 +497,16 @@
}
setTimeout(() => {
if (res.success) {
uni.showToast({
title: res.success?res.result.message:res.message,
title: res.result.message,
icon: 'none', // 'none' 表示不带图标
duration: 3000
})
} else {
openerror.value = true;
errormessage.value = res.message
}
}, 300)
})

8
pages/NursingNew/component/pleasetake/component/returnorder.vue
View File

@ -182,6 +182,7 @@
(newVal, oldVal) => {
// 当旧值为false，新值为true时延迟0.2秒调用方法
if (!oldVal && newVal) {
cannomessage.value = true
transition.value = false;
plzinfo.pageNo = 1;
plzinfo.canpull = true;
@ -415,10 +416,13 @@
let obj = {
nuId:plzinfo.nuId,
elderId:plzinfo.elderId,
qldNo:plsbuy.value[lefttarget.value].qldNo
qldNo:plsbuy.value[lefttarget.value].qldNo,
nuName:uni.getStorageSync('nuName'),
elderName:uni.getStorageSync(`NUall`).elderInfo.name
}
submitQld(obj).then(res=>{
console.log(res)
console.log("?????",obj,res)
if(res.success&&res.result.status=='success'){
uni.showToast({
icon:'success',

15
pages/NursingNew/component/pleasetake/component/takehomep.vue
View File

@ -38,7 +38,7 @@
</view>
<view class="qlthbtn-red" v-if="isRead"></view>
</view>
<view class="qlthbtn" @click="thshow = true">
<view class="qlthbtn" style="width: 8vw;" @click="thshow = true">
<image src="/static/index/requestform/ql2.png" mode="aspectFill"></image>
<view class="shx-font">
退货
@ -96,9 +96,9 @@
form.medicationId = '';
form.pageNo = 1;
form.wlParamInfo = '',
getreddian()
config()
wuliao()
getreddian()
if (!oldVal && newVal) {
transition.value = false;
setTimeout(() => {
@ -134,7 +134,7 @@
nuId: uni.getStorageSync('nuId')
}
queryQld(plzinfo0).then((res : any) => {
if (res.result.records[0].izYgRead == `N`) {
if ( res.result.records.length) {
isRead.value = true;
} else {
isRead.value = false;
@ -149,7 +149,8 @@
nuId: uni.getStorageSync('nuId')
}
queryQld(plzinfo1).then((res : any) => {
if (res.result.records[0].izYgRead == `N`) {
// console.log("22",res.result)
if (res.result.records.length) {
isQingling.value = true;
} else {
isQingling.value = false;
@ -169,6 +170,7 @@
const listarr = ref([])
const status = ref('loadmore')
const config = () => {
queryInvoicingList(form).then(res => {
res.result.records.forEach(item => {
item.zk = false;
@ -337,9 +339,12 @@
const tijiao = () => {
let obj = {
nuId: form.nuId,
elderId: form.elderId
elderId: form.elderId,
nuName: uni.getStorageSync('nuName'),
elderName: uni.getStorageSync(`NUall`).elderInfo.name
}
submitQld(obj).then(res => {
console.log("?????",obj,res)
if (res.success && res.result.status == 'success') {
uni.showToast({
icon: 'success',

2
pages/NursingNew/component/pleasetake/css/take.less
View File

@ -129,7 +129,7 @@
border-radius: 1.65vw;
border: 1rpx solid #D9DADC;
font-weight: 400;
font-size: 1.2vw;
font-size: 1.4vw;
color: #222;
display: flex;
justify-content: center;

2
pages/procurement/inventory.vue
View File

@ -30,7 +30,7 @@
<view class="heng-blue" :style="{ left: `${selectType === 0 ? 18 : 18 + selectType * 30}%` }">
</view>
</view>
<view class="right-button" @click="addshow=true">
<view class="right-button" @click="addnew">
<image src="/static/index/requestform/addnew.png" />
<view>
新增

4
pages/procurement/outbound.vue
View File

@ -416,7 +416,7 @@
const clickLeftMenu = (index : any, item : any) => {
let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 175.4;
leftscrolltop.value = (num - 2) * 175;
if (item.izYgRead == 'N') {
let param = {
status: `yg`,
@ -793,7 +793,7 @@
.left-menu-scroll {
margin-top: 3%;
height: 91%;
height: 89%;
width: 100%;
// position: relative;
// overflow: auto;

2
pages/watch/index.vue
View File

@ -708,7 +708,7 @@
uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
uni.setStorageSync('NUall', filteredMenu.value[savetypeNow.value]);
// console.log("??????1111", filteredMenu.value[savetypeNow.value])
if (!typeNow.value) {
uni.navigateTo({
url: '/pages/NursingNew/index'

8
unpackage/dist/cache/.vite/deps/_metadata.json vendored
View File

@ -1,8 +1,8 @@
{
"hash": "9e248234",
"configHash": "17f5f5b6",
"lockfileHash": "285de26d",
"browserHash": "f287ed85",
"hash": "63b19973",
"configHash": "f0a71f11",
"lockfileHash": "e88c1aa2",
"browserHash": "b680c5d4",
"optimized": {},
"chunks": {}
}