标签管理新增

jero-web/src/common/lang/en-us.js

@@ -398,7 +398,8 @@ module.exports = {
   InputBoxType: 'Input box type',
   DropDownType: 'Drop down type',
   ExhibitionAreaManagement: 'Exhibition area management',
-  NewLabelItem: 'New label item',
+  NewLabelItem: 'Add label item',
+  editLabelItem:'Edit label item',
   NodeQuickLookup: 'Node quick lookup',
   AreAllLabelsRead: 'Are all labels read',
   AllLabelsRead: 'labels read',
@@ -428,5 +429,38 @@ module.exports = {
   PleaseSelectLabelType:'Please select a label type',
   PleaseEnterDescription:'Please enter a description',
   LengthBe1to100:'Length should be 1 to 100',
+  Module:'Module',
+  PleaseSelectModule:'Please select the module',
+  AttributeName:'Attribute name',
+  PleaseEnterPropertyName:'Please enter a property name',
+  PleaseEnterYourEnglishName:'Please enter your English name',
+  PleaseSelectAttributeType:'Please select an attribute type',
+  OptionContent:'Option content',
+  PleaseSelectOptionContent:'Please select the option content',
+  PleaseEnterFieldLength:'Please enter the field length',
+  DisplayOrder:'Display order',
+  PleaseEnterDisplayOrder:'Please enter the display order',
+  Required:'Required',
+  DocumentLibraryModuleDisplay:'Document library module display',
+  DocumentLibraryListDisplay:'Document library list display',
+  SelectWhetherDisplayList:'Please select whether to display the document library list',
+  SelectDisplayArea:'Please select a display area',
+  Search:'Search',
+  SelectWhetherToSearch:'Please select whether to search',
+  DisplayOtherModules:'Display of other modules',
+  RegulationsListDisplay:'Regulations list display',
+  selectDisplayListRegulations:'Please select whether to display the list of regulations',
+  SearchCenterDisplay:'Search center display',
+  selectSearchCenterDisplayed:'Please select whether the search center is displayed',
+  selectWhetherRequired:'Please select whether it is required',
+  SortNumber:'Sort number',
+  enterDisplayArea:'Please enter the display area',
+  charactersLength:'1 - 50 characters in length',
+  enterSortingNumber:'Please enter the sorting number',
+  ParentName:'Parent name',
+  charactersLength130:'1 - 30 characters in length',
+  charactersLength1to300 :'1 - 300 characters in length',
+  OnlyOneSelected:'Only one piece of data can be selected',
+  OnlyPDF:'Only PDF files can be imported',
 
 }

jero-web/src/common/lang/zh-cn.js

@@ -403,6 +403,7 @@ module.exports = {
   DropDownType:'下拉选类型',
   ExhibitionAreaManagement:'展示区域管理',
   NewLabelItem:'新增标签项',
+  editLabelItem:'编辑标签项',
   NodeQuickLookup:'节点快速查找',
   AreAllLabelsRead:'是否全部标记已读',
   AllLabelsRead:'标记已读',
@@ -431,5 +432,39 @@ module.exports = {
   LabelType:'标签类型',
   PleaseSelectLabelType:'请选择标签类型',
   PleaseEnterDescription:'请输入描述',
-  LengthBe1to100:'长度应为1到100',
+  LengthBe1to100:'长度在 1 - 100字符',
+  Module:'所属模块',
+  PleaseSelectModule:'请选择所属模块',
+  AttributeName:'属性名称',
+  PleaseEnterPropertyName:'请输入属性名称',
+  PleaseEnterYourEnglishName:'请输入英文名称',
+  PleaseSelectAttributeType:'请选择属性类型',
+  OptionContent:'选项内容',
+  PleaseSelectOptionContent:'请选择选项内容',
+  PleaseEnterFieldLength:'请输入字段长度',
+  DisplayOrder:'展示顺序',
+  PleaseEnterDisplayOrder:'请输入展示顺序',
+  Required:'是否必填',
+  DocumentLibraryModuleDisplay:'文档库模块展示',
+  DocumentLibraryListDisplay:'文档库列表展示',
+  SelectWhetherDisplayList:'请选择是否文档库列表展示',
+  SelectDisplayArea:'请选择展示区域',
+  Search:'是否搜索',
+  SelectWhetherToSearch:'请选择是否搜索',
+  DisplayOtherModules:'其它模块展示',
+  RegulationsListDisplay:'法规清单展示',
+  selectDisplayListRegulations:'请选择法规清单是否展示',
+  SearchCenterDisplay:'搜索中心展示',
+  selectSearchCenterDisplayed:'请选择搜索中心是否展示',
+  selectWhetherRequired:'请选择是否必填',
+  SortNumber:'排序号',
+  enterDisplayArea:'请输入展示区域',
+  charactersLength:'长度在 1 - 50字符',
+  enterSortingNumber:'请输入排序号',
+  ParentName:'父级名称',
+  charactersLength130:'长度在 1 - 30字符',
+  charactersLength1to300:'长度在 1 - 300字符',
+  OnlyOneSelected:'只能选择一条数据',
+  OnlyPDF:'只能导入pdf文件',
+
 }

jero-web/src/views/documentManage/collection/index.vue

@@ -183,12 +183,12 @@
               async () => {
                 deleteAction(`collection/onlCgformCollection/deleteBatch`,params).then(res=> {
                   if(res.success){
-                    this.$message.success(res.message)
+                    this.$message.success(this.$t('OperationSuccessful'))
                     eventBUs.$emit('searchReset')
                     // this.selectedRowKeys = []
                     // this.loadData()
                   }else{
-                    this.$message.warning(res.message)
+                    this.$message.warning(this.$t('operationFailed'))
                   }
                 })
               },
@@ -210,11 +210,11 @@
             async () => {
               deleteAction(`collection/onlCgformCollection/delete`,params).then(res=> {
                 if(res.success){
-                  this.$message.success(res.message)
+                  this.$message.success(this.$t('OperationSuccessful'))
                   eventBUs.$emit('searchReset')
                   // this.loadData()
                 }else{
-                  this.$message.warning(res.message)
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               })
             },

jero-web/src/views/documentManage/ocr/index.vue

@@ -195,10 +195,10 @@
               async () => {
                 deleteAction(`ocr/ocrRecord/deleteBatch`, param).then(res => {
                   if (res.success) {
-                    this.$message.success(res.result)
+                    this.$message.success(this.$t('OperationSuccessful'))
                     eventBUs.$emit('searchReset')
                   }else{
-                    this.$message.warning(res.message)
+                    this.$message.warning(this.$t('operationFailed'))
                   }
                 })
             },
@@ -244,10 +244,10 @@
             async () => {
               deleteAction(`ocr/ocrRecord/delete`,params).then(res=> {
                 if(res.success){
-                  this.$message.success(res.result)
+                  this.$message.success(this.$t('OperationSuccessful'))
                   eventBUs.$emit('searchReset')
                 }else{
-                  this.$message.warning(res.message)
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               })
             },
@@ -291,10 +291,10 @@
         postAction(`ocr/ocrRecord/syncToDocument`,params).then(res=>{
           if(res.success){
             eventBUs.$emit('searchReset')
-            this.$message.success(res.message)
+            this.$message.success(this.$t('OperationSuccessful'))
             this.toVisible=false
           }else{
-            this.$message.warning(res.message)
+            this.$message.warning(this.$t('operationFailed'))
           }
         })
       },

jero-web/src/views/documentManage/ocr/modules/addForm.vue

@@ -1,11 +0,0 @@
-<template>
-
-</template>
-<script>
-  export default {
-    name: 'ocraddForm',
-  }
-</script>
-<style lang="less" scoped>
-
-</style>

jero-web/src/views/documentManage/ocr/modules/docTable.vue

@@ -162,7 +162,7 @@
       },
       onSelectChange(rowKeys,rows){
         if(rowKeys.length>1){
-          this.$message.warning('只能选择一条数据')
+          this.$message.warning(this.$t('OnlyOneSelected'))
         }else{
           this.rowId=rowKeys[0]
           this.rows=rows[0]
@@ -181,7 +181,7 @@
       //导入按钮
       tableExport(){
         if(this.rows.length>1){
-          this.$message.warning('只能选择一条数据')
+          this.$message.warning(this.$t('OnlyOneSelected'))
         }else {
           if(this.rows.file_name){
             let name = this.rows.file_name.split('.')
@@ -207,15 +207,15 @@
               }
               postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => {
                 if (res.success) {
-                  this.$message.success(res.message)
+                  this.$message.success(this.$t('OperationSuccessful'))
                   eventBUs.$emit('searchReset')
                 } else {
-                  this.$message.warning(res.message)
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               })
               // this.$emit('exportVisible',true)
             }else{
-              this.$message.warning('只能导入pdf文件')
+              this.$message.warning(this.$t('OnlyPDF'))
             }
           }
 

jero-web/src/views/documentManage/subscribtion/index.vue

@@ -195,12 +195,12 @@
               async () => {
                 deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> {
                   if(res.success){
-                    this.$message.success(res.message)
+                    this.$message.success(this.$t('OperationSuccessful'))
                     eventBUs.$emit('searchReset')
                     // this.selectedRowKeys = []
                     // this.loadData()
                   }else{
-                    this.$message.warning(res.message)
+                    this.$message.warning(this.$t('operationFailed'))
                   }
                 })
               },
@@ -222,11 +222,11 @@
             async () => {
               deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> {
                 if(res.success){
-                  this.$message.success(res.message)
+                  this.$message.success(this.$t('OperationSuccessful'))
                   eventBUs.$emit('searchReset')
                   // this.loadData()
                 }else{
-                  this.$message.warning(res.message)
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               })
             },

jero-web/src/views/documentManage/subscribtion/module/subArea.vue

@@ -115,9 +115,9 @@
         postAction(`domain/domainUserRel/insert`,params).then(res=>{
           if(res.success){
             this.$emit('visible',false)
-            this.$message.success(res.result)
+            this.$message.success(this.$t('OperationSuccessful'))
           }else{
-            this.$message.warning(res.message)
+            this.$message.warning(this.$t('operationFailed'))
           }
         })
       },

jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue

@@ -12,33 +12,37 @@
           :wrapper-col="wrapperCol"
         >
         <a-row>
-          <p class="tag-info">基本信息</p>
+          <p class="tag-info">{{$t('essentialInformation')}}</p>
           <a-divider dashed />
+<!--          所属模块-->
           <a-col :span="24">
-            <a-form-model-item label="所属模块" prop="isModel">
+            <a-form-model-item :label="$t('Module')" prop="isModel">
-              <j-dict-select-tag type="list" v-model="form.isModel" dictCode="module" placeholder="请选择所属模块" />
+              <j-dict-select-tag type="list" v-model="form.isModel" dictCode="module" :placeholder="$t('PleaseSelectModule')" />
             </a-form-model-item>
           </a-col>
+<!--          属性名称-->
           <a-col :span="24">
-            <a-form-model-item label="属性名称" prop="dbFieldTxt">
+            <a-form-model-item :label="$t('AttributeName')" prop="dbFieldTxt">
-              <a-input v-model="form.dbFieldTxt" placeholder="请输入属性名称" :maxLength="120"  ></a-input>
+              <a-input v-model="form.dbFieldTxt" :placeholder="$t('PleaseEnterPropertyName')" :maxLength="120"  ></a-input>
             </a-form-model-item>
           </a-col>
+<!--          英文名称-->
           <a-col :span="24">
-            <a-form-model-item label="英文名称" prop="dbFieldEnName">
+            <a-form-model-item :label="$t('enName')" prop="dbFieldEnName">
-              <a-input v-model="form.dbFieldEnName" placeholder="请输入英文名称" :maxLength="120"  ></a-input>
+              <a-input v-model="form.dbFieldEnName" :placeholder="$t('PleaseEnterYourEnglishName')" :maxLength="120"  ></a-input>
             </a-form-model-item>
           </a-col>
+<!--          属性类型-->
           <a-col :span="24">
-            <a-form-model-item label="属性类型" prop="fieldShowType" >
+            <a-form-model-item :label="$t('AttributeType')" prop="fieldShowType" >
-              <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type" />
+              <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type" :placeholder="$t('PleaseSelectAttributeType')" />
 <!--              <j-dict-select-tag type="list" v-if="type=='input'" v-model="form.fieldShowType" dictCode="sys_dict_item,item_text,item_value,dict_id='1493098515761917954' and (item_text = '输入框（字符串）' or item_text = '输入框（数字）' or item_text = '单日期选择' or item_text = '多日期选择' or item_text = '文件' or item_text = '文本框' or item_text='标准选择' or item_text = '输入框（链接）'  or item_text = '人员选择') " placeholder="请选择属性类型" />-->
 <!--              <j-dict-select-tag type="list" v-if="type=='select'" v-model="form.fieldShowType" dictCode="sys_dict_item,item_text,item_value,dict_id='1493098515761917954' and (item_text = '单选下拉框' or item_text = '多选下拉框' or item_text = '树形结构')" placeholder="请选择属性类型" />-->
             </a-form-model-item>
           </a-col>
           <a-col :span="24" v-if="isTagContent">
-            <a-form-model-item label="选项内容" prop="dictName">
+            <a-form-model-item :label="$t('OptionContent')" prop="dictName">
-              <a-select placeholder="请选择选项内容" v-model="form.dictName" @change="handleChange">
+              <a-select :placeholder="$t('PleaseSelectOptionContent')" v-model="form.dictName" @change="handleChange">
                 <a-select-option v-for="(item,index) in contentOption" :key="item.id" :value="item.id">
                   {{item.dictName}}
                 </a-select-option>
@@ -47,32 +51,33 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="字段长度" prop="dbLength">
+            <a-form-model-item :label="$t('FieldLength')" prop="dbLength">
-              <a-input-number v-model="form.dbLength" :min="1" :max="200" placeholder="请输入字段长度" style="width: 100%" :formatter="limitNumber" :parser="limitNumber"  />
+              <a-input-number v-model="form.dbLength" :min="1" :max="200" :placeholder="$t('PleaseEnterFieldLength')" style="width: 100%" :formatter="limitNumber" :parser="limitNumber"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="展示顺序" prop="orderNum">
+            <a-form-model-item :label="$t('DisplayOrder')" prop="orderNum">
-              <a-input-number v-model="form.orderNum" placeholder="请输入展示顺序" style="width: 100%"  :min="1" :formatter="limitNumber" :parser="limitNumber"  />
+              <a-input-number v-model="form.orderNum" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%"  :min="1" :formatter="limitNumber" :parser="limitNumber"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否必填" prop="fieldMustInput">
+            <a-form-model-item :label="$t('Required')" prop="fieldMustInput">
-              <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn" placeholder="请选择是否必填" />
+              <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn" :placeholder="$t('selectWhetherRequired')" />
             </a-form-model-item>
           </a-col>
 
 
-          <p class="tag-info">文档库模块展示</p>
+          <p class="tag-info">{{$t('DocumentLibraryModuleDisplay')}}</p>
           <a-divider dashed />
           <a-col :span="24">
-            <a-form-model-item label="文档库列表展示" prop="isShowForm">
+            <a-form-model-item :label="$t('DocumentLibraryListDisplay')" prop="isShowForm">
-              <j-dict-select-tag type="list"  v-model="form.isShowForm" dictCode="yn" placeholder="请选择是否文档库列表展示" />
+              <j-dict-select-tag type="list"  v-model="form.isShowForm" dictCode="yn"
+                                 :placeholder="$t('SelectWhetherDisplayList')" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="展示区域" prop="areaId">
+            <a-form-model-item :label="$t('DisplayArea')" prop="areaId">
-              <a-select placeholder="请选择展示区域" v-model="form.areaId" @change="handleChange">
+              <a-select :placeholder="$t('SelectDisplayArea')" v-model="form.areaId" @change="handleChange">
                 <a-select-option v-for="(item,index) in areaOptions" :key="item.id" :value="item.id">
                   {{item.showArea}}
                 </a-select-option>
@@ -81,21 +86,21 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否搜索" prop="isQuery">
+            <a-form-model-item :label="$t('Search')" prop="isQuery">
-              <j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn" placeholder="请选择是否搜索" />
+              <j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn" :placeholder="$t('SelectWhetherToSearch')" />
             </a-form-model-item>
           </a-col>
 
-          <p class="tag-info">其它模块展示</p>
+          <p class="tag-info">{{$t('DisplayOtherModules')}}</p>
           <a-divider dashed />
           <a-col :span="24">
-            <a-form-model-item label="法规清单展示" prop="isShowLawsList">
+            <a-form-model-item :label="$t('RegulationsListDisplay')" prop="isShowLawsList">
-              <j-dict-select-tag type="list"  v-model="form.isShowLawsList" dictCode="yn" placeholder="请选择法规清单是否展示" />
+              <j-dict-select-tag type="list"  v-model="form.isShowLawsList" dictCode="yn" :placeholder="$t('selectDisplayListRegulations')" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="搜索中心展示" prop="isShowSearch">
+            <a-form-model-item :label="$t('SearchCenterDisplay')" prop="isShowSearch">
-              <j-dict-select-tag type="list"  v-model="form.isShowSearch" dictCode="yn" placeholder="请选择搜索中心是否展示" />
+              <j-dict-select-tag type="list"  v-model="form.isShowSearch" dictCode="yn" :placeholder="$t('selectSearchCenterDisplayed')" />
             </a-form-model-item>
           </a-col>
 <!--          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">-->
@@ -138,10 +143,6 @@
         default: false,
         required: false
       },
-      isTagContent:{
-        type: Boolean,
-        default: false,
-      },
       drawerVisible:{
         type: Boolean,
         default: false,
@@ -155,9 +156,6 @@
       submitEdit:{
         type:String
       },
-      type:{
-        type:String
-      }
     },
     data () {
       return {
@@ -165,7 +163,7 @@
         model: {},
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 6 },
         },
         wrapperCol: {
           xs: { span: 24 },
@@ -174,43 +172,43 @@
         confirmLoading: false,
         validatorRules: {
           isModel: [
-              { required: true, message: '请输入所属模块!',trigger: 'change'},
+              { required: true, message: this.$t('PleaseSelectModule'),trigger: 'change'},
           ],
           dbFieldTxt:  [
-              { required: true, message: '请输入属性名称!',trigger: 'blur'},
+              { required: true, message: this.$t('PleaseEnterPropertyName'),trigger: 'blur'},
           ],
           dbFieldName: [
-              { required: true, message: '请输入英文名称!',trigger: 'blur'},
+              { required: true, message: this.$t('PleaseEnterYourEnglishName'),trigger: 'blur'},
           ],
           fieldShowType: [
-              { required: true, message: '请输入属性类型!',trigger: 'change'},
+              { required: true, message: this.$t('PleaseSelectAttributeType'),trigger: 'change'},
           ],
           dictName: [
-              { required: true, message: '请输入选项内容!',trigger: 'change'},
+              { required: true, message: this.$t('PleaseSelectOptionContent'),trigger: 'change'},
           ],
           dbLength: [
-              { required: true, message: '请输入字段长度!',trigger: 'blur'},
+              { required: true, message: this.$t('PleaseEnterFieldLength'),trigger: 'blur'},
           ],
           orderNum: [
-              { required: true, message: '请输入展示顺序!',trigger: 'blur'},
+              { required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'},
           ],
           fieldMustInput: [
-              { required: true, message: '请输入字段是否必填!',trigger: 'change'},
+              { required: true, message: this.$t('selectWhetherRequired'),trigger: 'change'},
           ],
           isShowForm: [
-              { required: true, message: '请选择是否显示文档库列表',trigger: 'change'},
+              { required: true, message: this.$t('SelectWhetherDisplayList'),trigger: 'change'},
           ],
           areaId:  [
-              { required: true, message: '请输入展示区域!',trigger: 'change'},
+              { required: true, message: this.$t('SelectDisplayArea'),trigger: 'change'},
           ],
           isQuery: [
-              { required: true, message: '请输入是否查询条件',trigger: 'change'},
+              { required: true, message: this.$t('SelectWhetherToSearch'),trigger: 'change'},
           ],
           isShowLawsList:  [
-              { required: true, message: '请选择法规清单是否展示!',trigger: 'change'},
+              { required: true, message: this.$t('selectDisplayListRegulations'),trigger: 'change'},
           ],
           isShowSearch: [
-              { required: true, message: '请选择搜索中心是否展示!',trigger: 'change'},
+              { required: true, message: this.$t('selectSearchCenterDisplayed'),trigger: 'change'},
           ],
         },
         addVisible:false,
@@ -225,7 +223,8 @@
         contentOption:[],
         contentFlag:3,
         contentOption1:[],
-        contentOption2:[]
+        contentOption2:[],
+        isTagContent:false,
       }
     },
     watch:{
@@ -233,12 +232,13 @@
         // this.contentFlag=val
         if(val==0){
           this.contentOption=[...this.contentOption2]
-          // console.log('ops11',this.contentOption)
+          this.isTagContent=true
-        }else{
+        }else if(val==3||val==4){
           this.contentOption=[...this.contentOption1]
-          // console.log('ops22',this.contentOption)
+          this.isTagContent=true
+        }else{
+          this.isTagContent=false
         }
-        // console.log('val',val)
       },
       contentOption(){
 
@@ -348,16 +348,18 @@
               this.form.id=this.editId
 
             }
-
+            this.form.dbIsKey='0'
+            this.form.dbIsNull='1'
+            this.form.dbPointLength='0'
             // let formData = Object.assign(this.editId, this.form);
             // console.log("表单提交数据",this.form)
             httpAction(httpurl,this.form,method).then((res)=>{
               if(res.success){
-                this.$message.success(res.message);
+                this.$message.success(this.$t('OperationSuccessful'));
                 this.$emit('ok',false);
 
               }else{
-                this.$message.warning(res.message);
+                this.$message.warning(this.$t('operationFailed'));
               }
             }).finally(() => {
               this.confirmLoading = false;

jero-web/src/views/documentManage/tags/dialog/areaManage.vue

@@ -16,10 +16,10 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-model-item label="所属模块" prop="isModel">
+        <a-form-model-item :label="$t('Module')" prop="isModel">
-          <j-dict-select-tag type="list" v-model="form.isModel" dictCode="module" placeholder="请选择所属模块" />
+          <j-dict-select-tag type="list" v-model="form.isModel" dictCode="module" :placeholder="$t('PleaseSelectModule')" />
         </a-form-model-item>
-        <a-form-model-item ref="showArea" label="展示区域" prop="showArea">
+        <a-form-model-item ref="showArea" :label="$t('DisplayArea')" prop="showArea">
           <a-input
             v-model="form.showArea"
             @blur="
@@ -29,7 +29,7 @@
         "
           />
         </a-form-model-item>
-        <a-form-model-item ref="enName" label="英文名称" prop="enName">
+        <a-form-model-item ref="enName" :label="$t('enName')" prop="enName">
           <a-input
             v-model="form.enName"
             @blur="
@@ -39,7 +39,7 @@
         "
           />
         </a-form-model-item>
-        <a-form-model-item ref="sort" label="排序号" prop="sort">
+        <a-form-model-item ref="sort" :label="$t('SortNumber')" prop="sort">
 <!--          <a-input-number v-decorator="['input-number', { initialValue: 3 }]" :min="1" :max="100" />-->
           <a-input-number
             style="width:100%"
@@ -68,16 +68,15 @@
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       @change="handleTableChange">
       <a slot="name" slot-scope="text">{{ text }}</a>
-      <span slot="customTitle">属性名称</span>
       <span slot="action" slot-scope="text, record">
-          <a @click="editArea(record.id)">编辑</a>
+          <a @click="editArea(record.id)">{{$t('edit')}}</a>
           <a-divider type="vertical" />
-          <a style="color:red" href="javascript:;" @click=" deleteArea(record.id)">删除</a>
+          <a style="color:red" href="javascript:;" @click=" deleteArea(record.id)">{{$t('delete')}}</a>
       </span>
     </a-table>
     <div class="page" v-if="areaTable.length > 0">
       <a-pagination
-        :show-total="total => `共 ${total} 条`"
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
         show-size-changer
         :current="queryParams.pageNo"
@@ -111,45 +110,47 @@
         editId:'',
         columns: [
           {
-            title: '展示区域',
+            title: this.$t('DisplayArea'),
             dataIndex: 'showArea',
             key: 'showArea',
             align: "center",
             width: 100,
-            ellipsis: true,
           },
           {
-            title: '英文名称',
+            title: this.$t('enName'),
             align: "center",
             width: 100,
             dataIndex: 'enName',
-            ellipsis: true,
           },
           {
-            title: '所属模块',
+            title: this.$t('Module'),
             align: "center",
             width: 100,
             dataIndex: 'isModel_dictText',
-            ellipsis: true,
           },
           {
-            title: '排序号',
+            title: this.$t('SortNumber'),
             align: "center",
             width: 80,
             dataIndex: 'sort',
-            ellipsis: true,
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
             align: "center",
-            width: 170
+            width: 120
           }
         ],
         newVisible:false,
-        labelCol: { span: 4 },
+        labelCol: {
-        wrapperCol: { span: 14 },
+          xs: { span: 24 },
+          sm: { span: 7 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 14 },
+        },
         form: {
           isModel:'1',
           showArea:'',
@@ -158,15 +159,15 @@
         },
         rules: {
           isModel:[
-            { required: true, message: '请选择所属模块', trigger: 'change' },
+            { required: true, message: this.$t('PleaseSelectModule'), trigger: 'change' },
 
             ],
           showArea:[
-            { required: true, message: '请输入展示区域', trigger: 'blur' },
+            { required: true, message: this.$t('enterDisplayArea'), trigger: 'blur' },
-            { min:1, max: 50, message: '长度在 1 - 50字符', trigger: 'blur' },
+            { min:1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' },
           ],
           sort:[
-            { required: true, message: '请输入排序号', trigger: 'change' },
+            { required: true, message: this.$t('enterSortingNumber'), trigger: 'change' },
           ]
         },
         areaTable:[]
@@ -209,7 +210,7 @@
             if(this.form.id){
               putAction(`tag/onlCgformArea/edit`,this.form).then((res)=>{
                 if(res.success){
-                  this.$message.success(res.result);
+                  this.$message.success(this.$t('OperationSuccessful'));
                   this.loadData()
                   this.form={
                     isModel:'',
@@ -217,13 +218,15 @@
                     enName:'',
                     sort:''
                   }
+                }else{
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               });
             }else{
               //新增
               postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{
                   if(res.success){
-                    this.$message.success( res.result,);
+                    this.$message.success( this.$t('OperationSuccessful'));
                     this.loadData()
                     this.form={
                       isModel:'',
@@ -231,6 +234,9 @@
                       enName:'',
                       sort:''
                     }
+                  }else{
+                    this.$message.warning(this.$t('operationFailed'))
+
                   }
                 }
               )
@@ -256,10 +262,10 @@
             async () => {
               deleteAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
                 if (res.success) {
-                  this.$message.success(res.result);
+                  this.$message.success(this.$t('OperationSuccessful'));
                   this.loadData()
                 }else{
-                  this.$message.warning(res.message);
+                  this.$message.warning(this.$t('operationFailed'));
                 }
               })
             }

jero-web/src/views/documentManage/tags/dialog/dicList.vue

@@ -3,13 +3,13 @@
       <div class="dic-list-content">
         <div class="dic-list-header">
           <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol">
-            <a-form-item label="名称">
+            <a-form-item :label="$t('name')+':'">
-              <j-input v-model="queryParams.itemText" placeholder="请输入名称" />
+              <j-input v-model="queryParams.itemText" :placeholder="$t('enterName')" />
             </a-form-item>
           </a-form>
           <div class="form-btn">
-            <a-button class="form-btn-search" type="primary" @click="search">查询</a-button>
+            <a-button class="form-btn-search" type="primary" @click="search">{{$t('query')}}</a-button>
-            <a-button class="form-btn-reset" @click="reset">重置</a-button>
+            <a-button class="form-btn-reset" @click="reset">{{$t('reset')}}</a-button>
           </div>
         </div>
         <div class="table-operator">
@@ -26,7 +26,7 @@
           <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total"></list-table>
           <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" @editDict="editTreeDict" @selectedKeys="selectedKeys" @ok="ok" :total="total"></tree-table>
         </div>
-        <a-modal class="dict-module" v-model="newVisible" :title="title" ok-text="保存" cancel-text="取消" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
+        <a-modal class="dict-module" v-model="newVisible" :title="title" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
           <a-form-model
             v-if="newVisible"
             class="dic-form-module"
@@ -35,19 +35,18 @@
             :rules="rules"
             :label-col="labelCol"
             :wrapper-col="wrapperCol"
-
           >
-            <a-form-model-item label="名称" prop="name">
+            <a-form-model-item :label="$t('name')" prop="name">
-              <a-input v-model="form.name" placeholder="请输入名称" />
+              <a-input v-model="form.name" :placeholder="$t('enterName')" />
             </a-form-model-item>
-            <a-form-model-item label="数据值" prop="itemValue">
+            <a-form-model-item :label="$t('DataValue')" prop="itemValue">
-              <a-input v-model="form.itemValue" placeholder="请输入数据值" />
+              <a-input v-model="form.itemValue" :placeholder="$t('enterDataValue')" />
             </a-form-model-item>
-            <a-form-model-item label="英文名称" prop="enName">
+            <a-form-model-item :label="$t('enName')" prop="enName">
-              <a-input v-model="form.enName" placeholder="请输入英文名称" />
+              <a-input v-model="form.enName" :placeholder="$t('PleaseEnterYourEnglishName')" />
             </a-form-model-item>
-            <a-form-model-item label="父级名称" prop="pid" v-if="parentVisible">
+            <a-form-model-item :label="$t('ParentName')" prop="pid" v-if="parentVisible">
-              <a-select v-model="form.pid" @change="handleChange" placeholder="请选择" >
+              <a-select v-model="form.pid" @change="handleChange" :placeholder="$t('pleaseSelect')" >
                 <a-select-option :value="item.id" v-for="(item, index) in parentData" :key="item.id">
                   {{item.name}}
                 </a-select-option>
@@ -65,8 +64,8 @@
 <!--                </span>-->
 <!--              </a-tree-select>-->
             </a-form-model-item>
-            <a-form-model-item label="描述" prop="description">
+            <a-form-model-item :label="$t('describe')" prop="description">
-              <a-input v-model="form.description" placeholder="请输入描述" />
+              <a-input v-model="form.description" :placeholder="$t('PleaseEnterDescription')" />
             </a-form-model-item>
 
           </a-form-model>
@@ -93,8 +92,8 @@
     data(){
       return{
         title:this.$t('add'),
-        labelCol: { span: 4 },
+        labelCol: { span: 6 },
-        wrapperCol: { span: 18 },
+        wrapperCol: { span: 16 },
         queryParams:{
           pageNo:1,
           pageSize:10
@@ -103,65 +102,26 @@
         newVisible:false,
         rules:{
           name:[
-              { required: true, message: '请输入名称', trigger: 'blur' },
+              { required: true, message: this.$t('enterName'), trigger: 'blur' },
-              { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' },
+              { min:1, max: 30, message: this.$t('charactersLength130'), trigger: 'blur' },
             ],
           itemValue:[
-            { required: true, message: '请输入数据值', trigger: 'blur' },
+            { required: true, message: this.$t('enterDataValue'), trigger: 'blur' },
-            { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' },
+            { min:1, max: 30, message: this.$t('charactersLength130'), trigger: 'blur' },
           ],
           enName:[
-            { required: true, message: '请输入英文名称', trigger: 'blur' },
+            { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' },
-              { min:1, max: 100, message: '长度在 1 - 100字符', trigger: 'blur' },
+              { min:1, max: 100, message: this.$t('LengthBe1to100'), trigger: 'blur' },
             ],
           description:[
-            { required: true, message: '请输入描述', trigger: 'blur' },
+            { required: true, message: this.$t('PleaseEnterDescription'), trigger: 'blur' },
-              { min:1, max: 300, message: '长度在 1 - 300字符', trigger: 'blur' },
+              { min:1, max: 300, message: this.$t('charactersLength1to300'), trigger: 'blur' },
             ]
         },
-        tableData:[
+        tableData:[],
-          {
-            key: '1',
-            name: '适用地区',
-            enName:'aaaaa',
-            describe:'单选',
-          },
-          {
-            key: '2',
-            name: '类别',
-            enName:'bbbb',
-            describe:'单选',
-          },
-        ],
         tabletreeData:[],
         parentName:undefined,
-        treeData:[
+        treeData:[],
-          {
-            title: 'Node1',
-            value: '0-0',
-            key: '0-0',
-            children: [
-              {
-                value: '0-0-1',
-                key: '0-0-1',
-                scopedSlots: {
-                  // custom title
-                  title: 'title',
-                },
-              },
-              {
-                title: 'Child Node2',
-                value: '0-0-2',
-                key: '0-0-2',
-              },
-            ],
-          },
-          {
-            title: 'Node2',
-            value: '0-1',
-            key: '0-1',
-          },
-        ],
         parentVisible:false,
         dataFlag:false,
         total:0,
@@ -284,23 +244,23 @@
           if (this.isEdit) {
             putAction(`sys/dictItem/edit`, params).then(res => {
               if (res.success) {
-                this.$message.success(res.message)
+                this.$message.success(this.$t('OperationSuccessful'))
                 this.form={}
                 this.loadData()
                 this.newVisible = false
               } else {
-                this.$message.warning(res.message)
+                this.$message.warning(this.$t('operationFailed'))
               }
             })
           } else {
             postAction(`sys/dictItem/add`, params).then(res => {
               if (res.success) {
-                this.$message.success(res.message)
+                this.$message.success(this.$t('OperationSuccessful'))
                 this.form={}
                 this.loadData()
                 this.newVisible = false
               } else {
-                this.$message.warning(res.message)
+                this.$message.warning(this.$t('operationFailed'))
               }
             })
           }
@@ -312,24 +272,24 @@
           if (this.isEdit) {
             putAction(`sys/category/edit`,params).then(res=>{
               if(res.success){
-                this.$message.success(res.message)
+                this.$message.success(this.$t('OperationSuccessful'))
                 this.form={}
                 this.loadData()
                 this.newVisible = false
               }else {
-                this.$message.warning(res.message)
+                this.$message.warning(this.$t('operationFailed'))
               }
             })
           }else{
             //新增
             postAction(`sys/category/add`, params).then(res => {
               if (res.success) {
-                this.$message.success(res.message)
+                this.$message.success(this.$t('OperationSuccessful'))
                 this.form={}
                 this.loadData()
                 this.newVisible = false
               } else {
-                this.$message.warning(res.message)
+                this.$message.warning(this.$t('operationFailed'))
               }
             })
           }
@@ -370,10 +330,10 @@
             async () => {
               deleteAction(`sys/dictItem/delete`, params).then(res => {
                 if(res.success) {
-                  this.$message.success(res.message);
+                  this.$message.success(this.$t('OperationSuccessful'));
                   this.loadData()
                 }else{
-                  this.$message.warning(res.message);
+                  this.$message.warning(this.$t('operationFailed'));
                 }
               })
             }
@@ -400,9 +360,9 @@
                 deleteAction(`sys/category/deleteBatch`, params).then(res => {
                   if(res.success){
                     this.loadData()
-                    this.$message.success(res.message)
+                    this.$message.success(this.$t('OperationSuccessful'))
                   }else{
-                    this.$message.warning((res.message))
+                    this.$message.warning(this.$t('operationFailed'))
                   }
                 })
               }

jero-web/src/views/documentManage/tags/dialog/listTable.vue

@@ -3,13 +3,13 @@
       <a-table :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" class="tag-con-table">
 
         <template slot="action" slot-scope="text, record">
-          <a class="action-edit" href="javascript:;" @click="actionEdit(record)">编辑</a>
+          <a class="action-edit" href="javascript:;" @click="actionEdit(record)">{{$t('edit')}}</a>
-          <a class="action-delete" href="javascript:;" @click="onDelete(record)">删除</a>
+          <a class="action-delete" href="javascript:;" @click="onDelete(record)">{{$t('delete')}}</a>
         </template>
       </a-table>
       <div class="page" v-if="tableData.length > 0">
         <a-pagination
-          :show-total="total => `共 ${total} 条`"
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
           show-quick-jumper
           show-size-changer
           :current="queryParams.pageNo"
@@ -40,20 +40,20 @@
         },   //搜索条件
         columns: [
           {
-            title: '名称',
+            title: this.$t('name'),
             dataIndex: 'itemText',
             key: 'itemText',
             align: "center",
             width: 100,
           },
           {
-            title: '英文名称',
+            title: this.$t('enName'),
             align: "center",
             width: 100,
             dataIndex: 'enName',
           },
           {
-            title: '描述',
+            title: this.$t('describe'),
             align: "center",
             width: 100,
             dataIndex: 'description',

jero-web/src/views/documentManage/tags/dialog/newDrawer.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="new-tag-drawer">
-    <onl-cgform-tag-form  ref="realForm" @ok="submitCallback" :isTagContent="isTagContent" :editData="editData" :editId=editId :submitEdit="submitEdit" :type="type" :disabled="disableSubmit" normal v-if="drawerVisible"> </onl-cgform-tag-form>
+    <onl-cgform-tag-form  ref="realForm" @ok="submitCallback" :isTagContent="isTagContent" :editData="editData" :editId=editId :submitEdit="submitEdit" :disabled="disableSubmit" normal v-if="drawerVisible"> </onl-cgform-tag-form>
 
     <div class="drawer-footer">
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">{{$t('preservation')}}</a-button>
@@ -31,7 +31,6 @@
       editData:Object,
       editId:String,
       submitEdit:String,
-      type:String
     },
     mounted() {
       this.visible=this.drawerVisible

jero-web/src/views/documentManage/tags/dialog/treeTable.vue

@@ -11,8 +11,8 @@
           :row-selection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange, onSelectAll: onSelectAll, onSelect: onSelect, }"
         >
           <template slot="action" slot-scope="text, record">
-            <a class="action-edit" href="javascript:;" @click="actionEdit(record)">编辑</a>
+            <a class="action-edit" href="javascript:;" @click="actionEdit(record)">{{$t('edit')}}</a>
-            <a class="action-delete" href="javascript:;" @click="onDelete(record)">删除</a>
+            <a class="action-delete" href="javascript:;" @click="onDelete(record)">{{$t('delete')}}</a>
           </template>
         </a-table>
       </div>
@@ -32,17 +32,17 @@
         loading:false,
         columns: [
           {
-            title: '名称',
+            title: this.$t('name'),
             dataIndex: 'name',
             key: 'name',
           },
           {
-            title: '英文名称',
+            title: this.$t('enName'),
             dataIndex: 'enName',
             key: 'enName',
           },
           {
-            title: '描述',
+            title: this.$t('describe'),
             dataIndex: 'description',
             key: 'description',
           },
@@ -115,10 +115,10 @@
             async () => {
               deleteAction(`sys/category/delete`, { id: val.id }).then((res) => {
                 if (res.success) {
-                  this.$message.success(res.message);
+                  this.$message.success(this.$t('OperationSuccessful'));
                   this.$emit('ok')
                 }else{
-                  this.$message.warning(res.message);
+                  this.$message.warning(this.$t('operationFailed'));
                 }
               })
             }

jero-web/src/views/documentManage/tags/tabs/tabTable.vue

@@ -64,7 +64,7 @@
 
       },
       editVisible(id){
-        this.$emit('visibleEd',true,id,'编辑标签项')
+        this.$emit('visibleEd',true,id,this.$t('editLabelItem'))
       },
       deleteVisible(id){
         this.$emit('visibleDelete',id)

jero-web/src/views/documentManage/tags/tabs/tagContent.vue

@@ -205,10 +205,13 @@
               params.isReadOnly=0
               postAction(`sys/dict/add`,params).then(res=>{
                 if(res.success){
-                  this.$message.success( res.message)
+                  this.$message.success( this.$t('OperationSuccessful'))
                   this.loadData()
                   this.contentVisible=false
                   this.form={}
+                }else{
+                  this.$message.warning(this.$t('operationFailed'))
+
                 }
               })
             }else if(this.isEdit==0){
@@ -217,10 +220,13 @@
               // console.log('editparams',params)
               putAction(`sys/dict/edit`,params).then(res=>{
                 if(res.success){
-                  this.$message.success( res.message)
+                  this.$message.success( this.$t('OperationSuccessful'))
                   this.loadData()
                   this.contentVisible=false
                   this.form={}
+                }else{
+                  this.$message.warning(this.$t('operationFailed'))
+
                 }
               })
             }
@@ -250,10 +256,10 @@
             async () => {
               deleteAction(`sys/dict/logicDelete`, param).then(res => {
                 if (res.success) {
-                  this.$message.success(res.message)
+                  this.$message.success(this.$t('OperationSuccessful'))
                   this.loadData()
                 }else{
-                  this.$message.warning(res.message);
+                  this.$message.warning(this.$t('operationFailed'));
                 }
               })
             }

jero-web/src/views/documentManage/tags/tabs/tagItem.vue

@@ -25,17 +25,9 @@
        </a-form>
      </div>
     <div class="table-operator">
-      <div class="operator-text">
+      <div class="operator-text" @click="handleAddPop">
-        <a-popover placement="right" v-model="typeVisible" trigger="click">
+          <a-icon type="plus" />
-          <template slot="content"  class="type-popover-content">
-            <div class="type-popover">
-              <p class="type type-input" @click="handleAddPop('input')">{{$t('InputBoxType')}}</p>
-              <p class="type type-select" @click="handleAddPop('select')">{{$t('DropDownType')}}</p>
-            </div>
-          </template>
-          <a-icon type="plus" @click="handleAddPop" />
           {{$t('add')}}
-        </a-popover>
       </div>
       <div class="operator-text" @click="handleShow">
         <a-icon type="rocket" :rotate="45" />
@@ -43,7 +35,7 @@
       </div>
     </div>
      <a-drawer class="show-drawer" :title="titleTag" placement="right" width="1000px" @close="close" :visible="drawerVisible" :after-visible-change="afterVisibleChange" >
-       <new-drawer v-if="drawerVisible&&editFlag" :drawerVisible="drawerVisible" :isTagContent="isTagContent" :editData="editData" :editId="editId" :submitEdit="submitEdit" :type="type" @closeTag="closeTag" ></new-drawer>
+       <new-drawer v-if="drawerVisible&&editFlag" :drawerVisible="drawerVisible" :isTagContent="isTagContent" :editData="editData" :editId="editId" :submitEdit="submitEdit" @closeTag="closeTag" ></new-drawer>
      </a-drawer>
      <a-modal class="show-area" v-model="areaVisible" :title="$t('ExhibitionAreaManagement')" :footer="null" @cancel="hideModal">
        <area-manage v-if="areaVisible" @diaHide="diaHide" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
@@ -205,7 +197,7 @@
           ...this.queryParam,
           isModel:1
         }
-        console.log('params',params)
+        // console.log('params',params)
         if(val==1){
           params.isModel=1
         }else if(val==0){
@@ -258,7 +250,6 @@
         this.titleTag=title
         this.editId=id
         this.submitEdit='edit'
-
         let params={
           id:id,
         }
@@ -282,14 +273,14 @@
               deleteAction(`tag/onlCgformTag/delete`, params).then(res => {
                 if (res.success) {
                   if (this.key == 1) {
-                    this.$message.success(res.message)
+                    this.$message.success(this.$t('OperationSuccessful'))
                     this.loadData(1)
                   } else if (this.key == 2) {
-                    this.$message.success(res.message)
+                    this.$message.success(this.$t('OperationSuccessful'))
                     this.loadData(0)
                   }
                 }else{
-                  this.$message.warning(res.message)
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               })
             }
@@ -312,7 +303,7 @@
         this.drawerVisible=true
         this.titleTag=this.$t('NewLabelItem')
         this.submitEdit='add'
-        this.type=val
+        // this.type=val
         if(val=='input'){
           this.typeVisible=false
           this.isTagContent=false