cloud-web-corejs 1.0.28 → 1.0.30

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

@@ -12,19 +12,22 @@
             <template #form>
               <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
                 <template #buttonLeft>
-                  <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"/>
+                  <base-table-export :option="{ title: $t1('项目标签导出'), targetRef: 'table-m1'}"
+                                     :parent-target="_self"/>
                 </template>
                 <template #buttonRight>
                   <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>
                 </template>
                 <template #tag>
-                  <vxe-form-item title="项目标签:" field="tag">
+                  <vxe-form-item :title="$t1('项目标签')+':'" field="tag">
                     <template v-slot>
                       <el-input
                         class="search-input"
@@ -95,18 +98,18 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '标签名称',
+            title: this.$t1('标签名称'),
             field: 'tagName',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '标签编码',
+            title: this.$t1('标签编码'),
             field: 'tagCode',
             width: 150
           },
           {
-            title: '标签说明',
+            title: this.$t1('标签说明'),
             field: 'tagRemark',
             width: 250
           },
@@ -141,7 +144,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>
@@ -153,9 +156,9 @@ export default {
           }
         ],
         searchColumns: [
-          {title: "标签名称", field: "tagName", type: "input", common: true},
-          {title: "标签编码", field: "tagCode", type: "input", common: true},
-          {title: "标签说明", field: "tagRemark", type: "input", common: true}
+          {title: this.$t1('标签名称'), field: "tagName", type: "input", common: true},
+          {title: this.$t1('标签编码'), field: "tagCode", type: "input", common: true},
+          {title: this.$t1('标签说明'), field: "tagRemark", type: "input", common: true}
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {

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

@@ -4,15 +4,17 @@
       <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="warning" class="button-sty" icon="el-icon-copy-document" @click="copy" v-if="!!dataId">复制
+          <el-button type="warning" class="button-sty" icon="el-icon-copy-document" @click="copy" v-if="!!dataId">
+            {{ $t1('复制') }}
           </el-button>
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{$t1('重置')}}
+            {{ $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">
@@ -23,7 +25,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                推送数据类型
+                {{ $t1('推送数据类型') }}
               </th>
               <td>
                 <el-form-item prop="dataType" :rules="[{ required: true, trigger: 'blur' }]">
@@ -32,7 +34,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                推送组织编码
+                {{ $t1('推送组织编码') }}
               </th>
               <td>
                 <el-form-item prop="pushCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
@@ -41,7 +43,7 @@
               </td>
               <th v-if="pushSetting.pushType==0">
                 <em class="f-red">*</em>
-                调度任务编码
+                {{ $t1('调度任务编码') }}
               </th>
               <td v-if="pushSetting.pushType==0">
                 <el-form-item prop="taskCode" :rules="[{ required: pushSetting.pushType==0, trigger: 'blur' }]">
@@ -50,7 +52,7 @@
               </td>
               <th v-if="pushSetting.pushType==0">
                 <em class="f-red">*</em>
-                Api请求编码
+                {{ $t1('Api请求编码') }}
               </th>
               <td v-if="pushSetting.pushType==0">
                 <el-form-item prop="apiReqCode" :rules="[{ required: pushSetting.pushType==0, trigger: 'blur' }]">
@@ -61,25 +63,25 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                是否启用
+                {{ $t1('是否启用') }}
               </th>
               <td>
                 <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="pushSetting.enabled">
-                    <el-radio :label="true">启用</el-radio>
-                    <el-radio :label="false">禁用</el-radio>
+                    <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
               <th>
                 <em class="f-red">*</em>
-                推送类型
+                {{ $t1('推送类型') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="pushType" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="pushSetting.pushType" @change="changePushType">
-                    <el-radio :label="0">异步推送</el-radio>
-                    <el-radio :label="1">同步调用</el-radio>
+                    <el-radio :label="0">{{ $t1('异步推送') }}</el-radio>
+                    <el-radio :label="1">{{ $t1('同步调用') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
@@ -87,11 +89,12 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                脚本备注
+                {{ $t1('脚本备注') }}
               </th>
               <td colspan="7">
                 <el-form-item prop="remark" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="pushSetting.remark"
+                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                            v-model="pushSetting.remark"
                             clearable></el-input>
                 </el-form-item>
               </td>
@@ -99,7 +102,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                脚本
+                {{ $t1('脚本') }}
                 <scriptDescriptionButton path="static/readme/PushSetting.txt"></scriptDescriptionButton>
                 <scriptTestButton :script.sync="pushSetting.script"></scriptTestButton>
               </th>

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

@@ -12,7 +12,7 @@
             <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"/>
                 </div>

package/src/views/user/role/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,7 +27,7 @@
           <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('搜索') }}
@@ -36,12 +36,12 @@
           </div>
           <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
                     @reset="resetEvent">
-            <vxe-form-item title="用户角色:" field="name">
+            <vxe-form-item :title="$t1('用户角色')+':'" field="name">
               <template v-slot>
                 <el-input v-model="formData.name" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="角色编码:" field="code">
+            <vxe-form-item :title="$t1('角色编码')+':'" field="code">
               <template v-slot>
                 <el-input v-model="formData.code" size="small" clearable/>
               </template>
@@ -123,24 +123,24 @@ export default {
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: '用户角色', field: 'name', width: 250, fixed: 'left'},
-          {title: '角色编码', field: 'code', width: 150},
-          {title: '角色描述', field: 'description', width: 150},
+          {title: this.$t1('用户角色'), field: 'name', width: 250, fixed: 'left'},
+          {title: this.$t1('角色编码'), field: 'code', width: 150},
+          {title: this.$t1('角色描述'), field: 'description', width: 150},
           {
-            title: '是否内置',
+            title: this.$t1('是否内置'),
             field: 'systems',
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.systems) {
-                  return '是';
+                  return this.$t1('是');
                 } else {
-                  return '否';
+                  return this.$t1('否');
                 }
               }
             }
           },
-          {title: '所属组织', field: 'companyName', width: 150},
+          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {title: this.$t1('创建时间'), field: 'createDate', width: 150},
           {
             width: 47,

package/src/views/user/role/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>
       <baseTabs>
@@ -20,7 +22,7 @@
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  用户角色
+                  {{ $t1('用户角色') }}
                 </th>
                 <td>
                   <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]" v-if="!role.systems">
@@ -30,7 +32,7 @@
                     {{ role.name }}
                   </template>
                 </td>
-                <th>角色编码</th>
+                <th>{{ $t1('角色编码') }}</th>
                 <td>
                   <el-form-item prop="code" :rules="[{ required: false, trigger: 'blur' }]" v-if="!dataId">
                     <el-input type="text" autocomplete="off" v-model="role.code" clearable/>
@@ -39,19 +41,19 @@
                     {{ role.code }}
                   </template>
                 </td>
-                <th>角色描述</th>
+                <th>{{ $t1('角色描述') }}</th>
                 <td>
                   <el-form-item prop="description" :rules="[{ required: false, trigger: 'blur' }]">
                     <el-input type="text" autocomplete="off" v-model="role.description" clearable/>
                   </el-form-item>
                 </td>
-                <th>是否内置</th>
+                <th>{{ $t1('是否内置') }}</th>
                 <td>
                   <template v-if="role.systems">
-                    是
+                    {{ $t1('是') }}
                   </template>
                   <template v-else>
-                    否
+                    {{ $t1('否') }}
                   </template>
                 </td>
               </tr>
@@ -69,7 +71,7 @@
             </table>
           </template>
         </baseTabPane>
-        <baseTabPane label="菜单信息">
+        <baseTabPane :label="$t1('菜单信息')">
           <template #default>
             <div class="role-box">
               <div class="item" v-for="item in basicMenus" :key="item.id">
@@ -106,7 +108,7 @@
               </div>
               <div class="item">
                 <div class="t">
-                  首页设置
+                  {{ $t1('首页设置') }}
                   <i class="fr" @click="visibleHome = !visibleHome"
                      :class="!visibleHome?'el-icon-arrow-up':'el-icon-arrow-down'"></i>
                 </div>
@@ -124,7 +126,7 @@
             </div>
           </template>
         </baseTabPane>
-        <baseTabPane label="移动端菜单信息">
+        <baseTabPane :label="$t1('移动端菜单信息')">
           <template #default>
             <div class="role-box">
               <div class="item" v-for="(item,index) in allMobileMenus" :key="index">

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

@@ -12,9 +12,11 @@
             <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"/>
+                  <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"
@@ -27,12 +29,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="name">
+                <vxe-form-item :title="$t1('用户角色')+':'" field="name">
                   <template v-slot>
                     <el-input v-model="formData.name" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="角色编码:" field="code">
+                <vxe-form-item :title="$t1('角色编码')+':'" field="code">
                   <template v-slot>
                     <el-input v-model="formData.code" size="small" clearable/>
                   </template>
@@ -98,37 +100,37 @@ export default {
             resizable: false
           },
           {
-            title: '用户角色',
+            title: this.$t1('用户角色'),
             field: 'name',
             width: 150,
             sortable: true,
             fixed: 'left'
           },
           {
-            title: '角色编码',
+            title: this.$t1('角色编码'),
             field: 'code',
             width: 150
           },
           {
-            title: '角色描述',
+            title: this.$t1('角色描述'),
             field: 'description',
 
           },
           {
-            title: '是否内置',
+            title: this.$t1('是否内置'),
             field: 'systems',
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.systems) {
-                  return "是";
+                  return this.$t1('是');
                 } else {
-                  return "否";
+                  return this.$t1('否');
                 }
               }
             }
           },
-          {title: '所属组织', field: 'companyName', width: 150},
+          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
@@ -149,7 +151,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/sale_org/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t2('机构列表', 'saleOrg.organizationList')"
+    :title="$t1('机构列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -27,16 +27,16 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t2('重置', 'common.pmdReset') }}
+                          plain>{{ $t1('重置') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                {{ $t2('搜索', 'common.search') }}
+                {{ $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="$t2('机构名称', 'saleOrg.organizationName')" field="name">
+            <vxe-form-item :title="$t1('机构名称')+''" field="name">
               <template v-slot>
                 <el-input v-model="formData.name" size="small" clearable/>
               </template>
@@ -53,7 +53,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t2('全部删除', 'saleOrg.deleteAll')" placement="top"><a
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
@@ -134,7 +134,7 @@ export default {
         columns: [
           {type: 'checkbox', width: 50, resizable: false, fixed: 'left'},
           {
-            title: this.$t2('机构名称', 'saleOrg.organizationName'),
+            title: this.$t1('机构名称'),
             field: 'name',
             width: 250,
             fixed: 'left',
@@ -155,24 +155,24 @@ export default {
               }
             }
           },
-          {title: this.$t2('机构编码', 'saleOrg.organizationCode'), field: 'sn', width: 200},
-          {title: this.$t2('所属组织', 'saleOrg.affiliatedOrganization'), field: 'companyName', width: 150},
+          {title: this.$t1('机构编码'), field: 'sn', width: 200},
+          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
-            title: this.$t2('负责人', 'saleOrg.personInCharge'),
+            title: this.$t1('负责人'),
             field: 'directorName',
             width: 150,
           },
           {
-            title: this.$t2('授权角色', 'saleOrg.authorizedRole'),
+            title: this.$t1('授权角色'),
             field: 'roleName',
             width: 150,
           },
           {
-            title: this.$t2('自然省份', 'saleOrg.areaName'),
+            title: this.$t1('自然省份'),
             field: 'areaName',
             width: 150,
           },
-          {title: this.$t2('上级机构', 'saleOrg.superiorOrganization'), field: 'treePathName', width: 200},
+          {title: this.$t1('上级机构'), field: 'treePathName', width: 200},
           {
             width: 47,
             fixed: 'right',