1

src/views/system/goofish/erpGoofishOrder/index.vue

@@ -56,7 +56,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" prop="id" width="72" />
       <el-table-column label="订单号" prop="orderNo" min-width="150" show-overflow-tooltip />
       <el-table-column label="商品" min-width="260">
         <template slot-scope="scope">
@@ -142,9 +141,9 @@
         </template>
       </el-table-column>
       <el-table-column label="京东地址" prop="jdAddress" min-width="140" show-overflow-tooltip />
-      <el-table-column label="发货" prop="shipStatus" width="76">
+      <el-table-column label="发货" prop="shipStatus" width="88">
         <template slot-scope="scope">
-          {{ shipLabel(scope.row.shipStatus) }}
+          {{ shipDisplayLabel(scope.row) }}
         </template>
       </el-table-column>
       <el-table-column label="更新时间" prop="modifyTime" width="158" align="center">
@@ -330,9 +329,23 @@ export default {
         this.eventLogsLoading = false
       })
     },
-    shipLabel(s) {
-      if (s === 1) return '成功'
-      if (s === 2) return '失败'
+    /** 平台侧是否已有发货事实：详情运单号或订单状态已发货/已完成（与 orderStatusOptions 一致） */
+    hasPlatformShipped(row) {
+      if (!row) return false
+      if (this.platformWaybillRaw(row)) return true
+      const os = row.orderStatus
+      return os === 21 || os === 22
+    },
+    /**
+     * 发货列展示：本系统开放平台发货成功 → 成功；
+     * 平台已有物流/已发货但本系统未记成功 → 手动推送（含在闲鱼侧手填物流、或曾自动发货失败后在平台处理等情况）；
+     * 其余按 shipStatus。
+     */
+    shipDisplayLabel(row) {
+      if (!row) return '未发'
+      if (row.shipStatus === 1) return '成功'
+      if (this.hasPlatformShipped(row)) return '手动推送'
+      if (row.shipStatus === 2) return '失败'
       return '未发'
     },
     detailDataField(row, key) {