fix: 发货问题修改

src/components/LogList.vue

 <template>
 <template>
   <div class="log-list">
   <div class="log-list">
-    <div v-for="l in logList" :key="l.id" class="log-item flex flex-align-center">
+    <div
+      v-for="l in logList"
+      :key="l.id"
+      class="log-item flex flex-align-center"
+    >
       <div class="log-item-icon">
       <div class="log-item-icon">
         <Icon name="a-2labadianji3x" />
         <Icon name="a-2labadianji3x" />
       </div>
       </div>
       <div class="log-item-time">
       <div class="log-item-time">
         <span>{{ l.createTime }}</span>
         <span>{{ l.createTime }}</span>
       </div>
       </div>
-      <div class="log-item-name">
+      <div v-if="l.employeeName" class="log-item-name">
         <span>{{ l.employeeName }}</span>
         <span>{{ l.employeeName }}</span>
       </div>
       </div>
-      <div class="log-item-content">
+      <div class="log-item-content" :title="l.description">
         <span>{{ l.description }}</span>
         <span>{{ l.description }}</span>
       </div>
       </div>
     </div>
     </div>
@@ -39,4 +43,22 @@ defineProps({
 .log-item div:not(:last-child) {
 .log-item div:not(:last-child) {
   margin-right: 6px;
   margin-right: 6px;
 }
 }
+
+.log-item-time {
+  width: 140px;
+}
+
+.log-item-name {
+  width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.log-item-content {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>
 </style>

src/types/api/order.ts

@@ -19,6 +19,7 @@ export interface OrderData {
   id: number
   id: number
   namespace?: string
   namespace?: string
   erpId?: number
   erpId?: number
+  count?: number
   orderNumber?: string
   orderNumber?: string
   erpOrderNumber?: string
   erpOrderNumber?: string
   facotoryNo?: string
   facotoryNo?: string

src/views/order/index.vue

@@ -194,14 +194,6 @@
                     </div>
                     </div>
                     <div class="order-list-expand_item_info_title">
                     <div class="order-list-expand_item_info_title">
                       <span class="order-list-expand_item_label"
                       <span class="order-list-expand_item_label"
-                        >付款时间:</span
-                      >
-                      <span class="order-list-expand_item_value">{{
-                        row.paymentTime || '--'
-                      }}</span>
-                    </div>
-                    <div class="order-list-expand_item_info_title">
-                      <span class="order-list-expand_item_label"
                         >确认时间:</span
                         >确认时间:</span
                       >
                       >
                       <span class="order-list-expand_item_value">{{
                       <span class="order-list-expand_item_value">{{
@@ -243,7 +235,10 @@
                         >操作日志</ElButton
                         >操作日志</ElButton
                       >
                       >
                     </div>
                     </div>
-                    <div class="order-list-expand_item_info_title">
+                    <div
+                      v-if="statusCode === 1 || statusCode === 3"
+                      class="order-list-expand_item_info_title"
+                    >
                       <ElButton text type="danger" @click="cancelOrder(row.id)"
                       <ElButton text type="danger" @click="cancelOrder(row.id)"
                         >取消</ElButton
                         >取消</ElButton
                       >
                       >
@@ -265,12 +260,6 @@
                   <span class="value">{{ scope.row.orderNumber }}</span>
                   <span class="value">{{ scope.row.orderNumber }}</span>
                 </div>
                 </div>
                 <div class="order-detail_item">
                 <div class="order-detail_item">
-                  <span class="label">店铺单号:</span>
-                  <span class="value" :title="scope.row.shopNumber">{{
-                    scope.row.shopNumber || '--'
-                  }}</span>
-                </div>
-                <div class="order-detail_item">
                   <span class="label">工厂:</span>
                   <span class="label">工厂:</span>
                   <span class="value" :title="scope.row.facotoryNo">{{
                   <span class="value" :title="scope.row.facotoryNo">{{
                     scope.row.facotoryNo || '--'
                     scope.row.facotoryNo || '--'
@@ -765,15 +754,18 @@ const saveShipment = async () => {
   const data: ShipmentOrderRes[] = []
   const data: ShipmentOrderRes[] = []
   orderList.value.forEach((item) => {
   orderList.value.forEach((item) => {
     shipmentForm.value.namespace = item.namespace
     shipmentForm.value.namespace = item.namespace
-    const subOrder = item.productList?.map((jj) => {
-      return {
+    const order = []
+    for (const jj of item.productList || []) {
+      if (jj.count === 0) break
+      const subOrder = {
         erpSubOrderNumber: jj.erpSubOrderNumber,
         erpSubOrderNumber: jj.erpSubOrderNumber,
         subOrderNumber: jj.subOrderNumber,
         subOrderNumber: jj.subOrderNumber,
         sendOutQuantity: jj.count,
         sendOutQuantity: jj.count,
       }
       }
-    })
-    if (subOrder) {
-      data.push(...subOrder)
+      order.push(subOrder)
+    }
+    if (order) {
+      data.push(...order)
     }
     }
   })
   })
   try {
   try {