diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index 76abe34..dd1fabb 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -288,10 +288,13 @@
src="/static/index/newruler/jiao.png" />
-
-
- {{item.title}}
+
+
+ {{ item.title }}
@@ -1658,14 +1661,23 @@
iszhouqi.value = true
return
}
- let cycleType = ""
+ let cycleType = "";
+ let cycleValue = "";
if (allobject.cycleType === "日常护理") {
cycleType = "日常"
} else {
if (weekIndex.value !== -1) {
cycleType = weekValue.value
+ let cycleTypeIndex = 0;
+ weekDays.forEach((element:any,index:any)=>{
+ if(element == weekValue.value){
+ cycleTypeIndex = index
+ }
+ })
+ cycleValue = cycleTypeIndex.toString()
} else {
- cycleType = monthValue.value + "号"
+ cycleType = monthValue.value + "号";
+ cycleValue = monthValue.value
}
iszhouqi.value = false;
weekIndex.value = -1;
@@ -1681,19 +1693,47 @@
const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].startTime = formattedStart
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].endTime = formattedEnd
-
+ // const moBan = ref({
+ // directiveId: "",
+ // directiveName: "",
+ // typeId:"",
+ // typeName:"",
+ // categoryId:"",
+ // categoryName:"",
+ // cycleTypeId:"",
+ // cycleType:"",
+ // cycleValue:"",
+ // startTime: "",
+ // endTime: "",
+ // positioning: "",
+ // positioningLong: "",
+ // izPackage:false,
+ // previewFile:"",
+ // previewFileSmall:"",
+ // immediateFile:"",
+ // immediateFileFocus:"",
+ // tagName: "",
+ // })
+ // console.log("))))",allobject)
let param = {
directiveId: allobject.id,
directiveName: allobject.title,
+ typeId: allobject.typeId,
+ typeName: allobject.typeName,
+ categoryId: allobject.categoryId,
+ categoryName: allobject.categoryName,
+ cycleTypeId: allobject.cycleTypeId,
+ cycleType: cycleType,
+ cycleValue: cycleValue,
startTime: formattedStart,
endTime: formattedEnd,
positioning: saveEditIndex.value.index0.toString(),
positioningLong: saveEditIndex.value.index1.toString(),
- // tagName: allobject.tagName,
- cycleType: cycleType,
- nuId: uni.getStorageSync('nuId'),
- customerId: uni.getStorageSync('customerId'),
- id: "",
+ izPackage: false,
+ previewFile: allobject.previewFile,
+ previewFileSmall: allobject.previewFileSmall,
+ immediateFile: allobject.immediateFile,
+ immediateFileFocus: allobject.immediateFileFocus,
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
}
//给表格赋值
@@ -1733,16 +1773,16 @@
})
})
console.log("00000", postArray)
- addBatch(postArray).then(() => {
+ // addBatch(postArray).then(() => {
- getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
- if (res.success) {
- console.log("new", res.result)
- timearr.value = res.result
- }
+ // getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
+ // if (res.success) {
+ // console.log("new", res.result)
+ // timearr.value = res.result
+ // }
- })
- })
+ // })
+ // })
}
const routerPush = () => {
uni.setStorage({
@@ -1801,6 +1841,7 @@
onShow(() => {
getServiceTree().then((res : any) => {
+ // console.log("?????",res)
res.result.forEach((element : any) => {
if (element.netFlag == '0') {
doctorsayList.value.forEach((res : any) => {
@@ -1811,7 +1852,7 @@
} else {
element.url = element.animationPath
}
- element.children.forEach((res1:any) => {
+ element.children.forEach((res1 : any) => {
if (res1.netFlag == '0') {
secondtemp.value.forEach((res2 : any) => {
if (res2.name == res1.title) {
@@ -1859,20 +1900,30 @@
index0: 999,
index1: 999
})
+ // tagName: "",
+ // nuId: uni.getStorageSync('nuId'),
+ // customerId: uni.getStorageSync('customerId'),
+ // id: "",
const moBan = ref({
directiveId: "",
directiveName: "",
+ typeId: "",
+ typeName: "",
+ categoryId: "",
+ categoryName: "",
+ cycleTypeId: "",
+ cycleType: "",
+ cycleValue: "",
startTime: "",
endTime: "",
positioning: "",
positioningLong: "",
- // tagName: "",
- cycleType: "",
- nuId: uni.getStorageSync('nuId'),
- customerId: uni.getStorageSync('customerId'),
- id: "",
- tagName: ""
-
+ izPackage: false,
+ previewFile: "",
+ previewFileSmall: "",
+ immediateFile: "",
+ immediateFileFocus: "",
+ tagName: "",
})
// 切割bigArray
function splitString(str) {
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 5b83190..40e3c36 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -34,7 +34,7 @@
- 王金福
+ {{ uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo.name:"" }}