feat: 工厂订单new界面优化 #1010397

src/views/order/factoryOrderNew/index.vue

@@ -490,30 +490,22 @@
             <ElDropdownMenu>
               <ElDropdownItem
                 command="createLogistic"
-                :disabled="
-                  cardSelectList.some((item) => item.shipmentType !== 1)
-                "
+                :disabled="isShowLogisticsButton"
                 >创建物流订单</ElDropdownItem
               >
               <ElDropdownItem
                 command="getTrackingNumber"
-                :disabled="
-                  cardSelectList.some((item) => item.shipmentType !== 1)
-                "
+                :disabled="isShowLogisticsButton"
                 >获取跟踪号</ElDropdownItem
               >
               <ElDropdownItem
                 command="getPrintOrder"
-                :disabled="
-                  cardSelectList.some((item) => item.shipmentType !== 1)
-                "
+                :disabled="isShowLogisticsButton"
                 >获取打印面单</ElDropdownItem
               >
               <ElDropdownItem
                 command="cancelLogistic"
-                :disabled="
-                  cardSelectList.some((item) => item.shipmentType !== 1)
-                "
+                :disabled="isShowLogisticsButton"
                 >取消物流订单</ElDropdownItem
               >
             </ElDropdownMenu>
@@ -837,7 +829,18 @@
                 @row-click="handleRowClick"
               >
                 <template #operation="{ row }">
-                  <div class="main-table-operation">
+                  <div
+                    v-if="
+                      !(
+                        status === 'ALL' &&
+                        ([, '已取消', '已完成', '已归档'].includes(
+                          row.statusName,
+                        ) ||
+                          row.pause)
+                      )
+                    "
+                    class="main-table-operation"
+                  >
                     <span v-if="status === 'PENDING_RECEIVE'" class="item">
                       <ElButton
                         type="primary"
@@ -1488,6 +1491,7 @@ const {
   operationOrderList,
   logList,
   tableRef,
+  currentRow,
   selectedRows,
   cardSelectList,
   loading,
@@ -1862,6 +1866,9 @@ const mainColumns = computed(() => [
     label: status.value !== 'SUSPEND' ? '订单状态' : '挂起前状态',
     minWidth: 120,
     align: 'center',
+    render: (row: FactoryOrderNewListData) => {
+      return <span>{row.pause ? '挂起' : row.statusName}</span>
+    },
   },
   {
     label: '客户标签',
@@ -2028,7 +2035,7 @@ function getOperationOrderMarkLabel(row: operateOrderListData): string {
   return ''
 }
 
-const operationOrderColumns = [
+const operationOrderColumns = computed(() => [
   {
     key: 'operationNo',
     prop: 'operationNo',
@@ -2118,6 +2125,7 @@ const operationOrderColumns = [
     minWidth: 120,
     align: 'center',
     showOverflowTooltip: true,
+    showColumn: currentRow.value?.pause === true,
   },
   {
     key: 'craftName',
@@ -2143,7 +2151,7 @@ const operationOrderColumns = [
     align: 'center',
     showOverflowTooltip: true,
   },
-]
+])
 
 const baseProductColumns = computed(() => [
   {
@@ -3369,6 +3377,15 @@ const getFunctionSwitch = async () => {
   if (res.code !== 200) return
   isEnableSorting.value = res.data.enable
 }
+// 物流接口是否展示
+const isShowLogisticsButton = computed(() => {
+  if (isCardLayout.value) {
+    return cardSelectList.value.find((item) => item.shipmentType !== 1)
+  } else {
+    return selectedRows.value.find((item) => item.shipmentType !== 1)
+  }
+})
+
 onMounted(() => {
   loadStatusTreeCounts()
   loadAllDictionaries()