Browse Source

档案装盒size/盒管理详情/用户中心-操作日志date/style调整

master
xuhuajiao 2 years ago
parent
commit
1ba2a7f64e
  1. 18
      src/views/archivesManage/archivesCheck/module/addCheck.vue
  2. 2
      src/views/archivesManage/archivesList/archivesAnjuan/index.vue
  3. 16
      src/views/archivesManage/archivesList/index.vue
  4. 3
      src/views/archivesManage/archivesList/module/deltArchives/index.vue
  5. 49
      src/views/archivesManage/archivesList/module/packing/index.vue
  6. 16
      src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
  7. 1
      src/views/archivesManage/outInStorage/inStorage/index.vue
  8. 20
      src/views/archivesManage/outInStorage/module/detailDialog.vue
  9. 2
      src/views/system/user/center.vue

18
src/views/archivesManage/archivesCheck/module/addCheck.vue

@ -11,7 +11,7 @@
label-width="80px"
:rules="rules"
>
<el-form-item label="选择区域" prop="selectArea" class="down-select" style="padding-top:1px;margin-right:20px">
<el-form-item label="选择区域" prop="selectArea" class="down-select" style="margin-right:20px">
<treeselect
v-model="selectAreaValue"
:options="selectArea"
@ -25,7 +25,7 @@
<el-form-item label="选择门类" prop="category" class="down-select">
<el-select
v-model="categoryValue"
style="width: 280px;"
style="width: 280px;height:30px"
multiple
filterable
clearable
@ -332,14 +332,8 @@ export default {
padding: 30px 0;
}
::v-deep .el-tag.el-tag--info{
height: 26px;
line-height: 26px;
background-color: #13439E;
border: none;
color: #fff;
}
::v-deep .el-tag.el-tag--info .el-tag__close{
background-color: #fff;
height: 24px !important;
line-height: 24px !important;
}
::v-deep .el-input__inner{
height: 30px !important;
@ -349,6 +343,9 @@ export default {
background: transparent;
}
//
::v-deep .vue-treeselect__placeholder, .vue-treeselect__single-value{
line-height: 30px;
}
::v-deep .vue-treeselect--has-value .vue-treeselect__multi-value{
margin-bottom: 0;
}
@ -358,6 +355,7 @@ export default {
}
::v-deep .el-dialog .el-form .vue-treeselect__control{
height: 30px !important;
line-height: 18px;
}
::v-deep .vue-treeselect__limit-tip{

2
src/views/archivesManage/archivesList/archivesAnjuan/index.vue

@ -407,7 +407,7 @@ export default {
this.$refs.packing.packingVisible = true
this.$refs.packing.isPackingOrPartType = type
if (type) {
this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData))
this.$refs.packing.getPackingFileList()
}
this.getTotalSumAll()
},

16
src/views/archivesManage/archivesList/index.vue

@ -340,7 +340,6 @@ export default {
}
if ((selectData && selectData.length > 1) || (selectData && selectData.length === 0)) {
this.isAnjuan = true
this.anjuanSelection = {}
this.$nextTick(() => {
if (this.$refs.file) {
@ -498,10 +497,12 @@ export default {
}
this.isAnjuan = false
} else {
this.$refs.anjuan.anjuanData = []
this.$refs.anjuan.anjuanTableHeight = ''
this.$refs.file.junneiData = []
this.$refs.file.juanneiTableHeight = ''
this.clearAnjuan()
this.clearFile()
// this.$refs.anjuan.anjuanData = []
// this.$refs.anjuan.anjuanTableHeight = ''
// this.$refs.file.junneiData = []
// this.$refs.file.juanneiTableHeight = ''
}
}, 500)
if (!this.treeCurrentNode) {
@ -538,8 +539,9 @@ export default {
}
this.isAnjuan = false
} else {
this.$refs.file.junneiData = []
this.$refs.file.juanneiTableHeight = ''
// this.$refs.file.junneiData = []
// this.$refs.file.juanneiTableHeight = ''
this.clearFile()
}
}, 500)
if (!this.treeCurrentNode) {

3
src/views/archivesManage/archivesList/module/deltArchives/index.vue

@ -95,19 +95,18 @@ export default {
// fetch
if (!this.recycleMain.isRecycle) {
del(params).then(res => {
this.crud.delAllLoading = false
this.$message.success('删除成功!')
this.crud.refresh()
localStorage.setItem('isDelt', this.isDeltType)
})
} else {
FetchCompletelyDelete(params).then(res => {
this.crud.delAllLoading = false
this.$message.success('删除成功!')
this.crud.refresh()
localStorage.setItem('isDelt', this.isDeltType)
})
}
this.crud.delAllLoading = false
},
// -
handleClose(done) {

49
src/views/archivesManage/archivesList/module/packing/index.vue

@ -159,6 +159,7 @@
<script>
import { FetchInitCartoningList, FetchCartoning } from '@/api/archivesManage/caseManage'
import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
import { header, form } from '@crud/crud'
export default {
name: 'Packing',
@ -170,6 +171,7 @@ export default {
],
data() {
return {
packingData: [],
tableData: [],
selectTableData: [],
archivesTable: [],
@ -232,16 +234,48 @@ export default {
this.tableData = res.content
})
},
async getPackingFileList() {
let categoryId
if (this.caseData.selectedCategory.isType === 2) {
categoryId = this.caseData.selectedCategory.children[0].children[0].id
} else {
categoryId = this.caseData.selectedCategory.children[0].id
}
const params = {
'categoryId': categoryId,
'parentsId': this.recycleMain.anjuanSelection.id,
'isdel': false,
'page': 0,
'size': null,
'sort': null,
'queryType': null,
'queryTitle': null,
'itemNo': null,
'archiveCtgNo': null,
'responsibleby': null,
'archiveNo': null,
'archiveYear': null,
'department': null,
'retention': null,
'securityClass': null,
'organizationMatter': null
}
await FetchInitArchivesView(params).then(data => {
if (data) {
this.packingData = data.list.content
this.archivesTable = data.list.content
}
})
},
// api
handleCartoning(row) {
let packingData = []
async handleCartoning(row) {
let jnCategoryId
let archivesParentsId
if (this.caseData.selectedCategory.isType === 5) {
packingData = this.caseData.selections
this.packingData = this.caseData.selections
jnCategoryId = this.caseData.selectedCategory.id
} else {
packingData = this.recycleMain.$refs.file.junneiData
await this.getPackingFileList()
if (this.caseData.selectedCategory.isType === 2) {
jnCategoryId = this.caseData.selectedCategory.children[0].children[0].id
} else {
@ -249,7 +283,7 @@ export default {
}
archivesParentsId = this.caseData.selections[0].id
}
const arrParams = packingData.map(item => {
const arrParams = this.packingData.map(item => {
const json = {}
json.archivesId = item.id
if (this.caseData.selectedCategory.isType === 5) {
@ -262,8 +296,7 @@ export default {
json.categoryId = jnCategoryId
return json
})
console.log(arrParams)
this.FetchCartioning(arrParams)
await this.FetchCartioning(arrParams)
},
FetchCartioning(arrParams) {
FetchCartoning(arrParams).then(res => {
@ -271,7 +304,7 @@ export default {
this.packingVisible = false
this.crud.refresh()
this.tableData = []
this.caseQuery[this.inputSelect] = []
this.caseQuery[this.inputSelect] = ''
})
},
//

16
src/views/archivesManage/caseManage/caseList/module/detailDialog.vue

@ -10,12 +10,19 @@
<p class="right"><span class="color-blue">盒条码</span><span class="color-white">{{ rowData.barcode }}</span></p>
</div>
<div class="dpflex">
<p class="left"><span class="color-blue">存放位置</span><span class="color-white">{{ rowData.folderLocationDetails }}</span></p>
<p class="left"><span class="color-blue">存放位置</span>
<span class="color-white">
<div v-if="!rowData.folderLocationDetails">-</div>
<div v-else>
<el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
</div>
</span>
</p>
<p class="right"><span class="color-blue">TID</span><span class="color-white">{{ rowData.tid }}</span></p>
</div>
<p class="left"><span class="color-blue">创建时间</span><span class="color-white">{{ rowData.create_time | parseTime }}</span></p>
</div>
<el-table :data="tableData" style="margin-top:15px;height:356px">
<el-table :data="tableData" style="margin-top:15px;" height="342px">
<el-table-column type="index" label="序号" align="center" width="80" />
<el-table-column prop="child" label="子条数目" align="center" width="100" />
<el-table-column prop="categoryType" label="门类级别" align="center" width="100">
@ -25,7 +32,7 @@
<span v-if="scope.row.categoryType === 3" style="width:56px">案卷级</span>
</template>
</el-table-column>
<el-table-column prop="categoryName" label="门类名称" align="center" width="100" />
<el-table-column prop="categoryName" label="门类名称" align="center" width="140" :show-overflow-tooltip="true" />
<el-table-column prop="fondsNo" label="全宗号" align="center" width="180" />
<el-table-column prop="archiveNo" label="档号" align="center" width="220" />
<el-table-column prop="archiveYear" label="归档年度" align="center" width="150" />
@ -67,7 +74,7 @@ export default {
<style lang="scss" scoped>
::v-deep .el-dialog{
width: 950px;
height: 520px;
// height: 520px;
}
::v-deep .el-dialog__body{
padding: 20px 0;
@ -93,6 +100,7 @@ p{
color: #339CFF;
}
.color-white{
display: inline-block;
color: #fff;
}
</style>

1
src/views/archivesManage/outInStorage/inStorage/index.vue

@ -163,7 +163,6 @@ export default {
},
//
handleDbClick(row) {
console.log(1)
this.$refs.detailDom.rowData = row
const params = {
caseId: row.id

20
src/views/archivesManage/outInStorage/module/detailDialog.vue

@ -9,16 +9,7 @@
<p class="left"><span class="color-blue">盒名称:</span><span class="color-white">{{ rowData.caseName }}</span></p>
<p class="right"><span class="color-blue">存放位置:</span>
<span class="color-white">
<div v-if="rowData.folderLocationDetails.indexOf(',')">
<el-tag
v-for="(item,index) in rowData.folderLocationDetails.split(',')"
:key="index"
:type="item"
effect="dark"
>
{{ item }}
</el-tag>
</div>
<div v-if="!rowData.folderLocationDetails">-</div>
<div v-else>
<el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
</div>
@ -53,8 +44,11 @@
<el-table-column prop="department" align="center" label="部门" width="100" />
<el-table-column prop="caseName" align="center" label="盒名称" width="140" />
<el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="300">
<template v-if="rowData" slot-scope="">
<el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
<template slot-scope="scope">
<span v-if="!scope.row.folderLocationDetails">-</span>
<span v-else>
<el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
</span>
</template>
</el-table-column>
<el-table-column prop="update_time" align="center" label="创建时间" width="180">
@ -84,7 +78,7 @@ export default {
@import "~@/assets/styles/lend-manage.scss";
::v-deep .el-dialog {
width: 950px;
height: 520px;
// height: 520px;
}
::v-deep .el-dialog__body{
padding: 20px 0;

2
src/views/system/user/center.vue

@ -87,7 +87,7 @@
<div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 40px" /></div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
<span>{{ scope.row.createTime | parseTime }}</span>
</template>
</el-table-column>
</el-table>

Loading…
Cancel
Save