Merge branch 'dev_new_search' into 'dev'

Dev new search

See merge request !236

src/types/api/factoryOrderNew/index.ts

@@ -46,6 +46,7 @@ export interface SearchForm {
   prop?: string
   prop?: string
   /** list_page 排序方向：asc 正序，desc 倒序 */
   /** list_page 排序方向：asc 正序，desc 倒序 */
   order?: 'asc' | 'desc'
   order?: 'asc' | 'desc'
+  customerNo?: string // 客户交运单号
 }
 }
 
 
 export interface FactoryOrderNewListData {
 export interface FactoryOrderNewListData {

src/types/api/order/factoryOrderNew.ts

@@ -49,6 +49,7 @@ export interface SearchForm {
   prop?: string
   prop?: string
   /** list_page 排序方向：asc 正序，desc 倒序 */
   /** list_page 排序方向：asc 正序，desc 倒序 */
   order?: 'asc' | 'desc'
   order?: 'asc' | 'desc'
+  customerNo?: string // 客户交运单号
 }
 }
 
 
 export interface FactoryOrderNewListData {
 export interface FactoryOrderNewListData {

src/views/order/factoryOrderNew/index.vue

@@ -218,10 +218,10 @@
                       />
                       />
                     </div>
                     </div>
                   </ElFormItem>
                   </ElFormItem>
-                  <ElFormItem label="订单号">
+                  <ElFormItem label="订单编号">
                     <ElInput
                     <ElInput
                       v-model.trim="searchForm.factoryOrderNumber"
                       v-model.trim="searchForm.factoryOrderNumber"
-                      placeholder="订单号"
+                      placeholder="订单编号"
                       clearable
                       clearable
                       style="width: 150px"
                       style="width: 150px"
                     />
                     />
@@ -243,6 +243,14 @@
                       ></el-option>
                       ></el-option>
                     </el-select>
                     </el-select>
                   </ElFormItem>
                   </ElFormItem>
+                  <ElFormItem v-if="status === 'ALL'" label="客户交运单号">
+                    <ElInput
+                      v-model.trim="searchForm.customerNo"
+                      placeholder="客户交运单号"
+                      clearable
+                      style="width: 150px"
+                    />
+                  </ElFormItem>
                   <ElFormItem label="Variant SKU">
                   <ElFormItem label="Variant SKU">
                     <ElInput
                     <ElInput
                       v-model.trim="searchForm.sku"
                       v-model.trim="searchForm.sku"

src/views/order/factoryOrderNew/utils/listSearchQueryFilter.ts

@@ -8,6 +8,7 @@ export const FACTORY_ORDER_LIST_SEARCH_FIELD_RULES: Record<
   operationNo: (c) => c.isCardLayout,
   operationNo: (c) => c.isCardLayout,
   receiverCountry: (c) => !c.isCardLayout,
   receiverCountry: (c) => !c.isCardLayout,
   logisticsWayId: (c) => c.status === 'ALL',
   logisticsWayId: (c) => c.status === 'ALL',
+  customerNo: (c) => c.status === 'ALL',
 }
 }
 
 
 export function filterFactoryOrderListSearchPayload(
 export function filterFactoryOrderListSearchPayload(