WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收藏

Browse Source
This commit is contained in:
caoyang
2022-03-01 18:08:02 +08:00
parent cb4428ade0
commit e613e6de96
9 changed files with 268 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class SysDict implements Serializable {
/** /**
* 是否为标签内容-数据字典（1是 0否） * 是否为标签内容-数据字典（1是 0否）
*/ */
@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict") @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dictTable = "onl_cgform_field",dicText = "is_tag_dict", dicCode = "is_tag_dict")
@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")
private java.lang.Integer isTagDict; private java.lang.Integer isTagDict;
jero-web/src/components/ocrAddForm/index.vue
+27 -11
View File
@@ -3,7 +3,7 @@
<a-form-model :model="formInline" v-if="isFormInline" class="formAdd" :rules="rules" ref="ruleForm1"> <a-form-model :model="formInline" v-if="isFormInline" class="formAdd" :rules="rules" ref="ruleForm1">
<a-row :gutter="24"> <a-row :gutter="24">
<div v-for="(item,index) in dataList" :key="index"> <div v-for="(item,index) in dataList" :key="index">
<a-col :span="24" v-if="item.field_show_type === 'text'"> <a-col :span="24" v-if="item.field_show_type === '1'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -18,7 +18,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'CHECKBOX'"> <a-col :span="24" v-else-if="item.field_show_type === '2'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -34,7 +34,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'date'"> <a-col :span="24" v-else-if="item.field_show_type === '5'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -51,7 +51,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'SMULTITIME'"> <a-col :span="24" v-else-if="item.field_show_type === '6'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -66,7 +66,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'NUMBER'"> <a-col :span="24" v-else-if="item.field_show_type === '2'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -81,7 +81,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'list'"> <a-col :span="24" v-else-if="item.field_show_type === '3'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -97,7 +97,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'list_multi'"> <a-col :span="24" v-else-if="item.field_show_type === '4'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -128,7 +128,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'TEXTAREA'"> <a-col :span="24" v-else-if="item.field_show_type === '8'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -161,7 +161,7 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'file'"> <a-col :span="24" v-else-if="item.field_show_type === '7'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -179,7 +179,21 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else-if="item.field_show_type === 'STANDARD'"> <a-col :span="24" v-else-if="item.field_show_type === '9'">
<div class="box-title-text">
<div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<PersonnelSelection :query="item"
:disabled="disabled"
v-model="formInline[item.db_field_name]"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24" v-else-if="item.field_show_type === '10'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -202,6 +216,7 @@
<script> <script>
import uploadFile from '@/components/ocrUpload/index' import uploadFile from '@/components/ocrUpload/index'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import Standardselection from '@/components/Standardselection/index' import Standardselection from '@/components/Standardselection/index'
import { getAction, postAction } from '@/api/manage' import { getAction, postAction } from '@/api/manage'
import eventBUs from '../../common/event' import eventBUs from '../../common/event'
@@ -211,7 +226,8 @@
name: 'ocrAddForm', name: 'ocrAddForm',
components: { components: {
uploadFile, uploadFile,
Standardselection Standardselection,
PersonnelSelection
}, },
props: { props: {
url: { url: {
jero-web/src/views/documentManage/collection/index.vue
+99 -66
View File
@@ -3,38 +3,38 @@
<a-card :bordered="false"> <a-card :bordered="false">
<div class="collection-search-wrapper"> <div class="collection-search-wrapper">
<div class="collection-search-header"> <div class="collection-search-header">
<!-- <search ></search>--> <search :url="url" :flag="'1'"></search>
<a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)"> <!-- <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">-->
<a-form-model <!-- <a-form-model-->
class="collection-content" <!-- class="collection-content"-->
:model="queryParams" <!-- :model="queryParams"-->
ref="tagEditForm" <!-- ref="tagEditForm"-->
> <!-- >-->
<a-row :gutter="24" type="flex" justify="start"> <!-- <a-row :gutter="24" type="flex" justify="start">-->
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">-->
<a-form-model-item :label="'编号'"> <!-- <a-form-model-item :label="'编号'">-->
<j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input> <!-- <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">-->
<a-form-model-item :label="'标题'"> <!-- <a-form-model-item :label="'标题'">-->
<j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input> <!-- <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">-->
<a-form-model-item :label="'状态'"> <!-- <a-form-model-item :label="'状态'">-->
<j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" /> <!-- <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">-->
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button> <!-- <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>-->
<a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button> <!-- <a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>-->
</span> <!-- </span>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
</a-form-model> <!-- </a-form-model>-->
</a-form> <!-- </a-form>-->
</div> </div>
</div> </div>
<div class="table-operator"> <div class="table-operator">
@@ -44,25 +44,34 @@
</div> </div>
</div> </div>
<div class="colloction-table"> <div class="colloction-table">
<a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table"> <tableData
<a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a> :url="url"
<!-- <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>--> :flag="'1'"
<template slot="action" slot-scope="text, record"> :OperationList="OperationList"
<a class="action-delete" href="javascript:;" @click="onCancel(record)">取消收藏</a> showAction
</template> @titleClick="titleClick"
</a-table> @onCancel="onCancel"
<div class="page" v-if="tableData.length > 0"> @onSelectChange="onSelectChange"
<a-pagination ></tableData>
:show-total="total => `共 ${total} 条`" <!-- <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">-->
show-quick-jumper <!-- <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>-->
show-size-changer <!--&lt;!&ndash; <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>&ndash;&gt;-->
:current="queryParams.pageNo" <!-- <template slot="action" slot-scope="text, record">-->
:page-size.sync="queryParams.pageSize" <!-- <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消收藏</a>-->
:total="total" <!-- </template>-->
@change="onChangePage" <!-- </a-table>-->
@showSizeChange="SizeChange" <!-- <div class="page" v-if="tableData.length > 0">-->
/> <!-- <a-pagination-->
</div> <!-- :show-total="total => `共 ${total} 条`"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :current="queryParams.pageNo"-->
<!-- :page-size.sync="queryParams.pageSize"-->
<!-- :total="total"-->
<!-- @change="onChangePage"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
</div> </div>
</a-card> </a-card>
</div> </div>
@@ -70,9 +79,14 @@
<script> <script>
import { getAction, postAction, deleteAction, putAction } from '@/api/manage' import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
import eventBUs from '../../../common/event' import eventBUs from '../../../common/event'
// import search from '@/components/search' import search from '@/components/search/index'
import tableData from '@/components/tableDate/index'
export default { export default {
name:'collection', name:'collection',
components:{
search,
tableData
},
data(){ data(){
return{ return{
selectedRowKeys:[], selectedRowKeys:[],
@@ -122,11 +136,22 @@
], ],
tableData:[], //列表数据 tableData:[], //列表数据
selecIds:'', selecIds:'',
loading:false loading:false,
url:{
tableHeader: 'collection/onlCgformCollection/getHeader', //表格头部字段
seachList: 'collection/onlCgformCollection/queryCondition', //搜索字段
tableList: 'collection/onlCgformCollection/page', //表格数据
},
OperationList: [
{
text: this.$t('CancelCollection'),
ClickEvent: 'onCancel'
}
],
} }
}, },
mounted() { mounted() {
this.loadData() // this.loadData()
}, },
methods:{ methods:{
//获取列表数据 //获取列表数据
@@ -159,8 +184,9 @@
deleteAction(`collection/onlCgformCollection/deleteBatch`,params).then(res=> { deleteAction(`collection/onlCgformCollection/deleteBatch`,params).then(res=> {
if(res.success){ if(res.success){
this.$message.success(res.message) this.$message.success(res.message)
this.selectedRowKeys = [] eventBUs.$emit('searchReset')
this.loadData() // this.selectedRowKeys = []
// this.loadData()
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
} }
@@ -185,7 +211,8 @@
deleteAction(`collection/onlCgformCollection/delete`,params).then(res=> { deleteAction(`collection/onlCgformCollection/delete`,params).then(res=> {
if(res.success){ if(res.success){
this.$message.success(res.message) this.$message.success(res.message)
this.loadData() eventBUs.$emit('searchReset')
// this.loadData()
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
} }
@@ -213,15 +240,16 @@
this.loadData() this.loadData()
}, },
//选择框 //选择框
onSelectChange(selectedRowKeys,rows) { onSelectChange(rows) {
this.selectedRowKeys = selectedRowKeys console.log('rows',rows)
let ids=[] // this.selectedRowKeys = selectedRowKeys
if(rows && rows.length>0){ // let ids=[]
rows.forEach(item=>{ // if(rows && rows.length>0){
ids.push(item.id) // rows.forEach(item=>{
}) // ids.push(item.id)
} // })
this.selecIds=ids.join(',') // }
this.selecIds=rows.join(',')
// console.log('selectedRowKeys changed: ', ids); // console.log('selectedRowKeys changed: ', ids);
}, },
//点击编号 //点击编号
@@ -257,4 +285,9 @@
} }
} }
} }
.collection-search-header{
.table-page-search-submitButtons{
float: none!important;
}
}
</style> </style>
jero-web/src/views/documentManage/subscribtion/index.vue
+98 -66
View File
@@ -3,37 +3,38 @@
<a-card :bordered="false"> <a-card :bordered="false">
<div class="subscribtion-search-wrapper"> <div class="subscribtion-search-wrapper">
<div class="subscribtion-search-header"> <div class="subscribtion-search-header">
<a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)"> <search :url="url" :flag="'1'"></search>
<a-form-model <!-- <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">-->
class="subscribtion-content" <!-- <a-form-model-->
:model="queryParams" <!-- class="subscribtion-content"-->
ref="tagEditForm" <!-- :model="queryParams"-->
> <!-- ref="tagEditForm"-->
<a-row :gutter="44"> <!-- >-->
<a-col :md="6" :sm="12"> <!-- <a-row :gutter="44">-->
<a-form-model-item :label="'编号'"> <!-- <a-col :md="6" :sm="12">-->
<j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input> <!-- <a-form-model-item :label="'编号'">-->
</a-form-model-item> <!-- <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
</a-col> <!-- </a-form-model-item>-->
<a-col :md="6" :sm="12"> <!-- </a-col>-->
<a-form-model-item :label="'标题'"> <!-- <a-col :md="6" :sm="12">-->
<j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input> <!-- <a-form-model-item :label="'标题'">-->
</a-form-model-item> <!-- <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
</a-col> <!-- </a-form-model-item>-->
<a-col :md="6" :sm="8"> <!-- </a-col>-->
<a-form-model-item :label="'状态'"> <!-- <a-col :md="6" :sm="8">-->
<j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" /> <!-- <a-form-model-item :label="'状态'">-->
</a-form-model-item> <!-- <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />-->
</a-col> <!-- </a-form-model-item>-->
<a-col :md="6" :sm="8"> <!-- </a-col>-->
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <!-- <a-col :md="6" :sm="8">-->
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button> <!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button> <!-- <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>-->
</span> <!-- <a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>-->
</a-col> <!-- </span>-->
</a-row> <!-- </a-col>-->
</a-form-model> <!-- </a-row>-->
</a-form> <!-- </a-form-model>-->
<!-- </a-form>-->
</div> </div>
</div> </div>
<div class="table-operator"> <div class="table-operator">
@@ -47,25 +48,34 @@
</div> </div>
</div> </div>
<div class="colloction-table"> <div class="colloction-table">
<a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table"> <tableData
<a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a> :url="url"
<!-- <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>--> :flag="'1'"
<template slot="action" slot-scope="text, record"> :OperationList="OperationList"
<a class="action-delete" href="javascript:;" @click="onCancel(record)">取消订阅</a> showAction
</template> @titleClick="titleClick"
</a-table> @onCancel="onCancel"
<div class="page" v-if="tableData.length > 0"> @onSelectChange="onSelectChange"
<a-pagination ></tableData>
:show-total="total => `共 ${total} 条`" <!-- <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">-->
show-quick-jumper <!-- <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>-->
show-size-changer <!--&lt;!&ndash; <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>&ndash;&gt;-->
:current="queryParams.pageNo" <!-- <template slot="action" slot-scope="text, record">-->
:page-size.sync="queryParams.pageSize" <!-- <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消订阅</a>-->
:total="total" <!-- </template>-->
@change="onChangePage" <!-- </a-table>-->
@showSizeChange="SizeChange" <!-- <div class="page" v-if="tableData.length > 0">-->
/> <!-- <a-pagination-->
</div> <!-- :show-total="total => `共 ${total} 条`"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :current="queryParams.pageNo"-->
<!-- :page-size.sync="queryParams.pageSize"-->
<!-- :total="total"-->
<!-- @change="onChangePage"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
</div> </div>
<sub-area v-if="visible" :subVisible="visible" @visible="areaVisible"></sub-area> <sub-area v-if="visible" :subVisible="visible" @visible="areaVisible"></sub-area>
</a-card> </a-card>
@@ -73,12 +83,16 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction, putAction } from '@/api/manage' import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
// import search from '@/components/search' import search from '@/components/search/index'
import tableData from '@/components/tableDate/index'
import subArea from './module/subArea' import subArea from './module/subArea'
import eventBUs from '../../../common/event'
export default { export default {
name:'subscribtion', name:'subscribtion',
components:{ components:{
subArea subArea,
search,
tableData
}, },
data(){ data(){
return{ return{
@@ -130,11 +144,22 @@
tableData:[], //列表数据 tableData:[], //列表数据
visible:false, visible:false,
selecIds:'', selecIds:'',
loading:false loading:false,
url:{
tableHeader: 'subscribe/onlCgformSubscribe/getHeader', //表格头部字段
seachList: 'subscribe/onlCgformSubscribe/queryCondition', //搜索字段
tableList: 'subscribe/onlCgformSubscribe/page', //表格数据
},
OperationList: [
{
text: '取消订阅',
ClickEvent: 'onCancel'
}
],
} }
}, },
mounted() { mounted() {
this.loadData() // this.loadData()
}, },
methods:{ methods:{
//获取列表数据 //获取列表数据
@@ -171,8 +196,9 @@
deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> { deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> {
if(res.success){ if(res.success){
this.$message.success(res.message) this.$message.success(res.message)
this.selectedRowKeys = [] eventBUs.$emit('searchReset')
this.loadData() // this.selectedRowKeys = []
// this.loadData()
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
} }
@@ -197,7 +223,8 @@
deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> { deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> {
if(res.success){ if(res.success){
this.$message.success(res.message) this.$message.success(res.message)
this.loadData() eventBUs.$emit('searchReset')
// this.loadData()
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
} }
@@ -225,15 +252,15 @@
this.loadData() this.loadData()
}, },
//选择框 //选择框
onSelectChange(selectedRowKeys,rows) { onSelectChange(rows) {
this.selectedRowKeys = selectedRowKeys; // this.selectedRowKeys = selectedRowKeys;
let ids=[] // let ids=[]
if(rows && rows.length>0){ // if(rows && rows.length>0){
rows.forEach(item=>{ // rows.forEach(item=>{
ids.push(item.id) // ids.push(item.id)
}) // })
} // }
this.selecIds=ids.join(',') this.selecIds=rows.join(',')
}, },
//点击编号 //点击编号
numberClick(records){ numberClick(records){
@@ -269,4 +296,9 @@
} }
} }
} }
.subscribtion-search-header{
.table-page-search-submitButtons{
float: none!important;
}
}
</style> </style>
jero-web/src/views/documentManage/tags/dialog/dicList.vue
+28 -25
View File
@@ -189,7 +189,8 @@
}) })
}else if(this.dictVal=='tree'){ }else if(this.dictVal=='tree'){
getAction(`sys/category/rootList`,{ getAction(`sys/category/rootList`,{
sysDictId:this.record.id sysDictId:this.record.id,
isTagDict:1
}).then(res=>{ }).then(res=>{
}) })
@@ -221,30 +222,32 @@
}, },
//保存 //保存
hideModal(){ hideModal(){
let params={ if(this.dictVal=='list') {
...this.form, let params = {
dictId:this.record.id ...this.form,
} dictId: this.record.id
if(this.isEdit){ }
putAction(`sys/dictItem/edit`,params).then(res=>{ if (this.isEdit) {
if(res.success){ putAction(`sys/dictItem/edit`, params).then(res => {
this.$message.success(res.message) if (res.success) {
this.loadData() this.$message.success(res.message)
this.newVisible=false this.loadData()
}else{ this.newVisible = false
this.$message.warning(res.message) } else {
} this.$message.warning(res.message)
}) }
}else{ })
postAction(`sys/dictItem/add`,params).then(res=>{ } else {
if(res.success){ postAction(`sys/dictItem/add`, params).then(res => {
this.$message.success(res.message) if (res.success) {
this.loadData() this.$message.success(res.message)
this.newVisible=false this.loadData()
}else{ this.newVisible = false
this.$message.warning(res.message) } else {
} this.$message.warning(res.message)
}) }
})
}
} }
}, },
//取消 //取消
jero-web/src/views/documentManage/tags/dialog/listTable.vue
+1 -1
View File
@@ -56,7 +56,7 @@
title: '英文名称', title: '英文名称',
align: "center", align: "center",
width: 100, width: 100,
dataIndex: 'enName', dataIndex: 'itemValue',
}, },
{ {
title: '描述', title: '描述',
jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+3 -5
View File
@@ -270,12 +270,10 @@
let param={ let param={
id:val.id id:val.id
} }
deleteAction(`sys/dict/delete`,param).then(res=>{ // sys/dict/logicDelete
deleteAction(`sys/dict/logicDelete`,param).then(res=>{
if(res.success){ if(res.success){
this.$notification.success({ this.$message.success( res.message)
message: res.message
})
this.loadData() this.loadData()
} }
}) })
jero-web/src/views/system/DictItemList.vue
+5
View File
@@ -95,6 +95,11 @@
align: "center", align: "center",
dataIndex: 'itemText', dataIndex: 'itemText',
}, },
{
title: this.$t('DictionaryEnName'),
align: "center",
dataIndex: 'itemValue',
},
{ {
title: this.$t('DataValue'), title: this.$t('DataValue'),
align: "center", align: "center",
jero-web/src/views/system/DictList.vue
+6 -6
View File
@@ -110,12 +110,12 @@
align: "left", align: "left",
dataIndex: 'dictName', dataIndex: 'dictName',
}, },
{ // {
title: this.$t('DictionaryEnName'), // title: this.$t('DictionaryEnName'),
align: "left", // align: "left",
width: 180, // width: 180,
dataIndex: 'dictEnName', // dataIndex: 'dictEnName',
}, // },
{ {
title: this.$t('DictionaryNumber'), title: this.$t('DictionaryNumber'),
align: "left", align: "left",