theo 3 سال پیش
والد
کامیت
bb0d727ac3

+ 8 - 8
backendEle/src/components/WithdrawTable.vue

@@ -227,33 +227,33 @@
                 Approve <!-- 审核通过 -->
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"
+                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"
                                 v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作? -->
                 设为待付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 6, 'Are you sure to set the current withdrawal as paid?')"
+                                @click.native="handleStatusShow(scope.row, 6, 'Are you sure to set the current withdrawal as paid?')"
                                 v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为已付款操作 -->
                 设为已付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"
+                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"
                                 v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作? -->
                 设为待付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?', '付款失败备注')"
+                                @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?', '付款失败备注')"
                                 v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为付款失败操作? -->
                 设为付款失败
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 7, '确定对当前提现进行设为提现退回操作?', '提现退回备注')"
-                                v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 7, 'Determines that the current withdrawal is set to a withdrawal return operation?', 'Note on withdrawal return')"
+                                v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为提现退回操作? --> <!-- 提现退回备注 -->
                 Return <!-- 设为提现退回 -->
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票,请确认是否处理提现退回?', '提现退回备注')"
-                                v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票,请确认是否处理提现退回?', 'Note on withdrawal return')"
+                                v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)"> <!-- 提现退回备注 -->
                 Return <!-- 设为提现退回 -->
               </el-dropdown-item>
             </el-dropdown-menu>

+ 4 - 4
backendEle/src/views/finance/withdraw.vue

@@ -69,13 +69,13 @@
                   Failed<!-- 设为付款失败 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 7, '确定对当前提现进行设为提现退回操作?', '提现退回备注')"
-                                  v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)">
+                                  @click.native="handleStatusShow(scope.row, 7, 'Determines that the current withdrawal is set to a withdrawal return operation?', 'Note on withdrawal return')"
+                                  v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为提现退回操作? --> <!-- 提现退回备注 -->
                   Return <!-- 设为提现退回 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票,请确认是否处理提现退回?', '提现退回备注')"
-                                  v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)">
+                                  @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票,请确认是否处理提现退回?', 'Note on withdrawal return')"
+                                  v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)"><!-- 提现退回备注 -->
                   Return <!-- 设为提现退回 -->
                 </el-dropdown-item>
               </el-dropdown-menu>

+ 2 - 1
common/models/Recharge.php

@@ -163,7 +163,8 @@ class Recharge extends \common\components\ActiveRecord {
      */
     public static function chkAuditStatus($sn, $nowStatus, $toStatus) {
         $statusName = self::STATUS_NAME;
-        $msg = '充值单' . $sn . '当前状态为【' . $statusName[$nowStatus] . '】,无法设置为【' . $statusName[$toStatus] . '】';
+//        $msg = '充值单' . $sn . '当前状态为【' . $statusName[$nowStatus] . '】,无法设置为【' . $statusName[$toStatus] . '】';
+        $msg = 'The current status of the recharge ' . $sn . ' is 【' . $statusName[$nowStatus] . '】, cannot be set to 【' . $statusName[$toStatus] . '】';
         switch ($toStatus) {
             //已审核
             case Recharge::STATUS_AUDITED:

+ 2 - 1
common/models/Withdraw.php

@@ -335,7 +335,8 @@ class Withdraw extends \common\components\ActiveRecord {
      */
     public static function chkAuditStatus($sn, $nowStatus, $toStatus) {
         $statusName = self::STATUS_NAME;
-        $msg = '提现单' . $sn . '当前状态为【' . $statusName[$nowStatus] . '】,无法设置为【' . $statusName[$toStatus] . '】';
+//        $msg = '提现单' . $sn . '当前状态为【' . $statusName[$nowStatus] . '】,无法设置为【' . $statusName[$toStatus] . '】';
+        $msg = 'The current status of the withdrawal ' . $sn . ' is 【' . $statusName[$nowStatus] . '】, cannot be set to【'.  $statusName[$toStatus] . '】';
         switch ($toStatus) {
             //已审核
             case Withdraw::STATUS_AUDITED: