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:
wangweidong 2026-01-14 16:35:48 +08:00
parent f1dd41cf3b 187bf2f516
commit 27d3224b0a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/websocket.js
View File

@ -79,7 +79,7 @@ class WsRequest {
} }
return String(a); return String(a);
}).join(' '); }).join(' ');
console.log('[WsRequest]', out); // console.log('[WsRequest]', out);
} }
// ---------- 对外控制 ---------- // ---------- 对外控制 ----------

2
component/public/severcard.vue
View File

@ -43,7 +43,7 @@
import { queryOrderlist,startDirectiveServe,finishDirectiveServe,queryOrderInfoList } from '@/pages/procurement/api/lunpan.js' import { queryOrderlist,startDirectiveServe,finishDirectiveServe,queryOrderInfoList } from '@/pages/procurement/api/lunpan.js'
import { startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js' import { startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js'
const qcobj = ref({}) const qcobj = ref({})
const openleft = ref(true) const openleft = ref(false)
const open = ref(0); const open = ref(0);
const zdcont = ref(''); const zdcont = ref('');
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')

12
pages/NursingNew/component/invoicing/index.vue
View File

@ -523,7 +523,7 @@
<view style="margin-top: 30rpx;"> <view style="margin-top: 30rpx;">
{{uni.getStorageSync('nuName')}} {{uni.getStorageSync('nuName')}}
<text style="color: #1083F8;"> <text style="color: #1083F8;">
{{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo.name:""}} {{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo?.name:""}}
</text> </text>
</view> </view>
<view class="blue-button"> <view class="blue-button">
@ -1328,7 +1328,7 @@
} }
const addnew = () => { const addnew = () => {
if (isDelete.value) { if (isDelete.value) {
isDelete.value = false; isDelete.value = false;
deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1); deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
@ -1376,7 +1376,7 @@
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
elderId: uni.getStorageSync('elderId'), elderId: uni.getStorageSync('elderId'),
elderName: uni.getStorageSync('NUall').elderInfo.name, elderName: uni.getStorageSync('NUall').elderInfo?.name?uni.getStorageSync('NUall').elderInfo?.name:"",
directiveId: allobject.id, directiveId: allobject.id,
directiveName: allobject.packageName, directiveName: allobject.packageName,
typeId: "", typeId: "",
@ -1454,7 +1454,7 @@
pushValue.nuId = uni.getStorageSync('nuId'); pushValue.nuId = uni.getStorageSync('nuId');
pushValue.nuName = uni.getStorageSync('nuName'); pushValue.nuName = uni.getStorageSync('nuName');
pushValue.elderId = uni.getStorageSync('elderId'); pushValue.elderId = uni.getStorageSync('elderId');
pushValue.elderName = uni.getStorageSync('NUall').elderInfo.name; pushValue.elderName = uni.getStorageSync('NUall').elderInfo?.name ? uni.getStorageSync('NUall').elderInfo?.name:"";
bottomItems.value.unshift(pushValue) bottomItems.value.unshift(pushValue)
// 实现即时指令动画 // 实现即时指令动画
cleansettimeout.value = setTimeout(() => { cleansettimeout.value = setTimeout(() => {
@ -1527,7 +1527,7 @@
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
elderId: uni.getStorageSync('elderId'), elderId: uni.getStorageSync('elderId'),
elderName: uni.getStorageSync('NUall').elderInfo.name, elderName: uni.getStorageSync('NUall').elderInfo?.name ? uni.getStorageSync('NUall').elderInfo?.name :"",
directiveId: allobject.id, directiveId: allobject.id,
directiveName: allobject.title, directiveName: allobject.title,
typeId: allobject.typeId, typeId: allobject.typeId,
@ -1599,7 +1599,7 @@
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
elderId: uni.getStorageSync('elderId'), elderId: uni.getStorageSync('elderId'),
elderName: uni.getStorageSync('NUall').elderInfo.name, elderName: uni.getStorageSync('NUall').elderInfo?.name?uni.getStorageSync('NUall').elderInfo?.name:"",
tagList: info tagList: info
} }

2
pages/NursingNew/component/nurse/bigindex.vue
View File

@ -241,7 +241,7 @@
<view class="history-left"> <view class="history-left">
<view <view
:class="item.executeStatus!==`hisOk`?`history-left-jiao-error`: `history-left-jiao`" :class="item.executeStatus!==`hisOk`?`history-left-jiao-error`: `history-left-jiao`"
style="top: 2rpx;right: 2rpx;" style="top: 1.5rpx;right: 1.5rpx;"
v-show="secondListTargetShow !== index"> v-show="secondListTargetShow !== index">
{{ item.rightshow }} {{ item.rightshow }}
</view> </view>

6
pages/NursingNew/component/pleasetake/common/nomessage.vue
View File

@ -25,11 +25,11 @@
.que { .que {
position: fixed; position: fixed;
top: 9%; top: 9%;
left: 12%; left: 10%;
width: 76%; width: 85%;
height: 88%; height: 88%;
z-index: 100; z-index: 100;
background-color: #eff0f4; background-color: #f5f6fa;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;