功能修改

backendApi/modules/v1/controllers/FinanceController.php

@@ -452,6 +452,10 @@ class FinanceController extends BaseController {
             'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
             'USER_NAME' => 'U.USER_NAME',
         ]);
+        $selectedIds = \Yii::$app->request->get('selectedIds', []);
+        if ($selectedIds) {
+            $filter['condition'] .= " AND W.ID IN (" . implode(',', $selectedIds) . ")";
+        }
         $form = new FinanceExportForm();
         $result = $form->run($filter, '提现申请');
         if (!$result) {

backendApi/modules/v1/models/lists/finance/WithdrawList.php

@@ -118,39 +118,39 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '150'],
                 ],
                 'OPEN_BANK' => [
-                    'header' => '提现银行',
+                    'header' => 'Bank info',
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return $row['OPEN_BANK'] ? OpenBank::getCnName($row['OPEN_BANK']) : '';
                     },
                 ],
-                'BANK_AREA' => [
-                    'header' => '银行地区',
-                    'value' => function($row) use($regionConfig) {
-                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
-                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
-                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
-                        return $province.$city.$county;
-                    },
-                    'showValue' => function($row) use($regionConfig) {
-                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
-                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
-                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
-                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
-                    },
-                    'headerOther' => [
-                        'width' => '200'
-                    ],
-                ],
-                'BANK_ADDRESS' => [
-                    'header' => '开户地址',
-                    'headerOther' => ['width' => '250'],
-                    'showValue' => function($row) {
-                        return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
-                    },
-                ],
+//                'BANK_AREA' => [
+//                    'header' => '银行地区',
+//                    'value' => function($row) use($regionConfig) {
+//                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
+//                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
+//                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
+//                        return $province.$city.$county;
+//                    },
+//                    'showValue' => function($row) use($regionConfig) {
+//                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
+//                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
+//                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
+//                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
+//                    },
+//                    'headerOther' => [
+//                        'width' => '200'
+//                    ],
+//                ],
+//                'BANK_ADDRESS' => [
+//                    'header' => '开户地址',
+//                    'headerOther' => ['width' => '250'],
+//                    'showValue' => function($row) {
+//                        return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
+//                    },
+//                ],
                 'BANK_NO' => [
-                    'header' => '提现银行账号',
+                    'header' => 'Bank account',
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return $row['BANK_NO'].' /';

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -180,7 +180,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'STATUS' => [
-                    'header' => 'STATUS',//状态
+                    'header' => 'Status',//状态
                     'value' => function($row) {
                         return $row['STATUS'] == 1 ? 'On sale' : 'Sold out'; //已上架：已下架
                     },
@@ -189,7 +189,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'UPDATED_AT' => [
-                    'header' => 'Update time',//更新时间
+                    'header' => 'Update Time',//更新时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['UPDATED_AT'],

backendEle/src/views/finance/deal-type.vue

@@ -9,13 +9,13 @@
         </el-table-column>
         <el-table-column label="是否系统预置" width="110">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.IS_PRESET=='1'?'success':'danger')">{{(scope.row.IS_PRESET==='1'?'是':'否')}}
+            <el-tag :type="(scope.row.IS_PRESET=='1'?'success':'danger')">{{(scope.row.IS_PRESET==='1'?'Yes':'No')}}
             </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="是否启用" width="110">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.IS_ENABLE=='1'?'success':'danger')">{{(scope.row.IS_ENABLE==='1'?'是':'否')}}
+            <el-tag :type="(scope.row.IS_ENABLE=='1'?'success':'danger')">{{(scope.row.IS_ENABLE==='1'?'Yes':'No')}}
             </el-tag>
           </template>
         </el-table-column>
@@ -34,12 +34,12 @@
             {{scope.row.UPDATE_ADMIN_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="修改时间" width="180">
+        <el-table-column label="Update time" width="180">
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.UPDATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column label="备注" width="150">
+        <el-table-column label="Note" width="150">
           <template slot-scope="scope">
             {{scope.row.CREATE_REMARK}}
           </template>
@@ -49,14 +49,14 @@
             {{scope.row.SORT_ORDER}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="Operation" width="180">
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`finance/deal-type-edit`)">
               <el-button type="primary" size="small" @click.stop="">
                 Operate on this data<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleEditShow(scope.row)">修改数据
+                <el-dropdown-item command="edit" @click.native="handleEditShow(scope.row)">Edit
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>

backendEle/src/views/finance/withdraw.vue

@@ -344,12 +344,22 @@ export default {
               this.$refs.multipleTable.toggleRowExpansion(row)
           },
           handleExport() {
+              let filterData = this.filterModel
+              // 如果有选中,导出选中ID,否则导出全部
+              if (this.multipleSelection.length > 0) {
+                  let selectedIds = []
+                  for (let val of this.multipleSelection) {
+                      selectedIds.push(val.ID)
+                  }
+
+                  filterData.selectedIds = selectedIds
+              }
               this.$confirm('确定要导出当前表格中的提现数据吗？', '提示', {
                   confirmButtonText: '确定',
                   cancelButtonText: '取消',
                   type: 'warning'
               }).then(() => {
-                  return network.getData('finance/withdraw-export', this.filterModel)
+                  return network.getData('finance/withdraw-export', filterData)
               }).then(response => {
                   this.$message({
                       message: response,