|
|
@@ -261,21 +261,27 @@
|
|
|
</el-row>
|
|
|
</template>
|
|
|
<!-- 搜索条件 -->
|
|
|
- <template slot="pos" >
|
|
|
+ <template slot="pos">
|
|
|
<ibps-user-selector
|
|
|
- v-if="showDeptSeach"
|
|
|
+ v-if="showDeptSeach"
|
|
|
v-model="search.pos"
|
|
|
type="position"
|
|
|
readonly-text="text"
|
|
|
:multiple="true"
|
|
|
size="mini"
|
|
|
:filter="filter"
|
|
|
-
|
|
|
filtrate
|
|
|
/>
|
|
|
<el-input
|
|
|
v-else
|
|
|
- :value="search.pos ? search.pos.split(',').map(id => switchIdToDept(id)).join(', ') : '无'"
|
|
|
+ :value="
|
|
|
+ search.pos
|
|
|
+ ? search.pos
|
|
|
+ .split(',')
|
|
|
+ .map((id) => switchIdToDept(id))
|
|
|
+ .join(', ')
|
|
|
+ : '无'
|
|
|
+ "
|
|
|
readonly
|
|
|
size="mini"
|
|
|
/>
|
|
|
@@ -611,7 +617,7 @@ export default {
|
|
|
totalPages: 0
|
|
|
}
|
|
|
},
|
|
|
- showDeptSeach:true,
|
|
|
+ showDeptSeach: true,
|
|
|
listConfig: {
|
|
|
// 工具栏
|
|
|
toolbars: [
|
|
|
@@ -624,7 +630,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
key: 'customBpm',
|
|
|
- label: '设备台账',
|
|
|
+ label: '设备管理台账',
|
|
|
icon: 'ibps-icon-file-text',
|
|
|
type: 'info'
|
|
|
},
|
|
|
@@ -1040,11 +1046,12 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
const bumen = this.$store.getters.userInfo.employee.positions
|
|
|
- if(flag){ //增加部门过滤条件
|
|
|
+ if (flag) {
|
|
|
+ //增加部门过滤条件
|
|
|
//const bumen = this.$store.getters.userInfo
|
|
|
this.search.pos = bumen
|
|
|
this.showDeptSeach = false
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
// 部门搜索(可多选)
|
|
|
if (this.search.pos) {
|
|
|
@@ -1216,7 +1223,7 @@ export default {
|
|
|
handleAction(command, position, selection, data, index, button) {
|
|
|
switch (command) {
|
|
|
case 'search': // 查询
|
|
|
- this.getDatas()
|
|
|
+ this.getDatas()
|
|
|
break
|
|
|
case 'customAdd':
|
|
|
this.handleCustomAdd()
|
