cloud-web-corejs 1.0.27 → 1.0.29

package/src/views/user/bill_setting/render.vue

@@ -294,25 +294,25 @@
       <div class="fix-bottom-btns" v-if="true || billJson.showSaveButton || !!taskParam.appBillCode">
         <!--begin-->
         <el-button class="btn" type="success" @click="openAgreeDialog" v-if="wfEnabled && wfInfo.toSubmit"
-                   icon="iconfont icon-tongguo">通过
+                   icon="iconfont icon-tongguo">{{ $t1('通过') }}
         </el-button>
         <el-button class="btn" type="danger" @click="rejectWfTask" v-if="wfEnabled && wfInfo.toReject"
-                   icon="iconfont icon-a-bohui1">驳回
+                   icon="iconfont icon-a-bohui1">{{ $t1('驳回') }}
         </el-button>
         <el-button class="btn" type="primary" @click="openChangeWfForm"
                    v-if="wfEnabled && ((wfInfo.toTransfer===null || wfInfo.toTransfer===undefined) ? wfInfo.toSubmit: wfInfo.toTransfer)"
-                   icon="iconfont icon-zhuanban">转办
+                   icon="iconfont icon-zhuanban">{{ $t1('转办') }}
         </el-button>
         <!--end-->
 
         <el-button class="btn" type="primary" icon="el-icon-edit" @click="openModifyDialog"
-                   v-if="wfEnabled && !!taskParam.appBillCode">修改单据
+                   v-if="wfEnabled && !!taskParam.appBillCode">{{ $t1('修改单据') }}
         </el-button>
         <el-button class="btn" type="primary" icon="el-icon-check" v-if="billJson.showSaveButton" @click="saveData">
-          保存
+          {{ $t1('保存') }}
         </el-button>
         <el-button class="btn" type="primary" icon="el-icon-check" @click="compare" v-if="getIsCompareEnabled()">
-          对比
+          {{ $t1('对比') }}
         </el-button>
         <!--        <el-dropdown>
                   <el-button class="btn more-btn" type="warning" plain icon="iconfont icon-guidang">
@@ -346,8 +346,8 @@
         v-el-dialog-center
       >
         <template #title>
-          <span class="el-dialog__title">流程驳回<span style="margin-left: 10px;margin-right: 10px;">—</span><b
-            class="f-red" style="font-size: 12px;">节点：{{
+          <span class="el-dialog__title">{{ $t1('流程驳回') }}<span style="margin-left: 10px;margin-right: 10px;">—</span><b
+            class="f-red" style="font-size: 12px;">{{ $t1('节点') }}：{{
               wfInfo.taskName
             }}</b></span>
         </template>
@@ -358,12 +358,12 @@
               <tr>
                 <th>
                     <span class="t">
-                      驳回节点
+                      {{ $t1('驳回节点') }}
                     </span>
                 </th>
                 <td>
                   <el-form-item label="" field="nodeId">
-                    <el-select v-model="rejectForm.nodeId" placeholder="请选择驳回节点">
+                    <el-select v-model="rejectForm.nodeId" :placeholder="$t1('请选择驳回节点')">
                       <el-option v-for="(rejectNode,index) in rejectNodes" :label="rejectNode.nodeName"
                                  :value="rejectNode.nodeId" :key="index"></el-option>
                     </el-select>
@@ -373,12 +373,13 @@
               <tr>
                 <th>
                     <span class="t">
-                      驳回意见
+                      {{ $t1('驳回意见') }}
+
                     </span>
                 </th>
                 <td>
                   <el-form-item label="" field="opinion">
-                    <el-input type="textarea" :rows="8" placeholder="请输入内容"
+                    <el-input type="textarea" :rows="8" :placeholder="$t1('请输入内容')"
                               v-model="rejectForm.opinion"></el-input>
                   </el-form-item>
                 </td>
@@ -409,8 +410,8 @@
         v-el-dialog-center
       >
         <template #title>
-          <span class="el-dialog__title">流程通过<span style="margin-left: 10px;margin-right: 10px;">—</span><b
-            class="f-red" style="font-size: 12px;">节点：{{
+          <span class="el-dialog__title">{{ $t1('流程通过') }}<span style="margin-left: 10px;margin-right: 10px;">—</span><b
+            class="f-red" style="font-size: 12px;">{{ $t1('节点') }}：{{
               wfInfo.taskName
             }}</b></span>
         </template>
@@ -421,12 +422,12 @@
               <tr v-if="agreeNodes.length>0">
                 <th>
                     <span class="t">
-                      通过节点
+                      {{ $t1('通过节点') }}
                     </span>
                 </th>
                 <td>
                   <el-form-item label="" field="nodeId">
-                    <el-select v-model="agreeForm.nodeId" placeholder="请选择通过节点">
+                    <el-select v-model="agreeForm.nodeId" :placeholder="$t1('请选择通过节点')">
                       <el-option v-for="(node,index) in agreeNodes" :label="node.nodeName"
                                  :value="node.nodeId" :key="index"></el-option>
                     </el-select>
@@ -436,15 +437,14 @@
               <tr>
                 <th>
                     <span class="t">
-                      通过意见
+                      {{ $t1('通过意见') }}
                     </span>
                 </th>
                 <td>
                   <el-form-item label="" field="opinion">
-                    <el-input type="textarea" :rows="8" placeholder="请填写您的意见~
+                    <el-input type="textarea" :rows="8" placeholder="$t1('请填写您的意见~
          注：
-         通过默认意见为“同意”
-          " v-model="agreeForm.opinion"></el-input>
+         通过默认意见为“同意”')" v-model="agreeForm.opinion"></el-input>
                   </el-form-item>
                 </td>
               </tr>
@@ -474,8 +474,8 @@
         v-el-dialog-center
       >
         <template #title>
-          <span class="el-dialog__title">流程转办<span style="margin-left: 10px;margin-right: 10px;">—</span><b
-            class="f-red" style="font-size: 12px;">节点：{{
+          <span class="el-dialog__title">{{ $t1('流程转办') }}<span style="margin-left: 10px;margin-right: 10px;">—</span><b
+            class="f-red" style="font-size: 12px;">{{ $t1('节点') }}：{{
               wfInfo.taskName
             }}</b></span>
         </template>
@@ -486,7 +486,7 @@
               <tr>
                 <th>
                     <span class="t">
-                      转办人
+                      {{ $t1('转办人') }}
                     </span>
                 </th>
                 <td>
@@ -500,7 +500,7 @@
                           changeUserRows = [];
                           $forceUpdate();
                         "
-                      placeholder="请选择转办人"
+                      :placeholder="$t1('请选择转办人')"
                       v-el-readonly
                       clearable
                     >
@@ -512,12 +512,12 @@
               <tr>
                 <th>
                     <span class="t">
-                      转办意见
+                      {{ $t1('转办意见') }}
                     </span>
                 </th>
                 <td>
                   <el-form-item label="" field="opinion">
-                    <el-input type="textarea" :rows="8" placeholder="请输入内容"
+                    <el-input type="textarea" :rows="8" :placeholder="$t1('请输入内容')"
                               v-model="changeWfForm.opinion"></el-input>
                   </el-form-item>
                 </td>
@@ -533,7 +533,7 @@
           </el-button>
           <el-button type="primary" @click="subChangeWfForm" class="button-sty">
             <i class="el-icon-check el-icon"></i>
-            确认转办
+            {{ $t1('确认转办') }}
           </el-button>
         </span>
       </el-dialog>
@@ -1178,7 +1178,7 @@ export default {
           if (res1.type == "success") {
             param.onSuccess(res1, fileObj);
           } else {
-            param.onError(new Error(res1.content || '上传异常'));
+            param.onError(new Error(res1.content || this.$t1('上传异常')));
           }
         }).catch(({
                     err
@@ -1189,7 +1189,7 @@ export default {
           }
         });
         req.abort = () => {
-          abort("取消上传");
+          abort(this.$t1('取消上传'));
         }
         //return req;
       }

package/src/views/user/bill_setting/userDialog.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,15 +27,17 @@
           <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="nickName">
+            <vxe-form-item :title="$t1('姓名')+':'" field="nickName">
               <template v-slot>
                 <el-input v-model="formData.nickName" size="small" clearable/>
               </template>
@@ -131,7 +133,7 @@ export default {
         },
         columns: [
           {type: 'checkbox', width: 50, resizable: false, fixed: 'left'},
-          {field: 'nickName', title: '姓名', width: 250, fixed: 'left'},
+          {field: 'nickName', title: this.$t1('姓名'), width: 250, fixed: 'left'},
           {
             width: 47,
             fixed: 'right',

package/src/views/user/code_rules/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>
@@ -21,7 +23,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                编码类型
+                {{ $t1('编码类型') }}
               </th>
               <td>
                 <el-form-item prop="codeType" :rules="[{ required: true, trigger: 'blur' }]">
@@ -30,7 +32,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                编码名称
+                {{ $t1('编码名称') }}
               </th>
               <td>
                 <el-form-item prop="codeName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -39,7 +41,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                编码前缀
+                {{ $t1('编码前缀') }}
               </th>
               <td>
                 <el-form-item prop="codePre" :rules="[{ required: true, trigger: 'blur' }]">
@@ -50,22 +52,22 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                规则
+                {{ $t1('规则') }}
               </th>
               <td colspan="7">
                 <el-form-item prop="rules" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="codeRules.rules" @change="()=>{codeRules.dateFormat=null}">
-                    <el-radio :label="1">按日重置流水号</el-radio>
-                    <el-radio :label="2">按月重置流水号</el-radio>
-                    <el-radio :label="3">按年重置流水号</el-radio>
-                    <el-radio :label="0">流水号一直累加</el-radio>
+                    <el-radio :label="1">{{ $t1('按日重置流水号') }}</el-radio>
+                    <el-radio :label="2">{{ $t1('按月重置流水号') }}</el-radio>
+                    <el-radio :label="3">{{ $t1('按年重置流水号') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('流水号一直累加') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
             </tr>
             <tr>
               <th>
-                时间格式
+                {{ $t1('时间格式') }}
               </th>
               <td>
                 <el-form-item prop="dateFormat" :rules="[{ required: false, trigger: 'blur' }]">
@@ -74,19 +76,19 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                全部组织使用
+                {{ $t1('全部组织使用') }}
               </th>
               <td>
                 <el-form-item prop="allCompany" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="codeRules.allCompany" @change="()=>{codeRules.ruleCompanyCode=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="!codeRules.allCompany">*</em>
-                规则对应组织
+                {{ $t1('规则对应组织') }}
               </th>
               <td>
                 <el-form-item prop="ruleCompanyCode" :rules="[{ required: !codeRules.allCompany, trigger: 'blur' }]">
@@ -95,7 +97,7 @@
                 </el-form-item>
               </td>
               <th>
-                流水固定位数
+                {{ $t1('流水固定位数') }}
               </th>
               <td>
                 <el-form-item prop="flowDigit" :rules="[{ required: false, trigger: 'blur' }]">
@@ -106,7 +108,8 @@
             <tr>
               <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="codeRules.remark"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="codeRules.remark"
                           clearable></el-input>
               </td>
             </tr>

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

@@ -12,31 +12,34 @@
             <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">搜索
+                  <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="codeType">
+                <vxe-form-item title="$t1('编码类型')+':'" field="codeType">
                   <template v-slot>
                     <el-input v-model="formData.codeType" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="编码名称:" field="codeName">
+                <vxe-form-item title="$t1('编码名称')+':'" field="codeName">
                   <template v-slot>
                     <el-input v-model="formData.codeName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="编码前缀:" field="codePre">
+                <vxe-form-item title="$t1('编码前缀')+':'" field="codePre">
                   <template v-slot>
                     <el-input v-model="formData.codePre" size="small" clearable/>
                   </template>
@@ -83,7 +86,12 @@ export default {
     },
     initTableList() {
       let that = this;
-      let rulesMap = {0: '流水号一直累加', 1: '按日重置流水号', 2: '按月重置流水号', 3: '按年重置流水号'};
+      let rulesMap = {
+        0: this.$t1('流水号一直累加'),
+        1: this.$t1('按日重置流水号'),
+        2: this.$t1('按月重置流水号'),
+        3: this.$t1('按年重置流水号')
+      };
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -95,42 +103,42 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '编码类型',
+            title: this.$t1('编码类型'),
             field: 'codeType',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '编码名称',
+            title: this.$t1('编码名称'),
             field: 'codeName',
             width: 150
           },
           {
-            title: '编码前缀',
+            title: this.$t1('编码前缀'),
             field: 'codePre',
             width: 150
           },
           {
-            title: '全部组织使用',
+            title: this.$t1('全部组织使用'),
             field: 'allCompany',
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.allCompany) {
-                  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>];
                 }
               }
             }
           },
           {
-            title: '规则对应组织',
+            title: this.$t1('规则对应组织'),
             field: 'ruleCompanyCode',
             width: 150
           },
           {
-            title: '规则',
+            title: this.$t1('规则'),
             field: 'rules',
             width: 150,
             slots: {
@@ -140,12 +148,12 @@ export default {
             }
           },
           {
-            title: '时间格式',
+            title: this.$t1('时间格式'),
             field: 'dateFormat',
             width: 150
           },
           {
-            title: '流水固定位数',
+            title: this.$t1('流水固定位数'),
             field: 'flowDigit',
             width: 150
           },
@@ -175,7 +183,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/commMenu/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inner-dialog">
     <el-dialog
-      title="常用功能"
+      :title="$t1('常用功能')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="falseValue"
@@ -16,7 +16,7 @@
     >
       <div class="cont" style="height:calc(100vh - 112px)">
         <div class="fast-set" style="background-color: #fff;">
-          <div class="set-tips">按住拖拽调整顺序，最多只能设置7个常用功能</div>
+          <div class="set-tips">{{ $t1('按住拖拽调整顺序，最多只能设置7个常用功能') }}</div>
           <div class="set-box">
             <div class="set-drag" id="imageChange">
               <div
@@ -114,7 +114,7 @@ export default {
       let selectedMenus = this.selectedMenus;
       if (menu.checked && selectedMenus.length >= 7) {
         this.$nextTick(() => {
-          this.$baseAlert('最多只能设置7个常用功能');
+          this.$baseAlert(this.$t1('最多只能设置7个常用功能'));
           /* menu.checked = false;
           et.target.checked = false;
           this.$forceUpdate(); */

package/src/views/user/common_attribute/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>
                 <el-form-item v-if="!dataId" prop="code" :rules="[{ required: true, trigger: 'blur' }]">
@@ -32,7 +34,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                属性名
+                {{ $t1('属性名') }}
               </th>
               <td>
                 <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">