修改内容

src/components/UserMan/RecommendRebate.vue

@@ -119,7 +119,7 @@
                                                 </span>
                                             </div>
                                             <div class="app-order-goods-price">
-                                                <span>货号：{{list.ProductCode}}</span>
+                                                <span>{{list.OrderIntroduction.Remark}}</span>
                                             </div>
                                         </div>
                                         <div flex="dir:left box:mean" style="width: 250px;">
@@ -170,12 +170,12 @@
                                         <div class="share-title"  style="margin-bottom: 10px; font-size: 15px;">
                                             <span>{{list.OrderIntroduction.UserName}}</span>
                                         </div>
-                                        <div flex="dir:left cross:center" style="margin-bottom: 10px;" >
+                                        <div flex="dir:left cross:center" style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Name!=null && list.OrderIntroduction.Name!='' " >
                                             <span style='color: #999999;margin-right: 10px;'>姓名:</span>
                                             <div>{{list.OrderIntroduction.Name}}</div>
                                         </div>
 
-                                        <div flex="dir:left cross:center" class=" share-price"  style="margin-bottom: 10px;">
+                                        <div flex="dir:left cross:center" class=" share-price"  style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 " >
                                             <span style='color: #999999;margin-right: 10px;'>佣金:</span>
                                             <div>￥{{list.OrderIntroduction.Commission}}</div>
                                         </div>

src/components/orderMan/RecommendBill.vue

@@ -3,7 +3,7 @@
     <template>
       <div class="head-title">
         推荐账单
-        <el-button @click="choiceOrder=true,UserMsg.Name='',getUserId()" style="float:right;margin: -5px 0 0 5px;" size="small"
+        <el-button @click=" orderMsg.UserId = 0,orderMsg.SupplierId = 0,choiceOrder=true,UserMsg.Name='',getUserId()" style="float:right;margin: -5px 0 0 5px;" size="small"
           type="primary">
           新增
         </el-button>
@@ -90,7 +90,7 @@
     <el-dialog title="新增账单" :visible.sync="choiceOrder" width="1200px" @close='closeDialog'>
       <el-form label-width="80px">
         <el-form-item label="用户" style="display:inline-block;">
-          <el-select size="small" v-model="orderMsg.UserId" @change="orderMsg.pageIndex=1,getOrderTable()" :filter-method="ChangeListName" filterable
+          <el-select size="small" v-model="orderMsg.UserId" :filter-method="ChangeListName" filterable
             placeholder="请选择">
             <el-option label="不限" :value="0"></el-option>
             <el-option v-for="item in searchUserTable" :key="item.Id" :label="item.Name" :value="item.Id">
@@ -98,14 +98,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="供应商" style="display:inline-block;">
-          <el-select class="w150" v-model="orderMsg.SupplierId" @change="orderMsg.pageIndex=1,getOrderTable()" size="small" placeholder="请选择">
+          <el-select class="w150" v-model="orderMsg.SupplierId"  size="small" placeholder="请选择">
             <el-option label="不限" :value="0"></el-option>
             <el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="display:inline-block;margin-left:10px;" label-width="0">
-          <el-button @click="orderMsg.pageIndex=1,getOrderTable()" size="small" type="primary">查询</el-button>
+          <el-button @click="goquery()" size="small" type="primary">查询</el-button>
         </el-form-item>
       </el-form>
       <el-table ref="multipleTable" :data="orderData" tooltip-effect="dark" height="450" style="width: 100%"
@@ -282,6 +282,19 @@
           }
         });
       },
+      goquery(){
+        if( this.orderMsg.UserId==0){
+          this.Error('请选择用户')
+          return
+        }
+           if( this.orderMsg.SupplierId==0){
+          this.Error('请选择供应商')
+          return
+        }
+        this.orderMsg.pageIndex =1
+        this.getOrderTable()
+      
+      },
       handleSelectionChange(val) {
         this.IntroductionIds = val;
       },

src/components/orderMan/orderDetails.vue

@@ -258,6 +258,9 @@
              ￥{{scope.row.Final_Price}}
             </template>
           </el-table-column>
+           <el-table-column prop="FreeShippingRemarks" label="备注" width="200" align="center">
+          
+          </el-table-column>
         </el-table>
         <el-form label-width="200px" class="app-order-count-price">
           <el-form-item label="商品小计">

src/components/orderMan/orderList.vue

@@ -153,6 +153,9 @@
                       <div class="app-order-goods-price">
                         <span>货号：{{list.ProductCode}}</span>
                       </div>
+                      <div class="app-order-goods-price" v-if='list.FreeShippingRemarks!=null'>
+                        <span>{{list.FreeShippingRemarks}}</span>
+                      </div>
                     </div>
                     <div flex="dir:left box:mean" style="width: 300px;">
                       <div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;">
@@ -1475,7 +1478,7 @@
 
   .app-order-list .goods-item .goods .app-order-goods-price {
     height: 24px;
-    margin-top: 10px;
+    margin-top: 3px;
     position: absolute;
     bottom: 20px;
     left: 125px;