Browse Source

20240419需求更改

master
xuhuajiao 1 year ago
parent
commit
164eb31a63
  1. 16
      src/views/archivesManage/archivesList/module/archivesInfo/index.vue
  2. 4
      src/views/archivesManage/archivesList/module/uploadFile/index.vue
  3. 115
      src/views/archivesManage/archivesSearch/index.vue
  4. 9
      src/views/archivesManage/fileImport/dataImport/index.vue
  5. 4
      src/views/archivesManage/fileImport/importLog/index.vue
  6. 51
      src/views/archivesManage/fileImport/module/detail.vue
  7. 7
      src/views/components/WarehouseWarning.vue
  8. 10
      src/views/system/logManage/warnLog/index.vue
  9. 2
      src/views/system/user/index.vue

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

@ -14,13 +14,13 @@
<!-- 基本信息 -->
<div v-if="archivesTabIndex==0" class="base-info item-content">
<el-row>
<el-col v-for="(item,index) in archivesDetailsData" v-show="index<archivesDetailsData.length-5" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
<el-col v-for="(item,index) in archivesDetailsData" v-show="index<archivesDetailsData.length-5" :key="index" :span="item.isLine || item.fieldName === 'barcode' ? 24 : 12" class="base-info-item">
<span>{{ item.fieldCnName }}</span>
<p :style="{ width: ( item.editLength ? item.editLength+'px' : '' ), flex: ( !item.editLength ? 1 : '' )}">{{ item.context }}</p>
<p :style="{ width: ( item.editLength ? item.editLength+'px' : '196px' ), flex: ( !item.editLength ? 1 : '' )}">{{ item.context }}</p>
</el-col>
</el-row>
<el-row v-if="isDetailsInfo">
<el-col v-for="(item,index) in archivesDetailsData.slice(archivesDetailsData.length-5,archivesDetailsData.length)" :key="'last'+index" :span=" 12" class="base-info-item">
<el-col v-for="(item,index) in archivesDetailsData.slice(archivesDetailsData.length-5,archivesDetailsData.length)" :key="'last'+index" :span="item.isLine || item.fieldName === 'barcode' ? 24 : 12" class="base-info-item">
<span>{{ item.fieldCnName }}</span>
<div v-if="item.fieldName === 'folder_location' && item.context" :style="{ width: item.editLength+'px', marginTop:'-6px'}">
<div v-if="item.context.indexOf(',')">
@ -60,7 +60,7 @@
<script>
// import vkbeautify from 'vkbeautify'
import { form } from '@crud/crud'
// import { form } from '@crud/crud'
import { FetchArchivesDetails, FetchArchivesMetadata } from '@/api/archivesManage/archivesList'
import UploadFile from '../uploadFile/index'
import CallExternal from '@/api/storeManage/deviceManage/device'
@ -68,9 +68,9 @@ export default {
name: 'ArchivesInfo',
components: { UploadFile },
mixins: [
form({})
// form({})
],
inject: ['recycleMain'],
// inject: ['recycleMain'],
props: {
categoryId: {
type: String,
@ -108,9 +108,9 @@ export default {
},
methods: {
getDetial(rowId) {
getDetial(rowId, searchCategoryId) {
const params = {
categoryId: this.categoryId,
categoryId: searchCategoryId || this.categoryId,
archivesId: rowId
}
FetchArchivesDetails(params).then(data => {

4
src/views/archivesManage/archivesList/module/uploadFile/index.vue

@ -93,13 +93,13 @@ import { FetchInitArchiveFilesView, FetchEditFile, FetchDeleteFile, FetchFileSor
import { archivesUpload } from '@/utils/upload'
import { downloadFile, getCurrentTime } from '@/utils/index'
import { mapGetters } from 'vuex'
import { form } from '@crud/crud'
// import { form } from '@crud/crud'
import Sortable from 'sortablejs'
export default {
name: 'UploadFile',
components: {},
mixins: [
form({})
// form({})
],
inject: ['recycleMain'],
props: {

115
src/views/archivesManage/archivesSearch/index.vue

@ -46,7 +46,7 @@
:data="tableData"
style="width: 100%;"
height="calc(100vh - 534px)"
@row-dblclick="handleDbClick"
@cell-dblclick="handleDbClick"
@select-all="selectAll"
@row-click="clickRowHandler"
@select="handleCurrentChange"
@ -111,7 +111,8 @@
<el-pagination :page-size.sync="page.size" :total="page.total" :current-page.sync="page.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
</div>
<!-- 详情 -->
<detailDialog ref="detailDom" @openCol="openCol" />
<!-- <detailDialog ref="detailDom" @openCol="openCol" /> -->
<ArchivesInfo ref="archivesInfo" :category-id="categoryId" :arc-id="arcId" />
<!-- 借阅 -->
<el-dialog title="借阅" :visible.sync="lengingVisible" :close-on-click-modal="false" :before-close="handleClose">
<span class="dialog-right-top" />
@ -130,13 +131,21 @@
</template>
<script>
import detailDialog from './module/detailDialog.vue'
import { querySeniorArchives, FetchArchivesDetails, FetchArchivesMetadata } from '@/api/archivesManage/archivesList'
import ArchivesInfo from '../../archivesManage/archivesList/module/archivesInfo/index'
// import detailDialog from './module/detailDialog.vue'
// , FetchArchivesDetails, FetchArchivesMetadata
import { getCategoryTree } from '@/api/category/category'
import { querySeniorArchives } from '@/api/archivesManage/archivesList'
import { FetchIsExistBorrow, FetchAddArchivesWaitRegister } from '@/api/archivesManage/lendManage'
import CallExternal from '@/api/storeManage/deviceManage/device'
export default {
name: 'ArchivesSearch',
components: { detailDialog },
components: { ArchivesInfo },
provide() {
return {
recycleMain: this
}
},
props: {
isHomeSearch: {
type: Boolean,
@ -145,6 +154,9 @@ export default {
},
data() {
return {
categoryTree: null,
categoryId: null,
arcId: null,
loading: false,
tableData: [],
selections: [],
@ -205,6 +217,7 @@ export default {
await this.getDeviceListAll()
},
mounted() {
this.getCateMenu()
if (localStorage.getItem('homeSearchWords') !== null) {
this.keywords = localStorage.getItem('homeSearchWords')
const homeSearchSelect = localStorage.getItem('homeSearchSelect')
@ -254,36 +267,78 @@ export default {
handleCurrentChange(selection, row) {
this.selections = selection
},
getCateMenu() {
getCategoryTree().then(res => {
this.categoryTree = res
console.log('this.categoryTree', this.categoryTree)
})
},
findItemById(data, id) {
if (Array.isArray(data)) {
for (const item of data) {
const result = this.findItemById(item, id)
if (result) return result
}
} else if (typeof data === 'object') {
if (data.id === id) {
return data
} else {
if (data.children && data.children.length > 0) {
return this.findItemById(data.children, id)
}
}
}
return null
},
//
handleDbClick(row) {
const params = {
'categoryId': row.category_id,
'archivesId': row.archives_id
console.log(this.$refs.archivesInfo)
this.categoryId = row.category_id
this.arcId = row.archives_id
const currentCategory = this.findItemById(this.categoryTree, row.category_id)
console.log(currentCategory.isType)
if (currentCategory.isType === 3) {
this.$refs.archivesInfo.isHasFile = false
this.$refs.archivesInfo.isTidOrBorrow = true
} else {
this.$refs.archivesInfo.isHasFile = true
this.$refs.archivesInfo.isTidOrBorrow = false
}
FetchArchivesDetails(params).then(res => {
if (res) {
const rowData = {}
res.forEach(item => {
rowData[item.fieldName] = item.context
})
this.$refs.archivesInfo.isDetailsInfo = true
this.$refs.archivesInfo.detailTitle = '档案详情'
this.$refs.archivesInfo.archivesInfoVisible = true
this.$refs.archivesInfo.archivesTabIndex = 0
this.$refs.archivesInfo.getDetial(row.archives_id, row.category_id)
//
if (rowData.folder_location !== null) {
this.openLocation = rowData.folder_location
this.$refs.detailDom.isShowOpen = true
} else {
this.openLocation = null
this.$refs.detailDom.isShowOpen = false
}
// const params = {
// 'categoryId': row.category_id,
// 'archivesId': row.archives_id
// }
// FetchArchivesDetails(params).then(res => {
// if (res) {
// const rowData = {}
// res.forEach(item => {
// rowData[item.fieldName] = item.context
// })
this.$refs.detailDom.rowData = rowData
//
FetchArchivesMetadata(params).then(res => {
this.$refs.detailDom.xmlStr = res
})
this.$refs.detailDom.detailVisible = true
}
})
// //
// if (rowData.folder_location !== null) {
// this.openLocation = rowData.folder_location
// this.$refs.detailDom.isShowOpen = true
// } else {
// this.openLocation = null
// this.$refs.detailDom.isShowOpen = false
// }
// this.$refs.detailDom.rowData = rowData
// //
// FetchArchivesMetadata(params).then(res => {
// this.$refs.detailDom.xmlStr = res
// })
// this.$refs.detailDom.detailVisible = true
// }
// })
},
// /
handleSearch() {

9
src/views/archivesManage/fileImport/dataImport/index.vue

@ -30,7 +30,7 @@
</div>
<div v-show="isShow02" class="step-content">
<div class="import-data-number">案卷<span>{{ ajnum }}</span> / 卷内<span>{{ danum }}</span> / 资料<span>{{ djnum }}</span> </div>
<detail ref="importTableList" :is-log-or-preview="isLogOrPreview" />
<detail ref="importTableList" :is-log-or-preview="isLogOrPreview" :ajnum="ajnum" :danum="danum" :djnum="djnum" />
</div>
<div v-if="isShow02" class="step-bottom-btn">
<el-button @click="handleReturn02">上一步</el-button>
@ -91,9 +91,9 @@ export default {
key: 0,
file: null,
fileList: [],
ajnum: null,
danum: null,
djnum: null,
ajnum: 0,
danum: 0,
djnum: 0,
deleteVisible: false,
zipName: null,
form: {
@ -174,7 +174,6 @@ export default {
this.ajnum = res.ajnum
this.danum = res.danum
this.djnum = res.djnum
this.djnum = res.djnum
this.$refs.importTableList.tableData = res.list.content
this.$refs.importTableList.page.total = res.list.totalElements
this.timer = setTimeout(() => {

4
src/views/archivesManage/fileImport/importLog/index.vue

@ -80,18 +80,18 @@ export default {
},
//
handleDbClick(row) {
this.zipSelect = row
this.zipSelect = { ...row }
if (row.status === 0) {
this.$message({
type: 'info',
message: '当前批量数据导入中,请用户耐心等待,谢谢!'
})
} else {
this.detailVisible = true
crudFileImport.FetchInitImportLogDetail({ page: 0, size: 10, zipid: row.id, type: 1 }).then(res => {
this.$refs.importTableList.tableData = res.content
this.$refs.importTableList.page.total = res.totalElements
})
this.detailVisible = true
}
},
handleClose() {

51
src/views/archivesManage/fileImport/module/detail.vue

@ -121,6 +121,21 @@ export default {
default: function() {
return {}
}
},
//
ajnum: {
type: Number,
default: 0
},
//
danum: {
type: Number,
default: 0
},
//
djnum: {
type: Number,
default: 0
}
},
data() {
@ -137,9 +152,37 @@ export default {
readData: null
}
},
watch: {
zipSelect: {
handler(newVal, oldVal) {
console.log('newValue', newVal)
console.log('oldVal', oldVal)
if (newVal && newVal.ajNum !== 0) {
this.changeActiveTab(0)
} else if (newVal && newVal.djNum !== 0) {
this.changeActiveTab(2)
}
},
deep: true
}
},
mounted() {
console.log(this.zipSelect)
this.getTotalInfo()
this.$nextTick(() => {
if (this.isLogOrPreview === 'preview') {
if (this.ajnum && this.ajnum !== 0) {
this.changeActiveTab(0)
} else if (this.djnum && this.djnum !== 0) {
this.changeActiveTab(2)
}
} else {
if (this.zipSelect && this.zipSelect.ajNum !== 0) {
this.changeActiveTab(0)
} else if (this.zipSelect && this.zipSelect.djNum !== 0) {
this.changeActiveTab(2)
}
}
})
},
methods: {
changeActiveTab(index) {
@ -167,9 +210,9 @@ export default {
if (this.isLogOrPreview === 'preview') {
//
crudFileImport.FetchInitImportPreview({ page: this.page.page - 1, size: this.page.size, type: this.archivesTabIndex + 1 }).then(res => {
this.ajnum = res.ajnum
this.danum = res.danum
this.djnum = res.djnum
// this.ajnum = res.ajnum
// this.danum = res.danum
// this.djnum = res.djnum
this.tableData = res.list.content
this.page.total = res.list.totalElements
})

7
src/views/components/WarehouseWarning.vue

@ -82,7 +82,8 @@ export default {
} else {
this.scrollTimer = setInterval(() => {
this.getAlarmInfo()
}, 1000 * 3 * this.tableData.length)
}, 15000)
// * this.tableData.length
}
},
addTableRefScroll(bodyWrapper) {
@ -107,7 +108,9 @@ export default {
// }
// }
// }
}, 1000 * 3 * this.displayNum)
}, 15000)
// * this.displayNum
console.log('this.displayNum', this.displayNum)
}
},
getAlarmInfo() {

10
src/views/system/logManage/warnLog/index.vue

@ -37,17 +37,17 @@
@selection-change="selectionChangeHandler"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="100" align="center" />
<el-table-column prop="state" label="状态" min-width="150" align="center">
<el-table-column type="index" label="序号" width="80" align="center" />
<el-table-column prop="state" label="状态" min-width="100" align="center">
<template slot-scope="scope">
<span v-if="scope.row.state" class="clear">已处理</span>
<span v-if="!scope.row.state" class="clear">未处理</span>
</template>
</el-table-column>
<el-table-column prop="storeroomName" label="库房" align="center" min-width="150" />
<el-table-column prop="deviceName" label="设备" align="center" min-width="150" />
<el-table-column prop="content" label="警情描述" align="center" min-width="180" />
<el-table-column prop="remark" label="说明" align="center" min-width="180" />
<el-table-column prop="deviceName" label="设备" align="center" min-width="200" />
<el-table-column prop="content" label="警情描述" align="center" min-width="240" />
<!-- <el-table-column prop="remark" label="说明" align="center" min-width="180" /> -->
<el-table-column prop="create_time" label="报警时间" align="center" min-width="180">
<template slot-scope="scope">
<div>{{ scope.row.create_time | parseTime }}</div>

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

@ -3,7 +3,6 @@
<el-row class="container-main" :gutter="20">
<!--侧边部门数据-->
<el-col :xs="9" :sm="6" :md="5" :lg="4" :xl="4">
<div class="head-container" style="padding-left:0">
<el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
</div>
@ -301,6 +300,7 @@ export default {
this.getRoleLevel()
this.getJobs()
form.enabled = form.enabled.toString()
form.dept.id = this.query.deptId
},
//
[CRUD.HOOK.beforeToAdd]() {

Loading…
Cancel
Save