update: update

src/components/allCustomers/consumption.vue

@@ -21,11 +21,19 @@
       <div class="record" v-loading="fullscreenLoading">
         <div class="record-search">
           <div class="record-searchitem">
-            <el-select v-model="orderType" style="width:160px;" placeholder="所有类型"
+            <el-select v-model="orderType" style="width:160px;margin-right:6px;" placeholder="所有类型"
               @change="handleSearch">
               <el-option v-for="item in orderOpts" :key="item.value" :label="item.label"
                 :value="item.value" />
             </el-select>
+             <el-input
+              style="width:260px;"
+              v-model="searchInfo"
+              prefix-icon="el-icon-search"
+              placeholder="输入订单编号/原始单号"
+              @change="handleSearch"
+              clearable
+            />
           </div>
         </div>
         <div class="table-content" v-loading="load">
@@ -41,6 +49,9 @@
                   <p class="order-number">
                     订单编号：{{ group.orderNumber }}
                   </p>
+                  <p class="order-number" v-if="group.orderStatus!==1">
+                    原始单号：{{ group.oorderNumber||'无' }}
+                  </p>
                   <p class="order-time">
                     订单时间：{{ group.receiptsDate|formatTime }}
                   </p>
@@ -61,7 +72,7 @@
                         v-if="['orderStatus','clerkName','payAmount'].includes(colunm.prop)">
                         <!-- 订单类型 -->
                         <template v-if="colunm.prop==='orderStatus'">
-                          <div style="padding-left:14px;">{{ group[colunm.prop]|orderTypeFilter }}
+                          <div :style="{paddingLeft:'14px',color:orderColor[group.orderStatus]}">{{ group.orderStatus|orderTypeFilter }}
                           </div>
                         </template>
                         <template v-else-if="colunm.prop==='clerkName'">
@@ -229,6 +240,7 @@ export default {
         avgDiscount: 0,
       },
       orderType: -1,
+      searchInfo:'',
       orderLoading: false,
       orderInfo: {},
       payInfo: [],
@@ -265,6 +277,7 @@ export default {
         { label: '导购', width: '120', prop: 'clerkName' },
         { label: '小计（实付）', width: '120', prop: 'payAmount' },
       ],
+      orderColor:{1:'#303133',2:'#FA8C16',4:'#F5222D'},
       brokeImg,
     };
   },
@@ -299,6 +312,7 @@ export default {
         ...this.page,
         memberId: this.memberId,
         orderType: this.orderType,
+        searchInfo: this.searchInfo,
       });
 
       this.memberData = [];
@@ -477,7 +491,7 @@ p {
         .left {
           display: flex;
           align-items: center;
-          gap: 32px;
+          gap: 40px;
         }
         p {
           line-height: 48px;