Browse Source

管理员关联用户,核销组只能看到自己核销的订单

lizhen_gitee 5 months ago
parent
commit
1c42f1fe5a

+ 14 - 0
application/admin/controller/unishop/Order.php

@@ -51,12 +51,24 @@ class Order extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            //核销组只能看已核销的,且核销人是自己的
+            $where_user = [];
+            if($this->auth->getGroupIds()[0] == 6){
+                $where_user = [
+                    'order.have_received' => ['neq',0],
+                    'order.hexiao_uid'    => ['=',$this->auth->user_id],
+                ];
+            }
+
+
             $total = $this->model
                 ->alias('order')
                 ->join('user', 'user.id = order.user_id','LEFT')
                 ->join('user intro', 'intro.id = order.intro_uid','LEFT')
                 ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->where($where)
+                ->where($where_user)
                 ->count();
 
             $sum_price = $this->model
@@ -65,6 +77,7 @@ class Order extends Backend
                 ->join('user intro', 'intro.id = order.intro_uid','LEFT')
                 ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->where($where)
+                ->where($where_user)
                 ->sum('total_price');
 
             $list = $this->model
@@ -73,6 +86,7 @@ class Order extends Backend
                 ->join('user intro', 'intro.id = order.intro_uid','LEFT')
                 ->join('user hexiao', 'hexiao.id = order.hexiao_uid','LEFT')
                 ->where($where)
+                ->where($where_user)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
                 ->field('order.*,user.username,intro.username as intro_username,intro.mobile as intro_mobile,hexiao.username as hexiao_username,hexiao.mobile as hexiao_mobile')

+ 1 - 0
application/admin/controller/user/User.php

@@ -17,6 +17,7 @@ class User extends Backend
      * @var \app\admin\model\User
      */
     protected $model = null;
+    protected $selectpageFields = 'id,username,nickname,mobile';
 
     public function _initialize()
     {

+ 1 - 0
application/admin/lang/zh-cn/auth/admin.php

@@ -11,4 +11,5 @@ return [
     'Username must be 3 to 30 characters'       => '用户名只能由3-30位数字、字母、下划线组合',
     'Please input correct password'             => '密码长度必须在6-30位之间,不能包含空格',
     'Password must be 6 to 30 characters'       => '密码长度必须在6-30位之间,不能包含空格',
+    'User_id' => '选择关联用户',
 ];

+ 7 - 1
application/admin/view/auth/admin/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
+            {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'data-rule'=>'required'])}
         </div>
     </div>
     <div class="form-group">
@@ -42,6 +42,12 @@
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" data-format-item="{username}-{mobile}-{nickname}" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 7 - 1
application/admin/view/auth/admin/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_select('group[]', $groupdata, $groupids, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
+            {:build_select('group[]', $groupdata, $groupids, ['class'=>'form-control selectpicker', 'data-rule'=>'required'])}
         </div>
     </div>
     <div class="form-group">
@@ -48,6 +48,12 @@
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" data-format-item="{username}-{mobile}-{nickname}" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
+        </div>
+    </div>
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 1
application/admin/view/unishop/order/index.html

@@ -33,7 +33,7 @@
                         <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('unishop/order/recyclebin')?'':'hide'}" href="unishop/order/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                         <a href="javascript:;" class="btn btn-default" style="font-size:14px;color:dodgerblue;">
                             <span class="extend">
-                                实付价格总计:<span id="sum_price">0</span>
+                                价格总计:<span id="sum_price">0</span>
                             </span>
                         </a>
                     </div>

+ 2 - 2
application/admin/view/unishop/order/product.html

@@ -41,11 +41,11 @@
     </div>
     {/foreach}
 
-    <div class="form-group layer-footer">
+    <!--<div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
-    </div>
+    </div>-->
 </form>