Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre

This commit is contained in:
a0049873 2022-11-03 14:50:58 +08:00
commit 0941a3c92b
5 changed files with 22 additions and 20 deletions

View File

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

View File

@ -9,7 +9,7 @@
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
</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>
<el-table v-loading="dataListLoading" :data="dataList" border

View File

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

View File

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

View File

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