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-11 10:09:33 +08:00
parent cd6b44efe6
commit 8039afb825
13 changed files with 84 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/NursingNew/component/nurse/index.css
View File

@ -992,7 +992,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
/* 添加毛玻璃效果 */ /* 添加毛玻璃效果 */
z-index: 98; z-index: 999;
.popup-overlay-content { .popup-overlay-content {
position: absolute; position: absolute;

6
pages/NursingNew/component/nurse/index.vue
View File

@ -419,7 +419,7 @@
</view> </view>
<!-- 点击的弹出层 --> <!-- 点击的弹出层 -->
<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1"> <view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao" <view class="popup-overlay-content" style="height: 390rpx;" popup-overlay:class="getjiao"
v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'" v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }" :style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
@click.stop> @click.stop>
@ -1548,7 +1548,7 @@
openX.value = Math.floor(res.left) - 18 openX.value = Math.floor(res.left) - 18
jiao.value[0] = false jiao.value[0] = false
} }
if (res.top > 500) { if (res.top > 300) {
// 表格太靠上侧，修改到下面 // 表格太靠上侧，修改到下面
openY.value = Math.floor(res.top) + 100; openY.value = Math.floor(res.top) + 100;
jiao.value[1] = true jiao.value[1] = true
@ -1561,7 +1561,7 @@
showDetail.value[0] = index0; showDetail.value[0] = index0;
showDetail.value[1] = index1; showDetail.value[1] = index1;
console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage) // console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
isopacity.value = false; isopacity.value = false;
//加动画 //加动画
setTimeout(() => { setTimeout(() => {

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

@ -5,10 +5,11 @@
请领物料 请领物料
<view class="mhao" v-if="Material.length>0">{{Material.length}}</view> <view class="mhao" v-if="Material.length>0">{{Material.length}}</view>
</view> </view>
<scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll" <scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll" scroll-with-animation
scroll-with-animation :scroll-left="scrollleft" :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' "> :scroll-left="scrollleft" :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
<view class="yjbox" v-for="(v,i) in Material" :key="i" > <view class="yjbox" v-for="(v,i) in Material" :key="i">
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'" <image
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image> mode="aspectFill"></image>
<view>{{v.materialInfo?.materialName}}</view> <view>{{v.materialInfo?.materialName}}</view>
<text class="ytj" v-if="v.qlNum>=0">{{v.qlNum}}</text> <text class="ytj" v-if="v.qlNum>=0">{{v.qlNum}}</text>
@ -16,9 +17,11 @@
<view>-</view> <view>-</view>
</view> </view>
</view> </view>
<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr> <defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
</scroll-view> </scroll-view>
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove" v-if="Material.length>0"> <view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
v-if="Material.length>0">
<view @click="zksq" class="righ0"> <view @click="zksq" class="righ0">
{{!qb?'更多':'收起'}} {{!qb?'更多':'收起'}}
<image class="guodu" :style="qb?'transform: rotate(180deg);':''" <image class="guodu" :style="qb?'transform: rotate(180deg);':''"
@ -44,42 +47,42 @@
import defaultr from './default.vue' import defaultr from './default.vue'
import tanchuang from '../common/tanchuang.vue'; import tanchuang from '../common/tanchuang.vue';
const props = defineProps({ const props = defineProps({
Material:{ Material: {
type:Array, type: Array,
required: true, required: true,
} }
}); });
const emit = defineEmits([ 'delall' ,'del','submit']) const emit = defineEmits(['delall', 'del', 'submit'])
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const qb = ref(false) const qb = ref(false)
const moredex = ref(0) const moredex = ref(0)
watch(()=>props.Material, watch(() => props.Material,
()=>{ () => {
if(props.Material.length==0){ if (props.Material.length == 0) {
qb.value = false; qb.value = false;
moredex.value=0; moredex.value = 0;
} }
}) })
const delall = ()=>{ const delall = () => {
emit('delall'); emit('delall');
setTimeout(()=>{ setTimeout(() => {
moredex.value = 0; moredex.value = 0;
qb.value = false; qb.value = false;
},100) }, 100)
} }
const del =(v)=>{ const del = (v) => {
emit('del',v) emit('del', v)
} }
const zksq = () =>{ const zksq = () => {
if(props.Material.length==0){ if (props.Material.length == 0) {
uni.showToast({ uni.showToast({
icon:'none', icon: 'none',
title:'请添加请领物料！' title: '请添加请领物料！'
}) })
return return
} }
qb.value=!qb.value; qb.value = !qb.value;
moredex.value=0; moredex.value = 0;
moveleft(); moveleft();
} }
const startX = ref(0) const startX = ref(0)
@ -93,7 +96,7 @@
} }
const scrollleft = ref(0) const scrollleft = ref(0)
const canmove = (e : any) => { const canmove = (e : any) => {
if(props.Material.length==0){ return } if (props.Material.length == 0) { return }
const moveX = e.touches[0].clientX const moveX = e.touches[0].clientX
const diff = moveX - startX.value const diff = moveX - startX.value
// diff 为负值就是向左滑 // diff 为负值就是向左滑
@ -129,10 +132,10 @@
} }
} }
const timeout = ref(false) const timeout = ref(false)
onMounted(()=>{ onMounted(() => {
setTimeout(()=>{ setTimeout(() => {
timeout.value = true timeout.value = true
},500) }, 500)
}) })
</script> </script>
@ -157,22 +160,30 @@
font-size: 1.4vw; font-size: 1.4vw;
position: relative; position: relative;
z-index: 10; z-index: 10;
.mhao{
width: 1.6vw; .mhao {
min-height: 0vw;
border-radius: 0.8vw;
border: 1px solid #FF4E4E;
font-weight: 400;
font-size: 1.1vw;
color: #FF4E4E;
padding: 0.4vw 0vw;
position: absolute; position: absolute;
top: -0.8vw; top: -0.9vw;
right: -0.4vw; /* 根据视觉需要微调 */
transform: rotate(-90deg); right: -0.5vw;
/* 根据视觉需要微调 */
box-sizing: border-box;
width: 1.8vw;
/* 保证两位数也能容纳（可改成 2vw 以更宽松） */
height: 1.8vw;
/* 圆高，line-height 要与它匹配 */
padding: 0 0.15vw;
/* 给两位数一点水平缓冲 */
border-radius: 50%;
border: 1px solid #FF4E4E;
color: #FF4E4E;
display: flex; display: flex;
justify-content: center;
align-items: center; align-items: center;
justify-content: center;
background: transparent;
writing-mode: horizontal-tb;
/* <- 关键：让内部按横排显示数字（不被父写排规则影响） */
overflow: hidden;
} }
} }
@ -234,8 +245,9 @@
} }
} }
.kcscrol { .kcscrol {
width:calc(100% - 10vw); width: calc(100% - 10vw);
height: 10vw; height: 10vw;
white-space: nowrap; white-space: nowrap;
margin-left: 0.6vw; margin-left: 0.6vw;
@ -250,14 +262,16 @@
border-radius: 1.1vw; border-radius: 1.1vw;
margin-right: 0.8vw; margin-right: 0.8vw;
position: relative; position: relative;
.zhanwei{
.zhanwei {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 200; z-index: 200;
view{
view {
position: absolute; position: absolute;
width: 2.2vw; width: 2.2vw;
height: 2.2vw; height: 2.2vw;
@ -276,6 +290,7 @@
color: rgba(255, 78, 78, 1); color: rgba(255, 78, 78, 1);
} }
} }
.ytj { .ytj {
min-width: 1.5vw; min-width: 1.5vw;
height: 1.8vw; height: 1.8vw;
@ -316,6 +331,7 @@
} }
} }
} }
.guodu { .guodu {
transition: .4s; transition: .4s;
-webkit-transform-style: preserve-3d; -webkit-transform-style: preserve-3d;

1
pages/NursingNew/component/pleasetake/common/carditem.vue
View File

@ -220,6 +220,7 @@
position: absolute; position: absolute;
bottom: 0.8vw; bottom: 0.8vw;
right: 0vw; right: 0vw;
} }
} }
.msitem { .msitem {

1
pages/NursingNew/component/pleasetake/common/submits.vue
View File

@ -338,6 +338,7 @@
} }
.quxiao{ .quxiao{
background: #EDEDEF; background: #EDEDEF;
color: #888888;
} }
.plsbuy-bottom-blue { .plsbuy-bottom-blue {
background: linear-gradient(0deg, #CAE0F9, #E9F4FF); background: linear-gradient(0deg, #CAE0F9, #E9F4FF);

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

@ -205,6 +205,7 @@
} }
.quxiao{ .quxiao{
background: #EDEDEF; background: #EDEDEF;
color: #888888;
} }
.plsbuy-bottom-blue { .plsbuy-bottom-blue {
background: linear-gradient(0deg, #CAE0F9, #E9F4FF); background: linear-gradient(0deg, #CAE0F9, #E9F4FF);

3
pages/NursingNew/component/pleasetake/common/takerecord.vue
View File

@ -101,10 +101,11 @@
if(props.show==true){ if(props.show==true){
let obj = { let obj = {
nuId:uni.getStorageSync('nuId'), nuId:uni.getStorageSync('nuId'),
elderId:uni.getStorageSync('NUall').id, elderId:uni.getStorageSync('NUall').elderId,
wlId:props.objtake.wlId, wlId:props.objtake.wlId,
} }
queryMaterialInfo(obj).then(res=>{ queryMaterialInfo(obj).then(res=>{
console.log("入参",obj,`返回`,res)
wuobj.value = res.result wuobj.value = res.result
}) })
qglog() qglog()

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

@ -299,6 +299,7 @@
elderId:form.elderId elderId:form.elderId
} }
submitQld(obj).then(res=>{ submitQld(obj).then(res=>{
console.log("入参",obj,"res",res)
if(res.success&&res.result.status=='success'){ if(res.success&&res.result.status=='success'){
uni.showToast({ uni.showToast({
icon:'success', icon:'success',

6
pages/Warehouse/picking.vue
View File

@ -1353,7 +1353,7 @@
const nomessageshow = ref(false); const nomessageshow = ref(false);
const firstgetqueryCgdList = () => { const firstgetqueryCgdList = () => {
queryCgdList(plzinfo).then((res : any) => { queryCgdList(plzinfo).then((res : any) => {
console.log("数据呢",res)
plsbuy.value.push(...res.result.records) plsbuy.value.push(...res.result.records)
alltotal.value = res.result.total alltotal.value = res.result.total
if (!res.result.total) { if (!res.result.total) {
@ -1406,7 +1406,7 @@
// console.log("!!!!",form) // console.log("!!!!",form)
queryCgdInfoList(form).then(res => { queryCgdInfoList(form).then(res => {
InvoicingList.value = [] InvoicingList.value = []
// console.log("数据呢", res.result.records) console.log("数据呢", form)
InvoicingList.value.push(...res.result.records); InvoicingList.value.push(...res.result.records);
if (form.pageNo) { if (form.pageNo) {
clickmiddle(0); clickmiddle(0);
@ -1454,7 +1454,7 @@
const mobanform = { const mobanform = {
nuId: '', nuId: '',
pageNo: 1, pageNo: 1,
pageSize: 9, pageSize: -1,
categoryId: '', categoryId: '',
typeId: '', typeId: '',
medicationId: '', medicationId: '',

6
pages/procurement/outbound.vue
View File

@ -183,7 +183,7 @@
<view class="right-one" v-for="(item,index) in rightarray" :key="index"> <view class="right-one" v-for="(item,index) in rightarray" :key="index">
<view class="right-one-left"> <view class="right-one-left">
<image class="left-image" <image class="left-image"
:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'" :src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image> mode="aspectFill"></image>
<view class="left-tages" style="margin-top: -15rpx;"> <view class="left-tages" style="margin-top: -15rpx;">
{{ item.materialInfo.categoryName}} {{ item.materialInfo.categoryName}}
@ -371,12 +371,14 @@
plsbuy.value = [] plsbuy.value = []
plsbuy.value.push(...res.result.records) plsbuy.value.push(...res.result.records)
alltotal.value = res.result.total alltotal.value = res.result.total
console.log("?????",res.result.records[0].qldNo)
if (res.result.records.length) { if (res.result.records.length) {
rightdonghua.value = false; rightdonghua.value = false;
queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => { queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
console.log("111111111",element)
rightarray.value = [] rightarray.value = []
rightarray.value.push(...element.result) rightarray.value.push(...element.result)
rightdonghua.value = true; rightdonghua.value = true;
}) })

2
pages/procurement/purchaseorder.vue
View File

@ -537,7 +537,7 @@
const mobanform = { const mobanform = {
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
pageNo: 1, pageNo: 1,
pageSize: 9, pageSize: -1,
categoryId: '', categoryId: '',
typeId: '', typeId: '',
medicationId: '', medicationId: '',

BIN
static/index/procurement/+.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
static/index/procurement/-.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB