Compare commits

..

No commits in common. "c19e1ac23139ef7572972e31e30b388db27c169a" and "b10158ce020b0402c5ca6084eb2c7e4ae28ff401" have entirely different histories.

5 changed files with 20 additions and 22 deletions

View File

@ -3,10 +3,10 @@
<div class="left-tree-box"> <div class="left-tree-box">
<el-form :inline="true" :model="dataForm" style="margin-left:10px"> <el-form :inline="true" :model="dataForm" style="margin-left:10px">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.dictLabel" placeholder="标签名称" clearable></el-input> <el-input v-model="filterText" placeholder="标签名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="query">标签检索</el-button> <el-button type="primary">标签检索</el-button>
</el-form-item> </el-form-item>
<div class="tree-box"> <div class="tree-box">
<el-tree ref="treeDom" class="filter-tree" :data="dataListCopy" :props="defaultProps" node-key="id" <el-tree ref="treeDom" class="filter-tree" :data="dataListCopy" :props="defaultProps" node-key="id"
@ -17,19 +17,19 @@
</el-form> </el-form>
</div> </div>
<div class="right-detail"> <div class="right-detail">
<div class="title">标签详情查看</div> <div class="title">标签详情</div>
<el-form :model="rowData" label-width="120px"> <el-form :model="dataForm" label-width="120px">
<el-form-item prop="dictName" label="标签名称"> <el-form-item prop="dictName" label="标签名称">
<el-input v-model="rowData.dictName" :placeholder="$t('dict.dictName')"></el-input> <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="dictType" label="标签编号"> <el-form-item prop="dictType" label="标签编号">
<el-input v-model="rowData.dictType" placeholder="标签编号"></el-input> <el-input v-model="dataForm.dictType" placeholder="标签编号"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="dictType" label="标签分类" style="width:100%"> <el-form-item prop="dictType" label="标签分类" style="width:100%">
<el-input v-model="rowData.dictType" placeholder="标签分类"></el-input> <el-input v-model="dataForm.dictType" placeholder="标签分类"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="remark" :label="$t('dict.remark')" style="width:100%"> <el-form-item prop="remark" :label="$t('dict.remark')" style="width:100%">
<el-input type="textarea" :rows="4" v-model="rowData.remark" :placeholder="$t('dict.remark')"> <el-input type="textarea" :rows="4" v-model="dataForm.remark" :placeholder="$t('dict.remark')">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -66,7 +66,6 @@ export default {
label: 'dictName' label: 'dictName'
}, },
defaultNode: '', defaultNode: '',
rowData: {},
} }
}, },
watch: { watch: {
@ -77,12 +76,12 @@ export default {
handler(newVal) { handler(newVal) {
this.dataListCopy = []; this.dataListCopy = [];
this.defaultNode = null; this.defaultNode = null;
this.rowData = {}; this.dataForm = {};
newVal.map((v, i) => { newVal.map((v, i) => {
v.id = `${v.id}`; v.id = `${v.id}`;
if (i == 0) { if (i == 0) {
this.defaultNode = v.id; this.defaultNode = v.id;
this.rowData = v; this.dataForm = v;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.treeDom.setCurrentKey(this.defaultNode); // this.$refs.treeDom.setCurrentKey(this.defaultNode); //
}); });
@ -96,8 +95,7 @@ export default {
} }
this.dataListCopy.push(v) this.dataListCopy.push(v)
}) })
}, }
deep: true,
} }
}, },
methods: { methods: {
@ -106,7 +104,7 @@ export default {
return data.label.indexOf(value) !== -1; return data.label.indexOf(value) !== -1;
}, },
handleNodeClick(data) { handleNodeClick(data) {
this.rowData = data this.dataForm = data
}, },
}, },

View File

@ -9,7 +9,7 @@
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">新增标签分类</el-button> <el-button type="primary" @click="addOrUpdateHandle()">新增分类</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border <el-table v-loading="dataListLoading" :data="dataList" border

View File

@ -59,7 +59,7 @@
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './tag-type-add-or-update' // import AddOrUpdate from './dict-data-add-or-update'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data() { data() {
@ -79,7 +79,7 @@ export default {
} }
}, },
components: { components: {
AddOrUpdate // AddOrUpdate
}, },
created() { created() {
this.dataForm.dictTypeId = this.$route.params.dictTypeId || '0' this.dataForm.dictTypeId = this.$route.params.dictTypeId || '0'

View File

@ -1,10 +1,10 @@
<template> <template>
<el-dialog :visible.sync="visible" title="标签体系分类" :close-on-click-modal="false" <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
:close-on-press-escape="false"> :close-on-press-escape="false">
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"> label-width="120px">
<el-form-item prop="dictName" label="标签分类名称"> <el-form-item prop="dictName" label="分类名称">
<el-input v-model="dataForm.dictName" placeholder="标签分类名称"></el-input> <el-input v-model="dataForm.dictName" placeholder="分类名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="dictType" label="编号"> <el-form-item prop="dictType" label="编号">
<el-input v-model="dataForm.dictType" placeholder="编号"></el-input> <el-input v-model="dataForm.dictType" placeholder="编号"></el-input>

View File

@ -6,7 +6,7 @@
{{ tab.name }} {{ tab.name }}
</div> </div>
</div> </div>
<!-- 标签体系分类 --> <!-- 标签体系构建 -->
<TagSysBuild v-if="selectTab == 'build'"></TagSysBuild> <TagSysBuild v-if="selectTab == 'build'"></TagSysBuild>
<!-- 标签目录管理 --> <!-- 标签目录管理 -->
<TagDirectory v-if="selectTab == 'directory'"></TagDirectory> <TagDirectory v-if="selectTab == 'directory'"></TagDirectory>
@ -23,7 +23,7 @@ export default {
return { return {
tabList: [ tabList: [
{ {
name: '标签体系分类', name: '标签体系构建',
key: 'build' key: 'build'
}, { }, {
name: '标签目录管理', name: '标签目录管理',