cloud-web-corejs 1.0.28 → 1.0.30

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

@@ -10,34 +10,35 @@
                 <div class="fl"></div>
                 <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 ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                         @submit="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="sn">
+                <vxe-form-item :title="$t1('机构编码')+':'" field="sn">
                   <template v-slot>
                     <el-input v-model="formData.sn" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="第三方机构编码:" field="outSn">
+                <vxe-form-item :title="$t1('第三方机构编码')+':'" field="outSn">
                   <template v-slot>
                     <el-input v-model="formData.outSn" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="是否启用:" field="enabled">
+                <vxe-form-item :title="$t1('是否启用')+':'" field="enabled">
                   <template v-slot>
                     <el-select v-model="formData.enabled" clearable>
-                      <el-option value="true" label="启用"></el-option>
-                      <el-option value="false" label="禁用"></el-option>
+                      <el-option value="true" :label="$t1('启用')"></el-option>
+                      <el-option value="false" :label="$t1('禁用')"></el-option>
                     </el-select>
                   </template>
                 </vxe-form-item>
@@ -60,11 +61,11 @@
                   </a>
                 </template>
                 <template v-else>
-                  <a class="a-link" data-tit="新增" @click="insertChildEvent(obj)">
+                  <a class="a-link" @click="insertChildEvent(obj)">
                     <el-tooltip :enterable="false" effect="dark" :content="$t1('新增')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-circle-plus-outline"></i></el-tooltip>
                   </a>
-                  <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑" v-if="obj.row && obj.row.parent !== 0">
+                  <a @click="editRowEvent(obj)" class="a-link" v-if="obj.row && obj.row.parent !== 0">
                     <el-tooltip :enterable="false" effect="dark" :content="$t1('行编辑')" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-edit-outline"></i></el-tooltip>
                   </a>
@@ -126,7 +127,7 @@
       </el-tab-pane>
     </el-tabs>
     <el-dialog
-      title="切换上级机构"
+      :title="$t1('切换上级机构')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
@@ -139,10 +140,10 @@
     >
       <div class="cont">
         <el-form :model="changeForm1">
-          <el-form-item label="当前机构">
+          <el-form-item :label="$t1('当前机构')">
             <el-input v-model="changeForm1.sale_org.name" autocomplete="off" readonly></el-input>
           </el-form-item>
-          <el-form-item label="上级机构">
+          <el-form-item :label="$t1('上级机构')">
             <el-input
               class="search-input"
               max="200"
@@ -171,7 +172,7 @@
       </span>
     </el-dialog>
     <el-dialog
-      title="排序"
+      :title="$t1('排序')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
@@ -261,6 +262,13 @@ export default {
     },
     initTableList() {
       let that = this;
+      let typeMap = {
+        0: this.$t1('集团'),
+        1: this.$t1('事业部'),
+        2: this.$t1('分公司'),
+        3: this.$t1('部门'),
+        99: this.$t1('其他')
+      }
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -281,7 +289,7 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '机构名称',
+            title: this.$t1('机构名称'),
             field: 'name',
             width: 250,
             fixed: 'left',
@@ -303,11 +311,11 @@ export default {
               }
             }
           },
-          {field: 'sn', title: '机构编码', width: 250, editRender: {name: 'input'}},
-          {field: 'outSn', title: '第三方机构编码', width: 150, editRender: {name: 'input'}},
+          {field: 'sn', title: this.$t1('机构编码'), width: 250, editRender: {name: 'input'}},
+          {field: 'outSn', title: this.$t1('第三方机构编码'), width: 150, editRender: {name: 'input'}},
           {
             field: 'type',
-            title: '类型',
+            title: this.$t1('类型'),
             width: 150,
             editRender: {
               name: '$select',
@@ -319,43 +327,30 @@ export default {
               },
               options: [
                 {
-                  label: '集团',
+                  label: typeMap[0],
                   value: 0
                 },
                 {
-                  label: '事业部',
+                  label: typeMap[1],
                   value: 1
                 },
                 {
-                  label: '分公司',
+                  label: typeMap[2],
                   value: 2
                 },
                 {
-                  label: '部门',
+                  label: typeMap[3],
                   value: 3
                 },
                 {
-                  label: '其他',
+                  label: typeMap[99],
                   value: 99
                 }
               ]
             },
             slots: {
               default: ({row}) => {
-                let val = row.type;
-                let html = '';
-                if (val == '0') {
-                  html = '集团';
-                } else if (val == '1') {
-                  html = '事业部';
-                } else if (val == '2') {
-                  html = '分公司';
-                } else if (val == '3') {
-                  html = '部门';
-                } else if (val == '99') {
-                  html = '其他';
-                }
-                return html;
+                return typeMap[row.type] || '';
               }
             }
           },
@@ -385,15 +380,15 @@ 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>];
                 }
               }
             }
           },
           {
-            title: '负责人',
+            title: this.$t1('负责人'),
             field: 'directorName',
             width: 150,
             editRender: {name: 'input'},
@@ -402,7 +397,7 @@ export default {
             }
           },
           {
-            title: '授权角色',
+            title: this.$t1('授权角色'),
             field: 'roleName',
             width: 150,
             editRender: {name: 'input'},
@@ -411,7 +406,7 @@ export default {
             }
           },
           {
-            title: '自然省份',
+            title: this.$t1('自然省份'),
             field: 'areaName',
             width: 150,
             editRender: {name: 'input'},
@@ -419,8 +414,8 @@ export default {
               edit: 'area'
             }
           },
-          {field: 'treePathName', title: '上级机构', width: 150},
-          {field: 'companyName', title: '所属组织', width: 150},
+          {field: 'treePathName', title: this.$t1('上级机构'), width: 150},
+          {field: 'companyName', title: this.$t1('所属组织'), width: 150},
           {field: 'createDate', title: this.$t1('创建时间'), width: 150},
           {field: 'modifyDate', title: this.$t1('更新时间'), width: 150},
           {width: 300, title: '', fixed: 'right', sortable: false, slots: {default: 'operate'}}
@@ -437,7 +432,7 @@ export default {
     },
     changeRowParent() {
       let that = this;
-      this.$baseConfirm('您确定提交修改吗？').then(() => {
+      this.$baseConfirm(this.$t1('您确定提交修改吗？')).then(() => {
         that.$http({
           url: 'changePage',
           method: `post`,
@@ -504,7 +499,7 @@ export default {
               },
               header: () => {
                 return [
-                  <vxe-tooltip v-model={this.showHelpTip2} content="按住后可以上下拖动排序！" enterable>
+                  <vxe-tooltip v-model={this.showHelpTip2} content={this.$t1('按住后可以上下拖动排序！')} enterable>
                     <i
                       class="vxe-icon--question"
                       onClick={() => {
@@ -517,13 +512,13 @@ export default {
             }
           },
           {
-            title: '机构名称',
+            title: this.$t1('机构名称'),
             field: 'name',
             width: 250
           },
           {
             field: 'sn',
-            title: '机构编码',
+            title: this.$t1('机构编码'),
             width: 250
           }
         ],

package/src/views/user/system_notice/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,28 +22,28 @@
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  标题
+                  {{ $t1('标题') }}
                 </th>
                 <td>
                   <el-form-item prop="title" :rules="[{ required: true, trigger: 'blur' }]">
                     <el-input type="text" autocomplete="off" v-model="system_notice.title" clearable/>
                   </el-form-item>
                 </td>
-                <th>副标题</th>
+                <th>{{ $t1('副标题') }}</th>
                 <td>
                   <el-form-item prop="secondTitle" :rules="[{ required: false, trigger: 'blur' }]">
                     <el-input type="text" autocomplete="off" v-model="system_notice.secondTitle" clearable/>
                   </el-form-item>
                 </td>
-                <th>设置</th>
+                <th>{{ $t1('设置') }}</th>
                 <td colspan="3">
-                  <el-checkbox label="是否发布" v-model="system_notice.publish"></el-checkbox>
-                  <el-checkbox label="是否置顶" v-model="system_notice.top"></el-checkbox>
-                  <el-checkbox label="重要" v-model="system_notice.important"></el-checkbox>
+                  <el-checkbox :label="$t1('是否发布')" v-model="system_notice.publish"></el-checkbox>
+                  <el-checkbox :label="$t1('是否置顶')" v-model="system_notice.top"></el-checkbox>
+                  <el-checkbox :label="$t1('重要')" v-model="system_notice.important"></el-checkbox>
                 </td>
               </tr>
               <tr>
-                <th>附件</th>
+                <th>{{ $t1('附件') }}</th>
                 <td colspan="7">
                   <baseUpload accept="file" multi="true" :file.sync="sysNoticeAttachmentDTOs"></baseUpload>
                 </td>
@@ -60,7 +62,7 @@
             </table>
           </template>
         </baseTabPane>
-        <baseTabPane label="内容">
+        <baseTabPane :label="$t1('内容')">
           <template #default>
             <table class="table-detail" style="width: 100%;">
               <tbody>

package/src/views/user/system_notice/infoDialog.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"
@@ -17,7 +17,7 @@
       <div class="item" v-for="(item, index) in page.records" :key="index" :class="{ on: currentIndex == index }"
            @click="checkLine(item, index)">
         <div class="name">
-          <em v-if="item.top">顶</em>
+          <em v-if="item.top">{{ $t1('顶') }}</em>
           {{ item.title }}
         </div>
         <p>{{ item.modifyDate ? item.modifyDate.substring(0, 10) : '' }}</p>

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

@@ -12,22 +12,24 @@
             <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"
-                              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 ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                         @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item title="标题:" field="title">
+                <vxe-form-item :title="$t1('标题')+':'" field="title">
                   <template v-slot>
                     <el-input v-model="formData.title" size="small" clearable/>
                   </template>
@@ -93,7 +95,7 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '标题',
+            title: this.$t1('标题'),
             field: 'title',
             width: 150,
             sortable: true,
@@ -101,50 +103,50 @@ export default {
           },
           {
             field: 'secondTitle',
-            title: '副标题',
+            title: this.$t1('副标题'),
             width: 250
           },
           {
             field: 'publish',
-            title: '是否发布',
+            title: this.$t1('是否发布'),
             width: 150,
             sortable: true,
             slots: {
               default: ({row}) => {
                 if (row.publish) {
-                  return [<div class="txt-status"> 发布 </div>];
+                  return [<div class="txt-status"> {this.$t1('发布')} </div>];
                 } else {
-                  return [<div class="txt-status s-3"> 未发布 </div>];
+                  return [<div class="txt-status s-3"> {this.$t1('未发布')} </div>];
                 }
               }
             }
           },
           {
             field: 'top',
-            title: '置顶',
+            title: this.$t1('置顶'),
             width: 150,
             sortable: true,
             slots: {
               default: ({row}) => {
                 if (row.top) {
-                  return [<div class="txt-status"> 是 </div>];
+                  return [<div class="txt-status"> {this.$t1('是')} </div>];
                 } else {
-                  return [<div class="txt-status s-3"> 否 </div>];
+                  return [<div class="txt-status s-3"> {this.$t1('否')} </div>];
                 }
               }
             }
           },
           {
             field: 'important',
-            title: '重要',
+            title: this.$t1('重要'),
             width: 150,
             sortable: true,
             slots: {
               default: ({row}) => {
                 if (row.important) {
-                  return [<div class="txt-status"> 是 </div>];
+                  return [<div class="txt-status"> {this.$t1('是')} </div>];
                 } else {
-                  return [<div class="txt-status s-3"> 否 </div>];
+                  return [<div class="txt-status s-3"> {this.$t1('否')} </div>];
                 }
               }
             }
@@ -170,7 +172,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/system_parameter/edit.vue

@@ -4,13 +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('重置')}}
+            {{ $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">
@@ -21,7 +22,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                参数编码
+                {{ $t1('参数编码') }}
               </th>
               <td>
                 <el-form-item prop="code" :rules="[{ required: true, trigger: 'blur' }]">
@@ -30,7 +31,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                参数名称
+                {{ $t1('参数名称') }}
               </th>
               <td>
                 <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">
@@ -39,7 +40,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                参数值
+                {{ $t1('参数值') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="value" :rules="[{ required: true, trigger: 'blur' }]">

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

@@ -12,27 +12,29 @@
             <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"
-                              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 ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                         @submit="searchEvent" @reset="searchEvent">
-                <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>
                 </vxe-form-item>
-                <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>
@@ -93,14 +95,14 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '参数编码',
+            title: this.$t1('参数编码'),
             field: 'code',
             width: 200,
             sortable: true,
             fixed: 'left'
           },
-          {field: 'name', title: '参数名称', width: 200},
-          {field: 'value', title: '参数值', width: 200},
+          {field: 'name', title: this.$t1('参数名称'), width: 200},
+          {field: 'value', title: this.$t1('参数值'), width: 200},
           {field: 'remark', title: this.$t1('备注'), width: 200},
           {title: this.$t1('创建时间'), field: 'createDate', width: 150},
           {title: this.$t1('更新时间'), field: 'modifyDate', width: 150},
@@ -119,7 +121,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/user/edit.vue

@@ -4,7 +4,7 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看') : $t1('新增') }} {{ $t1('用户') }}
+          {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
         </div>
         <div class="fr">
           <!--          <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>-->