theo пре 2 година
родитељ
комит
b5033fd95a

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

@@ -49,9 +49,9 @@
 <!--                  审核通过-->
 <!--                </el-dropdown-item>-->
 <!--                <el-dropdown-item command="status"-->
-<!--                                  @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作?')"-->
+<!--                                  @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待复核操作?')"-->
 <!--                                  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, '确定对当前提现进行设为已付款操作?')"
@@ -59,7 +59,7 @@
                   付款
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作?')"
+                                  @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待复核操作?')"
                                   v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status-audit`)">
                   审核通过
                 </el-dropdown-item>
@@ -100,7 +100,7 @@
             <el-dropdown-item command="7" v-show="permission.hasPermission(`finance/withdraw-status-return`)">批量退回</el-dropdown-item>
           </el-dropdown-menu>
 <!--          <el-dropdown-menu v-else-if="filterStatus==='2'" slot="dropdown">-->
-<!--            <el-dropdown-item command="3">批量设为待付款</el-dropdown-item>-->
+<!--            <el-dropdown-item command="3">批量设为待复核</el-dropdown-item>-->
 <!--          </el-dropdown-menu>-->
           <el-dropdown-menu v-else-if="filterStatus==='3'" slot="dropdown">
             <el-dropdown-item command="6" v-show="permission.hasPermission(`finance/withdraw-status-pay`)">批量设为已付款</el-dropdown-item>
@@ -110,7 +110,7 @@
 <!--            <el-dropdown-item command="4">批量设为付款失败</el-dropdown-item>-->
 <!--          </el-dropdown-menu>-->
 <!--          <el-dropdown-menu v-else-if="filterStatus==='4'" slot="dropdown">-->
-<!--            <el-dropdown-item command="3">批量设为待付款</el-dropdown-item>-->
+<!--            <el-dropdown-item command="3">批量设为待复核</el-dropdown-item>-->
 <!--          </el-dropdown-menu>-->
         </el-dropdown>
 

+ 3 - 3
common/models/Withdraw.php

@@ -59,7 +59,7 @@ class Withdraw extends \common\components\ActiveRecord {
     const STATUS_APPLIED = 0;       // 已申请
 //    const STATUS_INVOICED = 1;      // 已传票
     const STATUS_AUDITED = 2;       // 已审核
-    const STATUS_WAIT_PAID = 3;     // 待付款
+    const STATUS_WAIT_PAID = 3;     // 待复核
     const STATUS_PAID_FALSE = 4;    // 付款失败
     const STATUS_REFUSED = 5;       // 已拒绝
     const STATUS_PAID = 6;          // 已付款
@@ -69,7 +69,7 @@ class Withdraw extends \common\components\ActiveRecord {
         self::STATUS_APPLIED => '提现待审核',
 //        self::STATUS_INVOICED => '提现待审核',
         self::STATUS_AUDITED => '提现已审核',
-        self::STATUS_WAIT_PAID => '提现待付款',
+        self::STATUS_WAIT_PAID => '提现待复核',
         self::STATUS_PAID_FALSE => '付款失败',
         self::STATUS_REFUSED => '已拒绝',
         self::STATUS_PAID => '提现已付款',
@@ -352,7 +352,7 @@ class Withdraw extends \common\components\ActiveRecord {
 //                    $msg = '';
 //                }
 //                break;
-            //待付款
+            //待复核
             case Withdraw::STATUS_WAIT_PAID: // 3 待复核
                 if ($nowStatus == Withdraw::STATUS_APPLIED) {
                     $msg = '';

+ 3 - 3
common/models/forms/WithdrawForm.php

@@ -381,7 +381,7 @@ class WithdrawForm extends Model {
             $this->addError('add', '完善身份信息后才可以提现');
             return -1;
         }
-        return 0; 
+        return 0;
         // 暂时不进行身份证号接口校验了,先直接返回正常
         $response = LingYunGongApi::hasIdCardInfo($user['ID_CARD']);
         if( !$response ) {
@@ -556,13 +556,13 @@ class WithdrawForm extends Model {
                         }
                     }
                     $oneWithdraw->REMARK = $this->createRemark ?? '';
-                } //已审核->待付款
+                } //已审核->待复核
                 elseif ($this->auditStatus == Withdraw::STATUS_WAIT_PAID) {
                     $oneWithdraw->PAID_FAIL_REMARK = '';
                     $oneWithdraw->PAID_FAIL_AT = 0;
                     $oneWithdraw->REMARK = $this->createRemark ?? '';
                     $oneWithdraw->PLAN_PAID_AT = Date::utcToTime($this->planPaidAt);
-                } //待付款->已付款
+                } //待复核->已付款
                 elseif ($this->auditStatus == Withdraw::STATUS_PAID) {
                     $oneWithdraw->PAID_AT = Date::utcToTime($this->paidAt);
                     //记录付款信息