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 2025-12-18 10:23:57 +08:00
parent 744bba860d d30f92f970
commit 583c702d11
13 changed files with 1138 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages.json
View File

@ -171,6 +171,13 @@
},
{
"path" : "pages/procurement/addtory"
},
{
"path" : "pages/NursingNew/component/doctorask/doctorask",
"style" :
{
"navigationBarTitleText" : ""
}
}
],
"globalStyle": {

17
pages/NursingNew/component/doctorask/api/api.js Normal file
View File

@ -0,0 +1,17 @@
// 引入 request 文件
import request from '@/request/index.js'
export const queryCareList = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryCareList`,
method: 'get',
data: params,
})
}
export const queryCareInfoList = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryCareInfoList`,
method: 'get',
data: params,
})
}

455
pages/NursingNew/component/doctorask/doctorask.vue Normal file
View File

@ -0,0 +1,455 @@
<template>
<view>
<view class="t-box">
<view class="leftscr">
<view class="left-menu-father">
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
:lower-threshold="400">
<view class="card" v-for="(v,i) in plsbuy" :key="i" :class="i==lefttarget?'act':''"
@click="clickLeftMenu(i,v)">
<view class="rad" v-if="v.izPackage=='Y'">包</view>
<view class="cont">
<view class="conle">
<image :src="serverUrl + v.previewFileSmall" mode="aspectFill" />
</view>
<view class="ritcon">
<view class="rq" >
<text>{{v.directiveName}}</text>
</view>
<view class="rq">
执行人:{{v.employeeName}}
</view>
<view class="rq">
开始时间:{{v.startTime.slice(0,16)}}
</view>
<view class="rq">
结束时间:{{v.endTime.slice(0,16)}}
</view>
<view class="rq">
状态:{{v.izStart=="N"?"未开始":(v.izFinish=="Y"?'已结束':'进行中')}}
</view>
</view>
</view>
</view>
<view style="height:2vw;width: 90%;display: flex;align-items: center;justify-content: center;">
<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="plsbuy.length>4" />
</view>
</scroll-view>
</view>
</view>
<view class="rightscr">
<scroll-view scroll-y="true" class="itembox" scroll-with-animation enable-back-to-top @scroll="scroll" :scroll-top="middletarget">
<view class="box">
<view class="fler" v-for="(v,index) in cardarr" :key="index">
<view class="carditem guodu" >
<view class="zding" v-if="v.zhiDingId">
<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
</view>
<view class="speitem guodu" >
<image :src="serverUrl + v.previewFileSmall" mode="aspectFill">
</image>
</view>
<view class="msitem guodu" >
<view>
<view>指令名称：{{v.directiveName}}</view>
</view>
<view>
<text style="white-space: nowrap;"> 执行人: </text>
<view>{{v.employeeName}}</view>
</view>
<view>
<text style="white-space: nowrap;"> 开始时间: </text>
<view>{{v.startTime.slice(0,16)}}</view>
</view>
<view>
<text style="white-space: nowrap;"> 结束时间: </text>
<view>{{v.endTime.slice(0,16)}}</view>
</view>
</view>
<view class="fubtn" >
<view class="ld">开始服务</view>
<view class="ld">结束服务</view>
<view class="bd">录像</view>
<view class="bd">拍照</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
</template>
<script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import {queryCareList,queryCareInfoList} from './api/api.js'
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const form = reactive({
pageNo: 1,
pageSize: 10,
employeeId:uni.getStorageSync('userInfo').employessId,
nuId:uni.getStorageSync('nuId')
})
const plsbuy = ref([])
onMounted(() => {
form.pageNo=1;
plsbuy.value = [];
firstgetqueryCgdList();
})
const status = ref('loadmore')
const plsbuytolower = () => {
if (status.value == 'loading' || status.value == 'nomore') { return }
status.value = 'loading';
form.pageNo++;
firstgetqueryCgdList();
}
const firstgetqueryCgdList = () => {
queryCareList(form).then(res => {
console.log(res)
plsbuy.value.push(...res.result.records);
status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
if(form.pageNo==1){
clickLeftMenu(0,plsbuy.value[0])
}
})
}
const lefttarget = ref(0);
const middletarget = ref(0);
const leftscrolltop = ref(0);
const cardarr = ref([])
const clickLeftMenu = (index : any, item : object) => {
console.log(item)
if (lefttarget.value != index) {
middletarget.value = sctop.value;
nextTick(()=>{
middletarget.value = 0;
})
}
let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 186;
lefttarget.value = index;
queryCareInfoList({ mainId: item.id }).then(res => {
console.log(res)
cardarr.value = res.result
})
if (item.izRead == 'N') {
transReads(item, index)
}
}
const sctop = ref(0)
const scroll = (e)=>{
sctop.value = e.detail.scrollTop
}
const addMaterial = ref([])
const transReads = (v, i) => {
transRead({ id: v.id })
v.izRead = 'Y'
}
const tharrlist = ref([])
const thlist = () => {
thdList(form).then(res => {
tharrlist.value=res.result.records;
})
}
</script>
<style scoped lang="less">
.left-menu-father {
width: 33vw;
height: 90vh;
.act {
border: 2px solid #0385FA !important;
background: rgba(255, 255, 255, 1) !important;
}
.left-menu-scroll {
height: 100%;
height: 90vh;
.card {
width: 31vw;
height: 13.6vw;
background: rgba(255, 255, 255, 0.6);
border-radius: 1.6vw;
padding: 1vw 1.4vw;
border: 2px solid rgba(255, 255, 255, 0.01);
margin-bottom: 0.8vw;
position: relative;
.rad {
width: 2.5vw;
height: 2.5vw;
border-radius: 0.5vw;
position: absolute;
right: 1.3vw;
top: 1.5vw;
background: #0385FA;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
font-size: 1.6vw;
font-weight: bold;
}
.cont {
width: 100%;
height: 10vw;
display: flex;
justify-content: space-between;
.ritcon {
width: 19vw;
height: 100%;
flex-direction: column;
justify-content: space-around;
flex: 1;
.rq {
font-weight: 400;
font-size: 1.3vw;
color: #888888;
margin-bottom:0.5vw;
white-space: nowrap;
text {
font-size: 1.8vw;
font-weight: bolder;
color: rgba(85, 85, 85, 1);
}
}
}
.conle {
width: 10vw;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
image {
width: 9.3vw;
height: 9.3vw;
margin-top: 1vw;
}
view {
font-weight: bold;
font-size: 1.4vw;
color: #555555;
margin-top: 1vw;
}
}
}
.hli {
width: 100%;
height: 2vw;
display: flex;
justify-content: space-between;
align-items: center;
.rig {
width: 3.7vw;
height: 1.6vw;
position: relative;
display: flex;
justify-content: center;
align-items: center;
image {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index: 1;
}
text {
position: relative;
z-index: 2;
font-weight: 400;
font-size: 1vw;
color: #FFFFFF;
}
}
.lig {
font-weight: 400;
font-size: 1.2vw;
color: #666666;
display: flex;
justify-content: center;
align-items: center;
image {
width: 1.7vw;
height: 1.7vw;
margin-right: 0.4vw;
}
}
}
}
}
}
.fubtn{
width: 8vw;
height: 100%;
position: absolute;
top:0;
left: 35vw;
display: flex;
justify-content: space-around;
flex-direction: column;
align-items: center;
view{
width: 8vw;
height: 3vw;
border-radius: 0.4vw;
display: flex;
justify-content: center;
align-items: center;
font-size: 1.5vw;
font-weight: bold;
}
.ld{
background: #0385FA;
color: #fff;
border: 1px solid #0385FA;
}
.bd{
background: #fff;
color: #0385FA;
border: 1px solid #0385FA;
}
}
.msitem {
width: 18.5vw;
height: 100%;
position: absolute;
top:0;
left: 15vw;
>view {
margin-top: 0vw;
&:nth-child(2),&:nth-child(3),&:nth-child(4) {
display: flex;
margin-top: 0.7vw;
view{
font-size: 1.4vw;
color: #888888;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
text {
font-weight: 400;
font-size: 1.3vw;
color: #777777;
margin-top: 0.25vw;
}
}
&:nth-child(1) {
margin-top: 1.7vw;
view{
width: 100%;
font-weight: bold;
font-size: 1.6vw;
color: #222222;
height: 3vw;
padding-top: 1vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
}
}
.zding{
width: 4.6vw;
height: 4.6vw;
position: absolute;
left: 0;
top: 0;
z-index: 11;
image{
width: 100%;
height: 100%;
}
}
.speitem {
width: 14vw;
height: 100%;
display: inline-flex;
flex-direction: column;
position: absolute;
top:0;
left: 0;
>image {
width: 12vw;
height: 12vw;
margin: 1vw auto 0.25vw;
}
}
.itembox{
width: 100%;
height: calc(100vh - 10vw);
padding:1vw 0.5vw 1vw;
background: #fff;
.box{
width: 100%;
display: flex;
flex-wrap: wrap;
}
.fler{
width: 44vw;
height: 13vw;
margin-bottom: 0.9vw;
margin-left: 0.5vw;
.carditem{
width: 46vw;
height: 16vw;
background: rgba(245, 246, 248, 1);
border-radius: 1.1vw;
position: relative;
overflow: hidden;
margin: 1vw 0 0vw 1vw;
}
}
}
.t-box {
width: 85vw;
height: calc(90vh);
display: flex;
justify-content: space-between;
margin-top: 5vh;
.rightscr {
width: 50vw;
height: 100%;
background: #fff;
border-radius: 1.6vw;
overflow: hidden;
}
.leftscr {
width: 33.4vw;
height: calc(90vh);
margin-left: 1vw;
}
}
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch;
}
</style>

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

@ -188,7 +188,9 @@
elderId: uni.getStorageSync('NUall').elderId,
nuName: uni.getStorageSync('nuName'),
}
console.log("?????",data)
requireTH(data).then(res => {
console.log("?????",res)
if (res.success) {
thshow.value = false;
uni.showToast({
@ -199,7 +201,6 @@
thshow.value = false;
errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
console.log("?????")
}
})
}

5
pages/NursingNew/index.vue
View File

@ -62,6 +62,8 @@
<nurse :isold="isOld===2" :liang="indexNumber" :isshow="menuIndexshowsecond"
v-if="menuIndex==1&&isOld===2&&uni.getStorageSync('customerId')&&uni.getStorageSync('nuId')"
:propsmove="propsmove" :isMain="isMain" @vip="canmoveit" />
<!-- 医嘱 -->
<doctorask v-if="menuIndex==2"/>
</view>
</template>
@ -71,13 +73,14 @@
import index from "./component/index.vue"
import equipment from "./component/equipment.vue"
import requestform from "./component/pleasetake/takehome.vue"
import doctorask from "./component/doctorask/doctorask.vue"
import nurse from "./component/nurse/index.vue"
import { onShow } from '@dcloudio/uni-app';
import { getServiceTree, getNcPackagelist } from './component/nurse/api.js'
onMounted(() => {
menuIndex.value = -1;
nextTick(() => menuIndex.value = 3)
nextTick(() => menuIndex.value = 0)
isOld.value = 2;
uni.getSystemInfoSync(); // 确保 global 注入生效

1148
pages/Warehouse/Warehouse.vue
View File

File diff suppressed because it is too large Load Diff

1
pages/login/login.vue
View File

@ -305,6 +305,7 @@
uni.setStorageSync('token', res.result.token);
uni.setStorageSync('username', form.username);
uni.setStorageSync('realname', res.result.userInfo.realname);
uni.setStorageSync('userInfo', res.result.userInfo);
// huakuaiOK()
if (loading.value === 2) {
huakuaiOK()

5
pages/procurement/addtory.vue
View File

@ -63,10 +63,12 @@
selectType.value = index;
pageNo.value = 1;
pddlist.value = [];
uni.removeStorage({ key: 'valitem'})
pandian();
}
onLoad((e)=>{
pddobj.value = JSON.parse(e.pddobj)
pddobj.value = JSON.parse(e.pddobj);
console.log(pddobj.value)
pandian()
})
const pageNo = ref(1);
@ -80,6 +82,7 @@
pageSize:10
}
queryPddInfoList(obj).then(res=>{
console.log(res.result.records)
pddlist.value.push(...res.result.records);
status.value = (res.result.total == pddlist.value.length ? 'nomore' : 'loadmore');
let s = Math.ceil(res.result.total / 3);

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

@ -348,7 +348,7 @@
font-size: 1.6vw;
color: #222222;
height: 3.1vw;
padding-top: 1vw;
padding-top: 0.8vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;

22
pages/procurement/common/toryitem.vue
View File

@ -3,7 +3,7 @@
<scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()"
enable-back-to-top enable-flex :scroll-top="scrolltop" @scroll="scroll">
<defaultr cont="暂无数据" v-if="pddlist.length==0 && listflag" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
<view class="items guodu" v-for="(v,i) in pddlist" :key='i' :class="{'itembord0':v.zk==true,'dczk':v.dczk==true&&v.zk==true}">
<view class="items guodu" v-for="(v,i) in pddlist" :key='i' :class="{'itembord0':v.zk==true,'itembord1':v.zk==false,'dczk':v.dczk==true&&v.zk==true,'dczks':v.dczk==true&&v.zk==false}">
<view class="speitem guodu">
<view class="imgs">
<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
@ -27,7 +27,7 @@
<text>物料单位：</text>
{{v?.materialUnits}}
</view>
<view class="cot" style="white-space: nowrap;display: block;overflow: hidden;text-overflow: ellipsis;height: 1.5vw;">
<view class="cot" style="white-space: nowrap;display: block;overflow: hidden;text-overflow: ellipsis;height: 1.7vw;">
<text style="display: inline-block;">规格型号：</text>{{v?.specificationModel}}
</view>
<view class="wltwo">
@ -44,10 +44,10 @@
<view class="chae">
<!-- pdType 1:b/ 2:r -->
<view :class="{b:v?.pdType==1,r:v?.pdType==2&&v?.cesl>0}">{{v?.pdType==2&&v?.cesl>0?'-':''}}{{v?.cesl!=null?v?.cesl:'--'}}</view>
<text>差额</text>
<text>差额</text>
</view>
<view class="pandian" @click="zhankai(v,i)">
<image :src="v.zk?'/static/index/procurement/pd1.png':'/static/index/procurement/pd0.png'" mode="aspectFill" v-if="v.pdType==null||v.pdType==''"></image>
<image :src="v.zk?'/static/index/procurement/pd1.png':'/static/index/procurement/pd0.png'" mode="aspectFill" v-if="v.pdType==null||v.pdType==''||v.pdType == 3"></image>
<image :src="v.zk?'/static/index/procurement/pd5.png':'/static/index/procurement/pd2.png'" mode="aspectFill" v-if="v.pdType == 1"></image>
<image :src="v.zk?'/static/index/procurement/pd4.png':'/static/index/procurement/pd3.png'" mode="aspectFill" v-if="v.pdType == 2"></image>
</view>
@ -151,14 +151,14 @@
const valindex = ref(-1);
const zhankai = (v, i) => {
let s = Math.ceil((i + 1) / 3);
if(valindex.value !=i && valindex.value > -1 &&uni.getStorageSync('valitem')){
if(valindex.value !=i && valindex.value > -1 && uni.getStorageSync('valitem') && props.pddType == '1'){
emit('tabitem',valindex.value,uni.getStorageSync('valitem'))
}
valindex.value = i;
scrolltop.value = top.value;
v.zk = !v.zk;
if (v.zk) {
uni.setStorageSync('valitem', v);
if(props.pddType == '1'){uni.setStorageSync('valitem', v);}
setTimeout(() => {
v.yczk = v.zk;
}, 200)
@ -302,13 +302,21 @@
width: 100%;
height: 50vw;
display: flex;
.itembord1 {
border-radius: 1.6vw !important;
transition: 1s;
}
.itembord0 {
border-radius: 1.6vw 1.6vw 0 0 !important;
z-index: 25 !important;
transition: .1s;
}
.dczk{
top: -17vw !important;
transition: .4s !important;
}
.dczks{
transition: .4s !important;
}
.itemhei0 {
height: 0vw !important;

2
pages/procurement/components/calculator.vue
View File

@ -333,7 +333,7 @@
return
}
emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value,props.caigouobj)
}
const colse = ()=>{
emit('colse')

8
pages/procurement/inventory.vue
View File

@ -87,7 +87,7 @@
</view>
<view style="color: #888888;">
{{ `[ 王嘉尔 ]` }}
[{{ item.pddStartBy}}]
</view>
</view>
</view>
@ -107,7 +107,7 @@
盘点结束
</view>
<view style="color: #888888;">
{{ item.pddType=='2'?`[ 王嘉尔 ]`: `` }}
{{ item.pddType=='2'?`[` +item.pddEndBy+ `]`: `` }}
</view>
</view>
</view>
@ -273,7 +273,6 @@
}
onShow(()=>{
chongzhi()
console.log("刷新了")
})
onMounted(() => {
// firstgetqueryCgdList();
@ -528,7 +527,8 @@
if(res.success){
addshow.value = false
chongzhi();
let pddobj = res.result
let pddobj = res.result;
console.log(pddobj)
uni.navigateTo({url:'/pages/procurement/addtory?pddobj='+JSON.stringify(pddobj)})
}else{
openmessage.value = true

37
pages/procurement/materialcar.vue
View File

@ -82,7 +82,7 @@
suppliers:''
})
const InvoicingList = ref([])
const status = ref('loadmore')
const status = ref('nomore')
const open = ref(0)
onShow(()=>{
InvoicingList.value = [];
@ -108,9 +108,9 @@
item.zk = false;
item.scrollleft = 0;
})
// console.log(`最上层`,res.result.records)
console.log(`最上层`,res )
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
// status.value = (res.result.total == InvoicingList.value.length) ? 'nomore' : 'loadmore';
})
}
const search = (x : number) => {
@ -196,17 +196,17 @@
}
const adfangdou = ref(true);
// 防抖
const right = (n:number,nm:any,type:Object) => {
const right = (n:number,nm:any,type:Object,v:object) => {
setTimeout(()=>{
if(adfangdou.value){
connfig(nm,n,type);
connfig(nm,n,type,v);
adfangdou.value = false;
}
},30)
}
const timers = ref(true)
const connfig = (nm:any,num:Number,type:Object) =>{
const connfig = (nm:any,num:Number,type:Object,v:object) =>{
if(timers.value==false){return}
timers.value=false;
let dt = {
@ -225,10 +225,11 @@
timers.value=true;
if(res.success){
setTimeout(()=>{
tihuan(v);
addflag.value = false;
form.pageNo=1;
InvoicingList.value = [];
queryInvo();
// form.pageNo=1;
// InvoicingList.value = [];
},700)
uni.showToast({
icon:res.success?'success':'none',
@ -241,7 +242,23 @@
adfangdou.value = true;
})
}
const tihuan = (v)=>{
let forms={
nuId: uni.getStorageSync('nuId'),
wlParamInfo:v.wlMaterialNo,
}
queryShoppingCartList(forms).then(res => {
let obj = res.result.records[0];
InvoicingList.value.forEach((item,i)=>{
if(item.id == obj.id){
obj.flag = v.flag;
obj.zk = false;
obj.scrollleft = 0;
InvoicingList.value[i] = obj;
}
})
})
}
const caigouflag = ref(false)
const caigouarr = ref([])
const generatedOrder = ref([])