xuhuajiao
/
hp-storeroom-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

页面优化

master
xuhuajiao 1 month ago
parent
24e0246510
commit
f311ec15e9
10 changed files with 187 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/views/archivesManage/archivesList/archivesAnjuan/index.vue
  2. 19
      src/views/archivesManage/archivesList/archivesJuannei/index.vue
  3. 3
      src/views/archivesManage/archivesList/mixins/archives.js
  4. 18
      src/views/archivesManage/archivesSearch/index.vue
  5. 8
      src/views/archivesManage/fileImport/dataImport/index.vue
  6. 15
      src/views/components/AccessDoor.vue
  7. 15
      src/views/components/SecurityDoor.vue
  8. 15
      src/views/components/WarehouseWarning.vue
  9. 45
      src/views/dashboard/PanelGroup.vue
  10. 48
      src/views/home.vue

38
src/views/archivesManage/archivesList/archivesAnjuan/index.vue
View File

@ -5,7 +5,7 @@
<!-- <div v-if="!recycleMain.isRecycle" class="archives-handler-btn"> <!-- <div v-if="!recycleMain.isRecycle" class="archives-handler-btn">
<el-button :loading="codeLoading" style="position: absolute; left: 0; top: 0; padding: 0 14px 0 8px;" type="primary" class="warehousing-btn iconfont" :disabled="selections.length === 0" @click="printArchivesCode(selections)"><svg-icon icon-class="print" class="svg-arc-style" />批量打印条形码</el-button> <el-button :loading="codeLoading" style="position: absolute; left: 0; top: 0; padding: 0 14px 0 8px;" type="primary" class="warehousing-btn iconfont" :disabled="selections.length === 0" @click="printArchivesCode(selections)"><svg-icon icon-class="print" class="svg-arc-style" />批量打印条形码</el-button>
</div>--> </div>-->
<div v-if="!recycleMain.isRecycle" class="archives-crud">
<div v-if="!recycleMain.isRecycle" class="archives-crud" style="position: absolute; left: 0; top: 0; padding: 0 14px 0 8px;">
<!-- 新增 --> <!-- 新增 -->
<el-button v-if="!isHasProject" size="mini" :disabled="isProject && selectedCategory.isType === 2" icon="el-icon-plus" @click="handleForm('add','档案', 1)">新增</el-button> <el-button v-if="!isHasProject" size="mini" :disabled="isProject && selectedCategory.isType === 2" icon="el-icon-plus" @click="handleForm('add','档案', 1)">新增</el-button>
<!-- 修改 --> <!-- 修改 -->
@ -27,8 +27,8 @@
<i slot="prefix" class="iconfont icon-zhuangtai-fanbai" /> <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
<el-input v-model="anjuanQuery[anjuanInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 220px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
<el-select slot="prepend" v-model="anjuanInputSelect" style="width: 90px" @change="querySelect(anjuanInputSelect)">
<el-input v-model="anjuanQuery[anjuanInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 320px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
<el-select slot="prepend" v-model="anjuanInputSelect" style="width: 100px" @change="querySelect(anjuanInputSelect)">
<el-option <el-option
v-for="item in queryOption" v-for="item in queryOption"
:key="item.value" :key="item.value"
@ -40,18 +40,18 @@
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="getTableList()">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="getTableList()">搜索</el-button>
</div> </div>
<div v-if="!recycleMain.isRecycle" class="archives-handler-btn"> <div v-if="!recycleMain.isRecycle" class="archives-handler-btn">
<!-- 装盒btn 多选 --> <!-- 装盒btn 多选 -->
<!-- <svg-icon icon-class="zhuanghe" /> --> <!-- <svg-icon icon-class="zhuanghe" /> -->
<el-button class="packing-btn iconfont icon-sr-dn-pz" type="primary" :disabled="selectedCategory.isType === 5 ? selections.length === 0 : selections.length !== 1" @click="handlePacking(selections,0)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button> <el-button class="packing-btn iconfont icon-sr-dn-pz" type="primary" :disabled="selectedCategory.isType === 5 ? selections.length === 0 : selections.length !== 1" @click="handlePacking(selections,0)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
<el-button :loading="codeLoading" class="warehousing-btn iconfont" type="primary" :disabled="selections.length === 0" @click="onPrint(selections)"><svg-icon icon-class="print" class="svg-arc-style" />打印标签</el-button>
<!-- 绑定标签btn 单选 -->
<el-button v-if="selectedCategory.isType !== 3" class="binding-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="bindingTag(selections)"><svg-icon icon-class="bindbiaoqian" class="svg-arc-style" />绑定标签</el-button>
<!-- 分卷装盒btn 针对案卷-单选 --> <!-- 分卷装盒btn 针对案卷-单选 -->
<el-button v-if="selectedCategory.isType === 3 || selectedCategory.isType === 2" class="part-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="handlePacking(selections,1)"><svg-icon icon-class="partzhuanghe" class="svg-arc-style" />分卷装盒</el-button> <el-button v-if="selectedCategory.isType === 3 || selectedCategory.isType === 2" class="part-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="handlePacking(selections,1)"><svg-icon icon-class="partzhuanghe" class="svg-arc-style" />分卷装盒</el-button>
<!-- <el-button class="warehousing-btn iconfont" type="primary">入库</el-button> --> <!-- <el-button class="warehousing-btn iconfont" type="primary">入库</el-button> -->
<!-- 借阅btn 多选 --> <!-- 借阅btn 多选 -->
<!-- <el-button v-if="selectedCategory.isType !== 3" class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="handleLending"><i class="iconfont icon-chuku-fanbai" style="margin-right: 6px;" />借阅</el-button> -->
<!-- 绑定标签btn 单选 -->
<el-button v-if="selectedCategory.isType !== 3" class="binding-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="bindingTag(selections)"><svg-icon icon-class="bindbiaoqian" class="svg-arc-style" />绑定标签</el-button>
<el-button :loading="codeLoading" class="warehousing-btn iconfont" type="primary" :disabled="selections.length === 0" @click="onPrint(selections)"><svg-icon icon-class="print" class="svg-arc-style" />打印标签</el-button>
<el-button v-if="selectedCategory.isType !== 3" class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="handleLending"><i class="iconfont icon-chuku-fanbai" style="margin-right: 6px;" />借阅</el-button>
</div> </div>
<div ref="printDiv" style="display: none;"> <div ref="printDiv" style="display: none;">
@ -430,12 +430,18 @@ export default {
if (this.selectedCategory.isType === 5) { if (this.selectedCategory.isType === 5) {
this.queryOption = [ this.queryOption = [
{ value: 'queryTitle', label: '姓名' }, { value: 'queryTitle', label: '姓名' },
{ value: 'archiveNo', label: '编号' }
{ value: 'archiveNo', label: '编号' },
{ value: 'nativePlace', label: '籍贯' },
{ value: 'idType', label: '身份类别' },
{ value: 'idNumber', label: '身份证号' }
] ]
} else { } else {
this.queryOption = [ this.queryOption = [
{ value: 'queryTitle', label: '姓名' }, { value: 'queryTitle', label: '姓名' },
{ value: 'archiveNo', label: '档号' }
{ value: 'archiveNo', label: '编号' },
{ value: 'nativePlace', label: '籍贯' },
{ value: 'idType', label: '身份类别' },
{ value: 'idNumber', label: '身份证号' }
] ]
} }
this.anjuanInputSelect = this.queryOption[0].value this.anjuanInputSelect = this.queryOption[0].value
@ -473,6 +479,9 @@ export default {
getTableList() { getTableList() {
this.query.queryTitle = '' this.query.queryTitle = ''
this.query.archiveNo = '' this.query.archiveNo = ''
this.query.nativePlace = ''
this.query.idType = ''
this.query.idNumber = ''
this.query.archiveCtgNo = '' this.query.archiveCtgNo = ''
this.query.responsibleby = '' this.query.responsibleby = ''
this.query.docNo = '' this.query.docNo = ''
@ -487,6 +496,15 @@ export default {
case 'archiveNo': // 档号 case 'archiveNo': // 档号
this.query.archiveNo = this.anjuanQuery[this.anjuanInputSelect] this.query.archiveNo = this.anjuanQuery[this.anjuanInputSelect]
break 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': // 实体分类号 case 'archiveCtgNo': // 实体分类号
this.query.archiveCtgNo = this.anjuanQuery[this.anjuanInputSelect] this.query.archiveCtgNo = this.anjuanQuery[this.anjuanInputSelect]
break break

19
src/views/archivesManage/archivesList/archivesJuannei/index.vue
View File

@ -42,7 +42,7 @@
</div> </div>
<div v-if="!recycleMain.isRecycle" class="archives-handler-btn"> <div v-if="!recycleMain.isRecycle" class="archives-handler-btn">
<!-- 借阅btn 多选 --> <!-- 借阅btn 多选 -->
<!-- <el-button class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="handleLending"><i class="iconfont icon-chuku-fanbai" style="margin-right: 6px;" />借阅</el-button> -->
<el-button class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="handleLending"><i class="iconfont icon-chuku-fanbai" style="margin-right: 6px;" />借阅</el-button>
<!-- 绑定标签btn 单选 --> <!-- 绑定标签btn 单选 -->
<el-button class="binding-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="bindingTag(selections)"><svg-icon icon-class="bindbiaoqian" class="svg-arc-style" />绑定标签</el-button> <el-button class="binding-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="bindingTag(selections)"><svg-icon icon-class="bindbiaoqian" class="svg-arc-style" />绑定标签</el-button>
<el-button :loading="codeLoading" class="warehousing-btn iconfont" type="primary" :disabled="selections.length === 0" @click="onPrint(selections)"><svg-icon icon-class="print" class="svg-arc-style" />打印标签</el-button> <el-button :loading="codeLoading" class="warehousing-btn iconfont" type="primary" :disabled="selections.length === 0" @click="onPrint(selections)"><svg-icon icon-class="print" class="svg-arc-style" />打印标签</el-button>
@ -251,7 +251,10 @@ export default {
juanneiQuery: {}, juanneiQuery: {},
queryOption: [ queryOption: [
{ value: 'queryTitle', label: '姓名' }, { value: 'queryTitle', label: '姓名' },
{ value: 'archiveNo', label: '编号' }
{ value: 'archiveNo', label: '编号' },
{ value: 'nativePlace', label: '籍贯' },
{ value: 'idType', label: '身份类别' },
{ value: 'idNumber', label: '身份证号' }
// { value: 'responsibleby', label: '责任者' }, // { value: 'responsibleby', label: '责任者' },
// { value: 'documentNo', label: '文件编号 ' }, // { value: 'documentNo', label: '文件编号 ' },
// { value: 'barcode', label: '条形码' }, // { value: 'barcode', label: '条形码' },
@ -377,6 +380,9 @@ export default {
getTableList() { getTableList() {
this.query.queryTitle = '' this.query.queryTitle = ''
this.query.archiveNo = '' this.query.archiveNo = ''
this.query.nativePlace = ''
this.query.idType = ''
this.query.idNumber = ''
this.query.responsibleby = '' this.query.responsibleby = ''
this.query.docNo = '' this.query.docNo = ''
this.query.documentNo = '' this.query.documentNo = ''
@ -389,6 +395,15 @@ export default {
case 'archiveNo': // 档号 case 'archiveNo': // 档号
this.query.archiveNo = this.juanneiQuery[this.juanneiInputSelect] this.query.archiveNo = this.juanneiQuery[this.juanneiInputSelect]
break 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': // 责任者 case 'responsibleby': // 责任者
this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect] this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect]
break break

3
src/views/archivesManage/archivesList/mixins/archives.js
View File

@ -182,6 +182,9 @@ export const archivesCrud = {
'sort': this.arrySort, 'sort': this.arrySort,
'queryType': this.query.queryType, 'queryType': this.query.queryType,
'queryTitle': this.query.queryTitle, 'queryTitle': this.query.queryTitle,
'nativePlace': this.query.nativePlace,
'idType': this.query.idType,
'idNumber': this.query.idNumber,
'itemNo': this.query.itemNo, 'itemNo': this.query.itemNo,
'archiveCtgNo': this.query.archiveCtgNo, 'archiveCtgNo': this.query.archiveCtgNo,
'responsibleby': this.query.responsibleby, 'responsibleby': this.query.responsibleby,

18
src/views/archivesManage/archivesSearch/index.vue
View File

@ -361,18 +361,20 @@ export default {
this.$message.warning('请选择检索条件！') this.$message.warning('请选择检索条件！')
return return
} }
if (this.$route.path.indexOf('dashboard') !== -1) { if (this.$route.path.indexOf('dashboard') !== -1) {
if (this.roles.includes('admin') || this.roles.includes('archivesSearch:list')) {
this.$router.push('/archivesManage/archivesSearch') this.$router.push('/archivesManage/archivesSearch')
localStorage.setItem('homeSearchWords', this.keywords) localStorage.setItem('homeSearchWords', this.keywords)
localStorage.setItem('homeSearchSelect', JSON.stringify(this.select)) localStorage.setItem('homeSearchSelect', JSON.stringify(this.select))
// localStorage.setItem('homeSearchCheckbox', JSON.stringify([3, 4, 5]))
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// 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 { } else {
this.dimSearch() this.dimSearch()
} }

8
src/views/archivesManage/fileImport/dataImport/index.vue
View File

@ -265,10 +265,10 @@ export default {
} }
console.log('params:', params) console.log('params:', params)
crudFileImport.FetchImportHp(params).then(res => { crudFileImport.FetchImportHp(params).then(res => {
this.$message({
type: 'success',
message: '导入成功!'
})
// this.$message({
// type: 'success',
// message: '导入成功!'
// })
console.log('导入成功, 结果:', res) console.log('导入成功, 结果:', res)
// this.importStatus = 'success' // 导入成功，更新状态 // this.importStatus = 'success' // 导入成功，更新状态
}).catch(() => { }).catch(() => {

15
src/views/components/AccessDoor.vue
View File

@ -79,19 +79,20 @@ export default {
}, },
methods: { methods: {
toPage() { toPage() {
if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
this.$router.push({ this.$router.push({
name: 'RunningLog', name: 'RunningLog',
params: { params: {
locationIndex: 1 locationIndex: 1
} }
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
}, },
// 表格隔行变色 // 表格隔行变色
rowBgColor({ row, rowIndex }) { rowBgColor({ row, rowIndex }) {

15
src/views/components/SecurityDoor.vue
View File

@ -78,19 +78,20 @@ export default {
}, },
methods: { methods: {
toPage() { toPage() {
if (this.roles.includes('admin') || this.roles.includes('logManage:list')) {
this.$router.push({ this.$router.push({
name: 'LogManage', name: 'LogManage',
params: { params: {
locationIndex: 4 locationIndex: 4
} }
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('admin') || this.roles.includes('logManage:list')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
}, },
// 表格隔行变色 // 表格隔行变色
rowBgColor({ row, rowIndex }) { rowBgColor({ row, rowIndex }) {

15
src/views/components/WarehouseWarning.vue
View File

@ -74,19 +74,20 @@ export default {
}, },
methods: { methods: {
toPage() { toPage() {
if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
this.$router.push({ this.$router.push({
name: 'RunningLog', name: 'RunningLog',
params: { params: {
locationIndex: 0 locationIndex: 0
} }
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
}, },
// 表格隔行变色 // 表格隔行变色
rowBgColor({ row, rowIndex }) { rowBgColor({ row, rowIndex }) {

45
src/views/dashboard/PanelGroup.vue
View File

@ -179,38 +179,41 @@ export default {
methods: { methods: {
handleSetLineChartData(type) { handleSetLineChartData(type) {
if (type === 'archives') { if (type === 'archives') {
if (this.roles.includes('archivesList:list') || this.roles.includes('admin')) {
this.$router.push({ this.$router.push({
name: 'ArchivesList' name: 'ArchivesList'
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('archivesList:list') || this.roles.includes('admin')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
} else if (type === 'case') { } else if (type === 'case') {
if (this.roles.includes('caseManage:list') || this.roles.includes('admin')) {
this.$router.push({ this.$router.push({
name: 'caseManage' name: 'caseManage'
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('caseManage:list') || this.roles.includes('admin')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
} else if (type === 'device') { } else if (type === 'device') {
if (this.roles.includes('deviceManage:list') || this.roles.includes('admin')) {
this.$router.push({ this.$router.push({
name: 'DeviceManage' name: 'DeviceManage'
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('deviceManage:list') || this.roles.includes('admin')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
} }
}, },
/** /**

48
src/views/home.vue
View File

@ -653,7 +653,6 @@ export default {
}) })
}, },
changeActiveTab(floorId, roomId) { changeActiveTab(floorId, roomId) {
if (this.roles.includes('admin') || this.roles.includes('warehouse3D')) {
this.$router.push({ this.$router.push({
name: 'warehouse3D', name: 'warehouse3D',
params: { params: {
@ -661,37 +660,48 @@ export default {
roomId: roomId roomId: roomId
} }
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// 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) { handleToWaiting(item) {
if (this.roles.includes('admin') || this.roles.includes('lendManage:list')) {
let locationIndex = 0 let locationIndex = 0
if (item.title.includes('待借档案')) { if (item.title.includes('待借档案')) {
locationIndex = 0 locationIndex = 0
} else if (item.title.includes('借出确认')) {
locationIndex = 1
} else if (item.title.includes('逾期警告')) { } else if (item.title.includes('逾期警告')) {
locationIndex = 2
locationIndex = 1
} else if (item.title.includes('即将到期')) { } else if (item.title.includes('即将到期')) {
locationIndex = 2
locationIndex = 1
} }
// else if (item.title.includes('借出确认')) {
// locationIndex = 1
// }
this.$router.push({ this.$router.push({
name: 'lendManage',
name: 'RFIDArchives',
params: { params: {
locationIndex: locationIndex locationIndex: locationIndex
} }
}) })
} else {
this.$message({
message: '当前账号没有权限',
type: 'warning'
})
}
// if (this.roles.includes('admin') || this.roles.includes('lendManage:list')) {
// } else {
// this.$message({
// message: '当前账号没有权限',
// type: 'warning'
// })
// }
} }
} }
} }

Write Preview
Loading…
Cancel
Save