Merge remote-tracking branch 'origin/dev-nx' into dev-nx
This commit is contained in:
commit
3bc4aa50b3
|
|
@ -366,6 +366,11 @@
|
|||
width="55"
|
||||
align="center"
|
||||
v-if="repairTitle === '维修'"
|
||||
:selectable="
|
||||
(row) => {
|
||||
return row.status == 1
|
||||
}
|
||||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
|
|
|
|||
|
|
@ -1,218 +1,217 @@
|
|||
<template>
|
||||
<el-select
|
||||
class="user-select-tree"
|
||||
v-model="textStr"
|
||||
:placeholder="placeholder"
|
||||
ref="select"
|
||||
:filterable="true"
|
||||
:remote="true"
|
||||
:remote-method="remoteMethod"
|
||||
:clearable="clearable"
|
||||
@clear="clearSelect"
|
||||
@visible-change="visibleChange"
|
||||
:popper-append-to-body="false"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-model="value"
|
||||
style="
|
||||
height: 100%;
|
||||
max-height: 200px;
|
||||
overflow-y: auto;
|
||||
padding: 0;
|
||||
background-color: #ffffff;
|
||||
"
|
||||
<el-select
|
||||
class="user-select-tree"
|
||||
v-model="textStr"
|
||||
:placeholder="placeholder"
|
||||
ref="select"
|
||||
:filterable="true"
|
||||
:clearable="clearable"
|
||||
@clear="clearSelect"
|
||||
@visible-change="visibleChange"
|
||||
:popper-append-to-body="false"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-tree
|
||||
:data="treeList"
|
||||
:props="treeProps"
|
||||
:filter-node-method="filterNode"
|
||||
:current-node-key="currentKey"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:node-key="nodeKey"
|
||||
ref="selectTree"
|
||||
:check-strictly="true"
|
||||
@node-click="handleTreeClick"
|
||||
>
|
||||
<span
|
||||
slot-scope="{ data }"
|
||||
:title="data[treeProps.label]"
|
||||
class="ellipsis"
|
||||
<el-option
|
||||
v-model="value"
|
||||
style="
|
||||
height: 100%;
|
||||
max-height: 200px;
|
||||
overflow-y: auto;
|
||||
padding: 0;
|
||||
background-color: #ffffff;
|
||||
"
|
||||
>
|
||||
{{ data[treeProps.label] }}
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-tree
|
||||
:data="treeList"
|
||||
:props="treeProps"
|
||||
:filter-node-method="filterNode"
|
||||
:current-node-key="currentKey"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:node-key="nodeKey"
|
||||
ref="selectTree"
|
||||
:check-strictly="true"
|
||||
@node-click="handleTreeClick"
|
||||
>
|
||||
<span
|
||||
slot-scope="{ data }"
|
||||
:title="data[treeProps.label]"
|
||||
class="ellipsis"
|
||||
>
|
||||
{{ data[treeProps.label] }}
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'index',
|
||||
props: {
|
||||
treeList: {
|
||||
type: Array
|
||||
}, //树形原始数据
|
||||
treeProps: Object, //树形配置
|
||||
nodeKey: String, //树形唯一键值
|
||||
defaultSelect: {
|
||||
//默认选择
|
||||
type: Boolean,
|
||||
default: true
|
||||
name: 'index',
|
||||
props: {
|
||||
treeList: {
|
||||
type: Array,
|
||||
}, //树形原始数据
|
||||
treeProps: Object, //树形配置
|
||||
nodeKey: String, //树形唯一键值
|
||||
defaultSelect: {
|
||||
//默认选择
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
defaultData: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
clearable: { type: Boolean, default: false },
|
||||
placeholder: { type: String, default: '请选择' },
|
||||
},
|
||||
defaultData: {
|
||||
type: Object,
|
||||
default: null
|
||||
},
|
||||
clearable: { type: Boolean, default: false },
|
||||
placeholder: { type: String, default: '请选择' }
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
textStr: '',
|
||||
value: '',
|
||||
filterText: '',
|
||||
currentKey: '',
|
||||
highlightNode: -1
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// clearable(val) {
|
||||
// console.log('val-----', val);
|
||||
// },
|
||||
clearable: {
|
||||
handler: function(val,old) {
|
||||
},
|
||||
// 立即以obj.name的当前值触发回调
|
||||
immediate: true
|
||||
},
|
||||
filterText(val) {
|
||||
this.$refs.selectTree.filter(val)
|
||||
},
|
||||
defaultData(val) {
|
||||
if (this.highlightNode === -1) {
|
||||
this.setEdit(val)
|
||||
}
|
||||
},
|
||||
treeList(val) {
|
||||
if (val.length > 0) {
|
||||
this.$nextTick(() => {
|
||||
if (this.defaultSelect) {
|
||||
this.value = val[0][this.treeProps.children][0][this.nodeKey]
|
||||
this.textStr =
|
||||
val[0][this.treeProps.children][0][this.treeProps.label]
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setEdit(obj) {
|
||||
if (obj.name !== '' && obj.value !== '') {
|
||||
this.value = obj.value
|
||||
this.textStr = obj.name
|
||||
this.$nextTick(() => {
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
})
|
||||
}
|
||||
},
|
||||
visibleChange() {
|
||||
this.filterText = ''
|
||||
},
|
||||
filterNode(value, data) {
|
||||
if (!value) return true
|
||||
return data[this.treeProps.label].indexOf(value) !== -1
|
||||
},
|
||||
remoteMethod(query) {
|
||||
setTimeout(() => {
|
||||
this.filterText = query
|
||||
}, 100)
|
||||
},
|
||||
// 设备类型点击赋值
|
||||
handleTreeClick(data, checked) {
|
||||
this.filterText = ''
|
||||
if (checked) {
|
||||
// //判断是否是父子
|
||||
if (
|
||||
data[this.treeProps.children] !== undefined &&
|
||||
data[this.treeProps.children].length !== 0
|
||||
) {
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
} else {
|
||||
this.value = data[this.nodeKey]
|
||||
this.textStr = data[this.treeProps.label]
|
||||
this.$forceUpdate()
|
||||
this.currentKey = this.value
|
||||
this.highlightNode = data[this.nodeKey]
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
this.$refs.selectTree.setCheckedKeys([this.highlightNode])
|
||||
this.$refs.select.blur()
|
||||
data() {
|
||||
return {
|
||||
textStr: '',
|
||||
value: '',
|
||||
filterText: '',
|
||||
currentKey: '',
|
||||
highlightNode: -1,
|
||||
}
|
||||
}
|
||||
},
|
||||
clearFun() {
|
||||
this.value = null
|
||||
this.textStr = null
|
||||
this.currentKey = undefined
|
||||
this.highlightNode = undefined
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$refs.select.clearSingleSelect()
|
||||
// this.value = ''
|
||||
// this.textStr = ''
|
||||
// this.currentKey = undefined
|
||||
// this.highlightNode = undefined
|
||||
// this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
watch: {
|
||||
// clearable(val) {
|
||||
// console.log('val-----', val);
|
||||
// },
|
||||
clearable: {
|
||||
handler: function (val, old) {},
|
||||
// 立即以obj.name的当前值触发回调
|
||||
immediate: true,
|
||||
},
|
||||
filterText(val) {
|
||||
this.$refs.selectTree.filter(val)
|
||||
},
|
||||
defaultData(val) {
|
||||
if (this.highlightNode === -1) {
|
||||
this.setEdit(val)
|
||||
}
|
||||
},
|
||||
treeList(val) {
|
||||
if (val.length > 0) {
|
||||
this.$nextTick(() => {
|
||||
if (this.defaultSelect) {
|
||||
this.value =
|
||||
val[0][this.treeProps.children][0][this.nodeKey]
|
||||
this.textStr =
|
||||
val[0][this.treeProps.children][0][
|
||||
this.treeProps.label
|
||||
]
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
setEdit(obj) {
|
||||
if (obj.name !== '' && obj.value !== '') {
|
||||
this.value = obj.value
|
||||
this.textStr = obj.name
|
||||
this.$nextTick(() => {
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
})
|
||||
}
|
||||
},
|
||||
visibleChange() {
|
||||
this.filterText = ''
|
||||
},
|
||||
filterNode(value, data) {
|
||||
if (!value) return true
|
||||
return data[this.treeProps.label].indexOf(value) !== -1
|
||||
},
|
||||
remoteMethod(query) {
|
||||
setTimeout(() => {
|
||||
this.filterText = query
|
||||
}, 100)
|
||||
},
|
||||
// 设备类型点击赋值
|
||||
handleTreeClick(data, checked) {
|
||||
this.filterText = ''
|
||||
if (checked) {
|
||||
// //判断是否是父子
|
||||
if (
|
||||
data[this.treeProps.children] !== undefined &&
|
||||
data[this.treeProps.children].length !== 0
|
||||
) {
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
} else {
|
||||
this.value = data[this.nodeKey]
|
||||
this.textStr = data[this.treeProps.label]
|
||||
this.$forceUpdate()
|
||||
this.currentKey = this.value
|
||||
this.highlightNode = data[this.nodeKey]
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
this.$refs.selectTree.setCheckedKeys([this.highlightNode])
|
||||
this.$refs.select.blur()
|
||||
}
|
||||
}
|
||||
},
|
||||
clearFun() {
|
||||
this.value = null
|
||||
this.textStr = null
|
||||
this.currentKey = undefined
|
||||
this.highlightNode = undefined
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$refs.select.clearSingleSelect()
|
||||
// this.value = ''
|
||||
// this.textStr = ''
|
||||
// this.currentKey = undefined
|
||||
// this.highlightNode = undefined
|
||||
// this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
},
|
||||
clearSelect() {
|
||||
this.value = ''
|
||||
this.textStr = ''
|
||||
this.$refs.selectTree.setCurrentKey()
|
||||
this.$emit('handleNodeClick', '')
|
||||
},
|
||||
},
|
||||
clearSelect() {
|
||||
this.value = ''
|
||||
this.textStr = ''
|
||||
this.$refs.selectTree.setCurrentKey()
|
||||
this.$emit('handleNodeClick', '')
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.user-select-tree {
|
||||
::v-deep {
|
||||
.el-icon-::before {
|
||||
content: '\ea1b';
|
||||
font-family: 'icomoon' !important;
|
||||
display: inline-block;
|
||||
-webkit-transform: scale(0.83);
|
||||
font-size: 10px;
|
||||
//width: 100%;
|
||||
//height: 100%;
|
||||
color: #666666;
|
||||
pointer-events: none;
|
||||
}
|
||||
// ::v-deep {
|
||||
// .el-icon-::before {
|
||||
// content: '\ea1b';
|
||||
// font-family: 'icomoon' !important;
|
||||
// display: inline-block;
|
||||
// -webkit-transform: scale(0.83);
|
||||
// font-size: 10px;
|
||||
// //width: 100%;
|
||||
// //height: 100%;
|
||||
// color: #666666;
|
||||
// pointer-events: none;
|
||||
// }
|
||||
|
||||
.el-input.is-focus {
|
||||
.el-icon- {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
}
|
||||
// .el-input.is-focus {
|
||||
// .el-icon- {
|
||||
// transform: rotate(0deg);
|
||||
// }
|
||||
// }
|
||||
|
||||
.el-input__inner {
|
||||
height: 36px;
|
||||
line-height: 36px;
|
||||
}
|
||||
// .el-input__inner {
|
||||
// height: 36px;
|
||||
// line-height: 36px;
|
||||
// }
|
||||
|
||||
.el-input__icon {
|
||||
line-height: 36px;
|
||||
}
|
||||
// .el-input__icon {
|
||||
// line-height: 36px;
|
||||
// }
|
||||
|
||||
.el-tree-node__content {
|
||||
height: 32px;
|
||||
}
|
||||
}
|
||||
// .el-tree-node__content {
|
||||
// height: 32px;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -377,6 +377,11 @@
|
|||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="
|
||||
(row) => {
|
||||
return row.status == 1
|
||||
}
|
||||
"
|
||||
v-if="repairTitle === '维修'"
|
||||
/>
|
||||
<el-table-column
|
||||
|
|
|
|||
|
|
@ -1,218 +1,217 @@
|
|||
<template>
|
||||
<el-select
|
||||
class="user-select-tree"
|
||||
v-model="textStr"
|
||||
:placeholder="placeholder"
|
||||
ref="select"
|
||||
:filterable="true"
|
||||
:remote="true"
|
||||
:remote-method="remoteMethod"
|
||||
:clearable="clearable"
|
||||
@clear="clearSelect"
|
||||
@visible-change="visibleChange"
|
||||
:popper-append-to-body="false"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-model="value"
|
||||
style="
|
||||
height: 100%;
|
||||
max-height: 200px;
|
||||
overflow-y: auto;
|
||||
padding: 0;
|
||||
background-color: #ffffff;
|
||||
"
|
||||
<el-select
|
||||
class="user-select-tree"
|
||||
v-model="textStr"
|
||||
:placeholder="placeholder"
|
||||
ref="select"
|
||||
:filterable="true"
|
||||
:clearable="clearable"
|
||||
@clear="clearSelect"
|
||||
@visible-change="visibleChange"
|
||||
:popper-append-to-body="false"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-tree
|
||||
:data="treeList"
|
||||
:props="treeProps"
|
||||
:filter-node-method="filterNode"
|
||||
:current-node-key="currentKey"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:node-key="nodeKey"
|
||||
ref="selectTree"
|
||||
:check-strictly="true"
|
||||
@node-click="handleTreeClick"
|
||||
>
|
||||
<span
|
||||
slot-scope="{ data }"
|
||||
:title="data[treeProps.label]"
|
||||
class="ellipsis"
|
||||
<el-option
|
||||
v-model="value"
|
||||
style="
|
||||
height: 100%;
|
||||
max-height: 200px;
|
||||
overflow-y: auto;
|
||||
padding: 0;
|
||||
background-color: #ffffff;
|
||||
"
|
||||
>
|
||||
{{ data[treeProps.label] }}
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-tree
|
||||
:data="treeList"
|
||||
:props="treeProps"
|
||||
:filter-node-method="filterNode"
|
||||
:current-node-key="currentKey"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:node-key="nodeKey"
|
||||
ref="selectTree"
|
||||
:check-strictly="true"
|
||||
@node-click="handleTreeClick"
|
||||
>
|
||||
<span
|
||||
slot-scope="{ data }"
|
||||
:title="data[treeProps.label]"
|
||||
class="ellipsis"
|
||||
>
|
||||
{{ data[treeProps.label] }}
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'index',
|
||||
props: {
|
||||
treeList: {
|
||||
type: Array
|
||||
}, //树形原始数据
|
||||
treeProps: Object, //树形配置
|
||||
nodeKey: String, //树形唯一键值
|
||||
defaultSelect: {
|
||||
//默认选择
|
||||
type: Boolean,
|
||||
default: true
|
||||
name: 'index',
|
||||
props: {
|
||||
treeList: {
|
||||
type: Array,
|
||||
}, //树形原始数据
|
||||
treeProps: Object, //树形配置
|
||||
nodeKey: String, //树形唯一键值
|
||||
defaultSelect: {
|
||||
//默认选择
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
defaultData: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
clearable: { type: Boolean, default: false },
|
||||
placeholder: { type: String, default: '请选择' },
|
||||
},
|
||||
defaultData: {
|
||||
type: Object,
|
||||
default: null
|
||||
},
|
||||
clearable: { type: Boolean, default: false },
|
||||
placeholder: { type: String, default: '请选择' }
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
textStr: '',
|
||||
value: '',
|
||||
filterText: '',
|
||||
currentKey: '',
|
||||
highlightNode: -1
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// clearable(val) {
|
||||
// console.log('val-----', val);
|
||||
// },
|
||||
clearable: {
|
||||
handler: function(val,old) {
|
||||
},
|
||||
// 立即以obj.name的当前值触发回调
|
||||
immediate: true
|
||||
},
|
||||
filterText(val) {
|
||||
this.$refs.selectTree.filter(val)
|
||||
},
|
||||
defaultData(val) {
|
||||
if (this.highlightNode === -1) {
|
||||
this.setEdit(val)
|
||||
}
|
||||
},
|
||||
treeList(val) {
|
||||
if (val.length > 0) {
|
||||
this.$nextTick(() => {
|
||||
if (this.defaultSelect) {
|
||||
this.value = val[0][this.treeProps.children][0][this.nodeKey]
|
||||
this.textStr =
|
||||
val[0][this.treeProps.children][0][this.treeProps.label]
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setEdit(obj) {
|
||||
if (obj.name !== '' && obj.value !== '') {
|
||||
this.value = obj.value
|
||||
this.textStr = obj.name
|
||||
this.$nextTick(() => {
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
})
|
||||
}
|
||||
},
|
||||
visibleChange() {
|
||||
this.filterText = ''
|
||||
},
|
||||
filterNode(value, data) {
|
||||
if (!value) return true
|
||||
return data[this.treeProps.label].indexOf(value) !== -1
|
||||
},
|
||||
remoteMethod(query) {
|
||||
setTimeout(() => {
|
||||
this.filterText = query
|
||||
}, 100)
|
||||
},
|
||||
// 设备类型点击赋值
|
||||
handleTreeClick(data, checked) {
|
||||
this.filterText = ''
|
||||
if (checked) {
|
||||
// //判断是否是父子
|
||||
if (
|
||||
data[this.treeProps.children] !== undefined &&
|
||||
data[this.treeProps.children].length !== 0
|
||||
) {
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
} else {
|
||||
this.value = data[this.nodeKey]
|
||||
this.textStr = data[this.treeProps.label]
|
||||
this.$forceUpdate()
|
||||
this.currentKey = this.value
|
||||
this.highlightNode = data[this.nodeKey]
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
this.$refs.selectTree.setCheckedKeys([this.highlightNode])
|
||||
this.$refs.select.blur()
|
||||
data() {
|
||||
return {
|
||||
textStr: '',
|
||||
value: '',
|
||||
filterText: '',
|
||||
currentKey: '',
|
||||
highlightNode: -1,
|
||||
}
|
||||
}
|
||||
},
|
||||
clearFun() {
|
||||
this.value = null
|
||||
this.textStr = null
|
||||
this.currentKey = undefined
|
||||
this.highlightNode = undefined
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$refs.select.clearSingleSelect()
|
||||
// this.value = ''
|
||||
// this.textStr = ''
|
||||
// this.currentKey = undefined
|
||||
// this.highlightNode = undefined
|
||||
// this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
watch: {
|
||||
// clearable(val) {
|
||||
// console.log('val-----', val);
|
||||
// },
|
||||
clearable: {
|
||||
handler: function (val, old) {},
|
||||
// 立即以obj.name的当前值触发回调
|
||||
immediate: true,
|
||||
},
|
||||
filterText(val) {
|
||||
this.$refs.selectTree.filter(val)
|
||||
},
|
||||
defaultData(val) {
|
||||
if (this.highlightNode === -1) {
|
||||
this.setEdit(val)
|
||||
}
|
||||
},
|
||||
treeList(val) {
|
||||
if (val.length > 0) {
|
||||
this.$nextTick(() => {
|
||||
if (this.defaultSelect) {
|
||||
this.value =
|
||||
val[0][this.treeProps.children][0][this.nodeKey]
|
||||
this.textStr =
|
||||
val[0][this.treeProps.children][0][
|
||||
this.treeProps.label
|
||||
]
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
setEdit(obj) {
|
||||
if (obj.name !== '' && obj.value !== '') {
|
||||
this.value = obj.value
|
||||
this.textStr = obj.name
|
||||
this.$nextTick(() => {
|
||||
this.highlightNode = this.value
|
||||
this.currentKey = this.value
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
})
|
||||
}
|
||||
},
|
||||
visibleChange() {
|
||||
this.filterText = ''
|
||||
},
|
||||
filterNode(value, data) {
|
||||
if (!value) return true
|
||||
return data[this.treeProps.label].indexOf(value) !== -1
|
||||
},
|
||||
remoteMethod(query) {
|
||||
setTimeout(() => {
|
||||
this.filterText = query
|
||||
}, 100)
|
||||
},
|
||||
// 设备类型点击赋值
|
||||
handleTreeClick(data, checked) {
|
||||
this.filterText = ''
|
||||
if (checked) {
|
||||
// //判断是否是父子
|
||||
if (
|
||||
data[this.treeProps.children] !== undefined &&
|
||||
data[this.treeProps.children].length !== 0
|
||||
) {
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
} else {
|
||||
this.value = data[this.nodeKey]
|
||||
this.textStr = data[this.treeProps.label]
|
||||
this.$forceUpdate()
|
||||
this.currentKey = this.value
|
||||
this.highlightNode = data[this.nodeKey]
|
||||
this.$emit('handleNodeClick', this.value)
|
||||
this.$refs.selectTree.setCheckedKeys([this.highlightNode])
|
||||
this.$refs.select.blur()
|
||||
}
|
||||
}
|
||||
},
|
||||
clearFun() {
|
||||
this.value = null
|
||||
this.textStr = null
|
||||
this.currentKey = undefined
|
||||
this.highlightNode = undefined
|
||||
this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
this.$refs.select.clearSingleSelect()
|
||||
// this.value = ''
|
||||
// this.textStr = ''
|
||||
// this.currentKey = undefined
|
||||
// this.highlightNode = undefined
|
||||
// this.$refs.selectTree.setCurrentKey(this.highlightNode)
|
||||
},
|
||||
clearSelect() {
|
||||
this.value = ''
|
||||
this.textStr = ''
|
||||
this.$refs.selectTree.setCurrentKey()
|
||||
this.$emit('handleNodeClick', '')
|
||||
},
|
||||
},
|
||||
clearSelect() {
|
||||
this.value = ''
|
||||
this.textStr = ''
|
||||
this.$refs.selectTree.setCurrentKey()
|
||||
this.$emit('handleNodeClick', '')
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.user-select-tree {
|
||||
::v-deep {
|
||||
.el-icon-::before {
|
||||
content: '\ea1b';
|
||||
font-family: 'icomoon' !important;
|
||||
display: inline-block;
|
||||
-webkit-transform: scale(0.83);
|
||||
font-size: 10px;
|
||||
//width: 100%;
|
||||
//height: 100%;
|
||||
color: #666666;
|
||||
pointer-events: none;
|
||||
}
|
||||
// ::v-deep {
|
||||
// .el-icon-::before {
|
||||
// content: '\ea1b';
|
||||
// font-family: 'icomoon' !important;
|
||||
// display: inline-block;
|
||||
// -webkit-transform: scale(0.83);
|
||||
// font-size: 10px;
|
||||
// //width: 100%;
|
||||
// //height: 100%;
|
||||
// color: #666666;
|
||||
// pointer-events: none;
|
||||
// }
|
||||
|
||||
.el-input.is-focus {
|
||||
.el-icon- {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
}
|
||||
// .el-input.is-focus {
|
||||
// .el-icon- {
|
||||
// transform: rotate(0deg);
|
||||
// }
|
||||
// }
|
||||
|
||||
.el-input__inner {
|
||||
height: 36px;
|
||||
line-height: 36px;
|
||||
}
|
||||
// .el-input__inner {
|
||||
// height: 36px;
|
||||
// line-height: 36px;
|
||||
// }
|
||||
|
||||
.el-input__icon {
|
||||
line-height: 36px;
|
||||
}
|
||||
// .el-input__icon {
|
||||
// line-height: 36px;
|
||||
// }
|
||||
|
||||
.el-tree-node__content {
|
||||
height: 32px;
|
||||
}
|
||||
}
|
||||
// .el-tree-node__content {
|
||||
// height: 32px;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -124,6 +124,14 @@
|
|||
<a
|
||||
:href="filePreviewUrl + row.fileUrl"
|
||||
target="_blank"
|
||||
:download="row.fileName"
|
||||
v-if="fileTypeJudge(row.fileName)"
|
||||
>查看</a
|
||||
>
|
||||
<a
|
||||
:href="filePreviewUrl + row.fileUrl"
|
||||
target="_blank"
|
||||
v-else
|
||||
>查看</a
|
||||
>
|
||||
</template>
|
||||
|
|
@ -345,6 +353,11 @@ export default {
|
|||
)
|
||||
console.log('数据导出', data)
|
||||
},
|
||||
fileTypeJudge(url) {
|
||||
const file = url.split('.')[1]
|
||||
const docList = ['doc', 'docx', 'xls', 'xlsx']
|
||||
return docList.some((e) => e === file)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -5,9 +5,20 @@
|
|||
<el-table-column align="center" label="文件名称" prop="name" />
|
||||
<el-table-column align="center" label="操作">
|
||||
<template slot-scope="{ row }">
|
||||
<a :href="`${filePreviewUrl}${row.url}`" target="_blank"
|
||||
<a
|
||||
:href="`${filePreviewUrl}${row.url}`"
|
||||
target="_blank"
|
||||
:download="row.name"
|
||||
v-if="fileTypeJudge(row.name)"
|
||||
>查看</a
|
||||
>
|
||||
<a
|
||||
v-else
|
||||
:href="`${filePreviewUrl}${row.url}`"
|
||||
target="_blank"
|
||||
>
|
||||
查看
|
||||
</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -50,6 +61,13 @@ export default {
|
|||
return tableList || []
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
fileTypeJudge(url) {
|
||||
const file = url.split('.')[1]
|
||||
const docList = ['doc', 'docx']
|
||||
return docList.some((e) => e === file)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -297,7 +297,11 @@
|
|||
</el-table>
|
||||
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="submitForm" v-if="!isDetail"
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="submitForm"
|
||||
v-if="!isDetail"
|
||||
:loading="codingLoading"
|
||||
>确 定</el-button
|
||||
>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
|
|
@ -431,6 +435,7 @@ export default {
|
|||
isDetail: false,
|
||||
|
||||
surplusNoBindNum: 0,
|
||||
codingLoading: false,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -723,18 +728,23 @@ export default {
|
|||
)
|
||||
return // 停止提交流程
|
||||
}
|
||||
editPurchaseMacode(this.codeList).then((response) => {
|
||||
if (response.data && response.data.length > 0) {
|
||||
this.codeList = response.data
|
||||
this.$modal.msgError(
|
||||
'编码绑定失败,存在重复编码，请重新输入',
|
||||
)
|
||||
} else {
|
||||
this.$modal.msgSuccess('编码绑定成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
this.codingLoading = true
|
||||
editPurchaseMacode(this.codeList)
|
||||
.then((response) => {
|
||||
if (response.data && response.data.length > 0) {
|
||||
this.codeList = response.data
|
||||
this.$modal.msgError(
|
||||
'编码绑定失败,存在重复编码，请重新输入',
|
||||
)
|
||||
} else {
|
||||
this.$modal.msgSuccess('编码绑定成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
this.codingLoading = false
|
||||
})
|
||||
}
|
||||
},
|
||||
hasDuplicateField(array, field) {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ module.exports = {
|
|||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// target: `https://z.csgmall.com.cn`,
|
||||
|
||||
target: `http://192.168.2.167:28080`, //超
|
||||
target: `http://192.168.2.134:28080`, //超
|
||||
// target: `http://10.40.92.81:28080`, //韩/
|
||||
// target: `http://10.40.92.74:8080`,//旭/
|
||||
// target: `http://192.168.2.248:28080`, //帅
|
||||
|
|
|
|||
Loading…
Reference in New Issue