Browse Source

需求优化

master
xuhuajiao 1 month ago
parent
commit
da59f8696c
  1. 6
      src/views/archivesManage/RFIDArchives/toLend/index.vue
  2. 2
      src/views/archivesManage/archivesList/archivesAnjuan/index.vue
  3. 2
      src/views/archivesManage/archivesList/archivesJuannei/index.vue
  4. 13
      src/views/archivesManage/archivesSearch/index.vue
  5. 4
      src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
  6. 10
      src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue

6
src/views/archivesManage/RFIDArchives/toLend/index.vue

@ -1,7 +1,7 @@
<template>
<div class="to-lend">
<div class="head-container">
<el-button
<!-- <el-button
class="iconfont"
type="mini"
:class="{ 'rfid-reading': isRfidReading, 'rfid-retrying': isRetrying }"
@ -12,7 +12,7 @@
<span v-if="!isRfidReading">RFID读取</span>
<span v-else-if="isRetrying">重试中({{ retryCount }}/3)</span>
<span v-else>停止读取</span>
</el-button>
</el-button> -->
<el-button size="mini" class="iconfont icon-dengji-fanbai" :disabled="!selections.length" @click="handleRecord">登记</el-button>
<el-button size="mini" class="iconfont icon-yichu-fanbai" :disabled="!selections.length" @click="handleRemove">移出</el-button>
</div>
@ -31,7 +31,7 @@
<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" />
<el-table-column prop="archiveNo" label="档号" align="center" min-width="120" show-overflow-tooltip />
<el-table-column prop="maintitle" align="center" label="题名" min-width="120" show-overflow-tooltip />
<el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
<el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="160">

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

@ -540,7 +540,7 @@ export default {
selectAll(val) {
this.selections = val
this.isAnjuan = val.length !== 1
this.$emit('getJnInAjBtnState', this.isAnjuan)
this.$bus.$emit('updateAnjuanState', this.isAnjuan) //
this.$emit('getSelections', val, this.selections)
},
// table -

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

@ -13,7 +13,7 @@
<!-- 删除btn 多选 -->
<el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="selections.length === 0" @click="toDelete(selections)">删除</el-button>
<!-- 导出btn :disabled="!crud.data.length" -->
<el-button v-permission="permission.download" :disabled="isAnjuan && selectedCategory.isType !== 4" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="doExport(1)">导出</el-button>
<el-button v-permission="permission.download" :disabled="localIsAnjuan && selectedCategory.isType !== 4" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="doExport(1)">导出</el-button>
<!-- 上传附件btn 针对卷内/文件 单选 -->
<el-button :disabled="selections.length !== 1" size="mini" icon="el-icon-download" @click="uploadFile">上传附件</el-button>
</div>

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

@ -33,7 +33,7 @@
</div>
<div v-if="this.$route.path.indexOf('dashboard') === -1" class="search-result">
<div v-show="isShow" class="search-title">
<!-- <el-button v-if="resNum !== 0" 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 v-if="resNum !== 0" class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="handleLending"><i class="iconfont icon-chuku-fanbai" style="margin-right: 6px;" />借阅</el-button>
<p v-if="resNum === 0" class="search-res-left">检索结果</p>
<p :class="{'search-res-num' : resNum !== 0 }">本次检索结果共计{{ resNum }}条数据</p>
<el-checkbox v-if="resNum !== 0" v-model="fixedStatusBar">隐藏状态栏</el-checkbox>
@ -87,11 +87,11 @@
</template>
</el-table-column>
<!-- 未绑 / 已绑 -->
<el-table-column label="标签" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
<!-- <el-table-column label="标签" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
<template slot-scope="scope">
<span v-if="scope.row.category_type !== 3" :class="['row-state', 'row-binding', scope.row.tag_no ? 'state-active' : '' ]">{{ scope.row.tag_no ? '已绑': '未绑' }}</span>
</template>
</el-table-column>
</el-table-column> -->
<!-- state-active 已装/已入/已借/已绑 -->
<!-- 未装 / 已装 -->
<el-table-column label="装盒" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
@ -174,8 +174,8 @@ export default {
keywords: '',
select: ['maintitle'],
options: [
{ value: 'maintitle', label: '名' },
{ value: 'archive_no', label: '号' }
{ value: 'maintitle', label: '名' },
{ value: 'archive_no', label: '号' }
// { value: 'responsibleby', label: '' },
// { value: 'doc_no', label: '' },
// { value: 'record_type', label: '' },
@ -537,7 +537,8 @@ export default {
},
//
handleLending() {
const index = this.selections.findIndex((item) => item.is_storage === 0 || item.is_storage === '' || item.is_storage === 1)
console.log('selections', this.selections)
const index = this.selections.findIndex((item) => item.is_storage === 0 || item.is_storage === null || item.is_storage === '' || item.is_storage === 1)
const index2 = this.selections.findIndex((item) => item.is_borrow === 3)
const index3 = this.selections.findIndex((item) => item.is_storage === 3)
if (index !== -1) {

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

@ -24,7 +24,6 @@
</div>
<el-table :data="tableData" style="margin-top:15px;" height="342px">
<el-table-column type="index" label="序号" align="center" width="80" />
<el-table-column prop="docNo" label="发文字号" show-overflow-tooltip width="140" align="center" />
<el-table-column prop="child" label="子条数目" align="center" width="100" />
<el-table-column prop="categoryType" label="门类级别" align="center" width="100">
<template slot-scope="scope">
@ -35,12 +34,13 @@
</el-table-column>
<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="archiveNo" label="档号" align="center" min-width="270" :show-overflow-tooltip="true" />
<el-table-column prop="archiveYear" label="归档年度" align="center" width="150" />
<el-table-column prop="maintitle" :show-overflow-tooltip="true" align="center" label="题名" width="180" />
<el-table-column prop="securityClass" label="保密程度" align="center" width="150" />
<el-table-column prop="department" label="部门名称" align="center" width="150" />
<el-table-column prop="caseName" label="盒名称" :show-overflow-tooltip="true" align="center" width="190" />
<!-- <el-table-column prop="docNo" label="发文字号" show-overflow-tooltip width="140" align="center" /> -->
<el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="300">
<template slot-scope="scope">
<span v-if="!scope.row.folderLocationDetails">-</span>

10
src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue

@ -377,7 +377,7 @@ export default {
<style lang="scss" scoped>
::v-deep .in-dialog .el-dialog {
width: 725px;
width: 850px;
.setting-dialog {
height: 552px;
overflow: hidden;
@ -389,7 +389,7 @@ export default {
::v-deep .in-dialog .el-dialog .el-dialog__header .el-dialog__close::before {
position: absolute;
right: -50px;
bottom: -10px;
bottom: 10px;
}
.header {
height: 60px;
@ -400,7 +400,7 @@ export default {
border-bottom: 1px solid #339cff;
}
.head-container {
padding: 0 20px;
padding: 0;
}
.box {
padding-bottom: 15px;
@ -424,13 +424,13 @@ export default {
.case-name {
color: #fff;
font-size: 16px;
padding: 14px 30px;
padding: 14px 10px;
}
}
}
.frame-content {
display: flex;
flex-wrap: wrap;
// flex-wrap: wrap;
.frame-item {
display: flex;
width: 148px;

Loading…
Cancel
Save