From e613e6de96063d1eda48d1b983dd4ab7b5f5dfb4 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Tue, 1 Mar 2022 18:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/system/entity/SysDict.java   |   2 +-
 jero-web/src/components/ocrAddForm/index.vue  |  38 ++--
 .../views/documentManage/collection/index.vue | 165 +++++++++++-------
 .../documentManage/subscribtion/index.vue     | 164 ++++++++++-------
 .../documentManage/tags/dialog/dicList.vue    |  53 +++---
 .../documentManage/tags/dialog/listTable.vue  |   2 +-
 .../documentManage/tags/tabs/tagContent.vue   |   8 +-
 jero-web/src/views/system/DictItemList.vue    |   5 +
 jero-web/src/views/system/DictList.vue        |  12 +-
 9 files changed, 268 insertions(+), 181 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
index 914d8f508..d1d3dfa8a 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
@@ -91,7 +91,7 @@ public class SysDict implements Serializable {
     /**
      * 是否为标签内容-数据字典（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")
     private java.lang.Integer isTagDict;
 
diff --git a/jero-web/src/components/ocrAddForm/index.vue b/jero-web/src/components/ocrAddForm/index.vue
index 99999484d..256bd10c6 100644
--- a/jero-web/src/components/ocrAddForm/index.vue
+++ b/jero-web/src/components/ocrAddForm/index.vue
@@ -3,7 +3,7 @@
     <a-form-model :model="formInline" v-if="isFormInline" class="formAdd" :rules="rules" ref="ruleForm1">
       <a-row :gutter="24">
         <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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -18,7 +18,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -34,7 +34,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -51,7 +51,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -66,7 +66,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -81,7 +81,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -97,7 +97,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -128,7 +128,7 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -161,7 +161,7 @@
               </a-form-model-item>
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -179,7 +179,21 @@
             </div>
           </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="title-text">
                 <span class="Required" v-if="item.field_must_input == 0">*</span>
@@ -202,6 +216,7 @@
 
 <script>
   import uploadFile from '@/components/ocrUpload/index'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
   import Standardselection from '@/components/Standardselection/index'
   import { getAction, postAction } from '@/api/manage'
   import eventBUs from '../../common/event'
@@ -211,7 +226,8 @@
     name: 'ocrAddForm',
     components: {
       uploadFile,
-      Standardselection
+      Standardselection,
+      PersonnelSelection
     },
     props: {
       url: {
diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index d68ff32ce..567ff49ee 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -3,38 +3,38 @@
       <a-card :bordered="false">
         <div class="collection-search-wrapper">
           <div class="collection-search-header">
-<!--            <search ></search>-->
-            <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">
-              <a-form-model
-                class="collection-content"
-                :model="queryParams"
-                ref="tagEditForm"
-              >
-              <a-row :gutter="24" type="flex" justify="start">
-                <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="'编号'">
-                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="'标题'">
-                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="'状态'">
-                    <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="8">
-                  <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 @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-                  </span>
-                </a-col>
-              </a-row>
-              </a-form-model>
-            </a-form>
+            <search :url="url" :flag="'1'"></search>
+<!--            <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">-->
+<!--              <a-form-model-->
+<!--                class="collection-content"-->
+<!--                :model="queryParams"-->
+<!--                ref="tagEditForm"-->
+<!--              >-->
+<!--              <a-row :gutter="24" type="flex" justify="start">-->
+<!--                <a-col :md="6" :sm="8">-->
+<!--                  <a-form-model-item :label="'编号'">-->
+<!--                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--                <a-col :md="6" :sm="8">-->
+<!--                  <a-form-model-item :label="'标题'">-->
+<!--                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--                <a-col :md="6" :sm="8">-->
+<!--                  <a-form-model-item :label="'状态'">-->
+<!--                    <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--                <a-col :md="6" :sm="8">-->
+<!--                  <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 @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>-->
+<!--                  </span>-->
+<!--                </a-col>-->
+<!--              </a-row>-->
+<!--              </a-form-model>-->
+<!--            </a-form>-->
           </div>
         </div>
         <div class="table-operator">
@@ -44,25 +44,34 @@
           </div>
         </div>
         <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">
-            <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>
-<!--            <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>-->
-            <template slot="action" slot-scope="text, record">
-                <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消收藏</a>
-            </template>
-          </a-table>
-          <div class="page" v-if="tableData.length > 0">
-            <a-pagination
-              :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>
+          <tableData
+            :url="url"
+            :flag="'1'"
+            :OperationList="OperationList"
+            showAction
+            @titleClick="titleClick"
+            @onCancel="onCancel"
+            @onSelectChange="onSelectChange"
+          ></tableData>
+<!--          <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">-->
+<!--            <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>-->
+<!--&lt;!&ndash;            <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>&ndash;&gt;-->
+<!--            <template slot="action" slot-scope="text, record">-->
+<!--                <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消收藏</a>-->
+<!--            </template>-->
+<!--          </a-table>-->
+<!--          <div class="page" v-if="tableData.length > 0">-->
+<!--            <a-pagination-->
+<!--              :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>
       </a-card>
     </div>
@@ -70,9 +79,14 @@
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
   import eventBUs from '../../../common/event'
-  // import search from '@/components/search'
+  import search from '@/components/search/index'
+  import tableData from '@/components/tableDate/index'
   export default {
     name:'collection',
+    components:{
+      search,
+      tableData
+    },
     data(){
       return{
         selectedRowKeys:[],
@@ -122,11 +136,22 @@
         ],
         tableData:[],  //列表数据
         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() {
-      this.loadData()
+      // this.loadData()
     },
     methods:{
       //获取列表数据
@@ -159,8 +184,9 @@
                 deleteAction(`collection/onlCgformCollection/deleteBatch`,params).then(res=> {
                   if(res.success){
                     this.$message.success(res.message)
-                    this.selectedRowKeys = []
-                    this.loadData()
+                    eventBUs.$emit('searchReset')
+                    // this.selectedRowKeys = []
+                    // this.loadData()
                   }else{
                     this.$message.warning(res.message)
                   }
@@ -185,7 +211,8 @@
               deleteAction(`collection/onlCgformCollection/delete`,params).then(res=> {
                 if(res.success){
                   this.$message.success(res.message)
-                  this.loadData()
+                  eventBUs.$emit('searchReset')
+                  // this.loadData()
                 }else{
                   this.$message.warning(res.message)
                 }
@@ -213,15 +240,16 @@
         this.loadData()
       },
       //选择框
-      onSelectChange(selectedRowKeys,rows) {
-        this.selectedRowKeys = selectedRowKeys
-        let ids=[]
-        if(rows && rows.length>0){
-          rows.forEach(item=>{
-            ids.push(item.id)
-          })
-        }
-        this.selecIds=ids.join(',')
+      onSelectChange(rows) {
+        console.log('rows',rows)
+        // this.selectedRowKeys = selectedRowKeys
+        // let ids=[]
+        // if(rows && rows.length>0){
+        //   rows.forEach(item=>{
+        //     ids.push(item.id)
+        //   })
+        // }
+        this.selecIds=rows.join(',')
         // console.log('selectedRowKeys changed: ', ids);
       },
       //点击编号
@@ -257,4 +285,9 @@
       }
     }
   }
+  .collection-search-header{
+    .table-page-search-submitButtons{
+      float: none!important;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index a363be692..d3fc1c508 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -3,37 +3,38 @@
     <a-card :bordered="false">
       <div class="subscribtion-search-wrapper">
         <div class="subscribtion-search-header">
-          <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">
-            <a-form-model
-              class="subscribtion-content"
-              :model="queryParams"
-              ref="tagEditForm"
-            >
-              <a-row :gutter="44">
-                <a-col :md="6" :sm="12">
-                  <a-form-model-item :label="'编号'">
-                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="12">
-                  <a-form-model-item :label="'标题'">
-                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="'状态'">
-                    <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="8">
-                  <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 @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-                  </span>
-                </a-col>
-              </a-row>
-            </a-form-model>
-          </a-form>
+          <search :url="url" :flag="'1'"></search>
+<!--          <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">-->
+<!--            <a-form-model-->
+<!--              class="subscribtion-content"-->
+<!--              :model="queryParams"-->
+<!--              ref="tagEditForm"-->
+<!--            >-->
+<!--              <a-row :gutter="44">-->
+<!--                <a-col :md="6" :sm="12">-->
+<!--                  <a-form-model-item :label="'编号'">-->
+<!--                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--                <a-col :md="6" :sm="12">-->
+<!--                  <a-form-model-item :label="'标题'">-->
+<!--                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--                <a-col :md="6" :sm="8">-->
+<!--                  <a-form-model-item :label="'状态'">-->
+<!--                    <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--                <a-col :md="6" :sm="8">-->
+<!--                  <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 @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>-->
+<!--                  </span>-->
+<!--                </a-col>-->
+<!--              </a-row>-->
+<!--            </a-form-model>-->
+<!--          </a-form>-->
         </div>
       </div>
       <div class="table-operator">
@@ -47,25 +48,34 @@
         </div>
       </div>
       <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">
-          <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>
-<!--          <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>-->
-          <template slot="action" slot-scope="text, record">
-              <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消订阅</a>
-          </template>
-        </a-table>
-        <div class="page" v-if="tableData.length > 0">
-          <a-pagination
-            :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>
+        <tableData
+          :url="url"
+          :flag="'1'"
+          :OperationList="OperationList"
+          showAction
+          @titleClick="titleClick"
+          @onCancel="onCancel"
+          @onSelectChange="onSelectChange"
+        ></tableData>
+<!--        <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">-->
+<!--          <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>-->
+<!--&lt;!&ndash;          <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>&ndash;&gt;-->
+<!--          <template slot="action" slot-scope="text, record">-->
+<!--              <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消订阅</a>-->
+<!--          </template>-->
+<!--        </a-table>-->
+<!--        <div class="page" v-if="tableData.length > 0">-->
+<!--          <a-pagination-->
+<!--            :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>
       <sub-area v-if="visible" :subVisible="visible" @visible="areaVisible"></sub-area>
     </a-card>
@@ -73,12 +83,16 @@
 </template>
 <script>
   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 eventBUs from '../../../common/event'
   export default {
     name:'subscribtion',
     components:{
-      subArea
+      subArea,
+      search,
+      tableData
     },
     data(){
       return{
@@ -130,11 +144,22 @@
         tableData:[],  //列表数据
         visible:false,
         selecIds:'',
-        loading:false
+        loading:false,
+        url:{
+          tableHeader: 'subscribe/onlCgformSubscribe/getHeader',      //表格头部字段
+          seachList: 'subscribe/onlCgformSubscribe/queryCondition',   //搜索字段
+          tableList: 'subscribe/onlCgformSubscribe/page',         //表格数据
+        },
+        OperationList: [
+          {
+            text: '取消订阅',
+            ClickEvent: 'onCancel'
+          }
+        ],
       }
     },
     mounted() {
-      this.loadData()
+      // this.loadData()
     },
     methods:{
       //获取列表数据
@@ -171,8 +196,9 @@
                 deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> {
                   if(res.success){
                     this.$message.success(res.message)
-                    this.selectedRowKeys = []
-                    this.loadData()
+                    eventBUs.$emit('searchReset')
+                    // this.selectedRowKeys = []
+                    // this.loadData()
                   }else{
                     this.$message.warning(res.message)
                   }
@@ -197,7 +223,8 @@
               deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> {
                 if(res.success){
                   this.$message.success(res.message)
-                  this.loadData()
+                  eventBUs.$emit('searchReset')
+                  // this.loadData()
                 }else{
                   this.$message.warning(res.message)
                 }
@@ -225,15 +252,15 @@
         this.loadData()
       },
       //选择框
-      onSelectChange(selectedRowKeys,rows) {
-        this.selectedRowKeys = selectedRowKeys;
-        let ids=[]
-        if(rows && rows.length>0){
-          rows.forEach(item=>{
-            ids.push(item.id)
-          })
-        }
-        this.selecIds=ids.join(',')
+      onSelectChange(rows) {
+        // this.selectedRowKeys = selectedRowKeys;
+        // let ids=[]
+        // if(rows && rows.length>0){
+        //   rows.forEach(item=>{
+        //     ids.push(item.id)
+        //   })
+        // }
+        this.selecIds=rows.join(',')
       },
       //点击编号
       numberClick(records){
@@ -269,4 +296,9 @@
       }
     }
   }
+  .subscribtion-search-header{
+    .table-page-search-submitButtons{
+      float: none!important;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
index d6e168af0..c1464c259 100644
--- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
@@ -189,7 +189,8 @@
           })
         }else if(this.dictVal=='tree'){
           getAction(`sys/category/rootList`,{
-            sysDictId:this.record.id
+            sysDictId:this.record.id,
+            isTagDict:1
           }).then(res=>{
 
           })
@@ -221,30 +222,32 @@
       },
       //保存
       hideModal(){
-        let params={
-          ...this.form,
-          dictId:this.record.id
-        }
-        if(this.isEdit){
-          putAction(`sys/dictItem/edit`,params).then(res=>{
-            if(res.success){
-              this.$message.success(res.message)
-              this.loadData()
-              this.newVisible=false
-            }else{
-              this.$message.warning(res.message)
-            }
-          })
-        }else{
-          postAction(`sys/dictItem/add`,params).then(res=>{
-            if(res.success){
-              this.$message.success(res.message)
-              this.loadData()
-              this.newVisible=false
-            }else{
-              this.$message.warning(res.message)
-            }
-          })
+        if(this.dictVal=='list') {
+          let params = {
+            ...this.form,
+            dictId: this.record.id
+          }
+          if (this.isEdit) {
+            putAction(`sys/dictItem/edit`, params).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.loadData()
+                this.newVisible = false
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          } else {
+            postAction(`sys/dictItem/add`, params).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.loadData()
+                this.newVisible = false
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          }
         }
       },
       //取消
diff --git a/jero-web/src/views/documentManage/tags/dialog/listTable.vue b/jero-web/src/views/documentManage/tags/dialog/listTable.vue
index 205869ff2..20dcb52f0 100644
--- a/jero-web/src/views/documentManage/tags/dialog/listTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/listTable.vue
@@ -56,7 +56,7 @@
             title: '英文名称',
             align: "center",
             width: 100,
-            dataIndex: 'enName',
+            dataIndex: 'itemValue',
           },
           {
             title: '描述',
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 4cb27a88d..1ca4a9136 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -270,12 +270,10 @@
         let param={
           id:val.id
         }
-        deleteAction(`sys/dict/delete`,param).then(res=>{
+        // sys/dict/logicDelete
+        deleteAction(`sys/dict/logicDelete`,param).then(res=>{
           if(res.success){
-            this.$notification.success({
-              message: res.message
-
-            })
+            this.$message.success( res.message)
             this.loadData()
           }
         })
diff --git a/jero-web/src/views/system/DictItemList.vue b/jero-web/src/views/system/DictItemList.vue
index a96291007..1ca05162c 100644
--- a/jero-web/src/views/system/DictItemList.vue
+++ b/jero-web/src/views/system/DictItemList.vue
@@ -95,6 +95,11 @@
             align: "center",
             dataIndex: 'itemText',
           },
+          {
+            title: this.$t('DictionaryEnName'),
+            align: "center",
+            dataIndex: 'itemValue',
+          },
           {
             title: this.$t('DataValue'),
             align: "center",
diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue
index 3aff73c93..2279a9eef 100644
--- a/jero-web/src/views/system/DictList.vue
+++ b/jero-web/src/views/system/DictList.vue
@@ -110,12 +110,12 @@
             align: "left",
             dataIndex: 'dictName',
           },
-          {
-            title: this.$t('DictionaryEnName'),
-            align: "left",
-            width: 180,
-            dataIndex: 'dictEnName',
-          },
+          // {
+          //   title: this.$t('DictionaryEnName'),
+          //   align: "left",
+          //   width: 180,
+          //   dataIndex: 'dictEnName',
+          // },
           {
             title: this.$t('DictionaryNumber'),
             align: "left",