cloud-web-corejs 1.0.28 → 1.0.30

package/src/views/user/wf/wf_manage/list.vue

@@ -13,9 +13,9 @@
           @reload="$reloadHandle"
         ></component>
       </el-tab-pane>
-      <el-tab-pane label="我的流程" name="second">
+      <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>
           <el-tree
             :props="defaultProps"
             :load="loadNode"
@@ -42,30 +42,31 @@
               <template #form>
                 <div class="clearfix screen-btns">
                   <div class="fl">
-                    <base-table-export :option="{ title: '流程待办导出', targetRef: 'table-m1'}"
+                    <base-table-export :option="{ title: $t1('流程待办导出'), targetRef: 'table-m1'}"
                                        :parent-target="_self"/>
                   </div>
                   <div class="fr">
                     <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="待办类型:">
+                  <vxe-form-item :title="$t1('待办类型')+':'">
                     <template v-slot>
                       <el-input v-model="checkNodeData.label" size="small" disabled/>
                     </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>
                   </vxe-form-item>
-                  <vxe-form-item title="单据类型:" field="objTypeName">
+                  <vxe-form-item :title="$t1('单据类型')+':'" field="objTypeName">
                     <template v-slot>
                       <el-input
                         class="search-input"
@@ -83,12 +84,12 @@
                       </el-input>
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item title="流程状态:" field="stat">
+                  <vxe-form-item :title="$t1('流程状态')+':'" field="stat">
                     <template v-slot>
                       <el-select v-model="formData.stat" clearable>
-                        <el-option :value="1" label="审核中"></el-option>
-                        <el-option :value="2" label="已完成"></el-option>
-                        <el-option :value="3" label="已驳回"></el-option>
+                        <el-option :value="1" :label="$t1('审核中')"></el-option>
+                        <el-option :value="2" :label="$t1('已完成')"></el-option>
+                        <el-option :value="3" :label="$t1('已驳回')"></el-option>
                       </el-select>
                     </template>
                   </vxe-form-item>
@@ -98,31 +99,33 @@
           </div>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="全部流程" name="third" v-if="flag==1">
+      <el-tab-pane :label="$t1('全部流程')" name="third" v-if="flag==1">
         <div class="grid-height">
           <vxe-grid ref="table-m2" v-bind="vxeOption2" @resizable-change="$vxeTableUtil.onColumnWitchChange"
                     @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <base-table-export :option="{ title: '流程待办导出', targetRef: 'table-m2'}" :parent-target="_self"/>
+                  <base-table-export :option="{ title: $t1('流程待办导出'), targetRef: 'table-m2'}"
+                                     :parent-target="_self"/>
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent2" type="text" status="primary"
-                              plain>{{$t1('重置')}}
+                              plain>{{ $t1('重置') }}
                   </vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent2">搜索
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent2">
+                    {{ $t1('搜索') }}
                   </vxe-button>
                 </div>
               </div>
               <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData2"
                         @submit="searchEvent2" @reset="searchEvent2">
-                <vxe-form-item title="流程主题:" field="name">
+                <vxe-form-item :title="$t1('流程主题')+':'" field="name">
                   <template v-slot>
                     <el-input v-model="formData2.name" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="单据类型:" field="objTypeName">
+                <vxe-form-item :title="$t1('单据类型')+':'" field="objTypeName">
                   <template v-slot>
                     <el-input
                       class="search-input"
@@ -140,12 +143,12 @@
                     </el-input>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="流程状态:" field="stat">
+                <vxe-form-item :title="$t1('流程状态')+':'" field="stat">
                   <template v-slot>
                     <el-select v-model="formData2.stat" clearable>
-                      <el-option :value="1" label="审核中"></el-option>
-                      <el-option :value="2" label="已完成"></el-option>
-                      <el-option :value="3" label="已驳回"></el-option>
+                      <el-option :value="1" :label="$t1('审核中')"></el-option>
+                      <el-option :value="2" :label="$t1('已完成')"></el-option>
+                      <el-option :value="3" :label="$t1('已驳回')"></el-option>
                     </el-select>
                   </template>
                 </vxe-form-item>
@@ -221,12 +224,13 @@ export default {
     initTableList() {
       let that = this;
       let paramColumns = this.wfParamDTOs.map(item => {
+        let flag = item.paramName == '单号';
         return {
-          title: item.paramName,
+          title: this.$t1(item.paramName),
           field: item.paramKey,
           width: 150,
-          fixed: item.paramName == '单号' ? 'left' : '',
-          slots: item.paramName == '单号' ? {
+          fixed: flag ? 'left' : '',
+          slots: flag ? {
             default: ({row}) => {
               return [
                 <div>
@@ -238,7 +242,7 @@ export default {
                     }}
                     style="font-weight:bold; text-decoration: underline"
                   >
-                    <el-tooltip class="item" effect="dark" content={ this.$t1('查看') } placement="top-start">
+                    <el-tooltip class="item" effect="dark" content={this.$t1('查看')} placement="top-start">
                       <span>{row.param1}</span>
                     </el-tooltip>
                   </a>
@@ -251,11 +255,11 @@ export default {
 
       // let statuses = {0: '未启动', 1: '审核中', 2: '已完成', 3: '已驳回', 4: '中断'};
       var statuses = {
-        0: [<el-tag type="warning">未启动</el-tag>],
-        1: [<el-tag>审核中</el-tag>],
-        2: [<el-tag type="success">已完成</el-tag>],
-        3: [<el-tag type="danger">已驳回</el-tag>],
-        4: [<el-tag type="danger">中断</el-tag>]
+        0: [<el-tag type="warning">{this.$t1('未启动')}</el-tag>],
+        1: [<el-tag>{this.$t1('审核中')}</el-tag>],
+        2: [<el-tag type="success">{this.$t1('已完成')}</el-tag>],
+        3: [<el-tag type="danger">{this.$t1('已驳回')}</el-tag>],
+        4: [<el-tag type="danger">{this.$t1('中断')}</el-tag>]
       };
       let tableOption = {
         vue: this,
@@ -276,33 +280,33 @@ 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: 'objTypeName',
             width: 150
           },
           {
-            title: '启动人',
+            title: this.$t1('启动人'),
             field: 'starterName',
             width: 150
           },
           {
-            title: '当前任务',
+            title: this.$t1('当前任务'),
             field: 'taskName',
             width: 150
           },
           {
-            title: '当前任务用户',
+            title: this.$t1('当前任务用户'),
             field: 'candidateNames',
             width: 150
           },
           {
-            title: '流程状态',
+            title: this.$t1('流程状态'),
             field: 'stat',
             width: 150,
             slots: {
@@ -313,7 +317,7 @@ export default {
             }
           },
           {
-            title: '启动时间',
+            title: this.$t1('启动时间'),
             field: 'createDate',
             width: 150
           },
@@ -334,7 +338,7 @@ export default {
                       this.openEditDialog(row);
                     }}
                   >
-                    <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>
@@ -426,31 +430,31 @@ export default {
       let data = [
         {
           uuid: -1,
-          label: '待审批的',
+          label: this.$t1('待审批的'),
           type: 0,
           leaf: true
         },
         {
           uuid: -2,
-          label: '我发起的',
+          label: this.$t1('我发起的'),
           type: 1,
           leaf: true
         },
         {
           uuid: -3,
-          label: '已审批的',
+          label: this.$t1('已审批的'),
           type: 2,
           leaf: true
         },
         {
           uuid: -4,
-          label: '已完成的',
+          label: this.$t1('已完成的'),
           type: '3',
           leaf: true
         },
         {
           uuid: -5,
-          label: '我转办的',
+          label: this.$t1('我转办的'),
           type: '4',
           leaf: true
         }
@@ -536,12 +540,13 @@ export default {
     initTableList2() {
       let that = this;
       let paramColumns = this.wfParamDTOs.map(item => {
+        let flag = item.paramName == '单号';
         return {
-          title: item.paramName,
+          title: this.$t1(item.paramName),
           field: item.paramKey,
           width: 150,
-          fixed: item.paramName == '单号' ? 'left' : '',
-          slots: item.paramName == '单号' ? {
+          fixed: flag ? 'left' : '',
+          slots: flag ? {
             default: ({row}) => {
               return [
                 <div>
@@ -553,7 +558,7 @@ export default {
                     }}
                     style="font-weight:bold; text-decoration: underline"
                   >
-                    <el-tooltip class="item" effect="dark" content={ this.$t1('查看') } placement="top-start">
+                    <el-tooltip class="item" effect="dark" content={this.$t1('查看')} placement="top-start">
                       <span>{row.param1}</span>
                     </el-tooltip>
                   </a>
@@ -565,11 +570,11 @@ export default {
       });
 
       var statuses = {
-        0: [<el-tag type="warning">未启动</el-tag>],
-        1: [<el-tag>审核中</el-tag>],
-        2: [<el-tag type="success">已完成</el-tag>],
-        3: [<el-tag type="danger">已驳回</el-tag>],
-        4: [<el-tag type="danger">中断</el-tag>]
+        0: [<el-tag type="warning">{this.$t1('未启动')}</el-tag>],
+        1: [<el-tag>{this.$t1('审核中')}</el-tag>],
+        2: [<el-tag type="success">{this.$t1('已完成')}</el-tag>],
+        3: [<el-tag type="danger">{this.$t1('已驳回')}</el-tag>],
+        4: [<el-tag type="danger">{this.$t1('中断')}</el-tag>]
       };
       let tableOption = {
         vue: this,
@@ -584,33 +589,33 @@ 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: 'objTypeName',
             width: 150
           },
           {
-            title: '启动人',
+            title: this.$t1('启动人'),
             field: 'starterName',
             width: 150
           },
           {
-            title: '当前任务',
+            title: this.$t1('当前任务'),
             field: 'taskName',
             width: 150
           },
           {
-            title: '当前任务用户',
+            title: this.$t1('当前任务用户'),
             field: 'candidateNames',
             width: 150
           },
           {
-            title: '流程状态',
+            title: this.$t1('流程状态'),
             field: 'stat',
             width: 150,
             slots: {
@@ -621,7 +626,7 @@ export default {
             }
           },
           {
-            title: '启动时间',
+            title: this.$t1('启动时间'),
             field: 'createDate',
             width: 150
           },
@@ -641,7 +646,7 @@ export default {
                       this.openEditDialog(row);
                     }}
                   >
-                    <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/wf/wf_manage/wfContentDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="查看单据流程"
+    :title="$t1('查看单据流程')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="false"

package/src/views/user/wf/wf_obj_config/dialog.vue

@@ -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="objTypeName">
+            <vxe-form-item :title="$t1('单据类型名称')+':'" field="objTypeName">
               <template v-slot>
                 <el-input v-model="formData.objTypeName" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="单据类型编号:" field="objTypeCode">
+            <vxe-form-item :title="$t1('单据类型编号')+':'" field="objTypeCode">
               <template v-slot>
                 <el-input v-model="formData.objTypeCode" size="small" clearable/>
               </template>
@@ -110,11 +110,11 @@ export default {
       formData: {},
       vxeOption: {},
       typeMap: {
-        0: '待审批的',
-        1: '我发起的',
-        2: '已审批的',
-        3: '已完成的',
-        4: '我转办的'
+        0: this.$t1('待审批的'),
+        1: this.$t1('我发起的'),
+        2: this.$t1('已审批的'),
+        3: this.$t1('已完成的'),
+        4: this.$t1('我转办的')
       }
     };
   },
@@ -126,7 +126,7 @@ export default {
         icolumns = [
           {
             field: 'num',
-            title: '数量',
+            title: this.$t1('数量'),
             width: 150
           }
         ];
@@ -146,14 +146,14 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '单据类型名称',
+            title: this.$t1('单据类型名称'),
             field: 'objTypeName',
             width: 150,
             fixed: 'left'
           },
           {
             field: 'objTypeCode',
-            title: '单据类型编号',
+            title: this.$t1('单据类型编号'),
             width: 150
           },
           ...icolumns,

package/src/views/user/wf/wf_obj_config/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 prop="serviceId" :rules="[{ required: true, trigger: 'blur' }]" v-if="!dataId">
@@ -37,7 +39,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                单据类型编号
+                {{ $t1('单据类型编号') }}
               </th>
               <td>
                 <el-form-item prop="objTypeCode" :rules="[{ required: true, trigger: 'blur' }]" v-if="!dataId">
@@ -49,7 +51,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                单据类型名称
+                {{ $t1('单据类型名称') }}
               </th>
               <td>
                 <el-form-item prop="objTypeName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -60,7 +62,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                跳转url
+                {{ $t1('跳转url') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
@@ -70,7 +72,7 @@
             </tr>
             <tr>
               <th>
-                移动端url
+                {{ $t1('移动端url') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="mobileUrl" :rules="[{ required: false, trigger: 'blur' }]">
@@ -81,7 +83,8 @@
             <tr>
               <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="wfObjConfig.note"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="wfObjConfig.note"
                           clearable></el-input>
               </td>
             </tr>

package/src/views/user/wf/wf_obj_config/edit_form.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('重置') }}
           </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="serviceId" :rules="[{ required: true, trigger: 'blur' }]">
@@ -32,7 +33,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                单据类型编号
+                {{ $t1('单据类型编号') }}
               </th>
               <td>
                 <el-form-item prop="objTypeCode" :rules="[{ required: true, trigger: 'blur' }]" v-if="!dataId">
@@ -44,7 +45,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                单据类型名称
+                {{ $t1('单据类型名称') }}
               </th>
               <td>
                 <el-form-item prop="objTypeName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -55,7 +56,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                跳转url
+                {{ $t1('跳转url') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
@@ -66,7 +67,8 @@
             <tr>
               <th>{{ $t1('备注') }}</th>
               <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small" v-model="wfObjConfig.note"
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="wfObjConfig.note"
                           clearable></el-input>
               </td>
             </tr>
@@ -187,12 +189,12 @@ export default {
           {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
           {
             field: 'defName',
-            title: '流程名称',
+            title: this.$t1('流程名称'),
             width: 150
           },
           {
             field: 'defKey',
-            title: '流程',
+            title: this.$t1('流程'),
             width: 150
           },
           {