Browse Source

icon统一修改

master
x_ying 3 years ago
parent
commit
60ddee7c42
  1. 2
      src/assets/styles/archives-manage.scss
  2. 4
      src/assets/styles/lend-manage.scss
  3. 3
      src/views/archivesManage/archivesCheck/index.vue
  4. 8
      src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
  5. 6
      src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
  6. 6
      src/views/archivesManage/archivesList/module/archivesProject/index.vue
  7. 25
      src/views/archivesManage/caseManage/caseList/index.vue
  8. 2
      src/views/archivesManage/lendManage/borrowerManage/index.vue
  9. 23
      src/views/archivesManage/lendManage/lendConfirm/index.vue
  10. 8
      src/views/archivesManage/lendManage/returnArchives/index.vue
  11. 11
      src/views/archivesManage/lendManage/toLend/index.vue

2
src/assets/styles/archives-manage.scss

@ -106,7 +106,7 @@ $arcCyan: #0FBED9;
.el-button{ .el-button{
padding: 0 13px 0 3px; padding: 0 13px 0 3px;
::v-deep span{ ::v-deep span{
margin-left: 10px;
margin-left: 5px;
} }
&.packing-btn{ &.packing-btn{
border-color: $arcPurple; border-color: $arcPurple;

4
src/assets/styles/lend-manage.scss

@ -2,7 +2,9 @@
.crud-opts{ .crud-opts{
display: inline-block; display: inline-block;
} }
.iconfont::before{
margin-right: 5px;
}
.cell-lend{ .cell-lend{
display: inline-block; display: inline-block;
height: 26px; height: 26px;

3
src/views/archivesManage/archivesCheck/index.vue

@ -1,8 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="head-container" style="padding:0 0 20px 0"> <div class="head-container" style="padding:0 0 20px 0">
<el-button size="mini" @click="handleAdd">
<svg-icon icon-class="xinzengpandian-fanbai" class-name="svg-style" />新增盘点</el-button>
<el-button size="mini" class="iconfont icon-xinzengpandian-fanbai" @click="handleAdd">新增盘点</el-button>
<el-button <el-button
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"

8
src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue

@ -16,10 +16,7 @@
</div> </div>
<div v-else class="archives-recycle"> <div v-else class="archives-recycle">
<el-button icon="el-icon-delete" size="mini" :disabled="selections.length === 0" @click="toDelete(selections)">彻底删除</el-button> <el-button icon="el-icon-delete" size="mini" :disabled="selections.length === 0" @click="toDelete(selections)">彻底删除</el-button>
<el-button size="mini" :disabled="selections.length === 0" @click="handleRestore">
<svg-icon icon-class="huanyuan-fanbai" class="svg-style" />
还原
</el-button>
<el-button size="mini" class="iconfont icon-huanyuan-fanbai" :disabled="selections.length === 0" @click="handleRestore">还原</el-button>
</div> </div>
<div class="head-search"> <div class="head-search">
<!-- 搜索 --> <!-- 搜索 -->
@ -661,4 +658,7 @@ export default {
white-space: pre; white-space: pre;
// white-space: pre-wrap; // white-space: pre-wrap;
} }
.iconfont::before{
margin-right: 6px;
}
</style> </style>

6
src/views/archivesManage/archivesList/module/archivesJuannei/index.vue

@ -16,8 +16,7 @@
</div> </div>
<div v-else class="archives-recycle"> <div v-else class="archives-recycle">
<el-button icon="el-icon-delete" :disabled="selections.length === 0" size="mini" @click="toDelete(selections)">彻底删除</el-button> <el-button icon="el-icon-delete" :disabled="selections.length === 0" size="mini" @click="toDelete(selections)">彻底删除</el-button>
<el-button size="mini" :disabled="selections.length === 0" @click="handleRestore">
<svg-icon icon-class="huanyuan-fanbai" class-name="svg-style" />还原
<el-button size="mini" class="iconfont icon-huanyuan-fanbai" :disabled="selections.length === 0" @click="handleRestore">还原
</el-button> </el-button>
</div> </div>
<div class="head-search"> <div class="head-search">
@ -555,4 +554,7 @@ export default {
white-space: pre; white-space: pre;
// white-space: pre-wrap; // // white-space: pre-wrap; //
} }
.iconfont::before{
margin-right: 6px;
}
</style> </style>

6
src/views/archivesManage/archivesList/module/archivesProject/index.vue

@ -12,8 +12,7 @@
</div> </div>
<div v-else class="archives-recycle"> <div v-else class="archives-recycle">
<el-button icon="el-icon-delete" size="mini" :disabled="selections.length === 0" @click="toDelete(selections)">彻底删除</el-button> <el-button icon="el-icon-delete" size="mini" :disabled="selections.length === 0" @click="toDelete(selections)">彻底删除</el-button>
<el-button size="mini" :disabled="selections.length === 0" @click="handleRestore">
<svg-icon icon-class="huanyuan-fanbai" class-name="svg-style" />还原
<el-button size="mini" class="iconfont icon-huanyuan-fanbai" :disabled="selections.length === 0" @click="handleRestore">还原
</el-button> </el-button>
</div> </div>
<div class="head-search"> <div class="head-search">
@ -461,4 +460,7 @@ export default {
white-space: pre; white-space: pre;
// white-space: pre-wrap; // // white-space: pre-wrap; //
} }
.iconfont::before{
margin-right: 6px;
}
</style> </style>

25
src/views/archivesManage/caseManage/caseList/index.vue

@ -18,8 +18,8 @@
</template> </template>
<template v-slot:rightButtonGroup> <template v-slot:rightButtonGroup>
<div class="archives-handler-btn"> <div class="archives-handler-btn">
<el-button class="packing-btn iconfont icon-weibiaoti-2" type="primary" :disabled="crud.selections.length === 0" @click="openCase(crud.selections)">拆盒</el-button>
<el-button class="binding-btn iconfont icon-weibiaoti-2" type="primary" :disabled="crud.selections.length !== 1" @click="bindingTag(crud.selections)">绑定标签</el-button>
<el-button class="packing-btn iconfont icon-chaihe-fanbai" type="primary" :disabled="crud.selections.length === 0" @click="openCase(crud.selections)">拆盒</el-button>
<el-button class="binding-btn iconfont icon-bangding-fanbai" type="primary" :disabled="crud.selections.length !== 1" @click="bindingTag(crud.selections)">绑定标签</el-button>
</div> </div>
</template> </template>
</crudOperation> </crudOperation>
@ -36,11 +36,11 @@
<span v-if="" class="clear" style="width:56px">{{ scope.row.inState }}</span> <span v-if="" class="clear" style="width:56px">{{ scope.row.inState }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="depositNum" label="已装" align="center" />
<el-table-column prop="caseName" label="盒名称" align="center" />
<el-table-column prop="tid" label="TID" align="center" />
<el-table-column prop="barcode" label="条形码" align="center" />
<el-table-column label="存放位置" align="center">
<el-table-column prop="depositNum" label="已装" align="center" min-width="56" />
<el-table-column prop="caseName" label="盒名称" :show-overflow-tooltip="true" align="center" min-width="150" />
<el-table-column prop="tid" label="TID" align="center" min-width="180" />
<el-table-column prop="barcode" label="条形码" align="center" min-width="120" />
<el-table-column label="存放位置" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.folderLocationDetails === ''">-</span> <span v-if="scope.row.folderLocationDetails === ''">-</span>
<span v-else>{{ scope.row.folderLocationDetails }}</span> <span v-else>{{ scope.row.folderLocationDetails }}</span>
@ -51,7 +51,6 @@
<div>{{ scope.row.update_time | parseTime }}</div> <div>{{ scope.row.update_time | parseTime }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="isColumnLength" label="操作" align="center" />
</el-table> </el-table>
<!--新增编辑表单渲染--> <!--新增编辑表单渲染-->
<eForm /> <eForm />
@ -180,5 +179,15 @@ export default {
.container-wrap{ .container-wrap{
min-height: calc(100vh - 242px); min-height: calc(100vh - 242px);
} }
.packing-btn{
width: 76px;
height: 30px;
padding-left: 13px !important;
}
.binding-btn{
width: 106px;
height: 30px;
padding-left: 13px !important;
}
</style> </style>

2
src/views/archivesManage/lendManage/borrowerManage/index.vue

@ -4,7 +4,7 @@
<!-- <crudOperation :permission="permission" /> --> <!-- <crudOperation :permission="permission" /> -->
<el-button icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
<el-button icon="el-icon-edit" size="mini" :disabled="selections.length===1 ? false : true " @click="handelEdit">修改</el-button> <el-button icon="el-icon-edit" size="mini" :disabled="selections.length===1 ? false : true " @click="handelEdit">修改</el-button>
<el-button icon="el-icon-delete" size="mini" :disabled="selections.length ? false : true " @click="deleteVisible = true">删除</el-button>
<el-button icon="el-icon-delete" size="mini" :disabled="!selections.length" @click="deleteVisible = true">删除</el-button>
<!-- 搜索 --> <!-- 搜索 -->
<el-input <el-input

23
src/views/archivesManage/lendManage/lendConfirm/index.vue

@ -1,12 +1,9 @@
<template> <template>
<div> <div>
<div class="head-container"> <div class="head-container">
<el-button size="mini" @click="handleLendBtn">
<svg-icon icon-class="jiechu-fanbai" class-name="svg-style" />借出</el-button>
<el-button size="mini" @click="handelReRecord">
<svg-icon icon-class="dengji-fanbai" class-name="svg-style" />重新登记</el-button>
<el-button size="mini" @click="handleRemove">
<svg-icon icon-class="yichu-fanbai" class-name="svg-style" />移出</el-button>
<el-button size="mini" class="iconfont icon-jiechu-fanbai" :disabled="!selections.length" @click="handleLendBtn">借出</el-button>
<el-button size="mini" class="iconfont icon-dengji-fanbai" @click="handelReRecord">重新登记</el-button>
<el-button size="mini" class="iconfont icon-yichu-fanbai" :disabled="!selections.length" @click="handleRemove">移出</el-button>
<crudOperation style="margin-left:10px" /> <crudOperation style="margin-left:10px" />
</div> </div>
<!--表格渲染--> <!--表格渲染-->
@ -116,11 +113,6 @@ export default {
handleRemove() { handleRemove() {
if (this.selections.length > 0) { if (this.selections.length > 0) {
this.$refs.delConfirmDom.deleteVisible = true this.$refs.delConfirmDom.deleteVisible = true
} else {
this.$message({
message: '请选择要移出当前列表的档案',
type: 'warning'
})
} }
}, },
cell({ row, columnIndex }) { cell({ row, columnIndex }) {
@ -132,11 +124,6 @@ export default {
if (this.selections.length > 0) { if (this.selections.length > 0) {
this.$refs.lendDialogDom.table = this.selections this.$refs.lendDialogDom.table = this.selections
this.$refs.lendDialogDom.lendFormVisible = true this.$refs.lendDialogDom.lendFormVisible = true
} else {
this.$message({
message: '请选择要借出的档案',
type: 'warning'
})
} }
} }
} }
@ -153,7 +140,5 @@ export default {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.crud-opts{
display: inline-block;
}
</style> </style>

8
src/views/archivesManage/lendManage/returnArchives/index.vue

@ -1,8 +1,7 @@
<template> <template>
<div class="to-lend"> <div class="to-lend">
<div class="head-container"> <div class="head-container">
<el-button size="mini" @click="handleReturn">
<svg-icon icon-class="guihuan-fanbai" class-name="svg-style" />归还</el-button>
<el-button size="mini" class="iconfont icon-guihuan-fanbai" :disabled="!selections.length" @click="handleReturn">归还</el-button>
<crudOperation style="margin-left:10px" /> <crudOperation style="margin-left:10px" />
</div> </div>
<!--表格渲染--> <!--表格渲染-->
@ -139,11 +138,6 @@ export default {
handleReturn() { handleReturn() {
if (this.selections.length > 0) { if (this.selections.length > 0) {
this.returnVisible = true this.returnVisible = true
} else {
this.$message({
message: '请选择要归还的档案',
type: 'warning'
})
} }
} }
} }

11
src/views/archivesManage/lendManage/toLend/index.vue

@ -1,10 +1,8 @@
<template> <template>
<div class="to-lend"> <div class="to-lend">
<div class="head-container"> <div class="head-container">
<el-button size="mini" @click="handleRecord">
<svg-icon icon-class="dengji-fanbai" class-name="svg-style" />登记</el-button>
<el-button size="mini" @click="handleRemove">
<svg-icon icon-class="yichu-fanbai" class-name="svg-style" />移出</el-button>
<el-button size="mini" class="iconfont icon-dengji-fanbai" @click="handleRecord">登记</el-button>
<el-button size="mini" class="iconfont icon-yichu-fanbai" :disabled="!selections.length" @click="handleRemove">移出</el-button>
</div> </div>
<!--表格渲染--> <!--表格渲染-->
@ -97,11 +95,6 @@ export default {
handleRemove() { handleRemove() {
if (this.selections.length > 0) { if (this.selections.length > 0) {
this.$refs.delConfirmDom.deleteVisible = true this.$refs.delConfirmDom.deleteVisible = true
} else {
this.$message({
message: '请选择要移出当前列表的档案',
type: 'warning'
})
} }
}, },
// //

Loading…
Cancel
Save