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

Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

This commit is contained in:
Teng 2026-01-15 09:28:07 +08:00
parent 2d6be1afbf 26178f54c6
commit 2d4f593e28
8 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pages/NursingNew/component/index.vue
View File

@ -148,10 +148,14 @@
<tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang> <tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang>
<image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''" <image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/> :src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center; ">
<view class="server-name" v-if="indexmessage?.startTime"> <view class="server-name" v-if="indexmessage?.startTime">
{{ indexmessage?.directiveName }} {{ indexmessage?.directiveName }}
</view> </view>
<view style="width: 6.5vw;height: 2vw;margin-left: 1vw;position: relative;" v-if="indexmessage?.startTime">
<image src="/static/index/newindex/wendu/bgc.png" mode="aspectFill" style="width: 100%;height: 100%;position: relative;z-index: 0;margin-top: 0.9vw;"></image>
<view class="bgc-font" style="top: 0;left: 0;padding-left:0.45vw;width: 100%;height: 100%;z-index: 2;position: absolute;line-height:3.7vw;font-size: 1.1vw;">{{indexmessage.categoryName}}</view>
</view>
</view> </view>
<view style="display: flex;margin-top: 40rpx;" v-if="indexmessage?.startTime"> <view style="display: flex;margin-top: 40rpx;" v-if="indexmessage?.startTime">
<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;"> <view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
@ -723,6 +727,7 @@
} }
const clickLeftMenu = (index : any, item : object) => { const clickLeftMenu = (index : any, item : object) => {
queryOrderInfoList({ mainId: item.id }).then(res => { queryOrderInfoList({ mainId: item.id }).then(res => {
console.log(res)
if(res.result.length>0){ if(res.result.length>0){
indexmessage.value = res.result[0] indexmessage.value = res.result[0]
}else{ }else{
@ -1720,12 +1725,6 @@
left: 0%; left: 0%;
width: 120%; width: 120%;
height: 120rpx; height: 120rpx;
background: linear-gradient(to bottom,
rgba(239, 240, 244, 1) 0%,
/* #eff0f4 全不透明 */
rgba(239, 240, 244, 0) 100%
/* #eff0f4 完全透明 */
);
z-index: 4; z-index: 4;
} }
@ -1735,12 +1734,6 @@
left: 0%; left: 0%;
width: 120%; width: 120%;
height: 120rpx; height: 120rpx;
background: linear-gradient(to top,
rgba(239, 240, 244, 1) 0%,
/* #eff0f4 全不透明 */
rgba(239, 240, 244, 0) 100%
/* #eff0f4 完全透明 */
);
z-index: 4; z-index: 4;
} }

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

@ -241,7 +241,7 @@
} }
} }
.cont{ .cont{
width: 38vw; width: 37.5vw;
height: 14.6vw; height: 14.6vw;
background: #F9F9FA; background: #F9F9FA;
border-radius: 1.6vw; border-radius: 1.6vw;
@ -249,39 +249,41 @@
position: relative; position: relative;
.leftbox { .leftbox {
width: 13vw; width: 14vw;
height: 12vw; height: 12vw;
border-right: 2px solid #E5E5E5; border-right: 2px solid #f2f2f2;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
position: absolute; position: absolute;
left: 0; left: 0;
top: 1.3vw; top: 1.3vw;
padding-left: 0.5vw;
.carditem { .carditem {
width: 100%; width: 80%;
margin-top: 0.3vw; margin : 0.3vw auto 0;
display: flex; display: flex;
align-items: center; justify-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
// justify-content: space-around; // justify-content: space-around;
view { view {
width: 6vw; max-width: 6vw;
height: 2vw; height: 2vw;
border-radius: 1vw; border-radius: 1vw;
border: 1px solid #D2D2D2; border: 1px solid #D2D2D2;
font-weight: 400; font-weight: 400;
font-size: 0.9vw; font-size: 0.9vw;
color: #555555; color: #555555;
display: flex; padding: 0 0.4vw;
justify-content: center;
align-items: center;
padding: 0 0.6vw;
margin: 0.5vw 0 0 0.25vw; margin: 0.5vw 0 0 0.25vw;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
display: inline-block;
text-align: center;
line-height: 2.1vw;
} }
} }
.bgimg{ .bgimg{

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

@ -961,16 +961,17 @@
} }
.left-tages { .left-tages {
width: 130rpx; min-width: 130rpx;
height: 38rpx; height: 38rpx;
border-radius: 19rpx; border-radius: 19rpx;
display: flex;
justify-content: center;
align-items: center;
color: #555555; color: #555555;
border: 1rpx solid #D2D2D2; border: 1rpx solid #D2D2D2;
margin-bottom:0.2vw; margin-bottom:0.2vw;
font-size: 19rpx; font-size: 19rpx;
text-align: center;
line-height: 40rpx;
white-space: nowrap;
padding: 0 0.4vw;
} }
} }

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

@ -431,7 +431,7 @@
.itembox { .itembox {
width: 100%; width: 100%;
height: calc(100vh - 22vw); height: calc(100vh - 22vw);
padding: 1vw 0.5vw 1vw; padding: 1vw 0.5vw 0vw;
background: #fff; background: #fff;

13
pages/procurement/components/addall.vue
View File

@ -11,6 +11,7 @@
<view class="qd" @click="add()">确定</view> <view class="qd" @click="add()">确定</view>
</view> </view>
</view> </view>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" />
</view> </view>
</template> </template>
@ -20,10 +21,17 @@
props:{ props:{
show:false, show:false,
}, },
data(){
return{
openerror:false,
errmsg:''
}
},
methods: { methods: {
add(){ add(){
addWaringAll({nuId: uni.getStorageSync('nuId')}).then(res=>{ addWaringAll({nuId: uni.getStorageSync('nuId')}).then(res=>{
if(res.success){
uni.showToast({ uni.showToast({
icon:res.success?'success':'none', icon:res.success?'success':'none',
title:res.message title:res.message
@ -31,6 +39,11 @@
setTimeout(()=>{ setTimeout(()=>{
this.$emit('config') this.$emit('config')
},1800) },1800)
}else{
this.errmsg = res.message;
this.openerror = true
}
}) })
} }
} }

1
pages/procurement/retstock.vue
View File

@ -765,6 +765,7 @@
height: calc(100vh - 8vw); height: calc(100vh - 8vw);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-right: 0.6vw;
margin-top: 1vw; margin-top: 1vw;
.rightscr { .rightscr {

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 { export {
camera as default camera as default
}; };

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

@ -578,7 +578,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 { export {
fullcamera as default fullcamera as default
}; };