theo 3 년 전
부모
커밋
ce651ea139

+ 3 - 1
frontendApi/config/menu.php

@@ -85,7 +85,9 @@ return [
             ['name'=>'Withdrawal details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,],//提现明细
             ['name'=>'申请提现', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-add', 'routePath'=>'finance/withdraw-add', 'show'=>0,],
             ['name'=>'Recharge details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],//充值明细
-            ['name'=>'申请充值', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>1,],
+            ['name'=>'Apply for recharge', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>1,], // 申请充值
+            ['name'=>'Transfer record list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,'allow'=>'transferRecordSwitch'],
+            ['name'=>'我要转账', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>1,'allow'=>'transferSwitch'],
         ]
     ],
 //    'finance'=>[

+ 4 - 4
frontendEle/src/router/index.js

@@ -256,10 +256,10 @@ export const constantRouterMap = [
                 component: _import('atlas/network'),
                 name: 'atlas_network',
                 meta: {
-                    title: '安置网络',
+                    title: 'Placement network',
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},
-                        {title: '网络图谱', path: '/atlas/network'},
+                        {title: 'Network Atlas', path: '/atlas/network'},
                     ],
                 },
             },
@@ -472,7 +472,7 @@ export const constantRouterMap = [
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
             {title: 'Financial management', path: '/finance/index'},
-            {title: '转账记录', path: '/finance/transfer-list'},
+            {title: 'Transfer list', path: '/finance/transfer-list'},
           ],
         },
       },
@@ -498,7 +498,7 @@ export const constantRouterMap = [
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'}, // 首页
             {title: 'financial management', path: '/finance/index'}, // 财务管理
-            {title: 'Withdrawal details', path: '/finance/withdraw'},
+            {title: 'Recharge details', path: '/finance/recharge'},
           ],
         },
       },

+ 3 - 3
frontendEle/src/views/atlas/network.vue

@@ -3,15 +3,15 @@
     <div class="white-box">
         <div class="filter-user" @keyup.enter="enterToGetData()" >
             <el-input v-model="mainUserName" size="small" style="width:300px;">
-                <template slot="prepend">顶级会员</template>
+                <template slot="prepend">Top Member</template>
             </el-input>
             <el-input v-model="expandDeep" size="small" style="width:150px;">
-                <template slot="prepend">展开深度</template>
+                <template slot="prepend">Spread depth</template>
             </el-input>
             <el-input v-model="periodNum" size="small" style="width:150px;" v-show="false">
                 <template slot="prepend">期数</template>
             </el-input>
-            <el-button type="primary" size="small" @click="getMainData()">确定</el-button>
+            <el-button type="primary" size="small" @click="getMainData()">Confirm</el-button>
         </div>
         <el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0"
                  default-expand-all :height="tool.getTableHeight(true)">

+ 5 - 5
frontendEle/src/views/finance/recharge-add.vue

@@ -2,14 +2,14 @@
     <div v-loading="loading">
         <div class="white-box">
             <el-form ref="form"  label-width="250px" class="form-page">
-                <el-form-item label="充值金额">
+                <el-form-item label="Recharge Amount">
                     <el-input v-model="form.applyAmount"></el-input>
                 </el-form-item>
-                <el-form-item label="银行账号">
+                <el-form-item label="Bank account">
                     <el-input v-model="form.bankNo"></el-input>
                 </el-form-item>
-                <el-form-item label="汇款银行">
-                    <el-select v-model="form.openBank" placeholder="请选择开户行">
+                <el-form-item label="Remitting bank">
+                    <el-select v-model="form.openBank" placeholder="Select Bank">
                         <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                    :value="item.BANK_CODE"></el-option>
                     </el-select>
@@ -20,7 +20,7 @@
 <!--                </el-form-item>-->
 
                 <el-form-item>
-                    <el-button type="primary" @click="onSubmits" :loading="submitButtonStat">保存</el-button>
+                    <el-button type="primary" @click="onSubmits" :loading="submitButtonStat">Save</el-button>
                 </el-form-item>
             </el-form>
         </div>

+ 15 - 16
frontendEle/src/views/finance/recharge.vue

@@ -4,41 +4,40 @@
             <div class="white-box">
                 <el-table class="withdraw-table" :data="tableData" stripe style="width: 100%;">
 
-                    <el-table-column label="创建时间">
+                    <el-table-column label="Created Time">
                         <template slot-scope="scope">
                             {{tool.formatDate(scope.row.CREATED_AT)}}
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="充值金额" prop="AMOUNT">
+                    <el-table-column label="Recharge Amount" prop="AMOUNT">
 
                     </el-table-column>
 
-                    <el-table-column label="充值状态名称">
+                    <el-table-column label="Recharge Status">
                         <template slot-scope="scope">
                         <el-tag :type="tool.statusType(scope.row.AUDIT_STATUS)">{{scope.row.STATUS_NAME}}</el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="汇款银行" prop="OPEN_BANK_NAME">
+                    <el-table-column label="Remitting bank" prop="OPEN_BANK_NAME">
 
                     </el-table-column>
 
-                    <el-table-column label="我的汇款账号" prop="BANK_NO">
+                    <el-table-column label="Bank account" prop="BANK_NO">
 
                     </el-table-column>
 
-                      <el-table-column label="打印凭证" width="200">
-                            <template slot-scope="scope">
-                                <el-button type="primary" size="small" @click="handleAddInvoiceShow(scope.row)"
-                                           v-if="scope.row.AUDIT_STATUS==='0'" icon="el-icon-upload">上传凭证
-                                </el-button>
-
-                                <el-button type="success" size="small" @click="handleInvoiceShow(scope.row)"
-                                           v-if="scope.row.AUDIT_STATUS!=='0'" icon="el-icon-view">查看凭证
-                                </el-button>
-                            </template>
-                        </el-table-column>
+                    <el-table-column label="Print voucher" width="200">
+                        <template slot-scope="scope">
+                            <el-button type="primary" size="small" @click="handleAddInvoiceShow(scope.row)"
+                                       v-if="scope.row.AUDIT_STATUS==='0'" icon="el-icon-upload">Upload voucher
+                            </el-button>
 
+                            <el-button type="success" size="small" @click="handleInvoiceShow(scope.row)"
+                                       v-if="scope.row.AUDIT_STATUS!=='0'" icon="el-icon-view">View voucher
+                            </el-button>
+                        </template>
+                    </el-table-column>
 
                 </el-table>
                 <div class="white-box-footer">