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-22 16:23:52 +08:00
parent 31f5240104 53f694b33c
commit ac3ef67c98
13 changed files with 72 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages/NursingNew/component/doctorask/doctorask.vue
View File

@ -73,6 +73,7 @@
<view class="ld" v-if="v.izStart=='Y'&& v.izFinish=='N'" @click="end(v)">结束服务</view> <view class="ld" v-if="v.izStart=='Y'&& v.izFinish=='N'" @click="end(v)">结束服务</view>
<view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')||v.manuallyMp4Path!=null" @click="ysptp(v,i,2)">录像</view> <view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')||v.manuallyMp4Path!=null" @click="ysptp(v,i,2)">录像</view>
<view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')|| v.manuallyPicPath!=null" @click="ysptp(v,i,1)" >拍照</view> <view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')|| v.manuallyPicPath!=null" @click="ysptp(v,i,1)" >拍照</view>
<view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='Y')&&v.tplinkPath!=null" @click="ysptp(v,i,3)">Tplink</view>
</view> </view>
</view> </view>
@ -216,7 +217,7 @@
} }
const firstgetqueryCgdList = () => { const firstgetqueryCgdList = () => {
queryCareList(form).then(res => { queryCareList(form).then(res => {
console.log(res) console.log(form)
plsbuy.value.push(...res.result.records); plsbuy.value.push(...res.result.records);
status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore'; status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
if(form.pageNo==1){ if(form.pageNo==1){
@ -285,7 +286,11 @@
}else if(r == 2&&v.manuallyMp4Path){ }else if(r == 2&&v.manuallyMp4Path){
ilanarr.value = v.manuallyMp4Path.split(","); ilanarr.value = v.manuallyMp4Path.split(",");
ilanarr.value = ilanarr.value.filter(item => item !== ''); ilanarr.value = ilanarr.value.filter(item => item !== '');
}else{ }else if(r == 3&&v.tplinkPath){
ilanarr.value = v.tplinkPath.split(",");
ilanarr.value = ilanarr.value.filter(item => item !== '');
}
else{
ilanarr.value = []; ilanarr.value = [];
} }

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

@ -950,7 +950,7 @@
width: 140rpx; width: 140rpx;
height: 140rpx; height: 140rpx;
margin-top: 10rpx; margin-top: 10rpx;
margin-bottom: 15rpx; margin-bottom: 0.2vw;
padding: 0.2vw; padding: 0.2vw;
border-radius: 1.1vw; border-radius: 1.1vw;
background: #f8f8f8; background: #f8f8f8;
@ -969,7 +969,7 @@
align-items: center; align-items: center;
color: #555555; color: #555555;
border: 1rpx solid #D2D2D2; border: 1rpx solid #D2D2D2;
margin-top:0.2vw; margin-bottom:0.2vw;
font-size: 19rpx; font-size: 19rpx;
} }
} }

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

@ -194,7 +194,7 @@
if (res.success) { if (res.success) {
thshow.value = false; thshow.value = false;
uni.showToast({ uni.showToast({
icon: 'none', icon: 'success',
title: res.message title: res.message
}) })
} else { } else {

12
pages/Warehouse/picking.vue
View File

@ -1041,6 +1041,7 @@
<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang> <tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang> <tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang> <tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" />
</view> </view>
</template> </template>
@ -1814,6 +1815,8 @@
stringjh.value = toFixed4ByPadStart(showvalue.value.num) stringjh.value = toFixed4ByPadStart(showvalue.value.num)
} }
// //
const openerror = ref(false)
const errmsg = ref('')
const fag = (e) => { const fag = (e) => {
let str = ''; let str = '';
addupimg.value.forEach(item => { addupimg.value.forEach(item => {
@ -1830,11 +1833,11 @@
pickingInfo(obj).then(res => { pickingInfo(obj).then(res => {
console.log(`入参`, obj) console.log(`入参`, obj)
console.log(`返回`, res) console.log(`返回`, res)
if (res.success) {
uni.showToast({ uni.showToast({
icon: 'none', icon: res.success?'success':'none',
title: res.message ? res.message : '操作成功' title: res.message ? res.message : '操作成功'
}) })
if (res.success) {
plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
albumlist.value = []; albumlist.value = [];
addupimg.value = []; addupimg.value = [];
@ -1842,7 +1845,12 @@
open.value = 0; open.value = 0;
form.cgdId = plsbuy.value[lefttarget.value].id; form.cgdId = plsbuy.value[lefttarget.value].id;
plsbuy.value[lefttarget.value] = res.result.cgdInfo; plsbuy.value[lefttarget.value] = res.result.cgdInfo;
setTimeout(()=>{
queryInvo(middletarget.value) queryInvo(middletarget.value)
},700)
}else{
errmsg.value = res.message;
openerror.value = true;
} }
}) })
} }

19
pages/login/index.vue
View File

@ -10,7 +10,7 @@
{{ uni.getStorageSync('realname') }} {{ uni.getStorageSync('realname') }}
</view> </view>
</view> </view>
<view class="lingdang"> <view class="lingdang" v-show="!leftarraytarget">
<image class="lingdang-img" src="/static/shouye/lingdang.png" /> <image class="lingdang-img" src="/static/shouye/lingdang.png" />
<view class="hongdian"></view> <view class="hongdian"></view>
</view> </view>
@ -30,8 +30,13 @@
<view class="yanfazhong" v-show="leftarraytarget==3"> <view class="yanfazhong" v-show="leftarraytarget==3">
研发中... 研发中...
</view> </view>
<view class="componentall" v-show="leftarraytarget==4"> <view class="componentall" v-show="leftarraytarget==4&&ldflagindex==0">
<menusettings :isShow="leftarraytarget==4" /> <menusettings :isShow="leftarraytarget==4" @leftarray="leftarray"/>
</view>
<view class="componentall" v-show="ldflagindex>9" style="margin-top: -2vh;">
<leida v-if="ldflagindex==10"></leida>
<saoma v-if="ldflagindex==11"></saoma>
<inputing v-if="ldflagindex==12"></inputing>
</view> </view>
<view class="componentall" v-show="leftarraytarget==1 || leftarraytarget==2"> <view class="componentall" v-show="leftarraytarget==1 || leftarraytarget==2">
<scroll-view scroll-y class="componentall" > <scroll-view scroll-y class="componentall" >
@ -150,6 +155,10 @@
}) })
} }
} }
const ldflagindex = ref(0)
const leftarray =(e)=>{
ldflagindex.value = e;
}
const exitshow = ref(false); const exitshow = ref(false);
const cardarray = ref([]) const cardarray = ref([])
@ -168,7 +177,7 @@
// console.log("??11111111",cardarray.value) // console.log("??11111111",cardarray.value)
} }
leftarraytarget.value = index; leftarraytarget.value = index;
ldflagindex.value = 0;
} }
</script> </script>
@ -285,7 +294,7 @@
} }
.componentall{ .componentall{
width: 100%; width: 100%;
height: 100%; height: 96%;
// background-color: red; // background-color: red;
} }
.card-father{ .card-father{

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

@ -145,7 +145,7 @@
if(res.success){ if(res.success){
uni.showToast({ uni.showToast({
icon:'success', icon:'success',
title:res.message title:res.message?res.message:'提交成功'
}) })
emit('close'); emit('close');
setTimeout(()=>{ setTimeout(()=>{

8
pages/procurement/inventory.vue
View File

@ -45,11 +45,11 @@
</view> </view>
</view> </view>
<nomessage cont="暂无数据" :show="nomessageshow" /> <!-- <nomessage cont="暂无数据" :show="nomessageshow" /> -->
<view class="zhedang" v-if="nomessageshow"></view> <!-- <view class="zhedang" v-if="nomessageshow"></view> -->
</view> </view>
<view class="all-contain" v-show=" !nomessageshow"> <view class="all-contain">
<scroll-view scroll-y="true" scroll-with-animation class="all-scroll" :scroll-top="leftscrolltop" <scroll-view scroll-y="true" scroll-with-animation class="all-scroll" :scroll-top="leftscrolltop"
@scrolltolower="plsbuytolower" :lower-threshold="200"> @scrolltolower="plsbuytolower" :lower-threshold="200">
<view class="scroll-items"> <view class="scroll-items">
@ -724,7 +724,7 @@
right: 0; right: 0;
top: 0; top: 0;
height: 500rpx; height: 500rpx;
background-color: #fff; // background-color: #fff;
} }
.left-selecttype { .left-selecttype {

6
pages/watch/settings/input.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view class="index-content-other"> <view class="index-content-other">
<view class="index-content-right" @click="goback"> <!-- <view class="index-content-right" @click="goback">
<image class="back-img" :src="`/static/index/settings/back.png`" /> <image class="back-img" :src="`/static/index/settings/back.png`" />
返回 返回
</view> </view> -->
<view class="saomiao"> <view class="saomiao">
<view class="big-ball" v-if="!allitem.nuName"> <view class="big-ball" v-if="!allitem.nuName">
<view class="ball"></view> <view class="ball"></view>
@ -158,7 +158,7 @@
.index-content-down { .index-content-down {
// width: calc(100% - 60rpx); // width: calc(100% - 60rpx);
// height: 100rpx; // height: 100rpx;
position: absolute; position: fixed;
bottom: 40rpx; bottom: 40rpx;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);

4
pages/watch/settings/leida.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view class="index-content-other"> <view class="index-content-other">
<view class="index-content-right" @click="goback"> <!-- <view class="index-content-right" @click="goback">
<image class="back-img" :src="`/static/index/settings/back.png`" /> <image class="back-img" :src="`/static/index/settings/back.png`" />
返回 返回
</view> </view> -->
<view class="left-contain"> <view class="left-contain">
<view class="blue-bgc"> <view class="blue-bgc">
<image class="all-img" src="/static/index/leida/leftbgc.png" /> <image class="all-img" src="/static/index/leida/leftbgc.png" />

31
pages/watch/settings/menusettings.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<scroll-view scroll-y class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}"> <view scroll-y class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
<view class="array-father"> <view class="array-father">
<view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)"> <view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)">
@ -68,7 +68,7 @@
</view> </view>
<!-- </view> --> <!-- </view> -->
</scroll-view> </view>
<view class="bg-mask" v-if="selectserve"> <view class="bg-mask" v-if="selectserve">
<view @click.stop class="white-select"> <view @click.stop class="white-select">
<view class="big-font"> <view class="big-font">
@ -88,7 +88,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, watch, nextTick } from 'vue' import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
import exit from "@/component/public/exit.vue" import exit from "@/component/public/exit.vue"
import reset from "@/component/public/reset.vue" import reset from "@/component/public/reset.vue"
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue' import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
@ -101,7 +101,7 @@
const opentype = ref(false); const opentype = ref(false);
// const exitshow = ref(false); // const exitshow = ref(false);
const resetshow = ref(false); const resetshow = ref(false);
const emit = defineEmits(['jump']) const emit = defineEmits(['jump','leftarray'])
// const props = defineProps({ isShow: { type: Boolean, required: true } }) // const props = defineProps({ isShow: { type: Boolean, required: true } })
const iconsArray = ref(["雷达扫描", "扫码添加", "手动录入", "修改密码", "切换机构", "检查更新", "用户协议", "隐私政策"]) const iconsArray = ref(["雷达扫描", "扫码添加", "手动录入", "修改密码", "切换机构", "检查更新", "用户协议", "隐私政策"])
@ -147,19 +147,22 @@
const jumpToTarget = (index : number) => { const jumpToTarget = (index : number) => {
switch (index) { switch (index) {
case 0: case 0:
uni.navigateTo({ emit('leftarray',10)
url: '/pages/watch/settings/leida' // uni.navigateTo({
}) // url: '/pages/watch/settings/leida'
// })
break break
case 1: case 1:
uni.navigateTo({ emit('leftarray',11)
url: '/pages/watch/settings/saoma' // uni.navigateTo({
}) // url: '/pages/watch/settings/saoma'
// })
break break
case 2: case 2:
uni.navigateTo({ emit('leftarray',12)
url: '/pages/watch/settings/input' // uni.navigateTo({
}) // url: '/pages/watch/settings/input'
// })
break break
case 3: case 3:
resetshow.value = true resetshow.value = true
@ -231,7 +234,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
height: 130rpx; height: 115rpx;
.left-item { .left-item {
display: flex; display: flex;

4
pages/watch/settings/saoma.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view class="index-content-other"> <view class="index-content-other">
<view class="index-content-right" @click="goback"> <!-- <view class="index-content-right" @click="goback">
<image class="back-img" :src="`/static/index/settings/back.png`" /> <image class="back-img" :src="`/static/index/settings/back.png`" />
返回 返回
</view> </view> -->
<view class="saomiao"> <view class="saomiao">
<view class="card" v-if="allitem.nuName"> <view class="card" v-if="allitem.nuName">

4
pages/watch/settings/settings.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view class="index-content-other"> <view class="index-content-other">
<view class="index-content-right" @click="goback"> <!-- <view class="index-content-right" @click="goback">
<image class="back-img" :src="`/static/index/settings/back.png`" /> <image class="back-img" :src="`/static/index/settings/back.png`" />
返回 返回
</view> </view> -->
<view class="array-father"> <view class="array-father">
<view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)"> <view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)">
<view class="left-item"> <view class="left-item">

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

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