xieruidong 2 лет назад
Родитель
Сommit
694d77bc86

+ 16 - 0
application/admin/controller/Orders.php

@@ -175,5 +175,21 @@ class Orders extends Backend
     #md
     public function md($ids){
         $order=$this->model->find($ids);
+        if($this->request->isGet()){
+            return $this->fetch();
+        }else{
+            logistics()
+                ->setLogistics($order->logistics->com)
+                ->setUserName($order->address->name)
+                ->setPhone($order->address->mobile)
+                ->setToArea($order->address->address)
+                ->setFromUsername($order->logistics->from_username)
+                ->setFromMobile($order->logistics->from_mobile)
+                ->setFromArea($order->logistics->fullArea())
+                ->setCargo(implode(',',$order->info()->column('goods_name')))
+                ->setCount($order->info()->sum('num'))
+                ->setOrderNo($order->order_no)
+                ->labelOrder();
+        }
     }
 }

+ 0 - 124
application/admin/view/orders/add.html

@@ -1,124 +0,0 @@
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-status" min="0" class="form-control" name="row[status]" type="number" value="0">
-        </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" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" class="form-control" name="row[order_no]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_total')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_total" min="0" class="form-control" step="0.01" name="row[amount_total]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_pay')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_pay" min="0" class="form-control" step="0.01" name="row[amount_pay]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_install')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_install" min="0" class="form-control" step="0.01" name="row[amount_install]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_coupon')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_coupon" min="0" class="form-control" step="0.01" name="row[amount_coupon]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_coupon_kill')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_coupon_kill" min="0" class="form-control" step="0.01" name="row[amount_coupon_kill]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_discount')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_discount" min="0" class="form-control" step="0.01" name="row[amount_discount]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-num" min="0" class="form-control" name="row[num]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Num_install')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-num_install" min="0" class="form-control" name="row[num_install]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_type" min="0" class="form-control" name="row[pay_type]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pay_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cancel_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cancel_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Rec_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-rec_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[rec_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Continue_expire_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-continue_expire_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[continue_expire_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Tax')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-tax" class="form-control" name="row[tax]" type="text">
-        </div>
-    </div>
-    <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>
-</form>

+ 5 - 0
application/admin/view/orders/md.html

@@ -0,0 +1,5 @@
+<style>
+</style>
+<div>
+    <button class="btn btn-primary btn-print">打印</button>
+</div>

+ 4 - 0
application/common/model/OrderLogistics.php

@@ -8,6 +8,7 @@ use think\Model;
 /**
  * @property LogisticsCompany com
  * @property string trans_no
+ * @property string from_address
  */
 class OrderLogistics extends Model
 {
@@ -17,4 +18,7 @@ class OrderLogistics extends Model
     public function from(){
         return str_replace('/','',$this['from_area']?:'');
     }
+    public function fullArea(){
+        return $this->from().$this->from_address;
+    }
 }

+ 1 - 0
extend/logistics/QueryInterface.php

@@ -18,6 +18,7 @@ abstract class QueryInterface{
     protected $cargo;
     abstract public function query();
     abstract public function maptrack();
+    abstract public function labelOrder();
     public function setNo($value){
         $this->no=$value;
         return $this;

+ 7 - 1
public/assets/js/backend/orders.js

@@ -150,7 +150,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     icon: 'fa',
                                     url: 'orders/md',
                                     callback: function (data) {
-                                        //Layer.alert("接收到回传数据:" + JSON.stringify(data), {title: "回传数据"});
                                         $('.btn-refresh').trigger('click')
                                     },
                                     extend: `data-area='["800px","80%"]'`,
@@ -187,6 +186,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 Form.api.bindevent($("form[role=form]"));
             }
         },
+        md(){
+            $('.btn-print').click(function (){
+                Fast.api.ajax({},(res)=>{
+                    console.log(res)
+                })
+            })
+        },
         detail: function () {
             // 初始化表格参数配置
             Table.api.init({