admin update

admin/control/refill_order_manual.php

@@ -450,7 +450,6 @@ class refill_order_manualControl extends SystemControl
             $condition['refill_order.card_no'] = ['in', $card_nos];
         }
 
-        $merchant_list = $this->merchants();
         $transfer = new refill\transfer();
         $mMchid2Infos = $transfer->transfers();
 
@@ -461,7 +460,9 @@ class refill_order_manualControl extends SystemControl
 
 //        $mchids[] = 1092; //for test
         $condition['inner_status'] = 0;
-        if(!empty($mchids)) {
+        if(!empty($input['mchid'])){
+            $condition['mchid'] = $input['mchid'];
+        }elseif(!empty($mchids)) {
             $condition['mchid'] = ['in', $mchids];
         }
         else {
@@ -475,15 +476,17 @@ class refill_order_manualControl extends SystemControl
             ['egt', $start_day],
             ['lt', $cur_time]];
 
+        $merchant_list = $this->merchants(['mchid' => ['in', $mchids]]);
         $order_list = $mod->getMerchantOrderList($condition, 200, 0,'refill_order.*,vr_order.order_state', 'refill_order.order_time desc');
-        return $this->OrderDataFormat($order_list, $merchant_list);
+        return [$order_list, $merchant_list];
     }
 
     public function transfer_orderOp()
     {
         $condition['vr_order.order_state'] = ORDER_STATE_SEND;
-        $order_list = $this->transfer_orderData($_GET, $condition);
+        [$order_list, $merchant_list] = $this->transfer_orderData($_GET, $condition);
         Tpl::output('list', $order_list);
+        Tpl::output('merchant_list', $merchant_list);
         Tpl::output('show_page', Model('')->showpage());
         Tpl::showpage('transfer.order');
     }
@@ -520,9 +523,10 @@ class refill_order_manualControl extends SystemControl
     public function transfer_order_rechargeOp()
     {
         $condition['vr_order.order_state'] = ORDER_STATE_CANCEL;
-        $order_list = $this->transfer_orderData($_GET, $condition);
+        [$order_list, $merchant_list] = $this->transfer_orderData($_GET, $condition);
 
         Tpl::output('list', $order_list);
+        Tpl::output('merchant_list', $merchant_list);
         Tpl::output('show_page', Model('')->showpage());
         Tpl::showpage('transfer.order.recharge');
     }

admin/templates/default/transfer.order.recharge.php

@@ -105,6 +105,15 @@
         <input type="hidden" name="op" value="transfer_order_recharge" />
         <table class="tb-type1 noborder search">
             <tr>
+                <th><label>客户名称</label></th>
+                <td class="layui-form">
+                    <select name="mchid" class="querySelect" lay-verify="" lay-search>
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <?php foreach ($output['merchant_list'] as $merchant) { ?>
+                            <option value="<?php echo $merchant['mchid'] ?>"<?php if ($_GET['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name']; ?></option>
+                        <?php } ?>
+                    </select>
+                </td>
                 <th><label class="query_ors">充值卡号（多行查询）</label></th>
                 <td><textarea name="card_nos" id="card_nos" cols="30" rows="10"><?php echo $_GET['card_nos']; ?></textarea></td>
 
@@ -124,6 +133,11 @@
                         <span><i class="icon-edit"></i>批量补快充</span>
                     </a>
                 </td>
+                <td>
+                    <a href="#" class="btns" onclick="hCopyCardNo(event)">
+                        <span><i class="icon-edit"></i>拷贝充值卡号</span>
+                    </a>
+                </td>
             </tr>
         </table>
     </form>
@@ -335,6 +349,22 @@
             })
         })
 
+        function hCopyCardNo(e) {
+            let str = ''
+            $('#tbody tr').each(function () {
+                let res = $(this).find('td').eq(5).text()
+                str += res + '\n'
+            })
+            let oInput = document.createElement("textarea");
+            oInput.style.border = "0 none";
+            oInput.style.color = "transparent";
+            oInput.value = str;
+            document.body.appendChild(oInput);
+            oInput.select(); // 选择对象
+            document.execCommand("Copy"); // 执行浏览器复制命令
+            oInput.parentNode.removeChild(oInput)
+        }
+
         // 表格hover时背景
         $('.trFlex').each(function() {
             let data_color = $(this).attr('data-timeout_State');