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

同步

This commit is contained in:
wangweidong 2025-12-19 16:08:58 +08:00
parent ec474003d1
commit de81495e20
17 changed files with 292 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,12 +10,15 @@
<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
</view>
<view class="speitem guodu" >
<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imgs">
<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
<view v-if="v.medicationId_dictText">{{v.medicationId_dictText}}</view>
</view>
</view>
<view class="msitem guodu" >
@ -337,33 +340,43 @@
top:0;
left: 0;
.cardp {
width:8vw;
height: 4vw;
width:9vw;
display: flex;
margin: 0 auto;
margin:0.3vw auto;
align-items: center;
justify-content: center;
flex-direction: column;
flex-wrap: wrap;
// flex-direction: column;
view {
min-width: 5.5vw;
height: 1.8vw;
height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
margin: 0.5vw 0 0 0.5vw;
margin: 0.25vw 0 0 0;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 1vw;
font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
>image {
width: 8.5vw;
height: 7.5vw;
margin: 0vw auto 0.25vw;
.imgs {
width: 7.8vw;
height: 7vw;
background: #Fff;
border-radius: 1.1vw;
display: flex;
justify-content: center;
align-items: center;
margin: 0.8vw auto 0;
padding: 0.3vw;
>image {
width: 100%;
height: 100%;
}
}
}

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

@ -8,12 +8,16 @@
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" >
<view class="speitem guodu" >
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imge">
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
</view>
</view>
<view class="msitem guodu" >
@ -345,25 +349,32 @@
flex-direction: column;
view {
min-width: 5.5vw;
height: 1.8vw;
height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
margin: 0.5vw 0 0 0.5vw;
margin: 0.25vw 0 0 0.5vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 1vw;
font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
>image {
.imge{
width: 8vw;
height: 7vw;
padding: 0.2vw;
margin: 0.3vw auto 0.25vw;
background: #fff;
border-radius: 1.1vw;
>image {
width: 100%;
height: 100%;
}
}
}
.itembox{

39
pages/NursingNew/component/pleasetake/common/medetails.vue
View File

@ -5,10 +5,13 @@
<view class="tit">物料详情</view>
<view class="cont">
<view class="leftbox">
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
<view class="img">
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
</view>
<view>
<view>{{ objtake?.categoryId_dictText }}</view>
<view>{{ objtake?.typeId_dictText }}</view>
<view v-if="objtake?.medicationId_dictText">{{objtake?.medicationId_dictText}}</view>
</view>
</view>
<view class="youcont">
@ -143,17 +146,14 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
width: 14.2vw;
height: 100%;
border-right: 2px solid #E5E5E5;
view {
&:nth-child(1) view {
width: 100%;
margin-top: 0.6vw;
display: flex;
// justify-content: space-around;
flex-direction: column;
align-items: center;
flex-wrap: wrap;
view {
width: 6vw;
width: 6.5vw;
height: 2vw;
border-radius: 1vw;
border: 1px solid #D2D2D2;
@ -163,15 +163,28 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
display: flex;
justify-content: center;
align-items: center;
margin: 0.25vw 0 0 0.3vw;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}
>image {
width: 10.2vw;
height: 10.2vw;
margin: 0 auto;
display: block;
.img{
padding: 0.3vw;
background: #f8f8f8;
width: 12.2vw;
height: 11.2vw;
padding: 0.2vw;
margin: 0.3vw auto;
border-radius: 1.6vw;
>image {
width: 100%;
height: 100%;
margin: 0.3vw auto;
display: block;
}
}
}
.youcont {

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

@ -17,12 +17,15 @@
<view class="list">
<view class="card" v-for="(v,i) in list" :key='i'>
<view class="speitem guodu" >
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imgs">
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
<view v-if="v.materialInfo.medicationId_dictText">{{v.materialInfo.medicationId_dictText}}</view>
</view>
</view>
<view class="msitem guodu" >
@ -84,6 +87,7 @@
const showbox = ref(false)
watch(()=>props.show,
()=>{
console.log(props.list)
if(props.show==true){
setTimeout(()=>{
showbox.value = true
@ -228,8 +232,8 @@
top:0;
left: 0;
.cardp {
width:8vw;
height: 4vw;
width:10vw;
height: 5vw;
display: flex;
margin: 0 auto;
align-items: center;
@ -237,24 +241,34 @@
flex-direction: column;
view {
min-width: 5.5vw;
height: 1.8vw;
height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
margin: 0.5vw 0 0 0.5vw;
margin: 0.25vw 0 0 0.5vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 1vw;
font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
>image {
.imgs {
width: 7vw;
height: 7vw;
margin: 0.5vw auto 0.25vw;
background: #Fff;
border-radius: 1.1vw;
display: flex;
justify-content: center;
align-items: center;
margin: 0.5vw auto 0;
padding: 0.2vw;
>image {
width: 100%;
height: 100%;
}
}
}
}

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

@ -8,10 +8,14 @@
</view>
<view class="cont">
<view class="leftbox">
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
<view>
<view class="bgimg">
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
</view>
<view class="carditem">
<view v-if="objtake?.categoryId_dictText">{{objtake?.categoryId_dictText}}</view>
<view v-if="objtake?.typeId_dictText">{{objtake?.typeId_dictText}}</view>
<view v-if="objtake?.medicationId_dictText">{{objtake?.medicationId_dictText}}</view>
</view>
</view>
<view class="youcont">
@ -250,36 +254,46 @@
width: 15.2vw;
height: 100%;
border-right: 2px solid #E5E5E5;
view {
display: flex;
flex-direction: column;
align-items: center;
.carditem {
width: 100%;
margin-top: 0.3vw;
display: flex;
flex-direction: column;
align-items: center;
flex-wrap: wrap;
// justify-content: space-around;
view {
width: 6vw;
min-width: 6vw;
height: 2vw;
border-radius: 1vw;
border: 1px solid #D2D2D2;
font-weight: 400;
font-size: 1.1vw;
font-size: 0.9vw;
color: #555555;
display: flex;
justify-content: center;
align-items: center;
padding: 0 0.6vw;
margin: 0.5vw 0 0 0.25vw;
white-space: nowrap;
}
}
>image {
.bgimg{
width: 8.5vw;
height: 8vw;
margin: 0 auto;
display: block;
background: #fff;
border-radius: 1.1vw;
>image {
width: 100%;
height: 100%;
margin: 0.3vw auto;
display: block;
}
}
}
.youcont {

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

@ -163,15 +163,22 @@
<view class="right-ones">
<view class="right-one" v-for="(item,index) in rightarray" :key="index">
<view class="right-one-left">
<image class="left-image"
:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image>
<view class="left-tages" style="margin-top: -15rpx;">
<view class="imge">
<image class="left-image"
:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image>
</view>
<view class="left-tages" >
{{ item.materialInfo.categoryName}}
</view>
<view class="left-tages">
{{ item.materialInfo.typeName}}
</view>
<view class="left-tages" v-if="item.materialInfo.medicationName">
{{item.materialInfo.medicationName}}
</view>
</view>
<view class="right-one-right">
<view class="right-title">
@ -939,26 +946,31 @@
flex-direction: column;
align-items: center;
.left-image {
.imge {
width: 140rpx;
height: 140rpx;
// margin: 15rpx 0;
margin-top: 10rpx;
margin-bottom: 15rpx;
// margin-top: 5rpx;
padding: 0.2vw;
border-radius: 1.1vw;
background: #f8f8f8;
image{
width: 100%;
height: 100%;
}
}
.left-tages {
width: 130rpx;
height: 43rpx;
border-radius: 30rpx;
height: 38rpx;
border-radius: 19rpx;
display: flex;
justify-content: center;
align-items: center;
color: #555555;
border: 1rpx solid #D2D2D2;
margin-top: 5rpx;
font-size: 23rpx;
margin-top:0.2vw;
font-size: 19rpx;
}
}

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

@ -13,7 +13,7 @@
<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true" v-if="rightarray.length">
<image src="/static/index/warehouse/procurement/picking/caigou.png" />
<view>
提交请购单
提交请领单
</view>
</view>
</view>

34
pages/procurement/authorization.vue
View File

@ -103,12 +103,16 @@
<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
</view>
<view class="speitem guodu" >
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="bgimg">
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
</view>
</view>
<view class="msitem guodu" >
@ -511,30 +515,40 @@
width:8vw;
height: 4vw;
display: flex;
margin: 0 auto;
margin: 0.3vw auto;
align-items: center;
justify-content: center;
flex-direction: column;
view {
min-width: 5.5vw;
height: 1.8vw;
height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
margin: 0.5vw 0 0 0.5vw;
margin: 0.3vw 0 0 0vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 1vw;
font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
>image {
.bgimg{
width: 7.5vw;
height: 7.5vw;
margin: 0vw auto 0.25vw;
height: 7vw;
margin: 0.3vw auto 0.25vw;
border-radius: 1.1vw;
background: #fff;
display: flex;
justify-content: center;
align-items: center;
padding: 0.2vw;
>image {
width: 100%;
height: 100%;
}
}
}

40
pages/procurement/common/submits.vue
View File

@ -17,13 +17,18 @@
<view class="list">
<view class="card" v-for="(v,i) in list" :key='i'>
<view class="speitem guodu">
<image
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imge">
<image
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
</view>
</view>
<view class="msitem guodu">
@ -249,34 +254,41 @@
.cardp {
width: 8vw;
height: 4vw;
height: 5.5vw;
display: flex;
margin: 0 auto;
margin: 0.3vw auto 0;
align-items: center;
justify-content: center;
flex-direction: column;
overflow: hidden;
view {
min-width: 5.5vw;
height: 1.8vw;
height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
margin: 0.5vw 0 0 0.5vw;
margin: 0 0 0.5vw 0.5vw ;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 1vw;
font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
>image {
width: 8.5vw;
height: 7.5vw;
.imge{
width: 7vw;
height:6.5vw;
margin: 0.7vw auto 0.25vw;
border-radius: 1.1vw;
background: #fff;
padding: 0.2vw;
>image {
width: 100%;
height: 100%;
}
}
}
}
}

28
pages/procurement/common/thitem.vue
View File

@ -11,13 +11,17 @@
<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
</view>
<view class="speitem guodu">
<image
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="bgimg">
<image
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
</view>
</view>
<view class="msitem guodu">
@ -404,12 +408,22 @@
padding: 0 0.25vw;
}
}
>image {
.bgimg{
width: 7.5vw;
height: 7.5vw;
margin: 0vw auto 0.25vw;
margin: 0.3vw auto 0.25vw;
border-radius: 1.1vw;
background: #fff;
display: flex;
justify-content: center;
align-items: center;
padding: 0.2vw;
>image {
width: 100%;
height: 100%;
}
}
}

26
pages/procurement/components/carditem.vue
View File

@ -7,9 +7,12 @@
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" >
<view class="speitem guodu" >
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imghs">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
@ -418,12 +421,19 @@
}
}
}
>image {
width: 8.5vw;
height: 7.5vw;
margin: 1.25vw auto 0.25vw;
.imghs{
width: 9vw;
height: 8vw;
margin: 0.8vw auto 0.25vw;
padding: 0.2vw;
background: #fff;
border-radius: 1.1vw;
>image {
width: 100%;
height: 100%;
}
}
}
}
</style>

23
pages/procurement/components/carlist.vue
View File

@ -12,9 +12,12 @@
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" :class="v.flag?'actve':''">
<view class="speitem guodu" >
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imghs">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
@ -447,11 +450,17 @@
}
}
>image {
width: 9vw;
height: 8vw;
margin: 0 auto 0;
.imghs{
width: 10vw;
height: 9vw;
margin: -0.8vw auto 0.25vw;
padding: 0.2vw;
background: #fff;
border-radius: 1.1vw;
>image {
width: 100%;
height: 100%;
}
}
}
}

19
pages/procurement/components/purorder.vue
View File

@ -110,9 +110,11 @@
<!-- <view style="height:2vw;"></view> -->
<view class="fler" v-for="(v,index) in generatedOrder[lefttarget]?.cgdInfoList" :key="index">
<view class="speitem guodu">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
<view class="imghs">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill">
</image>
</view>
<view class="cardp">
<view v-if="v.categoryName">{{v.categoryName}}</view>
<view v-if="v.typeName">{{v.typeName}}</view>
@ -484,10 +486,17 @@
}
}
>image {
.imghs{
width: 10vw;
height: 9vw;
margin: 0.5vw auto 0;
margin: 0.8vw auto 0.25vw;
padding: 0.2vw;
background: #fff;
border-radius: 1.1vw;
>image {
width: 100%;
height: 100%;
}
}
}
}

38
pages/procurement/outbound.vue
View File

@ -181,15 +181,20 @@
<view class="right-ones">
<view class="right-one" v-for="(item,index) in rightarray" :key="index">
<view class="right-one-left">
<image class="left-image"
:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image>
<view class="left-tages" style="margin-top: -15rpx;">
<view class="bgimg">
<image class="left-image"
:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image>
</view>
<view class="left-tages" >
{{ item.materialInfo.categoryName}}
</view>
<view class="left-tages">
{{ item.materialInfo.typeName}}
</view>
<view class="left-tages" v-if="item.materialInfo.medicationName">
{{ item.materialInfo.medicationName}}
</view>
</view>
<view class="right-one-right">
<view class="right-title">
@ -1099,18 +1104,25 @@
flex-direction: column;
align-items: center;
.left-image {
width: 150rpx;
height: 150rpx;
// margin: 15rpx 0;
margin-top: 10rpx;
margin-bottom: 15rpx;
// margin-top: 5rpx;
.bgimg{
width: 7.5vw;
height: 7vw;
margin: 0.3vw auto 0.25vw;
border-radius: 1.1vw;
background: #fff;
display: flex;
justify-content: center;
align-items: center;
padding: 0.2vw;
>image {
width: 100%;
height: 100%;
}
}
.left-tages {
width: 130rpx;
height: 43rpx;
height: 36rpx;
border-radius: 30rpx;
display: flex;
justify-content: center;
@ -1118,7 +1130,7 @@
color: #555555;
border: 1rpx solid #D2D2D2;
margin-top: 5rpx;
font-size: 23rpx;
font-size: 20rpx;
}
}

2
pages/procurement/retstock.vue
View File

@ -264,7 +264,7 @@
console.log(v)
wuliao();
thdNuMaterialList({ nuId: v.nuId, id: v.id }).then(res => {
console.log(res)
console.log({ nuId: v.nuId, id: v.id })
cardarr.value = res.result
})
if (v.izRead == 'N') {

2
unpackage/dist/dev/.nvue/pages/camera.js vendored
View File

@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
export {
camera as default
};

2
unpackage/dist/dev/.nvue/pages/fullcamera.js vendored
View File

@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
export {
fullcamera as default
};