Merge branch 'lang_dev_jw' into lang_dev

src/lang/modules/systemManage/ReportApprove.js

@@ -0,0 +1,78 @@
+/**
+ * 系统设置-审批流配置
+ */
+
+/* 英文 */
+export const ReportApproveEn = {
+    add_btn:"Add approval workflow",
+    placeholder01:'Please select an associated report',
+    placeholder02:'Please enter the approval workflow name',
+    tips01:'The system has not yet opened the approval process. Please open the approval process before proceeding with the operation!',
+
+    table_col01:'Approval Workflow Name',
+    table_col02:'Associated Report',
+    table_col03:'Creation Time',
+    config_text:'Process Configuration',
+    add_approve_user_btn:'Add approver',
+    initiator:'Initiator',
+    everyone:'Everyone',
+    is_end:'Process End',
+
+    reviewer:'Reviewer',
+    placeholder03:'Please select an approver',
+    approver_set:'Approver Setting',
+    select_appriver:'Select approver',
+    designate_personnel:'Designate Personnel',
+    select_user:'Select Personnel',
+    mutl_person:'During Multi-Person Approval',
+    approval_type01:'Sequential Approval ',
+    approval_type02:'Consensus (Need agreement from all approvers)',
+    approval_type03:'Or Sign (Approval or rejection by any one approver is sufficient)',
+    des01:'Multiple approvers review and approve in sequence; The node passes only when all approvers agree; Approve in order of selection',
+    des02:'The node passes only when all approvers agree; There is no sequence in approval.',
+    des03:'If any approver agrees, the node wil pass; There is no sequence in approval.',
+    warning_msg01:'Please select at least one person',
+    search_btn:'Search',
+    has_selected:'has been selected',
+    clear_btn:'Clear'
+
+};
+  
+/* 中文 */
+export const ReportApproveZh = {
+    add_btn:"添加审批流",
+    placeholder01:'请选择关联报告',
+    placeholder02:'请输入审批流名称',
+    tips01:'系统暂未开通审批流程，请开启审批流程后再进行操作！',
+    table_col01:'审批流名称',
+    table_col02:'关联报告',
+    table_col03:'创建时间',
+    config_text:'流程配置',
+    add_approve_user_btn:'添加审批人',
+    initiator:'发起人',
+    everyone:'所有人',
+    is_end:'流程结束',
+
+    reviewer:'审核人',
+    placeholder03:'请选择审批人',
+    approver_set:'审批人设置',
+    select_appriver:'选择审批人',
+    designate_personnel:'指定人员',
+    select_user:'选择人员',
+    mutl_person:'多人审批时',
+    approval_type01:'依次审批',
+    approval_type02:'会签（须所有审批人同意）',
+    approval_type03:'或签（一名审批人同意或拒绝即可）',
+    des01:'多个审批人依次进行审批；只有当所有审批人同意，该节点才能通过；按选择顺序审批',
+    des02:'所有审批人同意，该节点才能通过；审批无先后顺序',
+    des03:'任意一名审批人同意，该节点即通过；审批无先后顺序',
+    warning_msg01:'请至少选择一人',
+    search_btn:'搜索',
+    has_selected:'项',
+    clear_btn:'清空'
+
+};
+  
+/**
+* $t('SystemManage.ReportApprove.XXX')
+*/

src/lang/modules/systemManage/indexEn.js

@@ -7,6 +7,7 @@ import {BaseConfigEn} from './BaseConfig'
 import {OutLinkConfigEn} from './OutLinkConfig'
 import {DataSourceAccountEn} from './DataSourceAccount'
 import {ChartSetEn} from './ChartSet'
+import {ReportApproveEn} from './ReportApprove'
 
 export default {
   // 系统设置
@@ -19,7 +20,8 @@ export default {
     BaseConfig:BaseConfigEn,
     OutLinkConfig:OutLinkConfigEn,
     DataSourceAccount:DataSourceAccountEn,
-    ChartSet:ChartSetEn
+    ChartSet:ChartSetEn,
+    ReportApprove:ReportApproveEn
   },
 };
 

src/lang/modules/systemManage/indexZh.js

@@ -7,6 +7,7 @@ import {BaseConfigZh} from './BaseConfig'
 import { OutLinkConfigZh } from "./OutLinkConfig";
 import{DataSourceAccountZh} from './DataSourceAccount'
 import { ChartSetZh } from "./ChartSet";
+import { ReportApproveZh } from "./ReportApprove";
 
 export default {
   // 系统设置
@@ -19,6 +20,7 @@ export default {
     BaseConfig:BaseConfigZh,
     OutLinkConfig:OutLinkConfigZh,
     DataSourceAccount:DataSourceAccountZh,
-    ChartSet:ChartSetZh
+    ChartSet:ChartSetZh,
+    ReportApprove:ReportApproveZh
   },
 };

src/views/approve_manage/approveEdit.vue

@@ -3,11 +3,11 @@
     <div class="approve-edit-wrap approve-page-wrap" v-if="isETAApprove">
         <div class="head-box">
             <el-form :inline="true" :model="approveForm" ref="approve-form" :rules="formRules"
-                label-width="100px" label-position="left">
-                <el-form-item label="审批流名称" prop="name">
+                label-width="180px" label-position="left">
+                <el-form-item :label="$t('SystemManage.ReportApprove.table_col01')" prop="name">
                     <el-input v-model="approveForm.name" :disabled="this.$route.query.flowId" placeholder="请输入审批流名称"></el-input>
                 </el-form-item>
-                <el-form-item label="关联报告" prop="classify">
+                <el-form-item :label="$t('SystemManage.ReportApprove.table_col02')" prop="classify">
                     <el-cascader v-model="approveForm.classify"
                         placeholder="请选择关联报告" clearable
                         :disabled="this.$route.query.flowId"
@@ -17,13 +17,13 @@
                 </el-form-item>
             </el-form>
             <div class="form-btn">
-                <el-button type="primary" plain @click="$router.back()">取消</el-button>
+                <el-button type="primary" plain @click="$router.back()">{{$t('Dialog.cancel_btn')}}</el-button>
                 <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_save"
-                    type="primary" @click="checkFlow">保存</el-button>
+                    type="primary" @click="checkFlow">{{$t('Dialog.confirm_save_btn')}}</el-button>
             </div>
         </div>
         <div class="form-item" style="color:#606266;width:100px;">
-            <span style="color:#F56C6C;margin-right: 4px;">*</span>流程配置
+            <span style="color:#F56C6C;margin-right: 4px;">*</span>{{$t('SystemManage.ReportApprove.config_text')}}
         </div>
         <!-- 审批流画布 -->
         <div class="flow-editor-wrap">
@@ -34,7 +34,7 @@
         </div>
     </div>
     <div class="approve-page-wrap" v-else>
-        <tableNoData :text="pageLoading?'':'系统暂未开通审批流程，请开启审批流程后再进行操作！'"></tableNoData>
+        <tableNoData :text="pageLoading?'':$t('SystemManage.ReportApprove.tips01')"></tableNoData>
     </div>
 </template>
 

src/views/approve_manage/approveSetting.vue

@@ -3,15 +3,15 @@
     <div class="approve-setting-wrap approve-page-wrap" v-if="isETAApprove">
         <div class="head-box">
             <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_add"
-                type="primary" @click="$router.push('/approveEdit')">添加审批流</el-button>
+                type="primary" @click="$router.push('/approveEdit')">{{$t('SystemManage.ReportApprove.add_btn')}}</el-button>
             <el-cascader v-model="classify"
-                placeholder="请选择关联报告" clearable
+                :placeholder="$t('SystemManage.ReportApprove.placeholder01')" clearable
                 :options="classifyTree"
                 :props="{value:'ClassifyId',label:'ClassifyName',children:'Children'}"
                 @change="handleSearchChange"
                 style="margin-right: auto;margin-left: 15px;"></el-cascader>
             <el-input v-model="Keyword" @input="handleCurrentChange(1)"
-                placeholder="请输入审批流名称" prefix-icon="el-icon-search" clearable style="width:260px;"></el-input>
+                :placeholder="$t('SystemManage.ReportApprove.placeholder02')" prefix-icon="el-icon-search" clearable style="width:260px;"></el-input>
         </div>
         <div class="list-box">
             <el-table :data="tableData" @sort-change="sortChange" border>
@@ -23,12 +23,12 @@
                     :sortable="item.sortable"
                     align="center"
                 ></el-table-column>
-                <el-table-column label="操作" align="center">
+                <el-table-column :label="$t('Table.column_operations')" align="center">
                     <template slot-scope="{row}">
                         <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_edit"
-                            type="text" style="padding:0;" @click="handleEditFlow(row)">编辑</el-button>
+                            type="text" style="padding:0;" @click="handleEditFlow(row)">{{$t('Table.edit_btn')}}</el-button>
                         <el-button v-permission="permissionBtn.approveFlowPermission.reportApprove_remove"
-                            type="text" style="padding:0;color:red;" @click="handleDeleteFlow(row)">删除</el-button>
+                            type="text" style="padding:0;color:red;" @click="handleDeleteFlow(row)">{{$t('Table.delete_btn')}}</el-button>
                     </template>
                     
                 </el-table-column>
@@ -47,7 +47,7 @@
         </div>
     </div>
     <div class="approve-page-wrap" v-else>
-        <tableNoData :text="pageLoading?'':'系统暂未开通审批流程，请开启审批流程后再进行操作！'"></tableNoData>
+        <tableNoData :text="pageLoading?'':$t('SystemManage.ReportApprove.tips01')"></tableNoData>
     </div>
 </template>
 
@@ -57,6 +57,21 @@ import approveMixins from './mixins/approveMixins';
 import reportApproveConfig from "@/mixins/reportApproveConfig.js"
 export default {
     mixins:[approveMixins,reportApproveConfig],
+    computed:{
+        tableColumns(){
+            return [{
+                label:this.$t('SystemManage.ReportApprove.table_col01'),
+                key:'FlowName'
+            },{
+                label:this.$t('SystemManage.ReportApprove.table_col02'),
+                key:'ReportClassify'
+            },{
+                label:this.$t('SystemManage.ReportApprove.table_col03'),
+                key:'CreateTime',
+                sortable:'custom'
+            }]
+        }
+    },
     data() {
         return {
             /* 列表筛选项 */
@@ -68,17 +83,17 @@ export default {
             classify:'',
 
             tableData:[],
-            tableColumns:[{
-                label:'审批流名称',
-                key:'FlowName'
-            },{
-                label:'关联报告',
-                key:'ReportClassify'
-            },{
-                label:'创建时间',
-                key:'CreateTime',
-                sortable:'custom'
-            }],
+            // tableColumns:[{
+            //     label:'审批流名称',
+            //     key:'FlowName'
+            // },{
+            //     label:'关联报告',
+            //     key:'ReportClassify'
+            // },{
+            //     label:'创建时间',
+            //     key:'CreateTime',
+            //     sortable:'custom'
+            // }],
             page:1,
             pageSize:10,
             total:0,
@@ -128,14 +143,14 @@ export default {
             })
         },
         handleDeleteFlow(item){
-            this.$confirm("删除后不可恢复,确认删除吗?","提示",{
+            this.$confirm(this.$t('MsgPrompt.delete_info_msg'),this.$t('Confirm.prompt'),{
                 type:"warning"
             }).then(()=>{
                 approveInterence.deleteApproveFlow({
                     ReportApproveFlowId:item.ReportApproveFlowId
                 }).then(res=>{
                     if(res.Ret!==200) return 
-                    this.$message.success("删除成功")
+                    this.$message.success(this.$t('MsgPrompt.delete_msg'))
                     this.handleCurrentChange(1)
                 })
             }).catch(()=>{})

src/views/approve_manage/components/flowNode/addNode.vue

@@ -2,7 +2,7 @@
     <div class="add-node-wrap">
         <div class="add-btn" @click="handleAddApprove">
             <span> <i class="el-icon-circle-plus-outline"></i></span>
-            <span>添加审批人</span>
+            <span>{{$t('SystemManage.ReportApprove.add_approve_user_btn')}}</span>
         </div>
     </div>
 </template>

src/views/approve_manage/components/flowNode/approveNode.vue

@@ -3,7 +3,7 @@
         <div class="node-content">
             <div class="head">
                 <span class="icon"></span>
-                <span class="name">审核人</span>
+                <span class="name">{{$t('SystemManage.ReportApprove.reviewer')}}</span>
                 <span class="icon-btn" @click="removeNode"><i class="el-icon-close"></i></span>
             </div>
             <div class="content" @click="showDrawer">
@@ -14,7 +14,7 @@
                 </ul>
                 <span v-else style="color:#0052D9;display: flex;align-items: center;">
                     <img src="~@/assets/img/approve_m/select.png">
-                    请选择审批人
+                    {{$t('SystemManage.ReportApprove.placeholder03')}}
                 </span>
             </div>
         </div>
@@ -27,17 +27,17 @@
             >
             <div class="approve-drawer-wrap">
                 <div class="header">
-                    <p>审批人设置</p>
+                    <p>{{$t('SystemManage.ReportApprove.approver_set')}}</p>
                     <span class="close-icon" @click="drawerShow=false" style="cursor: pointer;"><i class="el-icon-close"></i></span>
                 </div>
                 <div class="drawer-content">
                     <div class="block">
-                        <p>选择审批人</p>
+                        <p>{{$t('SystemManage.ReportApprove.select_appriver')}}</p>
                         <div class="choose-box">
-                            <el-radio v-model="block1" :label="1">指定人员</el-radio>
+                            <el-radio v-model="block1" :label="1">{{$t('SystemManage.ReportApprove.designate_personnel')}}</el-radio>
                             <el-button @click="chooseDialogShow=true" type="primary">
                                 <i class="el-icon-circle-plus-outline" style="margin-right: 5px;"></i>
-                                选择人员
+                                {{$t('SystemManage.ReportApprove.select_user')}}
                             </el-button>
                         </div>
                         <draggable 
@@ -55,27 +55,27 @@
                     </div>
                     <div class="line"></div>
                     <div class="block" style="margin-top:30px;">
-                        <p>多人审批时</p>
+                        <p>{{$t('SystemManage.ReportApprove.mutl_person')}}</p>
                         <el-radio-group v-model="approveType">
                             <el-radio :label="1">
-                                依次审批
-                                <el-tooltip effect="dark" placement="top" content="多个审批人依次进行审批；只有当所有审批人同意，该节点才能通过；按选择顺序审批" >
+                                {{$t('SystemManage.ReportApprove.approval_type01')}}
+                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des01')" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
                                 </el-tooltip>
                             </el-radio>
                             <el-radio :label="2">
-                                会签（须所有审批人同意）
-                                <el-tooltip effect="dark" placement="top" content="所有审批人同意，该节点才能通过；审批无先后顺序" >
+                                {{$t('SystemManage.ReportApprove.approval_type02')}}
+                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des02')" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
                                 </el-tooltip>
                             </el-radio>
                             <el-radio :label="3">
-                                或签（一名审批人同意或拒绝即可）
-                                <el-tooltip effect="dark" placement="top" content="任意一名审批人同意，该节点即通过；审批无先后顺序" >
+                                {{$t('SystemManage.ReportApprove.approval_type03')}}
+                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des03')" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
@@ -85,14 +85,14 @@
                     </div>
                 </div>
                 <div class="drawer-btn">
-                    <el-button type="primary" plain @click="drawerShow=false">取消</el-button>
-                    <el-button type="primary" @click="editApproveNode">确认</el-button>
+                    <el-button type="primary" plain @click="drawerShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                    <el-button type="primary" @click="editApproveNode">{{$t('Dialog.confirm_btn')}}</el-button>
                 </div>
             </div>
         </el-drawer>
         <!-- 选择人员弹窗 -->
         <el-dialog 
-            title="选择人员"
+            :title="$t('SystemManage.ReportApprove.select_user')"
             width="600px"
             :visible.sync="chooseDialogShow"
             :modal-append-to-body="false"
@@ -107,8 +107,8 @@
                 />
             </div>
             <div class="dialog-btn">
-                <el-button type="primary" plain @click="chooseDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="getChoosedList">确认</el-button>
+                <el-button type="primary" plain @click="chooseDialogShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="getChoosedList">{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
         </el-dialog>
     </div>
@@ -151,7 +151,7 @@ export default {
         },
         getChoosedList(){
             if(!this.$refs["tree-trans"].choosedList.length){
-                this.$message.warning("请至少选择一人")
+                this.$message.warning(this.$t('SystemManage.ReportApprove.warning_msg01'))
                 return
             }
             this.choosedList = _.cloneDeep(this.$refs["tree-trans"].choosedList)||[]

src/views/approve_manage/components/flowNode/endNode.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="end-node-wrap node-wrap">
-        <div class="end-content">流程结束</div>
+        <div class="end-content">{{$t('SystemManage.ReportApprove.is_end')}}</div>
     </div>
 </template>
 

src/views/approve_manage/components/flowNode/startNode.vue

@@ -3,9 +3,9 @@
         <div class="node-content">
             <div class="head">
                 <span class="icon"></span>
-                <p class="name">发起人</p>
+                <p class="name">{{$t('SystemManage.ReportApprove.initiator')}}</p>
             </div>
-            <div class="content">所有人</div>
+            <div class="content">{{$t('SystemManage.ReportApprove.everyone')}}</div>
         </div>
         <AddNode :node="flowNode" v-on="$listeners"/>
     </div>

src/views/approve_manage/components/treeTransfer.vue

@@ -3,7 +3,7 @@
     <div class="tree-transfer">
         <div class="before-transfer transfer">
             <div class="search">
-                <el-input placeholder="搜索" suffix-icon="el-icon-search" style="width:100%;"
+                <el-input :placeholder="$t('SystemManage.ReportApprove.search_btn')" suffix-icon="el-icon-search" style="width:100%;"
                     v-model="searchText" @input="$refs['trans-tree'].filter(searchText)"></el-input>
             </div>
             <div class="content">
@@ -23,8 +23,8 @@
         </div>
         <div class="after-transfer transfer">
             <div class="head">
-                <span>已选{{choosedList.length}}项</span>
-                <span class="btn-text delete" @click="clearnItem">清空</span>
+                <span>{{$i18n.locale == 'zh' ?'已选':''}}{{choosedList.length}}{{$t('SystemManage.ReportApprove.has_selected')}}</span>
+                <span class="btn-text delete" @click="clearnItem">{{$t('SystemManage.ReportApprove.clear_btn')}}</span>
             </div>
             <draggable 
                 v-model="choosedList"