Merge branch 'dev' into 'master'

Dev

See merge request !95

src/types/api/podUsOrder.ts

@@ -41,6 +41,7 @@ export interface SearchForm {
   trackRegisterSelect?: string | number
   trackRegisterSelect?: string | number
   sizeType?: number | null
   sizeType?: number | null
   tagsId?: string
   tagsId?: string
+  size?: string
   tagsIdArr?: (number | null)[]
   tagsIdArr?: (number | null)[]
   replaceShipment?: number | null
   replaceShipment?: number | null
 }
 }

src/views/order/podCN/PodDistributionOrder.vue

@@ -72,10 +72,10 @@
               </el-form-item>
               </el-form-item>
               <el-form-item>
               <el-form-item>
                 <el-input
                 <el-input
-                  ref="testingInput"
+                  ref="testingInputRef"
                   v-model="barcode"
                   v-model="barcode"
                   style="width: 400px"
                   style="width: 400px"
-                  placeholder="'请输入生产单号/ 主SKU'"
+                  placeholder="请输入生产单号/ 主SKU"
                   @keyup.enter="barcodeInput"
                   @keyup.enter="barcodeInput"
                 ></el-input>
                 ></el-input>
               </el-form-item>
               </el-form-item>

src/views/order/podUs/index.vue

@@ -133,8 +133,8 @@
             v-model="searchForm.customizedQuantity"
             v-model="searchForm.customizedQuantity"
             @click.stop="(e: Event) => handleRadioGroupClick(e)"
             @click.stop="(e: Event) => handleRadioGroupClick(e)"
           >
           >
-            <el-radio-button  label="single">单面</el-radio-button>
-            <el-radio-button  label="multiple">多面</el-radio-button>
+            <el-radio-button label="single">单面</el-radio-button>
+            <el-radio-button label="multiple">多面</el-radio-button>
           </el-radio-group>
           </el-radio-group>
         </ElFormItem>
         </ElFormItem>
         <ElFormItem label="数量">
         <ElFormItem label="数量">
@@ -329,7 +329,7 @@
                   style="width: 150px"
                   style="width: 150px"
                 >
                 >
                   <ElOption
                   <ElOption
-                    v-for="(item, index) in logisticsWayList "
+                    v-for="(item, index) in logisticsWayList"
                     :key="index"
                     :key="index"
                     :value="item.id"
                     :value="item.id"
                     :label="item.name"
                     :label="item.name"
@@ -352,6 +352,23 @@
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
+              <ElFormItem label="尺码筛选">
+                <ElSelect
+                  v-model="searchForm.size"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  :teleported="false"
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(item, index) in sizes"
+                    :key="index"
+                    :value="item"
+                    :label="item"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
             </ElForm>
             </ElForm>
             <template #reference>
             <template #reference>
               <el-button type="warning" @click="searchVisible = !searchVisible">
               <el-button type="warning" @click="searchVisible = !searchVisible">
@@ -2988,6 +3005,7 @@ const sourceList = [
     id: 'third-party',
     id: 'third-party',
   },
   },
 ]
 ]
+const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
 const tabsNav = ref<Tab[]>()
 const tabsNav = ref<Tab[]>()
 const isAuto = ref(true)
 const isAuto = ref(true)
 const countryList = ref([])
 const countryList = ref([])