cloud-web-corejs 1.0.27 → 1.0.29

package/src/views/user/company_info/edit.vue

@@ -4,12 +4,14 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          查看组织信息
+          {{ $t1('查看组织信息') }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">{{$t1('重置')}}
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
         </div>
       </div>
       <div class="d-cont">
@@ -20,7 +22,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                组织全称
+                {{ $t1('组织全称') }}
               </th>
               <td>
                 <el-form-item prop="companyName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -29,7 +31,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                组织简称
+                {{ $t1('组织简称') }}
               </th>
               <td>
                 <el-form-item prop="simpleName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -38,21 +40,22 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                组织编码
+                {{ $t1('组织编码') }}
               </th>
               <td>{{ companyInfo.companyCode }}</td>
             </tr>
             <tr>
               <th>
                 <em class="f-red">*</em>
-                组织唯一标志
+                {{ $t1('组织唯一标志') }}
               </th>
               <td colspan="5">{{ companyInfo.uniqueIdentify }}</td>
             </tr>
             <tr>
               <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="companyInfo.note"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="companyInfo.note"
                           clearable></el-input>
               </td>
             </tr>

package/src/views/user/country/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="国家列表"
+    :title="$t1('国家列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -27,25 +27,27 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{$t1('重置')}}
+                          plain>{{ $t1('重置') }}
               </vxe-button>
-              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{
+                  $t1('搜索')
+                }}
               </vxe-button>
             </div>
           </div>
           <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
                     @reset="resetEvent">
-            <vxe-form-item title="国家名称:" field="countryName">
+            <vxe-form-item :title="$t1('国家名称')+':'" field="countryName">
               <template v-slot>
                 <el-input v-model="formData.countryName" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="国家简称:" field="simpleName">
+            <vxe-form-item :title="$t1('国家简称')+':'" field="simpleName">
               <template v-slot>
                 <el-input v-model="formData.simpleName" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="国家编码:" field="countryCode">
+            <vxe-form-item :title="$t1('国家编码')+':'" field="countryCode">
               <template v-slot>
                 <el-input v-model="formData.countryCode" size="small" clearable/>
               </template>
@@ -126,19 +128,19 @@ export default {
         columns: [
           {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
           {
-            title: '国家名称',
+            title: this.$t1('国家名称'),
             field: 'countryName',
             width: 250,
             fixed: 'left'
           },
           {
             field: 'simpleName',
-            title: '国家简称',
+            title: this.$t1('国家简称'),
             width: 150
           },
           {
             field: 'countryCode',
-            title: '国家编码',
+            title: this.$t1('国家编码'),
             width: 150
           },
           {

package/src/views/user/country/edit.vue

@@ -4,12 +4,14 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看') : $t1('新增') }} 国家
+          {{ dataId ? $t1('查看国家') : $t1('新增国家') }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">{{$t1('重置')}}
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
         </div>
       </div>
       <div class="d-cont">
@@ -20,7 +22,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                国家名称
+                {{ $t1('国家名称') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="countryName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -29,7 +31,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                国家简称
+                {{ $t1('国家简称') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="simpleName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -40,22 +42,23 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                国家编码
+                {{ $t1('国家编码') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="countryCode" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="country.countryCode" clearable/>
                 </el-form-item>
               </td>
-              <th>设置</th>
+              <th>{{ $t1('设置') }}</th>
               <td>
-                <el-checkbox label="是否启用" v-model="country.enabled"></el-checkbox>
+                <el-checkbox :label="$t1('是否启用')" v-model="country.enabled"></el-checkbox>
               </td>
             </tr>
             <tr>
               <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="country.remark"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="country.remark"
                           clearable></el-input>
               </td>
             </tr>

package/src/views/user/country/list.vue

@@ -12,10 +12,10 @@
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
                   </vxe-button>
-                  <base-table-export :option="{ title: '国家导出', targetRef: 'table-m1'}" :parent-target="_self"/>
-                  <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入</vxe-button> -->
+                  <base-table-export :option="{ title: $t1('国家导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
@@ -28,17 +28,17 @@
               </div>
               <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                         @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item title="国家名称:" field="countryName">
+                <vxe-form-item :title="$t1('国家名称')+':'" field="countryName">
                   <template v-slot>
                     <el-input v-model="formData.countryName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="国家简称:" field="simpleName">
+                <vxe-form-item :title="$t1('国家简称')+':'" field="simpleName">
                   <template v-slot>
                     <el-input v-model="formData.simpleName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="国家编码:" field="countryCode">
+                <vxe-form-item :title="$t1('国家编码')+':'" field="countryCode">
                   <template v-slot>
                     <el-input v-model="formData.countryCode" size="small" clearable/>
                   </template>
@@ -96,19 +96,19 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '国家名称',
+            title: this.$t1('国家名称'),
             field: 'countryName',
             width: 250,
             fixed: 'left'
           },
           {
             field: 'simpleName',
-            title: '国家简称',
+            title: this.$t1('国家简称'),
             width: 150
           },
           {
             field: 'countryCode',
-            title: '国家编码',
+            title: this.$t1('国家编码'),
             width: 150
           },
           {
@@ -120,13 +120,13 @@ export default {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
-                      <span>启用</span>
+                      <span>{this.$t1('启用')}</span>
                     </div>
                   ];
                 } else {
                   return [
                     <div class="txt-status disable">
-                      <span>禁用</span>
+                      <span>{this.$t1('禁用')}</span>
                     </div>
                   ];
                 }
@@ -164,7 +164,7 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                   popper-class="tooltip-skin">
                         <i class="el-icon-edit"/>
                       </el-tooltip>

package/src/views/user/data_type_setting/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="数据类型列表"
+    :title="$t1('数据类型列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -27,21 +27,21 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{$t1('重置')}}
+                          plain>{{ $t1('重置') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                {{$t1('搜索')}}
+                {{ $t1('搜索') }}
               </vxe-button>
             </div>
           </div>
           <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
                     @reset="resetEvent">
-            <vxe-form-item title="数据类型名称:" field="dataTypeName">
+            <vxe-form-item :title="$t1('数据类型名称')+':'" field="dataTypeName">
               <template v-slot>
                 <el-input v-model="formData.dataTypeName" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="数据类型编码:" field="dataTypeCode">
+            <vxe-form-item :title="$t1('数据类型编码')+':'" field="dataTypeCode">
               <template v-slot>
                 <el-input v-model="formData.dataTypeCode" size="small" clearable/>
               </template>
@@ -70,14 +70,14 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">{{$t1('注：双击确认选择（单选）')}}</span>
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
 			<el-button type="primary" plain class="button-sty" @click="dialogClose">
 				<i class="el-icon-close el-icon"></i>
-				{{$t1('取 消')}}
+				{{ $t1('取 消') }}
 			</el-button>
 			<el-button type="primary" @click="dialogPrimary" class="button-sty">
 				<i class="el-icon-check el-icon"></i>
-				{{$t1('确 定')}}
+				{{ $t1('确 定') }}
 			</el-button>
 		</span>
   </el-dialog>
@@ -124,13 +124,13 @@ export default {
         columns: [
           {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
           {
-            title: '数据类型编码',
+            title: this.$t1('数据类型编码'),
             field: 'dataTypeCode',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '数据类型名称',
+            title: this.$t1('数据类型名称'),
             field: 'dataTypeName',
             width: 250
           },

package/src/views/user/data_type_setting/editDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="dataId?'编辑数据类型':'新增数据类型'"
+    :title="dataId?$t1('编辑数据类型'):$t1('新增数据类型')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="false"
@@ -15,10 +15,10 @@
     <div class="cont">
       <el-form ref="editForm" :model="dataType" label-width="110px" class="adSearchForm"
                style="width: 362px;height: auto;">
-        <el-form-item label="数据类型编码">
-          <span>{{dataType.dataTypeCode}}</span>
+        <el-form-item :label="$t1('数据类型编码')">
+          <span>{{ dataType.dataTypeCode }}</span>
         </el-form-item>
-        <el-form-item label="数据类型名称" :rules="[{ required: true, trigger: 'blur' }]">
+        <el-form-item :label="$t1('数据类型名称')" :rules="[{ required: true, trigger: 'blur' }]">
           <el-input v-model="dataType.dataTypeName" clearable class="all-width"/>
         </el-form-item>
       </el-form>
@@ -26,11 +26,11 @@
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" plain class="button-sty" @click="showDialog=false">
         <i class="el-icon-close el-icon"></i>
-        {{$t1('取 消')}}
+        {{ $t1('取 消') }}
       </el-button>
       <el-button type="primary" @click="saveData" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        {{$t1('确 定')}}
+        {{ $t1('确 定') }}
       </el-button>
     </span>
   </el-dialog>

package/src/views/user/ea/eagroup/eaobj_list.vue

@@ -1,14 +1,14 @@
 <template>
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane label="单据对象列表" name="second">
+      <el-tab-pane :label="$t1('单据对象列表')" name="second">
         <div class="grid-height">
           <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
                     @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <base-table-export :option="{ title: '扩展属性-单据配置导出', targetRef: 'table-m1'}"
+                  <base-table-export :option="{ title: $t1('扩展属性-单据配置导出'), targetRef: 'table-m1'}"
                                      :parent-target="_self"/>
                 </div>
                 <div class="fr">
@@ -22,12 +22,12 @@
               </div>
               <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                         @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item title="单据对象名称:" field="eaObjName">
+                <vxe-form-item :title="$t1('单据对象名称')+':'" field="eaObjName">
                   <template v-slot>
                     <el-input v-model="formData.eaObjName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="单据对象编码:" field="eaObjCode">
+                <vxe-form-item :title="$t1('单据对象编码')+':'" field="eaObjCode">
                   <template v-slot>
                     <el-input v-model="formData.eaObjCode" size="small" clearable/>
                   </template>
@@ -37,14 +37,15 @@
           </vxe-grid>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="单据对象分组配置列表" name="third">
+      <el-tab-pane :label="$t1('单据对象分组配置列表')" name="third">
         <div class="grid-height" v-if="showList">
           <vxe-grid ref="table-m2" v-bind="vxeOption2" @resizable-change="$vxeTableUtil.onColumnWitchChange"
                     @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog2">新增
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog2">
+                    {{ $t1('新增') }}
                   </vxe-button>
                 </div>
                 <div class="fr">
@@ -58,12 +59,12 @@
               </div>
               <vxe-form ref="form2" class="screen-box" title-width="92px" title-align="right" :data="formData2"
                         @submit="searchEvent2" @reset="searchEvent2">
-                <vxe-form-item title="单据对象名称:" field="eaObjName">
+                <vxe-form-item :title="$t1('单据对象名称')+':'" field="eaObjName">
                   <template v-slot>
                     <el-input v-model="eaObjName" size="small" disabled/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="单据对象编码:" field="eaObjCode">
+                <vxe-form-item :title="$t1('单据对象编码')+':'" field="eaObjCode">
                   <template v-slot>
                     <el-input v-model="eaObjCode" size="small" disabled/>
                   </template>
@@ -73,7 +74,7 @@
           </vxe-grid>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="分组配置常规" name="first">
+      <el-tab-pane :label="$t1('分组配置常规')" name="first">
         <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :eaObjCode.sync="eaObjCode"
                   :parent-target="_self" @reload="$reloadHandle"></editView>
       </el-tab-pane>
@@ -100,7 +101,6 @@ export default {
       dataId: 0,
       showEdit: false,
       showList: false,
-      dataId: '',
       eaObjName: '',
       eaObjCode: '',
       vxeOption: {},
@@ -149,19 +149,19 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '单据对象名称',
+            title: this.$t1('单据对象名称'),
             field: 'eaObjName',
             width: 150,
             fixed: 'left'
           },
           {
             field: 'eaObjCode',
-            title: '单据对象编码',
+            title: this.$t1('单据对象编码'),
             width: 150
           },
           {
             field: 'applicationName',
-            title: '所属应用服务名',
+            title: this.$t1('所属应用服务名'),
             width: 150
           },
           {
@@ -189,7 +189,7 @@ export default {
                       this.openEditDialog(row);
                     }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content="查看分组配置" placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('查看分组配置')} placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-edit"/>
                     </el-tooltip>
@@ -218,7 +218,7 @@ export default {
     },
     initTableList2() {
       let that = this;
-      let eaGroupTypeMap = {1: '单属性', 2: '列表属性', 3: '附件'};
+      let eaGroupTypeMap = {1: this.$t1('单属性'), 2: this.$t1('列表属性'), 3: this.$t1('附件')};
       let tableOption = {
         vue: this,
         tableRef: 'table-m2',
@@ -240,29 +240,29 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '分组描述',
+            title: this.$t1('分组描述'),
             field: 'eaGroupDesc',
             width: 150,
             fixed: 'left'
           },
           {
             field: 'eaGroupCode',
-            title: '分组编码',
+            title: this.$t1('分组编码'),
             width: 250
           },
           {
             field: 'eaObjCode',
-            title: '单据对象编码',
+            title: this.$t1('单据对象编码'),
             width: 150
           },
           {
             field: 'eaTableName',
-            title: '数据表名',
+            title: this.$t1('数据表名'),
             width: 250
           },
           {
             field: 'eaGroupType',
-            title: '分组类型',
+            title: this.$t1('分组类型'),
             width: 150,
             slots: {
               default: ({row}) => {
@@ -277,12 +277,12 @@ export default {
           },
           {
             field: 'applicationName',
-            title: '所属服务器名',
+            title: this.$t1('所属服务器名'),
             width: 150
           },
           {
             field: 'eaAttachType',
-            title: '附件类型名',
+            title: this.$t1('附件类型名'),
             width: 150
           },
           {
@@ -292,9 +292,9 @@ export default {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">{ this.$t1('启用') }</div>];
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">{ this.$t1('禁用') }</div>];
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
                 }
               }
             }
@@ -324,7 +324,7 @@ export default {
                       this.openEditDialog2(row.id);
                     }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-edit"/>
                     </el-tooltip>