diff --git a/src/components/customRecord/index.ts b/src/components/customRecord/index.ts index 899b1c7..d1fdffa 100644 --- a/src/components/customRecord/index.ts +++ b/src/components/customRecord/index.ts @@ -144,12 +144,14 @@ Component({ success: (res) => { wx.hideLoading(); const data = JSON.parse(res.data); + + const suffix = this.GetExtensionFileName(data.data.Url); const expandJson = { fileId: "", - name: "文件", + name: `病例相关文件.${suffix}`, size: (item.size / 1024).toFixed(2), fileUrl: data.data.Url, - suffix: this.GetExtensionFileName(data.data.Url), + suffix, type: item.fileType, imgUrl: "", duration: 0, diff --git a/src/components/uploadFile/index.ts b/src/components/uploadFile/index.ts index 70b43e4..4a36dcd 100644 --- a/src/components/uploadFile/index.ts +++ b/src/components/uploadFile/index.ts @@ -148,10 +148,10 @@ Component({ const suffix = this.GetExtensionFileName(data.data.Url); const expandJson = { fileId: "", - name: "文件", + name: `病例相关文件.${suffix}`, size: (item.size / 1024).toFixed(2), fileUrl: data.data.Url, - suffix: this.GetExtensionFileName(data.data.Url), + suffix, type: item.fileType, imgUrl: "", duration: 0, diff --git a/src/images/self.png b/src/images/self.png new file mode 100644 index 0000000..ca104f0 Binary files /dev/null and b/src/images/self.png differ diff --git a/src/module1/pages/casesDetail/index.scss b/src/module1/pages/casesDetail/index.scss index ea9cfa6..7e27e84 100644 --- a/src/module1/pages/casesDetail/index.scss +++ b/src/module1/pages/casesDetail/index.scss @@ -331,7 +331,7 @@ page { justify-content: space-between; .quality { width: 136rpx; - height: 50rpx; + height: 44rpx; } .gather { padding: 12rpx 32rpx; @@ -714,8 +714,8 @@ page { .tip { position: absolute; top: -25rpx; - transform: translateY(-100%); - left: 0; + transform: translate(-50%, -100%); + left: 50%; border-radius: 12rpx; width: 686rpx; box-sizing: border-box; @@ -741,7 +741,8 @@ page { &::after { position: absolute; bottom: -12rpx; - left: 20rpx; + left: 50%; + transform: translateX(-50%); content: ""; width: 0; height: 0; diff --git a/src/module1/pages/casesDetail/index.ts b/src/module1/pages/casesDetail/index.ts index 2b02688..dbaaead 100644 --- a/src/module1/pages/casesDetail/index.ts +++ b/src/module1/pages/casesDetail/index.ts @@ -40,11 +40,26 @@ Page({ } as any, rejectReason: {}, + remark: "", + fold: false, }, onLoad(options) { this.setData({ id: options.id, + beforeClose1: (e: any) => { + if (e === "confirm") { + if (!this.data.remark) { + wx.showToast({ + title: "请输入驳回原因", + icon: "none", + }); + return false; + } + this.handleRejectSubmit(); + } + return true; + }, beforeClose2: (e: any) => { if (e === "confirm") { this.handleQualitySubmit(); @@ -452,6 +467,33 @@ Page({ }); }, + handleReject() { + this.setData({ + show1: true, + }); + }, + handleQuickRemark(e) { + const { value } = e.currentTarget.dataset; + this.setData({ + remark: `${this.data.remark}${value}`, + }); + }, + handleRejectSubmit() { + const { id, remark } = this.data; + wx.ajax({ + method: "POST", + url: "?r=takeda/case/reject-case", + data: { + caseId: id, + remark, + }, + }).then(() => { + wx.reLaunch({ + url: "/pages/cases/index", + }); + }); + }, + handleFold() { this.setData({ fold: !this.data.fold, diff --git a/src/module1/pages/casesDetail/index.wxml b/src/module1/pages/casesDetail/index.wxml index accaf2f..5d48f82 100644 --- a/src/module1/pages/casesDetail/index.wxml +++ b/src/module1/pages/casesDetail/index.wxml @@ -12,7 +12,7 @@ {{fold ? '展开' : '收起'}} - + @@ -90,12 +90,12 @@ data-item="{{item}}" src="{{imageUrl}}icon-eye.png?t={{Timestamp}}" > - + + + + + + @@ -104,9 +104,14 @@ - + {{item.createTime}} {{item.fold ? '展开' : '收起'}} - + @@ -181,12 +186,12 @@ data-item="{{cItem}}" src="{{imageUrl}}icon-eye.png?t={{Timestamp}}" > - + + + + + + @@ -227,7 +232,7 @@ - + @@ -279,7 +284,7 @@ - + 驳回 @@ -343,18 +348,19 @@ title="" show="{{ show1 }}" show-cancel-button - bind:close="onClose" confirm-button-color="rgba(0, 180, 197, 1)" + beforeClose="{{beforeClose1}}" > 驳回病历后您无需批注此病历 - 专长不符 - 资料待补充 - 重复病历 + 专长不符 + 资料待补充 + 重复病历