diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index 1c72f1e..286f639 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -4,8 +4,8 @@
-
+
-->
+
新增
@@ -27,8 +27,8 @@
-
-
+
+
搜索
-
装盒
+ 打印标签
+
+ 绑定标签
分卷装盒
-
-
- 绑定标签
- 打印标签
+ 借阅
+
@@ -430,12 +430,18 @@ export default {
if (this.selectedCategory.isType === 5) {
this.queryOption = [
{ value: 'queryTitle', label: '姓名' },
- { value: 'archiveNo', label: '编号' }
+ { value: 'archiveNo', label: '编号' },
+ { value: 'nativePlace', label: '籍贯' },
+ { value: 'idType', label: '身份类别' },
+ { value: 'idNumber', label: '身份证号' }
]
} else {
this.queryOption = [
{ value: 'queryTitle', label: '姓名' },
- { value: 'archiveNo', label: '档号' }
+ { value: 'archiveNo', label: '编号' },
+ { value: 'nativePlace', label: '籍贯' },
+ { value: 'idType', label: '身份类别' },
+ { value: 'idNumber', label: '身份证号' }
]
}
this.anjuanInputSelect = this.queryOption[0].value
@@ -473,6 +479,9 @@ export default {
getTableList() {
this.query.queryTitle = ''
this.query.archiveNo = ''
+ this.query.nativePlace = ''
+ this.query.idType = ''
+ this.query.idNumber = ''
this.query.archiveCtgNo = ''
this.query.responsibleby = ''
this.query.docNo = ''
@@ -487,6 +496,15 @@ export default {
case 'archiveNo': // 档号
this.query.archiveNo = this.anjuanQuery[this.anjuanInputSelect]
break
+ case 'nativePlace': // 籍贯
+ this.query.nativePlace = this.anjuanQuery[this.anjuanInputSelect]
+ break
+ case 'idType': // 身份类别
+ this.query.idType = this.anjuanQuery[this.anjuanInputSelect]
+ break
+ case 'idNumber': // 身份证号
+ this.query.idNumber = this.anjuanQuery[this.anjuanInputSelect]
+ break
case 'archiveCtgNo': // 实体分类号
this.query.archiveCtgNo = this.anjuanQuery[this.anjuanInputSelect]
break
diff --git a/src/views/archivesManage/archivesList/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
index a7c4f5d..a278fd6 100644
--- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
@@ -42,7 +42,7 @@
-
+ 借阅
绑定标签
打印标签
@@ -251,7 +251,10 @@ export default {
juanneiQuery: {},
queryOption: [
{ value: 'queryTitle', label: '姓名' },
- { value: 'archiveNo', label: '编号' }
+ { value: 'archiveNo', label: '编号' },
+ { value: 'nativePlace', label: '籍贯' },
+ { value: 'idType', label: '身份类别' },
+ { value: 'idNumber', label: '身份证号' }
// { value: 'responsibleby', label: '责任者' },
// { value: 'documentNo', label: '文件编号 ' },
// { value: 'barcode', label: '条形码' },
@@ -377,6 +380,9 @@ export default {
getTableList() {
this.query.queryTitle = ''
this.query.archiveNo = ''
+ this.query.nativePlace = ''
+ this.query.idType = ''
+ this.query.idNumber = ''
this.query.responsibleby = ''
this.query.docNo = ''
this.query.documentNo = ''
@@ -389,6 +395,15 @@ export default {
case 'archiveNo': // 档号
this.query.archiveNo = this.juanneiQuery[this.juanneiInputSelect]
break
+ case 'nativePlace': // 档号
+ this.query.nativePlace = this.anjuanQuery[this.anjuanInputSelect]
+ break
+ case 'idType': // 档号
+ this.query.idType = this.anjuanQuery[this.anjuanInputSelect]
+ break
+ case 'idNumber': // 档号
+ this.query.idNumber = this.anjuanQuery[this.anjuanInputSelect]
+ break
case 'responsibleby': // 责任者
this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect]
break
diff --git a/src/views/archivesManage/archivesList/mixins/archives.js b/src/views/archivesManage/archivesList/mixins/archives.js
index 0d10f89..a3d42f7 100644
--- a/src/views/archivesManage/archivesList/mixins/archives.js
+++ b/src/views/archivesManage/archivesList/mixins/archives.js
@@ -182,6 +182,9 @@ export const archivesCrud = {
'sort': this.arrySort,
'queryType': this.query.queryType,
'queryTitle': this.query.queryTitle,
+ 'nativePlace': this.query.nativePlace,
+ 'idType': this.query.idType,
+ 'idNumber': this.query.idNumber,
'itemNo': this.query.itemNo,
'archiveCtgNo': this.query.archiveCtgNo,
'responsibleby': this.query.responsibleby,
diff --git a/src/views/archivesManage/archivesSearch/index.vue b/src/views/archivesManage/archivesSearch/index.vue
index 51e24f0..723a728 100644
--- a/src/views/archivesManage/archivesSearch/index.vue
+++ b/src/views/archivesManage/archivesSearch/index.vue
@@ -361,18 +361,20 @@ export default {
this.$message.warning('请选择检索条件!')
return
}
+
if (this.$route.path.indexOf('dashboard') !== -1) {
- if (this.roles.includes('admin') || this.roles.includes('archivesSearch:list')) {
- this.$router.push('/archivesManage/archivesSearch')
- localStorage.setItem('homeSearchWords', this.keywords)
- localStorage.setItem('homeSearchSelect', JSON.stringify(this.select))
- // localStorage.setItem('homeSearchCheckbox', JSON.stringify([3, 4, 5]))
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push('/archivesManage/archivesSearch')
+ localStorage.setItem('homeSearchWords', this.keywords)
+ localStorage.setItem('homeSearchSelect', JSON.stringify(this.select))
+ // if (this.roles.includes('admin') || this.roles.includes('archivesSearch:list')) {
+
+ // // localStorage.setItem('homeSearchCheckbox', JSON.stringify([3, 4, 5]))
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
} else {
this.dimSearch()
}
diff --git a/src/views/archivesManage/fileImport/dataImport/index.vue b/src/views/archivesManage/fileImport/dataImport/index.vue
index a3f2463..cefdc46 100644
--- a/src/views/archivesManage/fileImport/dataImport/index.vue
+++ b/src/views/archivesManage/fileImport/dataImport/index.vue
@@ -265,10 +265,10 @@ export default {
}
console.log('params:', params)
crudFileImport.FetchImportHp(params).then(res => {
- this.$message({
- type: 'success',
- message: '导入成功!'
- })
+ // this.$message({
+ // type: 'success',
+ // message: '导入成功!'
+ // })
console.log('导入成功, 结果:', res)
// this.importStatus = 'success' // 导入成功,更新状态
}).catch(() => {
diff --git a/src/views/components/AccessDoor.vue b/src/views/components/AccessDoor.vue
index d65e2aa..641e0c3 100644
--- a/src/views/components/AccessDoor.vue
+++ b/src/views/components/AccessDoor.vue
@@ -79,19 +79,20 @@ export default {
},
methods: {
toPage() {
- if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
- this.$router.push({
- name: 'RunningLog',
- params: {
- locationIndex: 1
- }
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'RunningLog',
+ params: {
+ locationIndex: 1
+ }
+ })
+ // if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
},
// 表格隔行变色
rowBgColor({ row, rowIndex }) {
diff --git a/src/views/components/SecurityDoor.vue b/src/views/components/SecurityDoor.vue
index dda673c..f92c396 100644
--- a/src/views/components/SecurityDoor.vue
+++ b/src/views/components/SecurityDoor.vue
@@ -78,19 +78,20 @@ export default {
},
methods: {
toPage() {
- if (this.roles.includes('admin') || this.roles.includes('logManage:list')) {
- this.$router.push({
- name: 'LogManage',
- params: {
- locationIndex: 4
- }
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'LogManage',
+ params: {
+ locationIndex: 4
+ }
+ })
+ // if (this.roles.includes('admin') || this.roles.includes('logManage:list')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
},
// 表格隔行变色
rowBgColor({ row, rowIndex }) {
diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue
index 1f5246a..b373c56 100644
--- a/src/views/components/WarehouseWarning.vue
+++ b/src/views/components/WarehouseWarning.vue
@@ -74,19 +74,20 @@ export default {
},
methods: {
toPage() {
- if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
- this.$router.push({
- name: 'RunningLog',
- params: {
- locationIndex: 0
- }
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'RunningLog',
+ params: {
+ locationIndex: 0
+ }
+ })
+ // if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
},
// 表格隔行变色
rowBgColor({ row, rowIndex }) {
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index a4e7976..f13462f 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -179,38 +179,41 @@ export default {
methods: {
handleSetLineChartData(type) {
if (type === 'archives') {
- if (this.roles.includes('archivesList:list') || this.roles.includes('admin')) {
- this.$router.push({
- name: 'ArchivesList'
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'ArchivesList'
+ })
+ // if (this.roles.includes('archivesList:list') || this.roles.includes('admin')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
} else if (type === 'case') {
- if (this.roles.includes('caseManage:list') || this.roles.includes('admin')) {
- this.$router.push({
- name: 'caseManage'
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'caseManage'
+ })
+ // if (this.roles.includes('caseManage:list') || this.roles.includes('admin')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
} else if (type === 'device') {
- if (this.roles.includes('deviceManage:list') || this.roles.includes('admin')) {
- this.$router.push({
- name: 'DeviceManage'
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'DeviceManage'
+ })
+ // if (this.roles.includes('deviceManage:list') || this.roles.includes('admin')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
}
},
/**
diff --git a/src/views/home.vue b/src/views/home.vue
index 4c69c3d..0eaf76b 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -653,45 +653,55 @@ export default {
})
},
changeActiveTab(floorId, roomId) {
- if (this.roles.includes('admin') || this.roles.includes('warehouse3D')) {
- this.$router.push({
- name: 'warehouse3D',
- params: {
- floorId: floorId,
- roomId: roomId
- }
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
- }
+ this.$router.push({
+ name: 'warehouse3D',
+ params: {
+ floorId: floorId,
+ roomId: roomId
+ }
+ })
+ // if (this.roles.includes('admin') || this.roles.includes('warehouse3D')) {
+ // this.$router.push({
+ // name: 'warehouse3D',
+ // params: {
+ // floorId: floorId,
+ // roomId: roomId
+ // }
+ // })
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
},
handleToWaiting(item) {
- if (this.roles.includes('admin') || this.roles.includes('lendManage:list')) {
- let locationIndex = 0
- if (item.title.includes('待借档案')) {
- locationIndex = 0
- } else if (item.title.includes('借出确认')) {
- locationIndex = 1
- } else if (item.title.includes('逾期警告')) {
- locationIndex = 2
- } else if (item.title.includes('即将到期')) {
- locationIndex = 2
- }
- this.$router.push({
- name: 'lendManage',
- params: {
- locationIndex: locationIndex
- }
- })
- } else {
- this.$message({
- message: '当前账号没有权限',
- type: 'warning'
- })
+ let locationIndex = 0
+ if (item.title.includes('待借档案')) {
+ locationIndex = 0
+ } else if (item.title.includes('逾期警告')) {
+ locationIndex = 1
+ } else if (item.title.includes('即将到期')) {
+ locationIndex = 1
}
+
+ // else if (item.title.includes('借出确认')) {
+ // locationIndex = 1
+ // }
+ this.$router.push({
+ name: 'RFIDArchives',
+ params: {
+ locationIndex: locationIndex
+ }
+ })
+ // if (this.roles.includes('admin') || this.roles.includes('lendManage:list')) {
+
+ // } else {
+ // this.$message({
+ // message: '当前账号没有权限',
+ // type: 'warning'
+ // })
+ // }
}
}
}