Merge remote-tracking branch 'origin/master' into master

application/admin/dao/PurchasePriceDao.php

@@ -29,7 +29,7 @@ class PurchasePriceDao
     {
         try {
             //删除记录
-            $this->delete($order_detail_id);
+            $this->delete($purchase_id);
             //循环添加
             foreach ($param as $value) {
                 $data = [

application/admin/service/PaymentOrderService.php

@@ -155,9 +155,13 @@ class PaymentOrderService
         }else{
             $hotel_where_arr[]=" b.id = 0 ";
         }
+        if (!empty($param['sub_order_id'])) {
+            $item_where_arr[] = " a.id = {$param["sub_order_id"]} ";
+            $hotel_where_arr[]=" b.id = {$param['sub_order_id']} ";
+        }
         if (!empty($param['order_id'])) {
-            $item_where_arr[] = " a.id = {$param["order_id"]} ";
-            $hotel_where_arr[]=" b.id = {$param['order_id']} ";
+            $item_where_arr[] = " a.order_id = {$param["order_id"]} ";
+            $hotel_where_arr[]=" b.order_id = {$param['order_id']} ";
         }
         if (!empty($param['supplier_id'])) {
             $item_where_arr[] = " d.supplier_id = {$param["supplier_id"]} ";
@@ -168,8 +172,8 @@ class PaymentOrderService
             $hotel_where_arr[]=" b.confirm_status = {$param['confirm_status']} ";
         }
         if (!empty($param['customer_name'])) {
-            $item_where_arr[] = " a.customer_name like %{$param["customer_name"]}% ";
-            $hotel_where_arr[]=" b.customer_name like %{$param['customer_name']}% ";
+            $item_where_arr[] = " a.customer_name like '%{$param["customer_name"]}%' ";
+            $hotel_where_arr[]=" b.customer_name like '%{$param['customer_name']}%' ";
         }
         if (!empty($param['item_id'])) {
             $item_where_arr[] = " a.item_id = {$param["item_id"]} ";

application/admin/service/ReceiptOrderService.php

@@ -133,7 +133,7 @@ class ReceiptOrderService
             $where['commissioner_id'] = $param['commissioner_id'];
         }
         if (!empty($param['user_name'])) {
-            $where['user_name'] = ["like","%".$param['user_name']."%"];
+            $where['user_name'] = ["like","'%".$param['user_name']."%'"];
         }
         if (!empty($param['user_phone'])) {
             $where['user_phone'] = $param['user_phone'];

application/admin/view/payment_order/index.html

@@ -126,6 +126,8 @@
             </el-form>
             <div>
                 <div class="header-search" style="width: 100%;margin-bottom: 10px">
+                    <span>子订单ID：</span>
+                    <el-input v-model="orderMainListSearch.sub_order_id" style="width: 120px;" placeholder="请输入内容"></el-input>
                     <span>订单类型：</span>
                     <el-select v-model="orderMainListSearch.prod_type"  style="width: 120px;" placeholder="请选择" >
                         <el-option
@@ -135,8 +137,6 @@
                                 :value="item.id">
                         </el-option>
                     </el-select>
-                    <span>子订单ID：</span>
-                    <el-input v-model="orderMainListSearch.order_id" style="width: 120px;" placeholder="请输入内容"></el-input>
                     <span>用户名</span>
                     <el-input v-model="orderMainListSearch.customer_name" style="width: 120px;" placeholder="请输入内容" clearable></el-input>
 
@@ -170,10 +170,12 @@
                     </el-select>
                 </div>
                 <div class="header-search" style="width: 100%;margin-bottom: 10px">
+                    <span>主订单ID：</span>
+                    <el-input v-model="orderMainListSearch.order_id" style="width: 120px;" placeholder="请输入内容"></el-input>
                     <span>成本</span>
-                    <el-input-number v-model="orderMainListSearch.startMoney" style="width: 120px;" placeholder="请输入内容" clearable></el-input-number>
+                    <el-input-number v-model="orderMainListSearch.startMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
                     ~
-                    <el-input-number v-model="orderMainListSearch.endMoney" style="width: 120px;" placeholder="请输入内容" clearable></el-input-number>
+                    <el-input-number v-model="orderMainListSearch.endMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
                     <span>时间</span>
                     <el-date-picker
                             style="width: 120px;"
@@ -308,6 +310,7 @@
                 orderMainListSearch:{
                     "payment_order_id":"",
                     "order_id":"",
+                    "sub_order_id":"",
                     "prod_type":"hotel",
                     "supplier_id":"",
                     "inPayment":"",

application/admin/view/receipt_order/index.html

@@ -172,9 +172,9 @@
                     <span>手机号</span>
                     <el-input v-model="orderMainListSearch.user_phone" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
                     <span>金额</span>
-                    <el-input-number v-model="orderMainListSearch.startMoney" style="width: 150px;" placeholder="请输入内容" clearable></el-input-number>
+                    <el-input-number v-model="orderMainListSearch.startMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
                     ~
-                    <el-input-number v-model="orderMainListSearch.endMoney" style="width: 150px;" placeholder="请输入内容" clearable></el-input-number>
+                    <el-input-number v-model="orderMainListSearch.endMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
                     <span>时间</span>
                     <el-date-picker
                             style="width: 150px;"
@@ -197,7 +197,7 @@
                     <el-table ref="multipleTable" :data="orderMainList" border tooltip-effect="dark" style="font-size:12px;width: 100%;margin-top: 12px" @selection-change="handleSelectionChange">
                         <el-table-column type="selection" width="30" :selectable="checkSelect"></el-table-column>
                         <el-table-column prop="id" label="订单ID" min-width="40" ></el-table-column>
-                        <el-table-column prop="commissioner_id" label="专员" min-width="40" :formatter="getUserName"></el-table-column>
+                        <el-table-column prop="commissioner" label="专员" min-width="40" ></el-table-column>
                         <el-table-column prop="channel_name" label="渠道" min-width="80" ></el-table-column>
                         <el-table-column prop="channel_order_no" label="渠道订单号" min-width="90" ></el-table-column>
                         <el-table-column prop="create_id" label="下单人" min-width="50" :formatter="getUserName"></el-table-column>