Merge branch 'wq' into dev

src/views/order/podUs/PodMakeOrder.vue

@@ -37,6 +37,7 @@
             </ElSelect>
             </ElSelect>
           </div>
           </div>
           <div class="form-item">
           <div class="form-item">
+            
             <ElSelect
             <ElSelect
               v-model="warehouseId"
               v-model="warehouseId"
               placeholder="请选择仓库"
               placeholder="请选择仓库"

src/views/order/podUs/index.vue

@@ -659,7 +659,9 @@
             </ElDropdown>
             </ElDropdown>
           </span>
           </span>
         </ElFormItem>
         </ElFormItem>
-        <ElFormItem v-if="status === 'COMPLETE'">
+        <ElFormItem
+          v-if="['WAIT_TRACK', 'COMPLETE', 'IN_TRANSIT'].includes(status)"
+        >
           <span class="item">
           <span class="item">
             <ElButton type="warning" @click="statusPush">状态推送</ElButton>
             <ElButton type="warning" @click="statusPush">状态推送</ElButton>
           </span>
           </span>