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-26 16:07:43 +08:00
parent 51bbc2ac2b
commit 0ad5232f24
12 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
if(props.show==true){ if(props.show==true){
let obj = { let obj = {
nuId:uni.getStorageSync('nuId'), nuId:uni.getStorageSync('nuId'),
elderId:uni.getStorageSync('NUall').elderId, elderId:uni.getStorageSync('elderId'),
wlId:props.objtake.wlId wlId:props.objtake.wlId
} }
queryMaterialInfo(obj).then(res=>{ queryMaterialInfo(obj).then(res=>{

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

@ -106,7 +106,7 @@
if(props.show==true){ if(props.show==true){
let obj = { let obj = {
nuId:uni.getStorageSync('nuId'), nuId:uni.getStorageSync('nuId'),
elderId:uni.getStorageSync('NUall').elderId, elderId:uni.getStorageSync('elderId'),
wlId:props.objtake.wlId, wlId:props.objtake.wlId,
} }
queryMaterialInfo(obj).then(res=>{ queryMaterialInfo(obj).then(res=>{
@ -133,7 +133,7 @@
const qglog = ()=>{ const qglog = ()=>{
let obj = { let obj = {
nuId:uni.getStorageSync('nuId'), nuId:uni.getStorageSync('nuId'),
elderId:uni.getStorageSync('NUall').elderId, elderId:uni.getStorageSync('elderId'),
wlId:props.objtake.wlId, wlId:props.objtake.wlId,
pageNo:pageNo.value, pageNo:pageNo.value,
pageSize:20 pageSize:20

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

@ -329,7 +329,7 @@
canpull: true, canpull: true,
searchContent: "", searchContent: "",
status: "1,2,4,5", status: "1,2,4,5",
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuId: uni.getStorageSync('nuId') nuId: uni.getStorageSync('nuId')
}) })
@ -450,7 +450,7 @@
let data = { let data = {
qldNo: plsbuy.value[lefttarget.value].qldNo, qldNo: plsbuy.value[lefttarget.value].qldNo,
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
elderName: uni.getStorageSync(`NUall`).elderInfo.name elderName: uni.getStorageSync(`NUall`).elderInfo.name
@ -491,7 +491,7 @@
const shouhuo = () => { const shouhuo = () => {
let param = { let param = {
qldNo: plsbuy.value[lefttarget.value].qldNo, qldNo: plsbuy.value[lefttarget.value].qldNo,
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuId: uni.getStorageSync('nuId') nuId: uni.getStorageSync('nuId')
} }
confirmReceipt(param).then((res : any) => { confirmReceipt(param).then((res : any) => {

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

@ -265,7 +265,7 @@
canpull: true, canpull: true,
searchContent: "", searchContent: "",
status: "3", status: "3",
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuId: uni.getStorageSync('nuId') nuId: uni.getStorageSync('nuId')
}) })
@ -389,7 +389,7 @@
let data = { let data = {
qldNo: plsbuy.value[lefttarget.value].qldNo, qldNo: plsbuy.value[lefttarget.value].qldNo,
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
elderName: uni.getStorageSync(`NUall`).elderInfo.name elderName: uni.getStorageSync(`NUall`).elderInfo.name

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

@ -130,7 +130,7 @@
pageSize: 1, pageSize: 1,
searchContent: "", searchContent: "",
status: "3", status: "3",
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuId: uni.getStorageSync('nuId') nuId: uni.getStorageSync('nuId')
} }
queryQld(plzinfo0).then((res : any) => { queryQld(plzinfo0).then((res : any) => {
@ -145,7 +145,7 @@
pageSize: 1, pageSize: 1,
searchContent: "", searchContent: "",
status: "4", status: "4",
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuId: uni.getStorageSync('nuId') nuId: uni.getStorageSync('nuId')
} }
queryQld(plzinfo1).then((res : any) => { queryQld(plzinfo1).then((res : any) => {
@ -185,7 +185,7 @@
let data = { let data = {
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
elderId: uni.getStorageSync('NUall').elderId, elderId: uni.getStorageSync('elderId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
} }
console.log("?????",data) console.log("?????",data)

0
pages/NursingNew/index.css
View File

4
pages/NursingNew/index.ts
View File

@ -1,4 +0,0 @@
export type Link = {
url : string;
targetUrl : string;
};

4
pages/Warehouse/index/index.vue
View File

@ -1,10 +1,6 @@
<template> <template>
<view> <view>
<view class="flex"> <view class="flex">
<!-- <leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent> -->
<!-- 主页 -->
<!-- <index :isShow="menuop" v-if="!ckindex" /> -->
<!-- <material></material> -->
<view class="left"> <view class="left">
<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent> <leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
</view> </view>

6
pages/procurement/outbound.vue
View File

@ -351,7 +351,7 @@
canpull: true, canpull: true,
searchContent: "", searchContent: "",
status: "1,4,5", status: "1,4,5",
// elderId: uni.getStorageSync('NUall').elderId, // elderId: uni.getStorageSync('elderId'),
// nuId: uni.getStorageSync('nuId') // nuId: uni.getStorageSync('nuId')
}) })
@ -516,7 +516,7 @@
// const shouhuo = () => { // const shouhuo = () => {
// // let param = { // // let param = {
// // qldNo: plsbuy.value[lefttarget.value].qldNo, // // qldNo: plsbuy.value[lefttarget.value].qldNo,
// // elderId: uni.getStorageSync('NUall').elderId, // // elderId: uni.getStorageSync('elderId'),
// // nuId: uni.getStorageSync('nuId') // // nuId: uni.getStorageSync('nuId')
// // } // // }
// // confirmReceipt(param).then((res : any) => { // // confirmReceipt(param).then((res : any) => {
@ -590,7 +590,7 @@
let data = { let data = {
qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo, qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo,
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
// elderId: uni.getStorageSync('NUall').elderId, // elderId: uni.getStorageSync('elderId'),
nuName: uni.getStorageSync('nuName'), nuName: uni.getStorageSync('nuName'),
// elderName: uni.getStorageSync(`NUall`).elderInfo.name // elderName: uni.getStorageSync(`NUall`).elderInfo.name

4
request/index.js
View File

@ -1,6 +1,6 @@
// 全局请求封装 // 全局请求封装
const base_url = 'https://www.focusnu.com/opeapi' // const base_url = 'https://www.focusnu.com/opeapi'
// const base_url = 'http://192.168.2.37:8081/opeapi' const base_url = 'http://192.168.2.37:8081/opeapi'
// const base_url = 'http://localhost:8091/opeapi' // const base_url = 'http://localhost:8091/opeapi'
// 请求超出时间 // 请求超出时间
const timeout = 5000 const timeout = 5000

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
}; };