diff --git a/package.json b/package.json index 74a605a3..42d86ad0 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "pdfobject": "^2.3.0", "qrcodejs2": "^0.0.2", "screenfull": "^6.0.2", - "sortablejs": "^1.15.5", "streamsaver": "^2.0.6", "svg-sprite-loader": "^4.1.3", "svgo": "^1.2.2", diff --git a/src/api/trials.js b/src/api/trials.js index 2ebd6066..2feb004a 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -3995,3 +3995,35 @@ export function deleteTrialFileType(id) { }) } +// 工作台-获取稽查文档 +export function getAuditDocumentData(data) { + return request({ + url: `/AuditDocument/getAuditDocumentData`, + method: 'post', + data + }) +} +// 工作台-新增稽查文档 +export function addAuditDocument(data) { + return request({ + url: `/AuditDocument/addAuditDocument`, + method: 'post', + data + }) +} +// 工作台-获取当前目录层级 +export function getBreadcrumbData(data) { + return request({ + url: `/AuditDocument/getBreadcrumbData`, + method: 'post', + data + }) +} +// 工作台-修改稽查文档 +export function updateAuditDocument(data) { + return request({ + url: `/AuditDocument/updateAuditDocument`, + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/assets/file_icon/doc.png b/src/assets/file_icon/doc.png new file mode 100644 index 00000000..e202e609 Binary files /dev/null and b/src/assets/file_icon/doc.png differ diff --git a/src/assets/file_icon/docx.png b/src/assets/file_icon/docx.png new file mode 100644 index 00000000..e202e609 Binary files /dev/null and b/src/assets/file_icon/docx.png differ diff --git a/src/assets/file_icon/folder.png b/src/assets/file_icon/folder.png new file mode 100644 index 00000000..d721fa4a Binary files /dev/null and b/src/assets/file_icon/folder.png differ diff --git a/src/assets/file_icon/pdf.png b/src/assets/file_icon/pdf.png new file mode 100644 index 00000000..6f6c4efb Binary files /dev/null and b/src/assets/file_icon/pdf.png differ diff --git a/src/assets/file_icon/ppt.png b/src/assets/file_icon/ppt.png new file mode 100644 index 00000000..6fc9d650 Binary files /dev/null and b/src/assets/file_icon/ppt.png differ diff --git a/src/assets/file_icon/pptx.png b/src/assets/file_icon/pptx.png new file mode 100644 index 00000000..e00b0b01 Binary files /dev/null and b/src/assets/file_icon/pptx.png differ diff --git a/src/assets/file_icon/xls.png b/src/assets/file_icon/xls.png new file mode 100644 index 00000000..ed5ff73b Binary files /dev/null and b/src/assets/file_icon/xls.png differ diff --git a/src/assets/file_icon/xlsx.png b/src/assets/file_icon/xlsx.png new file mode 100644 index 00000000..81b20c14 Binary files /dev/null and b/src/assets/file_icon/xlsx.png differ diff --git a/src/assets/file_icon/zip.png b/src/assets/file_icon/zip.png new file mode 100644 index 00000000..a993c4f6 Binary files /dev/null and b/src/assets/file_icon/zip.png differ diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue index f493caf8..f1cecd76 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue @@ -10,43 +10,20 @@ ) }}
-
- + + " />
{{ $t('trials:trialDocument:button:selectFolder') }}
- +
{{ $t('trials:trialDocument:button:select') }}
@@ -54,30 +31,14 @@
- - + + - + - + - + - + - + @@ -139,13 +78,8 @@ {{ $store.state.trials.uploadTip }} - + {{ $t('trials:trialDocument:action:upload') }}
@@ -265,11 +199,11 @@ export default { type: extendName.split('.')[1], status: 0, file: files[i], - id: `${files[i].lastModified}${ - files[i].name - }${new Date().getTime()}${i + 1}`, + id: `${files[i].lastModified}${files[i].name + }${new Date().getTime()}${i + 1}`, fileType: files[i].type, uploadFileSize: 0, + webkitRelativePath: files[i].webkitRelativePath } this.fileList.push(obj) this.$refs.filesTable.toggleRowSelection(obj, true) @@ -300,7 +234,7 @@ export default { ) } }) - .catch(() => {}) + .catch(() => { }) }, // 开始上传文件 async beginUpload() { @@ -348,7 +282,8 @@ export default { FileName: file.name, FilePath: this.$getObjectName(res.url), FileSize: file.size, - FileFormat: fileType, + FileFormat: fileType.split('.')[1], + catalogue: file.webkitRelativePath }) let flag = arr.every((item) => item.status === 2) if (flag) { @@ -431,7 +366,6 @@ export default { } else { this.fileInput.accept = this.faccept.join(',') } - console.log(this.fileInput) this.fileInput.click() }, }, @@ -481,6 +415,7 @@ export default { background: #428bca; border-color: #428bca; color: #fff; + .select-file { height: 30px; width: 90px; @@ -491,6 +426,7 @@ export default { opacity: 0; font-size: 0; } + .btn-select { //给显示在页面上的按钮写样式 width: 90px; diff --git a/src/views/trials/trials-workbench/components/auditDocument/contextmenu.vue b/src/views/trials/trials-workbench/components/auditDocument/contextmenu.vue index 1ff3d6f8..15c51b30 100644 --- a/src/views/trials/trials-workbench/components/auditDocument/contextmenu.vue +++ b/src/views/trials/trials-workbench/components/auditDocument/contextmenu.vue @@ -1,5 +1,7 @@ @@ -43,15 +64,19 @@ export default { default: () => { return [] } - } + }, }, data() { return { - visible: false + visible: false, + type: 'file', + zIndex: 9 }; }, methods: { - init(row, column, event) { + init(event, row, type, zIndex = 9) { + this.type = type + this.zIndex = zIndex // 设置菜单出现的位置 // 具体显示位置根据自己需求进行调节 this.visible = true @@ -121,7 +146,6 @@ export default { background-position: top 0 right 0; background-repeat: no-repeat; box-shadow: 0 0 0 .5px #88888830, 0 10px 40px 0 #88888840; - z-index: 9; } .contextmenu__item:hover { diff --git a/src/views/trials/trials-workbench/components/auditDocument/detail.vue b/src/views/trials/trials-workbench/components/auditDocument/detail.vue new file mode 100644 index 00000000..d415179b --- /dev/null +++ b/src/views/trials/trials-workbench/components/auditDocument/detail.vue @@ -0,0 +1,370 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-workbench/components/auditDocument/index.vue b/src/views/trials/trials-workbench/components/auditDocument/index.vue index 70361888..b60cd5d7 100644 --- a/src/views/trials/trials-workbench/components/auditDocument/index.vue +++ b/src/views/trials/trials-workbench/components/auditDocument/index.vue @@ -16,7 +16,7 @@ - + @@ -30,10 +30,10 @@ {{ $t('trials:trials-workbench:auditDocument:button:addFolder') }} - + {{ $t('trials:trials-workbench:auditDocument:button:uploadFile') }} - + {{ $t('trials:trials-workbench:auditDocument:button:uploadFolder') }} @@ -44,20 +44,28 @@ - - +
+ {{ $t('trials:trials-workbench:auditDocument:catalogue:title') }} + + {{ item.Name }} + +
+ + - + + - + + + + + + + + - \ No newline at end of file diff --git a/src/views/trials/trials-workbench/components/clinicalData.vue b/src/views/trials/trials-workbench/components/clinicalData.vue index 84a79129..77912ceb 100644 --- a/src/views/trials/trials-workbench/components/clinicalData.vue +++ b/src/views/trials/trials-workbench/components/clinicalData.vue @@ -238,7 +238,7 @@ :reading-id="selected.ReadingId" :clinical-form-id="selected.ClinicalFormId" :open-type="'look'" - @close="" + @close="false" />