展示供应商

application/admin/service/OrderMainService.php

@@ -306,7 +306,7 @@ class OrderMainService
      */
     public function getOrderList($param){
         $orderMainDao = new OrderMainDao();
-        $where = ["id"=>["neq",""]];
+        $where = ["del_flag"=>0];
         if (!empty($param['order_id'])) {
             $where["id"]=$param['order_id'];
         }

application/admin/view/order_main/index.html

@@ -180,6 +180,7 @@
                                 <div v-if="scope.row.profit<=0" v-html="scope.row.profit" style="color: red"></div>
                             </template>
                         </el-table-column>
+                        <el-table-column prop="supplier_name" label="供应商" min-width="30" ></el-table-column>
                         <el-table-column label="发单状态" min-width="30" :formatter="confirmStatusName"></el-table-column>
                         <el-table-column prop="payment_order_name" label="付款单" min-width="40" >
                             <template slot-scope="scope">