cloud-web-corejs 1.0.28 → 1.0.29

package/src/views/user/common_attribute/itemEdit.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,37 +22,34 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                属性名
+                {{ $t1('属性名') }}
               </th>
               <td>{{ commonAttribute.name }}</td>
               <th>
                 <em class="f-red">*</em>
-                属性编号
+                {{ $t1('属性编号') }}
               </th>
               <td>{{ commonAttribute.code }}</td>
             </tr>
             <tr>
               <th>
                 <em class="f-red">*</em>
-                属性值
+                {{ $t1('属性值') }}
               </th>
               <td>
                 <el-form-item prop="value" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="commonAttribute.value" clearable/>
                 </el-form-item>
               </td>
-
               <th>
-                英文属性值
+                {{ $t1('英文属性值') }}
               </th>
               <td>
                 <el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="commonAttribute.param5" clearable/>
                 </el-form-item>
               </td>
-
-
-              <th>属性值编号</th>
+              <th>{{ $t1('属性值编号') }}</th>
               <td>
                 <el-form-item v-if="!dataId" prop="sn" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="commonAttribute.sn" clearable/>
@@ -59,11 +58,11 @@
                   {{ commonAttribute.sn }}
                 </template>
               </td>
-              <td colspan="4"><span class="f-red">注：不填写，自动产生唯一属性值编号</span></td>
+              <td colspan="4"><span class="f-red">{{ $t1('注：不填写，自动产生唯一属性值编号') }}</span></td>
             </tr>
             <tr>
               <th>
-                企业编码
+                {{ $t1('企业编码') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: false, trigger: 'blur' }]">
@@ -71,11 +70,13 @@
                 </el-form-item>
               </td>
               <td colspan="2"><span
-                class="f-red">注：多个企业用逗号隔开，未配置全企业可见，已配置只允许配置企业才可见当前属性值。</span></td>
+                class="f-red">{{
+                  $t1('注：多个企业用逗号隔开，未配置全企业可见，已配置只允许配置企业才可见当前属性值。')
+                }}</span></td>
             </tr>
             <tr>
               <th>
-                参数1
+                {{ $t1('参数1') }}
               </th>
               <td>
                 <el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
@@ -83,7 +84,7 @@
                 </el-form-item>
               </td>
               <th>
-                参数2
+                {{ $t1('参数2') }}
               </th>
               <td>
                 <el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
@@ -91,7 +92,7 @@
                 </el-form-item>
               </td>
               <th>
-                参数3
+                {{ $t1('参数3') }}
               </th>
               <td>
                 <el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
@@ -101,22 +102,21 @@
             </tr>
             <tr>
               <th>
-                参数4
+                {{ $t1('参数4') }}
               </th>
               <td>
                 <el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="commonAttribute.param4" clearable/>
                 </el-form-item>
               </td>
-
             </tr>
             <tr>
-              <th>设置</th>
+              <th>{{ $t1('设置') }}</th>
               <td>
-                <el-checkbox label="是否启用" v-model="commonAttribute.enabled"></el-checkbox>
+                <el-checkbox :label="$t1('是否启用')" v-model="commonAttribute.enabled"></el-checkbox>
               </td>
               <th>
-                序号
+                {{ $t1('序号') }}
               </th>
               <td>
                 <el-form-item prop="orders" :rules="[{ required: false, trigger: 'blur' }]">

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

@@ -22,25 +22,27 @@
               <template #form>
                 <div style="margin-bottom: 8px;" class="clearfix">
                   <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>
                   </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" :data-form="formData" title-width="92px" title-align="right"
                           @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>
@@ -152,13 +154,13 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '属性名',
+            title: this.$t1('属性名'),
             field: 'name',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '属性编号',
+            title: this.$t1('属性编号'),
             field: 'code',
             width: 150
           },
@@ -178,16 +180,15 @@ export default {
                   <div>
                     <a
                       class="a-link"
-                      data-tit="新增"
                       onclick={() => {
                         this.openEditItemDialog('', 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">
                         <div>
                           <i class="el-icon-circle-plus-outline"/>
-                          <span>新增属性值</span>
+                          <span>{this.$t1('新增属性值')}</span>
                         </div>
                       </el-tooltip>
                     </a>
@@ -198,7 +199,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>
@@ -226,7 +227,7 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '属性值',
+            title: this.$t1('属性值'),
             field: 'value',
             width: 250,
             fixed: 'left',
@@ -237,7 +238,7 @@ export default {
             }
           },
           {
-            title: '属性值编号',
+            title: this.$t1('属性值编号'),
             field: 'sn',
             width: 150,
             slots: {
@@ -253,25 +254,25 @@ 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: 'name',
             width: 250
           },
           {
-            title: '属性编号',
+            title: this.$t1('属性编号'),
             field: 'code',
             width: 150
           },
           {
-            title: '企业编码',
+            title: this.$t1('企业编码'),
             field: 'exeCompanyCode',
             width: 250
           },
@@ -281,27 +282,27 @@ export default {
             width: 150
           },
           {
-            title: '参数1',
+            title: this.$t1('参数1'),
             field: 'param1',
             width: 150
           },
           {
-            title: '参数2',
+            title: this.$t1('参数2'),
             field: 'param2',
             width: 150
           },
           {
-            title: '参数3',
+            title: this.$t1('参数3'),
             field: 'param3',
             width: 150
           },
           {
-            title: '参数4',
+            title: this.$t1('参数4'),
             field: 'param4',
             width: 150
           },
           {
-            title: '参数5',
+            title: this.$t1('参数5'),
             field: 'param5',
             width: 150
           },
@@ -330,7 +331,7 @@ export default {
                       this.openEditItemDialog(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/common_script/edit.vue

@@ -4,7 +4,7 @@
       <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('重置')}}
@@ -20,7 +20,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                脚本编号
+                {{ $t1('脚本编号') }}
               </th>
               <td>
                 <el-form-item prop="scriptCode" :rules="[{ required: true, trigger: 'blur' }]">
@@ -29,18 +29,18 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                是否启用
+                {{ $t1('是否启用') }}
               </th>
               <td>
                 <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="commonScript.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>
-                数据类型
+                {{ $t1('数据类型') }}
               </th>
               <td>
                 <el-form-item prop="dataTypeName" :rules="[{ required: false, trigger: ['blur', 'change'] }]">
@@ -60,19 +60,19 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                全部组织使用
+                {{ $t1('全部组织使用') }}
               </th>
               <td>
                 <el-form-item prop="allCompany" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="commonScript.allCompany" @change="()=>{commonScript.exeCompanyCode=null}">
-                    <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" v-if="!commonScript.allCompany">*</em>
-                执行企业编码
+                {{ $t1('执行企业编码') }}
               </th>
               <td>
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: !commonScript.allCompany, trigger: 'blur' }]">
@@ -84,7 +84,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                脚本说明
+                {{ $t1('脚本说明') }}
               </th>
               <td colspan="7">
                 <el-form-item prop="scriptDesc" :rules="[{ required: true, trigger: 'blur' }]">
@@ -95,7 +95,7 @@
             </tr>
             <tr>
               <th>
-                脚本
+                {{ $t1('脚本') }}
                 <!--                <scriptDescriptionButton path="static/readme/PushSetting.txt"></scriptDescriptionButton>-->
                 <scriptTestButton :script.sync="commonScript.script"></scriptTestButton>
               </th>

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

@@ -7,16 +7,16 @@
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
-          <div class="tit"><b>数据类型</b></div>
+          <div class="tit"><b>{{ $t1('数据类型') }}</b></div>
           <div class="tree-btns" style="margin-top: 10px;">
             <el-button type="primary" plain icon="el-icon-circle-plus-outline" class="btn"
-                       @click="addDataType()">新增
+                       @click="addDataType()">{{ $t1('新增') }}
             </el-button>
             <el-button type="primary" plain icon="el-icon-edit-outline" class="btn" @click="editDataType()"
-                       :disabled="!currentDataType || !currentDataType.dataTypeCode">编辑
+                       :disabled="!currentDataType || !currentDataType.dataTypeCode">{{ $t1('编辑') }}
             </el-button>
             <el-button type="primary" plain icon="el-icon-delete" class="btn" @click="deleteDataType()"
-                       :disabled="!currentDataType || !currentDataType.dataTypeCode">删除
+                       :disabled="!currentDataType || !currentDataType.dataTypeCode">{{ $t1('删除') }}
             </el-button>
           </div>
           <el-tree
@@ -45,51 +45,48 @@
               <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'}"
+                    <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">搜索
+                    <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" @reset="searchEvent">
-                  <vxe-form-item title="数据类型:" field="dataTypeName">
+                  <vxe-form-item :title="$t1('数据类型')+':'" field="dataTypeName">
                     <template v-slot>
                       <el-input v-model="currentDataType.dataTypeName" size="small" disabled/>
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item title="脚本编号:" field="scriptCode">
+                  <vxe-form-item :title="$t1('脚本编号')+':'" field="scriptCode">
                     <template v-slot>
                       <el-input v-model="formData.scriptCode" size="small" clearable/>
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item title="脚本说明:" field="scriptDesc">
+                  <vxe-form-item :title="$t1('脚本说明')+':'" field="scriptDesc">
                     <template v-slot>
                       <el-input v-model="formData.scriptDesc" size="small" clearable/>
                     </template>
                   </vxe-form-item>
-                  <!--                  <vxe-form-item title="执行企业编码:" field="exeCompanyCode">-->
-                  <!--                    <template v-slot>-->
-                  <!--                      <el-input v-model="formData.exeCompanyCode" size="small" clearable/>-->
-                  <!--                    </template>-->
-                  <!--                  </vxe-form-item>-->
-                  <vxe-form-item title="脚本:" field="script">
+                  <vxe-form-item :title="$t1('脚本')+':'" field="script">
                     <template v-slot>
                       <el-input v-model="formData.script" 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>
@@ -151,7 +148,7 @@ export default {
     },
     initTableList() {
       let that = this;
-      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let pushTypeMap = {0: this.$t1('异步推送'), 1: this.$t1('同步调用')};
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -166,18 +163,18 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '脚本编号',
+            title: this.$t1('脚本编号'),
             field: 'scriptCode',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '脚本说明',
+            title: this.$t1('脚本说明'),
             field: 'scriptDesc',
             width: 150
           },
           {
-            title: '执行企业编码',
+            title: this.$t1('执行企业编码'),
             field: 'exeCompanyCode',
             width: 150
           },
@@ -190,13 +187,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>
                   ];
                 }
@@ -205,20 +202,20 @@ export default {
           },
           {
             field: 'allCompany',
-            title: '全部组织使用',
+            title: this.$t1('全部组织使用'),
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.allCompany) {
                   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>
                   ];
                 }
@@ -247,7 +244,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>
@@ -278,7 +275,7 @@ export default {
           dataTypeGroup: this.dataTypeGroup
         },
         success: res => {
-          let rows = [{id: -1, dataTypeCode: null, dataTypeName: "全部", leaf: true}]
+          let rows = [{id: -1, dataTypeCode: null, dataTypeName: this.$t1('全部'), leaf: true}]
           let records = res.objx && res.objx.records ? res.objx.records : [];
           records.forEach(value => {
             value.leaf = true;
@@ -314,7 +311,8 @@ export default {
     },
     deleteDataType() {
       let row = this.currentDataType;
-      this.$baseConfirm('您确定要删除数据类型[' + row.dataTypeName + ']吗？').then(() => {
+
+      this.$baseConfirm(this.$t1('您确定要删除数据类型[{dataTypeName}]吗？', {dataTypeName: row.dataTypeName})).then(() => {
         var url = USER_PREFIX + `/data_type_setting/setDisabled`;
         this.$http({
           url: url,

package/src/views/user/company_info/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,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>{{$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="companyName">
+            <vxe-form-item :title="$t1('组织名称')+':'" field="companyName">
               <template v-slot>
                 <el-input v-model="formData.companyName" size="small" clearable/>
               </template>
@@ -63,14 +63,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>
@@ -116,8 +116,8 @@ export default {
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: '组织名称', field: 'companyName', width: 250, fixed: 'left', treeNode: true},
-          {title: '组织编码', field: 'companyCode', width: 200},
+          {title: this.$t1('组织名称'), field: 'companyName', width: 250, fixed: 'left', treeNode: true},
+          {title: this.$t1('组织编码'), field: 'companyCode', width: 200},
           {
             width: 47,
             fixed: 'right',