diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index 27572e6..70dba81 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -14,7 +14,6 @@ size="small">保存 - 更多 @@ -68,7 +67,7 @@
-
@@ -119,18 +118,18 @@ 纵排 - + + :disabled="doctorBtnDisabled('save')" + :autosize="{ minRows: Math.floor((window.pageHeight - 550) / 24), maxRows: 18 }" />
- @@ -141,14 +140,36 @@
- -
检查结论： - + + + + + + + + +
@@ -213,7 +234,7 @@ export default { summary: '' }, tabPosition: 'top', - tabChoosed:"0", + tabChoosed: "0", checkPictures: [ // { @@ -239,7 +260,7 @@ export default { // 裁图 dialogWinCutPic: false, cutPicParam: {}, - pictureFileType:'1' + pictureFileType: '1' }; }, @@ -249,7 +270,7 @@ export default { if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) this.sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig')) // console.log('this.sysConfig checkPictures', this.sysConfig) - + }, //挂载完成 @@ -327,6 +348,22 @@ export default { return srcList }, + //删除小结 + delSum(index) { + this.$confirm("此操作将删除该记录, 是否继续?", "提示", { + confirmButtonText: "是", + cancelButtonText: "否", + type: "warning", + }).then(() => { + this.doctorCheck.checkSummaryList.splice(index, 1); + }).catch(err => { + if (err == "cancel") { + // this.$message.info("已取消删除"); + console.log('已取消删除') + } + }); + }, + // 图片文件补全路径 imageFilePlus(fileName) { if (fileName.indexOf('base64') > -1 || fileName.indexOf('http') > -1) { @@ -367,7 +404,7 @@ export default { this.$peisAPI.imageAcquisition(JSON.stringify(toOutShell)) .then(async (res) => { let lres = JSON.parse(res) - console.log('this.$peisAPI.imageAcquisition', lres) + console.log('this.$peisAPI.imageAcquisition', lres) if (lres.code > -1) { for (let i = 0; i < lres.data.length; i++) { let item = lres.data[i]; @@ -394,7 +431,7 @@ export default { pictureBaseStrs: [{ fileName, localPathName: item.FilePath, - pictureBaseStr: baseHead + item.Image + pictureBaseStr: baseHead + item.Image }], pictureFileType: '0' //采图暂定图0，上传暂定报告1 this.pictureFileType } @@ -424,8 +461,8 @@ export default { // 清除结果 btnClear(seq) { - if(this.doctorBtnDisabled('save')){ - this.$message.warning({showClose:true,message:"已保存，不可操作！"}) + if (this.doctorBtnDisabled('save')) { + this.$message.warning({ showClose: true, message: "已保存，不可操作！" }) return } this.doctorCheck.checkItemList[seq].result = '' @@ -433,8 +470,8 @@ export default { // 默认结果 btnDefResult(seq) { - if(this.doctorBtnDisabled('save')){ - this.$message.warning({showClose:true,message:"已保存，不可操作！"}) + if (this.doctorBtnDisabled('save')) { + this.$message.warning({ showClose: true, message: "已保存，不可操作！" }) return } this.doctorCheck.checkItemList[seq].result = this.doctorCheck.checkItemList[seq].defaultResult @@ -457,7 +494,7 @@ export default { let token = window.sessionStorage.getItem('token') this.iframeSrc = `${this.sysConfig.dcmViewers}/?mrn=${this.doctorCheck.checkRequestNo}&token=${token}&pacsapi=${this.sysConfig.pacsApiHttps}` // this.iframeSrc = `${this.sysConfig.dcmViewers}/viewer?StudyInstanceUIDs=1.3.12.2.1107.5.1.4.79623.30000024091203062645300000022` - this.tabPosition = this.doctorCheck.checkItemList.length > 2 ? 'left':'top' + this.tabPosition = this.doctorCheck.checkItemList.length > 2 ? 'left' : 'top' this.tabChoosed = "0" this.dialogDcm = true @@ -677,7 +714,7 @@ export default { item.isPrint = "Y"; } else { item.isPrint = "N"; - } + } body.push(item); }); diff --git a/src/components/doctorCheck/PacsDcmList.vue b/src/components/doctorCheck/PacsDcmList.vue index f7dd4ba..a049ba3 100644 --- a/src/components/doctorCheck/PacsDcmList.vue +++ b/src/components/doctorCheck/PacsDcmList.vue @@ -112,20 +112,47 @@
检查结论： - + + + + + + + + +
-
+
+ 自动下一条 +
- 选择描述 - 保存结果 - 自动下一条 +
@@ -230,7 +257,7 @@ export default { return moment(new Date(date)).format(forMat); }, tableHeight() { - return this.window.pageHeight - 105 - 400 - 76 + return this.window.pageHeight - 105 - 450 - 76 }, }, methods: { @@ -406,6 +433,22 @@ export default { return false; }, + + //删除小结 + delSum(index) { + this.$confirm("此操作将删除该记录, 是否继续?", "提示", { + confirmButtonText: "是", + cancelButtonText: "否", + type: "warning", + }).then(() => { + this.doctorCheck.checkSummaryList.splice(index, 1); + }).catch(err => { + if (err == "cancel") { + // this.$message.info("已取消删除"); + console.log('已取消删除') + } + }); + }, // 浏览Dcm文件 btnBrowseDcm() { @@ -441,17 +484,23 @@ export default { // 确定描述与结论 btnOkBigtext() { // console.log('this.pacsParams', this.pacsParams) + /* if (!this.pacsParams.summary) { this.$message.warning({ showClose: true, message: '请填写检查结论' }) return } - //this.doctorCheck.checkItemList[0].result = this.pacsParams.result + this.doctorCheck.checkSummaryList = [{ id: Math.random(), registerCheckId: this.doctorCheck.RegisterCheckEdit.id, summary: this.pacsParams.summary, summaryFlag: 'N', }] + */ + if (this.doctorCheck.checkSummaryList.length < 1) { + this.$message.warning({ showClose: true, message: '请填写检查结论' }) + return + } this.save() .then(() => { diff --git a/src/components/doctorCheck/PacsTemplate.vue b/src/components/doctorCheck/PacsTemplate.vue index 35fde57..14f418f 100644 --- a/src/components/doctorCheck/PacsTemplate.vue +++ b/src/components/doctorCheck/PacsTemplate.vue @@ -27,26 +27,18 @@
+ placeholder="请输入检查结果" :autosize="{ minRows: 9, maxRows: 9 }" />
检查结论：
- - - - - -
-