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

readme/table-checkbox居中显示/档案搜索状态添加/元数据样式统一

master
xuhuajiao 2 years ago
parent
491902586b
commit
9876d7fb43
22 changed files with 38 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README.md
  2. 12
      src/assets/styles/archives-manage.scss
  3. 2
      src/views/archivesManage/archivesCheck/index.vue
  4. 8
      src/views/archivesManage/archivesList/module/archivesInfo/index.vue
  5. 8
      src/views/archivesManage/archivesSearch/index.vue
  6. 3
      src/views/archivesManage/archivesSearch/module/detailDialog.vue
  7. 3
      src/views/archivesManage/lendManage/components/lendArchivesList.vue
  8. 2
      src/views/archivesManage/lendManage/lendConfirm/index.vue
  9. 2
      src/views/archivesManage/lendManage/lendQuery/index.vue
  10. 2
      src/views/archivesManage/lendManage/returnArchives/index.vue
  11. 2
      src/views/archivesManage/lendManage/toLend/index.vue
  12. 2
      src/views/archivesManage/outInStorage/inStorage/index.vue
  13. 2
      src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
  14. 2
      src/views/archivesManage/outInStorage/outInHistory/index.vue
  15. 2
      src/views/archivesManage/outInStorage/outStorage/index.vue
  16. 2
      src/views/system/dept/index.vue
  17. 2
      src/views/system/job/index.vue
  18. 2
      src/views/system/menu/index.vue
  19. 4
      src/views/system/notifyManage/index.vue
  20. 2
      src/views/system/role/index.vue
  21. 2
      src/views/system/timing/index.vue
  22. 2
      src/views/system/user/index.vue

4
README.md
View File

@ -41,6 +41,7 @@
│ │ ├── features # 错误页面
│ │ ├── storeManage # 库房管理
│ │ ├── system # 权限管理
│ │ │ ├── archiveStatistics # 档案统计
│ │ │ ├── dept # 部门管理
│ │ │ ├── job # 岗位管理
│ │ │ ├── menu # 菜单管理
@ -49,6 +50,9 @@
│ │ │ ├── log # 日志
│ │ │ │ ├── errLog # 异常日志
│ │ │ │ ├── index # 操作日志
│ │ │ ├── logManage # 日志管理
│ │ │ ├── messageCenter # 消息中心
│ │ │ ├── notifyManage # 通知管理
│ │ ├── home # 首页
│ │ ├── login # 登录
│ ├── App.vue # 入口页面

12
src/assets/styles/archives-manage.scss
View File

@ -542,10 +542,8 @@ $arcCyan: #0FBED9;
::v-deep .el-table{
overflow-x: hidden;
overflow-y: auto;
// background: #02255F;
border: 2px solid #02255f;
border-top: none;
// border-right: none;
.el-table__body-wrapper{
background-color: #031435;
}
@ -569,4 +567,14 @@ $arcCyan: #0FBED9;
opacity: 0;
height: 34px;
}
}
// 元数据
::v-deep .hljs{
font-family: "Sans Mono", "Consolas", "Courier", monospace;
font-size: 12px;
.hljs-attribute{
display: inline-block;
margin: 2px 0 !important;
}
}

2
src/views/archivesManage/archivesCheck/index.vue
View File

@ -55,7 +55,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleDbClick"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="index" align="center" label="序号" width="55" />
<el-table-column prop="id" align="center" label="盘点单号" min-width="100" />
<el-table-column prop="region" align="center" label="包含位置" min-width="140" />

8
src/views/archivesManage/archivesList/module/archivesInfo/index.vue
View File

@ -251,12 +251,4 @@ export default {
top: 12px;
right: -320px;
}
::v-deep .hljs{
font-family: "Sans Mono", "Consolas", "Courier", monospace;
font-size: 12px;
.hljs-attribute{
display: inline-block;
margin: 2px 0 !important;
}
}
</style>

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

@ -31,8 +31,8 @@
@row-dblclick="handleDbClick"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column type="index" label="序号" width="90" align="center" />
<el-table-column prop="child" label="子条数目" align="center" min-width="150" />
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="child" label="子条数目" align="center" width="100" />
<el-table-column prop="category_type" label="门类级别" align="center" min-width="100">
<template slot-scope="scope">
<!-- 门类级别 -->
@ -41,11 +41,11 @@
<span v-if="scope.row.category_type === 3" style="width:56px">案卷级</span>
</template>
</el-table-column>
<el-table-column prop="case_name" label="门类名称" align="center" min-width="150" />
<el-table-column prop="case_name" label="门类名称" align="center" min-width="170" />
<el-table-column prop="fonds_no" label="全宗号" align="center" min-width="180" />
<el-table-column prop="archive_no" label="档号" align="center" min-width="180" />
<el-table-column prop="archive_year" label="归档年度" align="center" min-width="100" />
<el-table-column prop="maintitle" label="题名" align="center" min-width="180" />
<el-table-column prop="maintitle" label="题名" align="center" min-width="240" />
<el-table-column prop="security_class" label="保密程度" align="center" min-width="100" />
<el-table-column prop="department" label="部门" align="center" min-width="100" />
<el-table-column prop="case_name" label="盒名称" align="center" min-width="180" />

3
src/views/archivesManage/archivesSearch/module/detailDialog.vue
View File

@ -61,7 +61,6 @@
<p class="right"><span class="color-blue">借阅状态：</span>
<span :class="['color-white', rowData.borrow_type ? 'row-state row-lending' : '' ]">{{ rowData.borrow_type | borrowStatus }}</span>
</p>
</div>
<p class="sin-row"><span class="color-blue">条形码：</span><span class="color-white">{{ rowData.barcode }}</span></p>
</div>
@ -96,6 +95,8 @@ export default {
return '已归还'
case 5:
return '逾期'
case null:
return '-'
case -1:
return '异常'
}

3
src/views/archivesManage/lendManage/components/lendArchivesList.vue
View File

@ -13,7 +13,7 @@
@selection-change="selectionChangeHandler"
@row-click="clickRowHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="categoryName" align="center" label="门类名称" min-width="85" />
<el-table-column prop="archiveNo" align="center" label="档号" min-width="85" />
@ -136,7 +136,6 @@ export default {
},
selectionChangeHandler(val) {
this.selections = val
console.log(this.selections)
},
clickRowHandler(row) {
this.$refs.table.toggleRowSelection(row)

2
src/views/archivesManage/lendManage/lendConfirm/index.vue
View File

@ -19,7 +19,7 @@
@row-dblclick="handleDbClick"
@select="handleCurrentChange"
>
<el-table-column type="selection" :reserve-selection="true" width="55" />
<el-table-column type="selection" :reserve-selection="true" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="orderNo" align="center" label="单据号" min-width="100" />
<el-table-column prop="borrowNum" align="center" label="数量" min-width="50" />

2
src/views/archivesManage/lendManage/lendQuery/index.vue
View File

@ -43,7 +43,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleDbClick"
>
<el-table-column type="selection" :reserve-selection="true" width="55" />
<el-table-column type="selection" :reserve-selection="true" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="borrowType" align="center" label="借阅状态" width="100">
<template slot-scope="scope">

2
src/views/archivesManage/lendManage/returnArchives/index.vue
View File

@ -30,7 +30,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleDbClick"
>
<el-table-column type="selection" :reserve-selection="true" width="55" />
<el-table-column type="selection" :reserve-selection="true" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="orderNo" align="center" label="单据号" width="140" />
<el-table-column prop="categoryName" align="center" label="门类名称" width="120" />

2
src/views/archivesManage/lendManage/toLend/index.vue
View File

@ -15,7 +15,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleLendDbClick"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="categoryName" label="门类名称" align="center" min-width="85" />
<el-table-column prop="archiveNo" label="档号" align="center" min-width="120" />

2
src/views/archivesManage/outInStorage/inStorage/index.vue
View File

@ -40,7 +40,7 @@
@row-dblclick="handleDbClick"
@selection-change="selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="80" />
<el-table-column prop="storageType" align="center" label="入库" min-width="80">
<template slot-scope="scope">

2
src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
View File

@ -8,7 +8,7 @@
<div class="setting-dialog">
<p class="msg">该案卷存在多个档案盒，请确认全部入库！</p>
<el-table ref="table" :data="tableData" height="325px" @row-click="clickRowHandler" @selection-change="selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="index" align="center" label="序号" width="80" />
<el-table-column prop="caseName" align="center" label="盒名称" width="100" />
<el-table-column prop="tid" align="center" label="TID" width="180" />

2
src/views/archivesManage/outInStorage/outInHistory/index.vue
View File

@ -39,7 +39,7 @@
@row-dblclick="handleDbClick"
@selection-change="selectionChangeHandler"
>
<el-table-column type="selection" :reserve-selection="true" width="55" />
<el-table-column type="selection" :reserve-selection="true" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="80" />
<el-table-column prop="storageType" label="状态" align="center" width="90">
<template slot-scope="scope">

2
src/views/archivesManage/outInStorage/outStorage/index.vue
View File

@ -16,7 +16,7 @@
</div>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" style="width: 100%" height="calc(100vh - 357px)" :data="crud.data" :cell-class-name="cell" @row-click="clickRowHandler" @row-dblclick="handleDbClick" @selection-change="selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="index" label="序号" align="center" width="80" />
<el-table-column prop="storageType" label="状态" align="center" min-width="90">
<template slot-scope="scope">

2
src/views/system/dept/index.vue
View File

@ -74,7 +74,7 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
<el-table-column label="名称" prop="name" />
<el-table-column label="排序" prop="deptSort" />
<el-table-column label="状态" align="center" prop="enabled">

2
src/views/system/job/index.vue
View File

@ -11,7 +11,7 @@
<span class="right-top-line" />
<span class="left-bottom-line" />
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="jobSort" label="排序">
<template slot-scope="scope">

2
src/views/system/menu/index.vue
View File

@ -109,7 +109,7 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column :show-overflow-tooltip="true" label="菜单标题" width="125px" prop="title" />
<el-table-column prop="icon" label="图标" align="center" width="60px">
<template slot-scope="scope">

4
src/views/system/notifyManage/index.vue
View File

@ -316,9 +316,9 @@ export default {
if (this.pushObj === '用户') {
params.pushType = 1
if (this.selectOptions.length === this.sendObjOptions.length) {
params.users = this.selectOptions.filter(item => item !== 0)
params.userId = this.selectOptions.filter(item => item !== 0)
} else {
params.users = this.selectOptions
params.userId = this.selectOptions
}
}
// params.users = params.users.map(item => {

2
src/views/system/role/index.vue
View File

@ -62,7 +62,7 @@
<span class="role-span">角色列表</span>
</div>
<el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" height="calc(100vh - 400px)" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="dataScope" label="数据权限" />
<el-table-column prop="level" label="角色级别" />

2
src/views/system/timing/index.vue
View File

@ -83,7 +83,7 @@
<span class="right-top-line" />
<span class="left-bottom-line" />
<el-table ref="table" v-loading="crud.loading" :cell-class-name="cell" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
<el-table-column :show-overflow-tooltip="true" align="center" prop="id" label="任务ID" />
<el-table-column :show-overflow-tooltip="true" align="center" prop="jobName" label="任务名称" />
<el-table-column :show-overflow-tooltip="true" align="center" prop="beanName" label="Bean名称" />

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

@ -155,7 +155,7 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
<el-table-column :show-overflow-tooltip="true" prop="username" label="用户名" />
<el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
<el-table-column prop="gender" label="性别" />

Write Preview
Loading…
Cancel
Save