diff --git a/application/admin/controller/CfItem.php b/application/admin/controller/CfItem.php index 2ee738d..d6f12cd 100755 --- a/application/admin/controller/CfItem.php +++ b/application/admin/controller/CfItem.php @@ -222,7 +222,7 @@ class CfItem extends Backend $config = \think\Config::get("site.item_category"); $config = json_decode($config,true); foreach ($result as $key=>$value){ - $result[$key]["item_type_name"]= $config[$value["item_type"]]; + $result[$key]["item_type_name"]= empty($config[$value["item_type"]])?"":$config[$value["item_type"]]; } $config = \think\Config::get("site.item_unit"); $config = json_decode($config,true); diff --git a/application/admin/dao/PaymentOrderDao.php b/application/admin/dao/PaymentOrderDao.php index 156cc18..58b77a8 100644 --- a/application/admin/dao/PaymentOrderDao.php +++ b/application/admin/dao/PaymentOrderDao.php @@ -123,6 +123,12 @@ class PaymentOrderDao if ($param['status']."" != 'all' && $param['status']!=="") { $where["a.status"] = $param['status']; } + if (!empty($param["id"])) { + $where["a.id"] = $param["id"]; + } + if (!empty($param['create_id'])) { + $where["a.create_id"] = $param["create_id"]; + } $having = []; if(!empty($param['startCost']) && !empty($param['endCost'])) { $having[] = " (itemMoney >= {$param['startCost']} and itemMoney <= {$param['endCost']} ) or (hotelMoney >= {$param['startCost']} and hotelMoney <= {$param['endCost']} ) "; diff --git a/application/admin/dao/ReceiptOrderDao.php b/application/admin/dao/ReceiptOrderDao.php index 477f708..1879618 100644 --- a/application/admin/dao/ReceiptOrderDao.php +++ b/application/admin/dao/ReceiptOrderDao.php @@ -124,6 +124,12 @@ class ReceiptOrderDao if ($param['status']."" != 'all' && $param['status']!=="") { $where["a.status"] = $param['status']; } + if (!empty($param["id"])) { + $where["a.id"] = $param["id"]; + } + if (!empty($param['create_id'])) { + $where["a.create_id"] = $param["create_id"]; + } $having = ""; if(!empty($param['startMoney']) && !empty($param['endMoney'])) { $having = " total_amount >= {$param['startMoney']} and total_amount <= {$param['endMoney']} "; diff --git a/application/admin/view/payment_order/index.html b/application/admin/view/payment_order/index.html index ef18c29..50ec1c6 100755 --- a/application/admin/view/payment_order/index.html +++ b/application/admin/view/payment_order/index.html @@ -8,9 +8,11 @@
-
+
+ 付款单ID： + 名称： - + 状态 + 创建人 + + + + +
+
成本 ~ @@ -289,6 +302,8 @@ data: function () { return { search: { + id:"", + create_id:"", name: "", status: "all", startCost:"", diff --git a/application/admin/view/receipt_order/index.html b/application/admin/view/receipt_order/index.html index fa876cc..10a2908 100755 --- a/application/admin/view/receipt_order/index.html +++ b/application/admin/view/receipt_order/index.html @@ -8,7 +8,9 @@
-
+
+ 付款单ID： + 名称： 状态 @@ -20,6 +22,18 @@ :value="item.id"> + 创建人 + + + + + +
+
金额 ~ @@ -260,6 +274,8 @@ data: function () { return { search: { + id:"", + create_id:"", name: "", status: "all", startMoney:0,