diff --git a/src/components/STreeSelect.vue b/src/components/STreeSelect.vue index f6fb927b..de9dc080 100644 --- a/src/components/STreeSelect.vue +++ b/src/components/STreeSelect.vue @@ -38,12 +38,13 @@ export default { watch: { value: { handler () { - if (this.value) { + if (typeof this.value !== 'string' && this.value) { this.treeValue = JSON.parse(JSON.stringify(this.value)) + } else { + this.treeValue = this.value } }, - immediate: true, - deep: true + immediate: true } }, data () { diff --git a/src/views/documentTool/standardWarning/StandardWarningList.vue b/src/views/documentTool/standardWarning/StandardWarningList.vue index b2fa50f5..d33518cc 100644 --- a/src/views/documentTool/standardWarning/StandardWarningList.vue +++ b/src/views/documentTool/standardWarning/StandardWarningList.vue @@ -55,7 +55,7 @@ format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="queryParam.date" - :disabled="false"/> + :disabled="false" /> @@ -82,7 +82,7 @@ :columns="columns" :dataSource="dataSource" :can-drag="true" - :rowKey="(index) => {return index}" + :rowKey="(record, index) => {return index}" :pagination="ipagination" :scroll="{x: '100%'}" :loading="loading" @@ -292,7 +292,7 @@ export default { delete param.date } return filterObj(param) - }, + } } }