Merge branch 'dev'

src/views/order/podUs/PodMakeOrder.vue

@@ -365,14 +365,10 @@ watch(visible, async (value: boolean) => {
     warehouseId.value = locaclWarehouseId
       ? JSON.parse(locaclWarehouseId)
       : props.warehouseList[0].id
-
     _warehouseId.value = locaclWarehouseId
       ? JSON.parse(locaclWarehouseId)
       : props.warehouseList[0].id
 
-    _warehouseId.value = locaclWarehouseId
-      ? JSON.parse(locaclWarehouseId)
-      : props.warehouseList[0].id
     if (userStore.user?.factory.id) {
       try {
         await socket.init(

src/views/order/podUs/index.vue

@@ -2136,7 +2136,6 @@
     v-model="podOrderVisible"
     :print-order="printOrder"
     :warehouse-list="warehouseList"
-        :is-cn="false"
     @set-printer="handlePrinterChange"
     @set-warehouse-id="handleWarehouseIdChange"
     @refresh="onFastRefresh"