diff --git a/src/components/customAudioText/index.ts b/src/components/customAudioText/index.ts
index 490562e..a72c028 100644
--- a/src/components/customAudioText/index.ts
+++ b/src/components/customAudioText/index.ts
@@ -22,12 +22,10 @@ Component({
methods: {
init() {},
handleAudioText() {
- this.setData({
- show: true,
- });
wx.ajax({
method: "GET",
url: "?r=takeda/common/audio-url-to-text",
+ loading: true,
data: {
AudioUrl: this.data.url,
},
diff --git a/src/components/uploadFile/index.ts b/src/components/uploadFile/index.ts
index defcdc6..b38e768 100644
--- a/src/components/uploadFile/index.ts
+++ b/src/components/uploadFile/index.ts
@@ -151,7 +151,7 @@ Component({
const suffix = this.GetExtensionFileName(data.data.Url);
const expandJson = {
fileId: "",
- name: `病历相关文件.${suffix}`,
+ name: item.name || `病历相关文件.${suffix}`,
size: (item.size / 1024).toFixed(2),
fileUrl: data.data.Url,
suffix,
diff --git a/src/echart/components/homeLevel2/index.ts b/src/echart/components/homeLevel2/index.ts
index ad7aadf..f596f3e 100644
--- a/src/echart/components/homeLevel2/index.ts
+++ b/src/echart/components/homeLevel2/index.ts
@@ -21,7 +21,7 @@ Component({
fold2: false,
foldHeight2: 10000,
take: {},
- case: {},
+ case: {} as any,
cooperateList: [],
inviteList: [],
},
@@ -147,6 +147,16 @@ Component({
const { index } = e.currentTarget.dataset;
this.triggerEvent("question", index);
},
+ handleNewCase() {
+ const { case: cases } = this.data;
+ wx.showModal({
+ confirmColor: "#00B4C5",
+ cancelColor: "#141515",
+ showCancel: false,
+ confirmText: "关闭",
+ content: `本人提交:${cases.newOneCaseCount}\r\n他人提交:${cases.newTwoCaseCount}`,
+ });
+ },
},
});
diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml
index 64e7a02..4708fdd 100644
--- a/src/echart/components/homeLevel2/index.wxml
+++ b/src/echart/components/homeLevel2/index.wxml
@@ -75,10 +75,10 @@
{{case.totalCaseCount}}
-
+
新病历
-
+
{{case.newCaseCount}}
@@ -86,7 +86,7 @@
讨论中
-
+
{{case.feedbackCaseCount}}
diff --git a/src/echart/components/homeLevel3/index.ts b/src/echart/components/homeLevel3/index.ts
index 8a3461c..f364001 100644
--- a/src/echart/components/homeLevel3/index.ts
+++ b/src/echart/components/homeLevel3/index.ts
@@ -17,7 +17,7 @@ Component({
*/
data: {
take: {},
- case: {},
+ case: {} as any,
doctorCount: {},
},
diff --git a/src/echart/components/homeLevel3/index.wxml b/src/echart/components/homeLevel3/index.wxml
index 8067317..31bc40e 100644
--- a/src/echart/components/homeLevel3/index.wxml
+++ b/src/echart/components/homeLevel3/index.wxml
@@ -74,14 +74,14 @@
新病历
-
+
{{case.newCaseCount}}
讨论中
-
+
{{case.feedbackCaseCount}}
diff --git a/src/echart/components/homeLevel4/index.ts b/src/echart/components/homeLevel4/index.ts
index a77e73b..1f21f5d 100644
--- a/src/echart/components/homeLevel4/index.ts
+++ b/src/echart/components/homeLevel4/index.ts
@@ -23,7 +23,7 @@ Component({
lazyLoad: true,
},
take: {},
- case: {},
+ case: {} as any,
doctorCount: {},
DepartmentId: "",
@@ -680,6 +680,16 @@ Component({
const { index } = e.currentTarget.dataset;
this.triggerEvent("question", index);
},
+ handleNewCase() {
+ const { case: cases } = this.data;
+ wx.showModal({
+ confirmColor: "#00B4C5",
+ cancelColor: "#141515",
+ showCancel: false,
+ confirmText: "关闭",
+ content: `本科室:${cases.newOneCaseCount}\r\n无科室:${cases.newTwoCaseCount}`,
+ });
+ },
},
});
diff --git a/src/echart/components/homeLevel4/index.wxml b/src/echart/components/homeLevel4/index.wxml
index 231d7f6..467f4c3 100644
--- a/src/echart/components/homeLevel4/index.wxml
+++ b/src/echart/components/homeLevel4/index.wxml
@@ -72,17 +72,17 @@
{{case.totalCaseCount}}
-
+
新病历
-
+
{{case.newCaseCount}}
-
+
讨论中
-
+
{{case.feedbackCaseCount}}
diff --git a/src/module1/pages/casesDetail/index.ts b/src/module1/pages/casesDetail/index.ts
index 0b832be..c3f3049 100644
--- a/src/module1/pages/casesDetail/index.ts
+++ b/src/module1/pages/casesDetail/index.ts
@@ -291,6 +291,17 @@ Page({
},
});
},
+ handlePreviewName(e) {
+ const { item } = e.currentTarget.dataset;
+ wx.showModal({
+ title: "文件名",
+ content: item.name,
+ confirmColor: "#00B4C5",
+ cancelColor: "#141515",
+ showCancel: false,
+ confirmText: "关闭",
+ });
+ },
handleDownloadFile(e) {
const { item } = e.currentTarget.dataset;
wx.downloadFile({
diff --git a/src/module1/pages/casesDetail/index.wxml b/src/module1/pages/casesDetail/index.wxml
index 4c5fd85..238f8e7 100644
--- a/src/module1/pages/casesDetail/index.wxml
+++ b/src/module1/pages/casesDetail/index.wxml
@@ -85,6 +85,7 @@
wx:for="{{detail.caseFiles}}"
wx:key="url"
bind:tap="handlePreviewFile"
+ bind:longpress="handlePreviewName"
data-item="{{item}}"
>
@@ -190,6 +191,7 @@
wx:for-item="cItem"
wx:key="url"
bind:tap="handlePreviewFile"
+ bind:longpress="handlePreviewName"
data-item="{{cItem}}"
>
diff --git a/src/module1/pages/casesFeedback/index.ts b/src/module1/pages/casesFeedback/index.ts
index 2cbcae7..6b7f61c 100644
--- a/src/module1/pages/casesFeedback/index.ts
+++ b/src/module1/pages/casesFeedback/index.ts
@@ -137,6 +137,18 @@ Page({
},
});
},
+ handlePreviewName(e) {
+ const { index } = e.currentTarget.dataset;
+ const item = this.data.files[index];
+ wx.showModal({
+ title: "文件名",
+ content: item.name,
+ confirmColor: "#00B4C5",
+ cancelColor: "#141515",
+ showCancel: false,
+ confirmText: "关闭",
+ });
+ },
handleDownloadFile(e) {
const { index } = e.currentTarget.dataset;
const item = this.data.files[index];
diff --git a/src/module1/pages/casesFeedback/index.wxml b/src/module1/pages/casesFeedback/index.wxml
index a93ef89..a43760f 100644
--- a/src/module1/pages/casesFeedback/index.wxml
+++ b/src/module1/pages/casesFeedback/index.wxml
@@ -62,7 +62,7 @@
-
+
{{item.name}}
diff --git a/src/module1/pages/entryCases/index.ts b/src/module1/pages/entryCases/index.ts
index faf7d04..961b741 100644
--- a/src/module1/pages/entryCases/index.ts
+++ b/src/module1/pages/entryCases/index.ts
@@ -208,6 +208,18 @@ Page({
},
});
},
+ handlePreviewName(e) {
+ const { index } = e.currentTarget.dataset;
+ const item = this.data.files[index];
+ wx.showModal({
+ title: "文件名",
+ content: item.name,
+ confirmColor: "#00B4C5",
+ cancelColor: "#141515",
+ showCancel: false,
+ confirmText: "关闭",
+ });
+ },
handleDownloadFile(e) {
const { index } = e.currentTarget.dataset;
const item = this.data.files[index];
diff --git a/src/module1/pages/entryCases/index.wxml b/src/module1/pages/entryCases/index.wxml
index 23d7c56..7b08381 100644
--- a/src/module1/pages/entryCases/index.wxml
+++ b/src/module1/pages/entryCases/index.wxml
@@ -66,7 +66,7 @@
-
+
{{item.name}}
diff --git a/src/module1/pages/org3/index.scss b/src/module1/pages/org3/index.scss
index a1bf759..e13b85c 100644
--- a/src/module1/pages/org3/index.scss
+++ b/src/module1/pages/org3/index.scss
@@ -7,7 +7,27 @@ page {
padding: 32rpx;
border-radius: 0 0 32rpx 32rpx;
background-color: #fff;
+ .select {
+ display: flex;
+ align-content: inherit;
+ gap: 14rpx;
+ .label {
+ font-size: 28rpx;
+ color: rgba(20, 21, 21, 1);
+ }
+ .picker {
+ .picker-content {
+ padding: 4rpx 24rpx;
+ font-size: 28rpx;
+ color: rgba(133, 133, 133, 1);
+ line-height: 39rpx;
+ border-radius: 98rpx;
+ background-color: rgba(246, 246, 246, 1);
+ }
+ }
+ }
.banner {
+ margin-top: 24rpx;
padding: 32rpx 0;
display: flex;
justify-content: space-between;
@@ -29,9 +49,8 @@ page {
color: rgba(255, 255, 255, 1);
line-height: 1;
}
- &:nth-of-type(2) {
+ &:nth-of-type(1) {
border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
- border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
}
}
}
@@ -94,6 +113,7 @@ page {
}
}
.wrap {
+ flex: 1;
padding-top: 8rpx;
.w-header {
display: flex;
@@ -105,6 +125,7 @@ page {
display: flex;
align-items: baseline;
gap: 16rpx;
+ flex-wrap: wrap;
.name {
font-size: 36rpx;
color: rgba(20, 21, 21, 1);
@@ -186,19 +207,39 @@ page {
margin: 24rpx 24rpx 0;
border-radius: 16rpx;
background-color: #fff;
+ overflow: hidden;
.level-three {
- margin: 24rpx 0 0;
+ &.active {
+ background: #E9F7F9;
+ .doctor {
+ background: #E9F7F9;
+ }
+ }
.doctor {
padding: 24rpx;
background: linear-gradient(180deg, #e5f5f7 0%, #ffffff 50%);
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
border-radius: 16rpx 16rpx 16rpx 16rpx;
border: 2rpx solid #ffffff;
+ .avatar-wrap {
+ .num {
+ flex-shrink: 0;
+ margin-top: 8rpx;
+ padding: 0 20rpx;
+ font-size: 22rpx;
+ color: rgba(255, 255, 255, 1);
+ border-radius: 64rpx;
+ background-color: rgba(0, 180, 197, 1);
+ }
+ }
}
}
.level-two {
display: flex;
+ &.active {
+ background-color: #E9F7F9;
+ }
.aside {
padding-left: 60rpx;
display: flex;
@@ -242,6 +283,9 @@ page {
}
.level-one {
display: flex;
+ &.active {
+ background-color: #E9F7F9;
+ }
.aside {
margin-left: 60rpx;
padding-left: 42rpx;
@@ -274,6 +318,9 @@ page {
}
.level-one-only {
display: flex;
+ &.active {
+ background-color: #E9F7F9;
+ }
.aside {
padding-left: 60rpx;
display: flex;
@@ -296,6 +343,11 @@ page {
}
}
}
+ .fold-wrap {
+ &.fold {
+ display: none;
+ }
+ }
.empty-wrap {
.empty {
diff --git a/src/module1/pages/org3/index.ts b/src/module1/pages/org3/index.ts
index 1bb6394..ce674e0 100644
--- a/src/module1/pages/org3/index.ts
+++ b/src/module1/pages/org3/index.ts
@@ -2,8 +2,16 @@ const app = getApp();
Page({
data: {
+ Department: [],
+
doctorCount: {},
- tree: [],
+
+ tree: [] as any,
+ search: "",
+
+ userInfo: {} as any,
+
+ allFold: false,
},
onLoad() {
app.waitLogin().then(() => {
@@ -38,6 +46,73 @@ Page({
url: "/module1/pages/invite/index",
});
},
+ handleSearch() {
+ const { tree, search } = this.data;
+ let newTree: any = null;
+ if (search) {
+ newTree = this.sourceTree(tree, search);
+ } else {
+ newTree = this.clearTree(tree, search);
+ }
+ this.setData({
+ tree: newTree,
+ });
+ },
+ sourceTree(tree: any[], search: string): any[] {
+ return tree.map((item) => {
+ if (item.Children?.length) {
+ this.sourceTree(item.Children, search);
+ }
+ if (item.DoctorInfo.doctorName.includes(search)) {
+ item.active = true;
+ } else {
+ item.active = false;
+ }
+ return item;
+ });
+ },
+ clearTree(tree: any[], search: string): any[] {
+ return tree.map((item) => {
+ if (item.Children?.length) {
+ this.clearTree(item.Children, search);
+ }
+ item.active = false;
+ return item;
+ });
+ },
+ handleFold(e) {
+ const { index } = e.currentTarget.dataset;
+ const { tree } = this.data;
+ tree[index].fold = !tree[index].fold;
+ this.setData({
+ tree,
+ });
+ },
+ handleSubFold(e) {
+ const { index, subindex } = e.currentTarget.dataset;
+ const { tree } = this.data;
+ tree[index].Children[subindex].fold = !tree[index].Children[subindex].fold;
+ this.setData({
+ tree,
+ });
+ },
+ handleFoldAll() {
+ const { tree, allFold } = this.data;
+ const newTree = this.toggleFoldAll(tree, !allFold);
+ this.setData({
+ allFold: !allFold,
+ tree: newTree,
+ });
+ },
+ toggleFoldAll(tree, fold) {
+ return tree.map((item) => {
+ if (item.Children?.length) {
+ this.toggleFoldAll(item.Children, fold);
+ }
+ item.fold = fold;
+ return item;
+ });
+ },
});
export {};
diff --git a/src/module1/pages/org3/index.wxml b/src/module1/pages/org3/index.wxml
index a997056..9c1626d 100644
--- a/src/module1/pages/org3/index.wxml
+++ b/src/module1/pages/org3/index.wxml
@@ -1,12 +1,12 @@