diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 9cf7216..981c2c8 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -471,7 +471,6 @@
}
const getmenu = () => {
queryPadPageList().then((res => {
- console.log(res.result)
leftMenuArray.value = res.result.records;
filteredMenu(0).forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
@@ -490,7 +489,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/index.vue b/pages/NursingNew/index.vue
index 954b4cd..1ac58b2 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -53,7 +53,6 @@
uni.setStorageSync("Packagelist", res.result)
})
getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
- console.log(res.result)
listarr.value = res.result;
})
})
@@ -128,33 +127,36 @@
//
}
- const arrlist = ref([])
+ const arrlist = ref([
+ { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}
+ ])
const swip = ()=>{
let nuName = uni.getStorageSync('nuName')
queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
+ console.log(res.result.records)
let arr = res.result.records[0].permissionList;
- console.log(arr)
- arrlist.value = [];
+ arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}];
let tbr = [];
- arr.forEach((v,i)=>{
- let obj = listarr.value.find(item=>
- item.menuCode == v.menuCode
- );
- if(obj){
- tbr.push(v)
- }
- })
- tbr.forEach(item=>{
- let obj = tabbrarr.value.find(r=>
- r.type == item.menuCode
- );
- if(obj){
- arrlist.value.push(obj);
- console.log(arrlist.value)
- }
- })
- let sy = { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}
- arrlist.value.unshift(sy);
+ if(arr){
+ arr.forEach((v,i)=>{
+ let obj = listarr.value.find(item=>
+ item.menuCode == v.menuCode
+ );
+ if(obj){
+ tbr.push(v);
+ }
+ })
+ tbr.forEach(item=>{
+ let obj = tabbrarr.value.find(r=>
+ r.type == item.menuCode
+ );
+ if(obj){
+ arrlist.value.push(obj);
+ console.log(arrlist.value)
+ }
+ })
+ }
+
let back =[
{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png' ,type:'wl'},
{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' ,type:'back'}
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index eca7de5..8f3f1d3 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -1325,6 +1325,14 @@
}
}
)
+ onMounted(()=>{
+ firstgetqueryCgdList();
+ getSelectList();
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
+ })
const transition = ref(false)
const opencgr = ref(false);
const opengys = ref(false);
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 798d0b2..c0ecba5 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -224,15 +224,15 @@
const openleft = ref(false)
const menutarget = ref(0)
-
+ const emit = defineEmits(['swip'])
const clickmenu = (index : number) => {
menutarget.value = index
let data = filteredMenu(2)[index]
- console.log("!!!!", data)
uni.setStorageSync('nuId', data.nuId);
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
+ emit('swip')
}
const tagarray = ["市医保", "半失能", "正常计费"]
@@ -372,6 +372,10 @@
setInterval(updateTime, 1000);
photoplay.value = true;
getmenu()
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
@@ -381,7 +385,8 @@
leftMenuArray.value = res.result.records;
filteredMenu(2).forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
- menutarget.value = index
+ menutarget.value = index;
+ clickmenu(index)
}
})
}))
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index 8161416..e975888 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -2,16 +2,16 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -20,6 +20,7 @@
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/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
};