Merge branch 'feature/york-1388-gongzuoshi' into feature/1347-dd-userUpgrade

backendApi/modules/v1/controllers/UserController.php

@@ -122,6 +122,8 @@ class UserController extends BaseController
             'DEC_USER_NAME' => 'DU.USER_NAME',
             'IS_DEC' => 'U.IS_DEC',
             'IS_STUDIO' => 'U.IS_STUDIO',
+            'IS_STUDIO_CODE' => 'U.IS_STUDIO_CODE',
+            'IS_STUDIO_DATE' => 'U.IS_STUDIO_DATE',
             'DEC_ROLE_NAME' => 'U.DEC_ROLE_ID',
             'OPEN_BANK_NAME' => 'U.OPEN_BANK',
             'BANK_AREA' => [
@@ -183,6 +185,8 @@ class UserController extends BaseController
             'DEC_USER_NAME' => 'DU.USER_NAME',
             'IS_DEC' => 'U.IS_DEC',
             'IS_STUDIO' => 'U.IS_STUDIO',
+            'IS_STUDIO_CODE' => 'U.IS_STUDIO_CODE',
+            'IS_STUDIO_DATE' => 'U.IS_STUDIO_DATE',
             'DEC_ROLE_NAME' => 'U.DEC_ROLE_ID',
             'OPEN_BANK_NAME' => 'U.OPEN_BANK',
             'BANK_AREA' => [
@@ -1150,6 +1154,8 @@ class UserController extends BaseController
             'openBank' => $userInfo['OPEN_BANK'],
             'bankAddress' => $userInfo['BANK_ADDRESS'],
             'bankNo' => $userInfo['BANK_NO'],
+            'studiocode' => $userInfo['IS_STUDIO_CODE'],
+            'studiodate' => $userInfo['IS_STUDIO_DATE'],
         ];
 
         return static::notice($data);

backendApi/modules/v1/models/User.php

@@ -26,7 +26,7 @@ class User extends Admin implements IdentityInterface
 //        if($userId){
 //            return static::findOne(['ID' => $userId]);
 //        }
-//        return null;
+//        return null ;
     }
 
     public function fields()

backendApi/modules/v1/models/lists/user/IndexList.php

@@ -296,6 +296,14 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                         ];
                     },
                 ],
+                'IS_STUDIO_CODE' => [
+                    'header' => '工作室编号',
+                    'headerOther' => ['width' => '120'],
+                ],
+                'IS_STUDIO_DATE' => [
+                    'header' => '工作室日期',
+                    'headerOther' => ['width' => '120'],
+                ],
                 'IS_ATLAS' => [
                     'header' => '是否显示图谱',
                     'value' => function($row) {

backendEle/src/utils/config_development_example.js

@@ -1,5 +1,5 @@
 const APP_NAME = '奖金结算系统'
-const SERVER_API_DOMAIN = '16.163.228.151:8012'
+const SERVER_API_DOMAIN = '127.0.0.1:3030'
 const SERVER_API_HTTP_TYPE = 'http://'
 const SERVER_API_PORT = ''  // ':8102'
 const SERVER_API_VERSION = 'v1'
@@ -11,7 +11,7 @@ const ACCESS_TOKEN_PREFIX = 'Bearer '
 const CDN_BASE_URL = 'http://16.163.228.151:8016'
 const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
 const PRICE_IS_ROUND = true
-const FRONTEND_SERVER = 'http://16.163.228.151:8012'
+const FRONTEND_SERVER = 'http://127.0.0.1:8086'
 const REGION_URL = `${CDN_BASE_URL}/cdn/jsdata/ar_region_data.js?ver=0.1`
 
 export {

backendEle/src/views/user/index.vue

@@ -232,7 +232,14 @@
         </el-form-item>
         <el-form-item label="银行帐号">
           <el-input v-model="formModifyProfile.bankNo"></el-input>
-        </el-form-item>
+        </el-form-item>
+        <el-form-item label="工作室编号">
+          <el-input v-model="formModifyProfile.studiocode" maxlength='5'></el-input>
+        </el-form-item>
+        <el-form-item label="工作室日期">
+        <el-date-picker v-model="formModifyProfile.studiodate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+
         <el-form-item>
           <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">提交</el-button>
         </el-form-item>
@@ -342,7 +349,9 @@
             mobile: '',
             openBank: '',
             bankAddress: '',
-            bankNo: '',
+            bankNo: '',
+            studiocode:'',
+            studiodate:'',
         },
         passwordType: [
             {
@@ -391,7 +400,7 @@
       },
       getData(page, pageSize, isLoading = true) {
         network.getPageData(this, 'user/index', page, pageSize, this.filterModel, response => {
-          console.log(response.filterTypes);
+          console.log(response);
           this.filterTypes = response.filterTypes
         }, isLoading)
       },
@@ -731,7 +740,8 @@
       handleModifyProfile(row){
           this.dialogModifyProfileVisible = true
           let vueObj = this
-          network.getData('user/profile-get', {id: row.USER_ID}).then(response => {
+          network.getData('user/profile-get', {id: row.USER_ID}).then(response => {
+             // console.log('user/profile-get',response.userInfo);
               vueObj.formModifyProfile = response.userInfo
               vueObj.allOpenBank = response.allOpenBank
               vueObj.allNation = response.allNation

common/models/User.php

@@ -92,6 +92,8 @@ use common\libs\logging\operate\valueType\Config as ValueTypeConfig;
  * @property int $IS_FIRST_OPEN 首次开通
  * @property int $IS_MODIFY_PASSWORD 是否修改密码
  * @property int $IS_STUDIO 是否是工作室
+ * @property int $IS_STUDIO_CODE 工作室编号
+ * @property int $IS_STUDIO_DATE 工作室时间
  */
 class User extends \common\components\ActiveRecord
 {
@@ -212,6 +214,8 @@ class User extends \common\components\ActiveRecord
             'IS_FIRST_OPEN' => '首次开通',
             'IS_MODIFY_PASSWORD' => '是否修改密码',
             'IS_STUDIO' => '是否是工作室',
+            'IS_STUDIO_CODE' => '工作室编号',
+            'IS_STUDIO_DATE' => '工作室日期',
         ];
     }
 
@@ -296,7 +300,7 @@ class User extends \common\components\ActiveRecord
             'CITY' => $userInfo['CITY'],
             'COUNTY' => $userInfo['COUNTY'],
             'BANK_NO' => $userInfo['BANK_NO'],
-//            'BANK_NO' => Tool::hideBankNo($userInfo['BANK_NO']),
+//            'BANK_NO' => Tool::hideBankNo($userInfo['BANK_NO']) ,
         ];
     }
 

common/models/forms/UserBasicForm.php

@@ -24,6 +24,8 @@ class UserBasicForm extends Model {
     public $openBank;
     public $bankAddress;
     public $bankNo;
+    public $studiocode;
+    public $studiodate;
 
     public $status;
 
@@ -44,6 +46,7 @@ class UserBasicForm extends Model {
             [['idCard', 'allData'], 'required', 'on'=>['addWithUserName']],
             [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo'], 'required', 'on'=>'modifyProfile'],
             [['mobile'], 'mobile'],
+            [['studiocode'],'string','max'=>'5']
         ];
     }
 
@@ -55,7 +58,7 @@ class UserBasicForm extends Model {
         $parentScenarios = parent::scenarios();
         $customScenarios = [
             'modifyPassword' => ['userId', 'password', 'passwordType'],
-            'modifyProfile' => ['userId','nation','realName','idCard','mobile','openBank','bankAddress','bankNo'],
+            'modifyProfile' => ['userId','nation','realName','idCard','mobile','openBank','bankAddress','bankNo','studiocode','studiodate'],
             'modifyStatus' => ['userId','status'],
             'isModifyPasswordStatus' => ['userId','status'],
         ];
@@ -75,6 +78,7 @@ class UserBasicForm extends Model {
             'bankAddress' => '开户支行',
             'bankNo' => '银行账号',
             'status' => '状态',
+            'studiocode'=>'工作室编号'
         ];
     }
 
@@ -136,6 +140,8 @@ class UserBasicForm extends Model {
             $userModel->OPEN_BANK = $this->openBank;
             $userModel->BANK_NO = $this->bankNo;
             $userModel->BANK_ADDRESS = $this->bankAddress;
+            $userModel->IS_STUDIO_CODE = $this->studiocode;
+            $userModel->IS_STUDIO_DATE = $this->studiodate;
             if( !$userModel->save(false) ) {
                 throw new Exception($userModel->getErrors());
             }
@@ -150,6 +156,8 @@ class UserBasicForm extends Model {
                 'idCard' => $this->idCard,
                 'openBank' => $this->openBank,
                 'bankNo' => $this->bankNo,
+                'studiocode' => $this->studiocode,
+                'studiodate' => $this->studiodate,
                 'bankAddress' => $this->bankAddress,
             ]);
         }catch (Exception $e) {

frontendApi/config/menu.php

@@ -29,7 +29,7 @@ return [
         'child'=>[
             ['name'=>'商品列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1,],
             ['name'=>'复消商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],
-            ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],
+            ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,'allow'=>'declarer',],
             ['name'=>'订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],
         ]
     ],