diff --git a/src/assets/images/alert_bottom.png b/src/assets/images/alert_bottom.png new file mode 100644 index 0000000..5da2ff6 Binary files /dev/null and b/src/assets/images/alert_bottom.png differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 256f64f..6003f19 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -8,6 +8,7 @@ $arcCyan: #0FBED9; ::v-deep.input-prepend{ position: relative; + z-index: 1001; .el-input__inner { padding-left: 80px; } @@ -22,6 +23,14 @@ $arcCyan: #0FBED9; line-height: 32px; .el-input__inner { padding-left: 15px; + color: #339CFF; + } + .el-input__inner:hover, + .el-input__inner:focus{ + color: #339CFF; + } + .el-select__caret{ + color: #339CFF; } } } @@ -114,7 +123,6 @@ $arcCyan: #0FBED9; &.is-disabled{ color: #666; } - } .iconfont{ line-height: 30px; @@ -215,6 +223,8 @@ $arcCyan: #0FBED9; } } .upload-file{ + position: relative; + z-index: 1001; .upload-curd{ display: flex; flex-direction: row; @@ -295,4 +305,205 @@ $arcCyan: #0FBED9; .selct-data-head{ color: #fff; line-height: 32px; +} + +// 绑定标签 +.bindingDialog{ + ::v-deep.el-dialog{ + width: 720px; + } + ::v-deep.el-dialog__body{ + padding: 35px 35px 58px 35px; + } +} +.rebinding { + display: flex; + justify-content: space-between; + padding: 50px 65px 35px 65px; + span{ + display: block; + width: 60px; + line-height: 36px; + color: #3A99FD; + } + ::v-deep.el-input { + .el-input__inner{ + font-size: 14px; + height: 36px; + line-height: 36px; + color: #fff; + border: 1px solid #3A99FD; + background-color: transparent; + } + } +} + +.binding-flow{ + .step-item{ + position: relative; + display: flex; + justify-content: space-between; + margin-bottom: 10px; + z-index: 1; + &::before{ + content: ""; + position: absolute; + left: 15px; + top: 10px; + width: 1px; + height: 100%; + background-color: #3A99FD; + z-index: 1; + } + &:last-child::before{ + display: none; + } + } + .step-left-num{ + position: relative; + display: block; + width: 30px; + height: 30px; + line-height: 30px; + border-radius: 50%; + font-size: 16px; + text-align: center; + color: #fff; + border: 1px solid #339CFF; + background-color:#031435; + z-index: 4; + &.step-active{ + background-color: #339CFF; + } + &.step-loading{ + &::before, + &::after{ + content: ""; + position: absolute; + left: 50%; + top: 50%; + width: 40px; + height: 40px; + border-radius: 50%; + border: 1px solid #13439E; + box-shadow: inset 0px 0px 8px 1px #13439E; + margin: -20px 0 0 -20px; + z-index: 1; + } + &::before{ + animation: halo 2s linear 0.5s infinite; + } + &::after{ + animation: halo 2s linear 1.5s infinite; + } + } + } + // 晕开效果 + @keyframes halo { + 0% { + transform: scale(1); + -webkit-transform: scale(1); + opacity: 0.0; + } + 25% { + transform: scale(1); + -webkit-transform: scale(1); + opacity: 0.1; + } + 50% { + transform: scale(1); + -webkit-transform: scale(1); + opacity: 0.3; + } + 75% { + transform: scale(1.2); + -webkit-transform: scale(1.2); + opacity: 0.5; + } + 100% { + transform: scale(1.5); + -webkit-transform: scale(1.5); + opacity: 0.0; + } + } + .step-right-cont{ + flex: 1; + margin-left: 12px; + .step-title{ + line-height: 30px; + color: #339CFF; + span{ + padding-left: 10px; + font-weight: bold; + color: #fff; + } + } + .step-tip{ + padding: 0 10px; + height: 40px; + line-height: 40px; + color: #13439E; + background-color: #02255F; + border-radius: 4px; + &.tip-active{ + color: #339CFF; + } + &.tip-error{ + color: #EF3147; + } + } + } +} + +// 分卷装盒 +.partPackingDialog{ + ::v-deep .el-dialog{ + width: 950px !important; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + margin-top: 2vh !important; + } + ::v-deep .el-dialog__body{ + padding: 0; + } + ::v-deep .dialog-footer{ + margin: 20px auto 0 auto; + padding-bottom: 20px; + } + .packing-head{ + border-bottom: 1px solid #339CFF; + .head-search{ + margin-bottom: 0; + } + } +} +.part-packing-cont{ + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; +} +.part-packing-item{ + width: calc(100vh/2); + .part-packing-title{ + padding: 0 30px; + height: 40px; + line-height: 40px; + font-size: 16px; + font-weight: normal; + color: #fff; + } + ::v-deep.el-table{ + overflow-x: hidden; + overflow-y: auto; + // background: #02255F; + border: 2px solid #02255f; + border-top: none; + // border-right: none; + .el-table__body-wrapper{ + background-color: #031435; + } + } } \ No newline at end of file diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index bda8e1a..a810fff 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -883,5 +883,51 @@ input[type='number'] { } } - - +// alert 样式 +.el-message-box{ + position: relative; + width: 588px; + border: 2px solid #339CFF; + border-bottom: none; + border-radius: 4px 4px 0 0; + background-color: #031435; + overflow: visible; + &::after{ + position: absolute; + left: -2px; + bottom: -30px; + content: ""; + width: 589px; + height: 30px; + background: url(~@/assets/images/alert_bottom.png) no-repeat; + background-size: contain; + } + .el-message-box__header{ + padding: 18px 60px; + background-color: #339CFF; + .el-message-box__title{ + font-weight: bold; + color: #fff; + } + .el-message-box__headerbtn{ + top: -36px; + right: -16px; + } + .el-icon-close{ + font-family: "iconfont" !important; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 24px; + color: #339cff; + &::before{ + content: "\E60C"; + } + } + } + .el-message-box__content{ + height: 110px; + padding: 35px 60px 15px 60px; + color: #fff; + } +} diff --git a/src/views/archivesManage/archivesList/archivesDetail.vue b/src/views/archivesManage/archivesList/archivesDetail.vue index 0df230b..c94ce16 100644 --- a/src/views/archivesManage/archivesList/archivesDetail.vue +++ b/src/views/archivesManage/archivesList/archivesDetail.vue @@ -25,21 +25,29 @@ + @@ -66,7 +74,7 @@ - +
@@ -123,25 +131,26 @@ - + + + + + + + + +
- +
+

确定将当前档案加入借阅列表?

+
- - - - -
- -
-
-
@@ -153,12 +162,14 @@ import crudOperation from '@crud/CRUD.operation' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import PreviewForm from '@/views/components/category/PreviewForm' -import UploadFile from './module/uploadFile' -import ArchivesInfo from './module/archivesInfo' -import Packing from './module/packing' +import UploadFile from './module/uploadFile/index' +import ArchivesInfo from './module/archivesInfo/index' +import Packing from './module/packing/index' +import PartPacking from './module/partPacking/index' +import Binding from './module/binding/index' export default { - components: { crudOperation, rrOperation, pagination, PreviewForm, UploadFile, ArchivesInfo, Packing }, + components: { crudOperation, rrOperation, pagination, PreviewForm, UploadFile, ArchivesInfo, Packing, Binding, PartPacking }, mixins: [ presenter(), header(), @@ -220,15 +231,16 @@ export default { tableDisplayFields: [], // table-list-title字段 getTableDisplayFieldsLoading: false, // table-loading formPreviewData: [], // 预览界面data - isEditOrAdd: '', - selectedData: null, + isEditOrAdd: '', // 判断crud-add/edit-btn + selectedData: null, // table已选择的 archivesTabIndex: 0, // 新增 - tabDisabled: true, arcId: null, // 档案ID - arrySort: [], + arrySort: [], // 多项sort-query uploadFileVisible: false, // 上传附件 archivesInfoVisible: false, // 档案详情 - packingVisible: false // 装盒 + lengingVisible: false, // 借阅 + isBinding: false // 判断是否已绑定标签 + } }, watch: { @@ -298,11 +310,9 @@ export default { this.selectedData = crud.selections this.archivesTabIndex = 0 if (this.isEditOrAdd === 'add') { - this.tabDisabled = true this.arcId = null } else if (this.isEditOrAdd === 'edit') { this.arcId = this.selectedData[0].id - this.tabDisabled = false } this.form.dictionaryConfigId = {} this.formPreviewData = [] @@ -332,7 +342,7 @@ export default { }, // table - 双击查看详情 tableDoubleClick(row) { - this.archivesInfoVisible = true + this.$refs.archivesInfo.archivesInfoVisible = true const params = { categoryId: this.selectedCategory.id, archivesId: row.id @@ -383,11 +393,31 @@ export default { this.$refs.table.doLayout() }) }, + // 上传附件 uploadFile() { this.uploadFileVisible = true }, uploadFileSave() { this.uploadFileVisible = false + }, + // 绑定 + handleBinding(data) { + this.$refs.bind.bindingVisible = true + if (data.tid == null) { + this.isBinding = false + this.$refs.bind.bindingTitle = '绑定标签' + } else { + this.isBinding = true + this.$refs.bind.bindingTitle = '重新绑定' + } + }, + // 装盒 + handlePacking(data) { + this.$refs.packing.packingVisible = true + }, + // 分卷装盒 + handlePartPacking(data) { + this.$refs.partPacking.partPackingVisible = true } } } diff --git a/src/views/archivesManage/archivesList/module/archivesInfo.vue b/src/views/archivesManage/archivesList/module/archivesInfo.vue deleted file mode 100644 index fc81ae2..0000000 --- a/src/views/archivesManage/archivesList/module/archivesInfo.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue new file mode 100644 index 0000000..a30c23a --- /dev/null +++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/views/archivesManage/archivesList/module/binding/index.vue b/src/views/archivesManage/archivesList/module/binding/index.vue new file mode 100644 index 0000000..c16aa4c --- /dev/null +++ b/src/views/archivesManage/archivesList/module/binding/index.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/views/archivesManage/archivesList/module/packing.vue b/src/views/archivesManage/archivesList/module/packing.vue deleted file mode 100644 index 35e280c..0000000 --- a/src/views/archivesManage/archivesList/module/packing.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - diff --git a/src/views/archivesManage/archivesList/module/packing/index.vue b/src/views/archivesManage/archivesList/module/packing/index.vue new file mode 100644 index 0000000..78c7fdd --- /dev/null +++ b/src/views/archivesManage/archivesList/module/packing/index.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/archivesManage/archivesList/module/partPacking/index.vue b/src/views/archivesManage/archivesList/module/partPacking/index.vue new file mode 100644 index 0000000..753b361 --- /dev/null +++ b/src/views/archivesManage/archivesList/module/partPacking/index.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/archivesManage/archivesList/module/uploadFile.vue b/src/views/archivesManage/archivesList/module/uploadFile/index.vue similarity index 97% rename from src/views/archivesManage/archivesList/module/uploadFile.vue rename to src/views/archivesManage/archivesList/module/uploadFile/index.vue index 11a27d7..3034dbf 100644 --- a/src/views/archivesManage/archivesList/module/uploadFile.vue +++ b/src/views/archivesManage/archivesList/module/uploadFile/index.vue @@ -71,7 +71,7 @@
- +
@@ -89,7 +89,7 @@