Merge branch 'dev' into 'master'

Dev

See merge request !274

src/views/order/factoryOrderNew/index.vue

@@ -62,7 +62,7 @@
             class="search-form"
             class="search-form"
             :model="searchForm"
             :model="searchForm"
             :inline="true"
             :inline="true"
-            label-width="110px"
+            label-width="70px"
           >
           >
             <ElFormItem v-if="status === 'ALL'" label="订单状态">
             <ElFormItem v-if="status === 'ALL'" label="订单状态">
               <ElTreeSelect
               <ElTreeSelect
@@ -108,16 +108,6 @@
               </ElSelect>
               </ElSelect>
             </ElFormItem>
             </ElFormItem>
 
 
-            <ElFormItem label="工艺">
-              <LogisticsWaySelect
-                v-model="searchForm.craftCode"
-                :company-list="craftList"
-                :start-width="'150px'"
-                search-placeholder="搜索工艺名称"
-                start-placeholder="请选择工艺名称"
-              ></LogisticsWaySelect>
-            </ElFormItem>
-
             <ElFormItem label="库存SKU">
             <ElFormItem label="库存SKU">
               <ElInput
               <ElInput
                 v-model.trim="searchForm.thirdSkuCode"
                 v-model.trim="searchForm.thirdSkuCode"
@@ -178,7 +168,21 @@
                 width="140px"
                 width="140px"
               />
               />
             </ElFormItem>
             </ElFormItem>
-            <ElFormItem v-if="status === 'PICKING'" label="操作单状态">
+
+            <ElFormItem label="工艺" label-width="50px">
+              <LogisticsWaySelect
+                v-model="searchForm.craftCode"
+                :company-list="craftList"
+                :start-width="'150px'"
+                search-placeholder="搜索工艺名称"
+                start-placeholder="请选择工艺名称"
+              ></LogisticsWaySelect>
+            </ElFormItem>
+            <ElFormItem
+              v-if="status === 'PICKING'"
+              label="操作单状态"
+              label-width="100px"
+            >
               <ElSelect
               <ElSelect
                 v-model="searchFormOperationStatusSelect"
                 v-model="searchFormOperationStatusSelect"
                 placeholder="请选择"
                 placeholder="请选择"
@@ -2658,8 +2662,8 @@ const handleUpdateCustomsInfo = async () => {
   await nextTick()
   await nextTick()
   updateCustomsDialogRef.value?.resetForm()
   updateCustomsDialogRef.value?.resetForm()
 }
 }
-// 值为空：待接单和已取消状态
-const NULL_STATUSES = ['PENDING_RECEIVE', 'CANCELLED']
+// 值为空：已取消状态
+const NULL_STATUSES = ['CANCELLED']
 // 终态订单：已完成/已归档
 // 终态订单：已完成/已归档
 const TERMINAL_ORDER_STATUSES = ['COMPLETED', 'ARCHIVE']
 const TERMINAL_ORDER_STATUSES = ['COMPLETED', 'ARCHIVE']
 const getOrderDelayText = (
 const getOrderDelayText = (