diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index fe30613..cc0acef 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -340,7 +340,7 @@ .el-table__header{ th.el-table__cell{ background-color: #02255F; - border-top: 1px solid #113D72; + // border-top: 1px solid #113D72; border-bottom: none; &>.cell{ font-size: 16px; @@ -478,8 +478,13 @@ // 弹框 .el-dialog{ position: relative; + position: fixed; width: 620px; padding: 2px; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + margin-top: 2vh !important; background: linear-gradient(135deg, transparent 10px, #339CFF 0) top left, linear-gradient(-135deg, transparent 10px, #339CFF 0) top right, linear-gradient(-45deg, transparent 10px, #339CFF 0) bottom right, @@ -753,6 +758,9 @@ background-size: contain; } } + .el-table__header{ + border-top: 1px solid #113D72; + } } // 默认底图 - 暂时只有头像 @@ -860,11 +868,6 @@ .preview-dialog{ .el-dialog{ width: 680px !important; - position: fixed; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - margin-top: 2vh !important; .preview-content{ max-height: calc(100vh - 330px) !important; overflow: hidden !important; @@ -977,7 +980,6 @@ input[type='number'] { } .el-table__header-wrapper{ background-color: #02255f; - border-top: 1px solid #113d72; } .svg-style{ diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index d015486..2a8b771 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -237,6 +237,7 @@ export default { getAjInProjectBtnState(data) { this.isProject = data }, + // 项目内操作 getProjectSelections(data, selectData) { this.smartQuery = { 'archiveYear': null, @@ -250,6 +251,7 @@ export default { this.$nextTick(() => { if (this.$refs.anjuan) { this.$refs.anjuan.anjuanData = [] + this.$refs.file.junneiData = [] } }) } else if (selectData && selectData.length === 1) { @@ -257,6 +259,7 @@ export default { this.$nextTick(() => { if (this.$refs.anjuan) { this.$refs.anjuan.getTableList() + this.$refs.file.junneiData = [] } }) } else { @@ -264,10 +267,12 @@ export default { this.$nextTick(() => { if (this.$refs.anjuan) { this.$refs.anjuan.getTableList() + this.$refs.file.junneiData = [] } }) } }, + // 案卷内操作 getSelections(data, selectData) { this.smartQuery = { 'archiveYear': null, @@ -299,6 +304,7 @@ export default { }) } }, + // 智能分类获取年度 getYear(obj) { if (this.$refs.smartTree) { this.intellClassifyLoading = true @@ -328,20 +334,6 @@ export default { const selectedKey = this.$refs.smartTree.getCurrentNode() const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.data.dicCode this.treeCurrentNode = ele.$el - // if (data.ifChild) { - // this.treeCurrentNode = ele.$el - // const eles = document.querySelectorAll('.el-tree-node__children .el-tree-node.is-focusable') - // for (let i = 0; i < eles.length; i++) { - // eles[i].classList.remove('is-current') - // } - // this.treeCurrentNode.classList.add('is-current') - // } else { - // ele.$el.classList.remove('is-current') - // console.log(this.treeCurrentNode) - // if (this.treeCurrentNode) { - // this.treeCurrentNode.classList.add('is-current') - // } - // } if (ele.$el.classList.contains('is-current')) { this.treeCurrentNode.classList.remove('is-current') this.smartQuery = { @@ -384,6 +376,7 @@ export default { } } }, + // 获取档案list handleTableList() { if (this.selectedCategory.isType === 2) { this.$nextTick(() => { diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index b10e03c..c7d5c86 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -11,6 +11,7 @@ v-model="addOrUpdateForm[item.fieldName]" :options="item.options" :normalizer="normalizer" + :clearable="false" placeholder="" :style="{ width: item.editLength+'px'}" :disabled="isDisabled" @@ -134,15 +135,18 @@ export default { parentsId: function(newValue, oldValue) { } }, - mounted() { + created() { this.editFormRow() + }, + mounted() { this.FetchNoFormatField() }, methods: { - getAuto() { + // 自动生成 + handleAuto() { let string = '' this.autoMatic.forEach(val => { - if (this.addOrUpdateForm[val.fieldName] === '' || this.addOrUpdateForm[val.fieldName] === null) { + if (!this.addOrUpdateForm[val.fieldName]) { string += '' } else { string += '' + this.addOrUpdateForm[val.fieldName] + val.connector @@ -154,10 +158,11 @@ export default { }) }) }, + // 获取档号组成项 FetchNoFormatField() { getNoFormatField({ categoryId: this.selectedCategory.id }).then(res => { this.autoMatic = res - this.getAuto() + this.handleAuto() }) }, // 获取对应字典子集数据 @@ -176,7 +181,7 @@ export default { handlerIsRepeat(params, item) { FetchDoeditIsRepeat(params).then(res => { if (res) { - this.$message.error(item.fieldCnName + '字段不可重复,请重新输入或选择') + this.$message.error(item.fieldCnName + '不可重复') } }) }, @@ -193,7 +198,7 @@ export default { this.handlerIsRepeat(params, item) } if (!item.isAutomatic) { - this.getAuto() + this.handleAuto() } }, // tree - open @@ -205,6 +210,7 @@ export default { // tree - select selectTree(val) { this.addOrUpdateForm[this.treeCurrentFiled.fieldName] = val.dicName + this.treeName = val.dicName // 自动重复字段 - 是否重复 - treeSelect方式 if (this.treeCurrentFiled.isRepeat) { const params = { @@ -215,8 +221,7 @@ export default { } this.handlerIsRepeat(params, this.treeCurrentFiled) } - console.log(val) - this.getAuto() + this.handleAuto() }, // popover - table 单选 clickRowHandler(row) { @@ -230,7 +235,7 @@ export default { } this.$refs.popoverTable.clearSelection() this.popoverVisible = false - this.getAuto() + this.handleAuto() }, // popover - 当前选中得 handleCurrentFieldName(item) { @@ -242,13 +247,17 @@ export default { editFormRow() { this.rules = {} this.formPreviewData.map(item => { + if (item.isInputClass === 'select') { + this.$set(item, 'options', []) + this.$set(this.addOrUpdateForm, item.fieldName, null) // 防止unkonwn + } if (item.isDefaultValue !== '') { this.$set(this.addOrUpdateForm, item.fieldName, item.isDefaultValue) } else { this.$set(this.addOrUpdateForm, item.fieldName, '') - } - if (item.isInputClass === 'select') { - this.$set(this.addOrUpdateForm, item.fieldName, null) // 防止unkonwn + if (item.isInputClass === 'select') { + this.$set(this.addOrUpdateForm, item.fieldName, null) // 防止unkonwn + } } this.rules[item.fieldName] = [ { @@ -306,14 +315,10 @@ export default { 'parentsId': this.setParentsId, 'jsonString': JSON.stringify(this.addOrUpdateForm) } - console.log(params) + // console.log(this.addOrUpdateForm) edit(params).then(res => { if (res) { - this.$notify({ - title: res, - type: 'success', - duration: 2500 - }) + this.$message.success(res) this.$emit('emitTableList') this.crud.refresh() } @@ -335,8 +340,6 @@ export default {