diff --git a/pages/NursingNew/component/equipment.vue b/pages/NursingNew/component/equipment.vue
index 007532b..7583fd6 100644
--- a/pages/NursingNew/component/equipment.vue
+++ b/pages/NursingNew/component/equipment.vue
@@ -1357,6 +1357,10 @@
photoplay.value = true;
init();
yulan();
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
const changeallmessage = () => {
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 85fd1e9..c788754 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -311,7 +311,7 @@
const openleft = ref(false)
const menutarget = ref(0)
-
+ const emit = defineEmits(['swip'])
const clickmenu = (index : number) => {
menutarget.value = index
let data = filteredMenu(0)[index]
@@ -319,7 +319,8 @@
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
- getgif()
+ getgif();
+ emit('swip')
}
const tagarray = ["市医保", "半失能", "正常计费"]
@@ -412,6 +413,7 @@
(newVal, oldVal) => {
// 当旧值为false，新值为true时延迟0.2秒调用方法
if (!oldVal && newVal) {
+ console.log(oldVal && newVal)
transition.value = false;
// console.log("????",transition.value)
setTimeout(() => {
@@ -459,8 +461,14 @@
setInterval(updateTime, 1000);
photoplay.value = true;
getmenu();
- getgif();
+ transition.value = false;
+ // console.log("????",transition.value)
+ setTimeout(() => {
+ transition.value = true;
+ // console.log("看看", uni.getStorageSync('NUall'))
+ }, 50)
})
+
const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
}
@@ -470,6 +478,7 @@
filteredMenu(0).forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
menutarget.value = index
+ clickmenu(menutarget.value)
}
})
}))
@@ -483,7 +492,7 @@
}
queryWorkCareList(data).then((res : any) => {
// console.log("看看图",res.result.records[0])
- indexmessage.value = res.result.records[0]
+ indexmessage.value = res.result.records[0];
// console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
})
}
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index d998bef..72d192e 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -5,7 +5,7 @@
-
+
{{v.name}}
diff --git a/pages/NursingNew/component/nurse/logistics.vue b/pages/NursingNew/component/nurse/logistics.vue
new file mode 100644
index 0000000..96c5732
--- /dev/null
+++ b/pages/NursingNew/component/nurse/logistics.vue
@@ -0,0 +1,1823 @@
+
+
+
+
+
+ NUID：{{ uni.getStorageSync('nuId')}}
+
+
+ {{ uni.getStorageSync('nuName')}}
+
+
+
+
+
+
+ 预览
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.tagName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择服务指令迁移的目标单元格
+
+
+
+ 请选择服务指令迁移的目标单元格
+
+
+
+
+
+
+
+
+
+
+ {{item1.startTime + `-` + item1.endTime}}
+
+
+
+ {{item1.cycleType}}
+
+
+
+ {{splitString(item1.directiveName)[0]}}
+
+
+ {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 即时指令
+
+
+
+
+
+
+
+
+
+
+
+ {{item.directiveName}}
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ 周
+ 月
+
+
+ 周
+ 月
+
+
+
+
+ {{item}}
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+
+
+ 周期
+
+
+ 即时
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+ 指令包
+
+
+ 包名：{{ item.packageName }}
+
+
+
+ 包含：
+
+
+ 、
+ {{ item1.directiveName }}
+
+
+
+
+
+
+
+ 不能重复添加相同的即时服务指令
+
+
+ 请选择服务指令来进行操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+ 监控
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+ 确定要删除指令吗
+
+
+
+
+
+ {{timearr[saveEditIndex.index0].children[saveEditIndex.index1].startTime + `-` + timearr[saveEditIndex.index0].children[saveEditIndex.index1].endTime}}
+
+
+
+ {{ timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleType }}
+
+
+
+ {{splitString(timearr[saveEditIndex.index0].children[saveEditIndex.index1].directiveName)[0]}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/NursingNew/component/pleasetake/takehome.vue b/pages/NursingNew/component/pleasetake/takehome.vue
index cdb4ba9..6a9d91d 100644
--- a/pages/NursingNew/component/pleasetake/takehome.vue
+++ b/pages/NursingNew/component/pleasetake/takehome.vue
@@ -37,6 +37,10 @@
});
onMounted(()=>{
hometype.value = 0;
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
watch(
() => props.isShow,
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 1dd07d6..1ac58b2 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -1,18 +1,22 @@
-
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -23,8 +27,10 @@
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 5dfb65d..fdf0a05 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1075,6 +1075,14 @@
}
}
)
+ onMounted(()=>{
+ firstgetqueryCgdList();
+ getSelectList();
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
+ })
const transition = ref(false)
const open = ref(0);
const typechange = ref(0);
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index cfc8e54..9a10be1 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -275,12 +275,19 @@
},
});
const transition = ref(false);
+ onMounted(() => {
+ chongzhi()
+ getSelectList();
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
+ })
watch(
() => props.isShow,
(newVal, oldVal) => {
if (!oldVal && newVal) {
- chongzhi()
- getSelectList();
+
}
}
)
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 22a2a53..778955b 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -186,23 +186,42 @@
type: Boolean
},
});
+ onMounted(()=>{
+ form.pageNo = 1;
+ warn.pageNo = 1;
+ Material.value = [];
+ InvoicingList.value = [];
+ moredex.value = 0;
+ shoppcar();
+ getWaringMaterial()
+ nextTick(() => {
+ chongzhi()
+ })
+ setTimeout(()=>{
+ timeout.value = true
+ },500)
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
+ })
watch(
() => props.isShow,
(newVal, oldVal) => {
if (!oldVal && newVal) {
- form.pageNo = 1;
- warn.pageNo = 1;
- Material.value = [];
- InvoicingList.value = [];
- moredex.value = 0;
- shoppcar();
- getWaringMaterial()
- nextTick(() => {
- chongzhi()
- })
- setTimeout(()=>{
- timeout.value = true
- },500)
+ form.pageNo = 1;
+ warn.pageNo = 1;
+ Material.value = [];
+ InvoicingList.value = [];
+ moredex.value = 0;
+ shoppcar();
+ getWaringMaterial()
+ nextTick(() => {
+ chongzhi()
+ })
+ setTimeout(()=>{
+ timeout.value = true
+ },500)
transition.value = false;
setTimeout(() => {
transition.value = true;
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index c0f93c3..d0070c9 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -281,6 +281,10 @@
)
onMounted(() => {
firstgetqueryCgdList();
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
const lanjie = ref(false);
@@ -374,9 +378,7 @@
alltotal.value = res.result.total
if (res.result.records.length) {
rightdonghua.value = false;
-
queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
- console.log(element.result)
rightarray.value = []
rightarray.value.push(...element.result)
rightdonghua.value = true;
@@ -641,6 +643,7 @@
// padding: 2vw;
padding-left: 1vw;
padding-top: 1.5vh;
+ width: 90vw;
}
.right-container-tem {
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index caed94e..64d3fd1 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -194,6 +194,7 @@
}
}
)
+
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const opendata = ref(false);
const form = reactive({
@@ -210,6 +211,10 @@
const carnum = ref(0)
onMounted(() => {
thlist()
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
onShow(() => {
ritbot();
diff --git a/pages/watch/api/lunpan.js b/pages/watch/api/lunpan.js
index ef0f32d..f1bad0a 100644
--- a/pages/watch/api/lunpan.js
+++ b/pages/watch/api/lunpan.js
@@ -11,9 +11,18 @@ export const movedirection = (direction,startOrNot) => {
// 获取护理单元
-export const queryPadPageList = () => {
+export const queryPadPageList = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/baseInfo/queryPadPageList`,
- method: 'get'
+ method: 'get',
+ data: params,
})
-}
\ No newline at end of file
+}
+
+export const getPermissionList = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/employessInfo/getPermissionList`,
+ method: 'get',
+ data: params,
+ })
+}
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -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 {
camera as default
};
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index a0a8c0f..f69ae1a 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -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 {
fullcamera as default
};