Browse Source

修改资料删除校验,修改下拉框bug

zxiansheng 4 years ago
parent
commit
04301c0a1c

+ 2 - 1
common/models/User.php

@@ -108,7 +108,7 @@ class User extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['USER_NAME', 'PASSWORD_HASH', 'PAY_PASSWORD', 'REAL_NAME', 'ID_CARD'], 'required'],
+            [['USER_NAME', 'PASSWORD_HASH', 'PAY_PASSWORD', 'REAL_NAME'], 'required'],
             [['NATION', 'ID_TYPE', 'BANK_PROVINCE', 'BANK_CITY', 'BANK_COUNTY', 'CREATED_AT', 'UPDATED_AT', 'STATUS', 'DEC_CLOSED', 'DEC_CLOSED_AT', 'PROVINCE', 'CITY', 'COUNTY', 'DELETED', 'DELETED_AT', 'IS_DEC', 'IS_ATLAS', 'IS_RECHARGE', 'PERIOD_AT', 'DEC_PROVINCE', 'DEC_CITY', 'DEC_COUNTY', 'IS_UNION', 'STATUS_AT', 'VERIFIED', 'VERIFIED_AT', 'ALLOW_LOGIN', 'NOT_OPERATING', 'REG_FROM', 'BANK_UPDATED_AT', 'IS_DIRECT_SELLER', 'DEC_LV_UPDATED_AT', 'DEC_LV_UPDATED_PERIOD', 'PART_FUNC_CLOSED', 'LAST_DEC_LV_UPDATED_PERIOD', 'LAST_DEC_LV_UPDATED_AT', 'DEC_CREATED_AT', 'DEC_CREATED_PERIOD', 'PASSWORD_CHANGED', 'SUB_COM_LEADER', 'READ_AGREEMENT', 'IS_FIRST_OPEN', 'IS_MODIFY_PASSWORD'], 'integer'],
             [['ZG_UPGRADE_PV'], 'number'],
             [['ID', 'OPEN_BANK', 'BANK_NO', 'DEC_LV', 'EMP_LV', 'SUB_COM_ID', 'DEC_ID', 'DEC_ROLE_ID', 'ID_CARD_PREFIX', 'SEX', 'DEC_PHONE', 'GUARANTOR', 'USER_CREATOR', 'USER_UPDATER', 'LAST_DEC_LV'], 'string', 'max' => 32],
@@ -272,6 +272,7 @@ class User extends \common\components\ActiveRecord
             'ID' => $userId,
             'USER_NAME' => $userInfo['USER_NAME'],
             'NATION' => \Yii::$app->params['nation'][$userInfo['NATION']]['name']??'',
+            'NATION_VAL' => $userInfo['NATION'],
             'REAL_NAME' => $userInfo['REAL_NAME'],
             'ID_CARD' => $userInfo['ID_CARD'],
 //            'ID_CARD' => Tool::hideIdCard($userInfo['ID_CARD']),

+ 3 - 1
common/models/forms/UserForm.php

@@ -81,7 +81,8 @@ class UserForm extends Model
             [['conUid', 'location'], 'required', 'on'=>['validateLocation', 'validateAddWithUid']],
             [['conUserName', 'location'], 'required', 'on'=>['validateLocationConName', 'validateAddWithName']],
 
-            [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo'], 'required', 'on'=>'modifyProfile'],
+            // [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo'], 'required', 'on'=>'modifyProfile'],
+            [['nation','realName'], 'required', 'on'=>'modifyProfile'],
             [['oldPassword','verifyPassword'], 'required','on' => ['modifyPassword', 'modifyPasswordPay', 'noLoginModifyPassword']],
             [['password'], 'required','on' => ['modifyPassword', 'noLoginModifyPassword']],
             [['payPassword'], 'required','on' => ['modifyPasswordPay']],
@@ -552,6 +553,7 @@ class UserForm extends Model
             $this->addErrors($model->getErrors());
             return null;
         }
+
         User::updateBaseInfoToRedis($uid);
 
         $this->userOperateLogger->afterUpdate(\Yii::$app->user->id,'ID',['select'=>'NATION,OPEN_BANK,BANK_NO,BANK_ADDRESS']);

+ 4 - 3
frontendEle/src/views/user/index.vue

@@ -16,7 +16,7 @@
             <el-form-item label="会员姓名">
               <el-input v-model="infoData.REAL_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="身份证号">
+            <!-- <el-form-item label="身份证号">
               <el-input v-model="infoData.ID_CARD" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="手机号">
@@ -34,7 +34,7 @@
             </el-form-item>
             <el-form-item label="银行帐号">
               <el-input v-model="infoData.BANK_NO"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" @click="handleSubmit" :loading="submitButtonStat">保存</el-button>
             </el-form-item>
@@ -66,7 +66,7 @@ export default {
         MOBILE: '',
         OPEN_BANK: '',
         BANK_ADDRESS: '',
-        BANK_NO: '',
+        BANK_NO: ''
       },
       allOpenBank:null,
       allNation:null,
@@ -82,6 +82,7 @@ export default {
         this.allOpenBank = response.allOpenBank
         this.allNation = response.allNation
         this.loading = false
+        this.infoData.NATION = this.infoData.NATION_VAL
       })
     },
     handleSubmit(){