Merge remote-tracking branch 'origin/master'

src/views/hisStore/storeOrder/index.vue

@@ -92,6 +92,16 @@
         />
       </el-form-item>
 
+      <el-form-item label="产品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="手机号" prop="userPhone">
         <el-input
           v-model="queryParams.userPhone"
@@ -511,7 +521,7 @@
               <el-tag prop="orderMedium" v-for="(item, index) in orderMediumOptions"    v-if="scope.row.orderMedium==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column label="订单产品" align="center" width="200px">
+      <el-table-column label="产品名称" align="center" width="200px">
         <template slot-scope="scope">
           <div v-if="scope.row.items && scope.row.items.length > 0">
             <el-tag
@@ -668,7 +678,7 @@
                     </el-popover>
                   </template>
                 </el-table-column>
-                <el-table-column label="商品名称" show-overflow-tooltip align="center" prop="productName" />
+                <el-table-column label="产品名称" show-overflow-tooltip align="center" prop="productName" />
                 <el-table-column label="商品规格" align="center" prop="sku" />
                 <el-table-column label="库存" align="center" prop="stock" />
                 <el-table-column label="单价" align="center" prop="price" />
@@ -1230,7 +1240,7 @@ export default {
         isSysDel: null,
         deptId:null,
         isUpload:null,
-
+        productName:null,
       },
       // 表单参数
       form: {
@@ -1444,10 +1454,6 @@ export default {
 
     },
 
-    // 删除订单号
-    removeOrderCode(index) {
-      this.queryParams.orderCodes.splice(index, 1)
-    },
     // 清空所有标签
     clearAllTags() {
       this.$confirm('确认清空所有订单号吗？', '提示', {

src/views/live/liveOrder/index.vue

@@ -45,6 +45,16 @@
         />
       </el-form-item>
 
+      <el-form-item label="收货人姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入收货人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="商品规格" prop="productSpec">
         <el-input
           v-model="queryParams.productSpec"
@@ -183,7 +193,7 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="绑定销售昵称" align="center" prop="companyUserName" />
+      <el-table-column label="绑定销售昵称" align="center" prop="companyUserNickName" />
       <el-table-column label="客户编码" align="center" prop="userId" />
       <el-table-column label="会员等级" align="center" prop="userLevel">
       </el-table-column>
@@ -196,7 +206,8 @@
       <el-table-column label="客户ID" align="center" prop="userId" />
       <el-table-column label="客户昵称" align="center" prop="nickName" />
       <el-table-column label="客户绑定手机号" align="center" prop="userBindPhone" />
-      <el-table-column label="收货手机号" align="center" prop="userPhone" />
+      <el-table-column label="收货人电话" align="center" prop="userPhone" />
+      <el-table-column label="收货人姓名" align="center" prop="userName" />
       <el-table-column label="累计成交笔数" align="center" prop="totalOrderCount" />
       <el-table-column label="累计成交总额" align="center" prop="totalOrderAmount" />
       <el-table-column label="最新绑定时间" align="center" prop="latestBindTime" width="180">