fix: bug

src/components/LogisticsTabs/index.vue

@@ -22,10 +22,14 @@
             :timestamp="item.time"
           >
             <el-row :gutter="20">
-              <el-col class="logistics-title"> {{ item.status }} </el-col>
+              <el-col class="logistics-title"> {{ statusObj[item.status].label }} </el-col>
               <el-col>
                 <div class="flex">
-                  <div>{{ item.context }}</div>
+                  <div>{{ item.comment }}</div>
+                  <!-- <div>{{ item.createTime }}</div> -->
+                </div>
+                <div class="flex">
+                  <div>{{ item.statusDetails }}</div>
                   <!-- <div>{{ item.createTime }}</div> -->
                 </div>
               </el-col>
@@ -39,33 +43,24 @@
       <div slot="header">
         <span>物流费用</span>
       </div>
-      <div>
-        <zj-table
-          :table-attributes="defaultTableAttributes"
-          :is-drop="true"
-          :columns="formLogistics"
-          :table-data="logisticsData"
-        />
-      </div>
+      <zj-table
+        :table-attributes="defaultTableAttributes"
+        :is-drop="true"
+        :columns="formLogistics"
+        :table-data="logisticsData"
+      />
     </el-card>
     <el-card v-if="curTarget === 3 && tabsList[curTarget - 1].show">
       <div slot="header">
         <span>出库条码</span>
       </div>
-      <div>
-        <zj-table
-          :is-drop="true"
-          :columns="formOutbound"
-          :table-data="outboundData"
-        />
-      </div>
+      <zj-table :is-drop="true" :columns="formOutbound" :table-data="outboundData" />
     </el-card>
   </div>
 </template>
 
 <script>
-import { getListCostBillV2 } from '@/api/logisticsBill'
-import { getListOrderTrack } from '@/api/supply/pickup'
+import { getListCostBillV2, getOrderTrackList2 } from '@/api/logisticsBill'
 import { getListCodeV2 } from '@/api/barcode'
 
 export default {
@@ -86,7 +81,7 @@ export default {
           label: '物流状态',
           value: 1,
           show: true,
-          fun: this.getListOrderTrack
+          fun: this.getOrderTrackList2
         },
         {
           label: '物流费用',
@@ -102,10 +97,46 @@ export default {
         }
       ],
       curTarget: 1,
+      statusObj: {
+        COLLECT: {
+          label: '揽收',
+          value: 'COLLECT'
+        },
+        OUT_OF_STOCK: {
+          label: '出库',
+          value: 'OUT_OF_STOCK'
+        },
+        ARRIVE_BRANCH: {
+          label: '到达网点',
+          value: 'ARRIVE_BRANCH'
+        },
+        DELIVERING: {
+          label: '派送中',
+          value: 'DELIVERING'
+        },
+        SIGNED: {
+          label: '已签收',
+          value: 'SIGNED'
+        },
+        RETURN: {
+          label: '退件',
+          value: 'RETURN'
+        },
+        REJECTION: {
+          label: '拒收',
+          value: 'REJECTION'
+        },
+        RESCHEDULE: {
+          label: '改约',
+          value: 'RESCHEDULE'
+        },
+        OTHER_EXCEPTION: {
+          label: '其他异常',
+          value: 'OTHER_EXCEPTION'
+        }
+      },
       defaultTableAttributes: {
-        heigth: 300,
         border: true,
-        headerCellClassName: 'headerRowColor',
         size: 'mini',
         'summary-method': this.$getSummaries,
         'show-summary': true
@@ -236,109 +267,127 @@ export default {
             prop: 'materialCostType',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '产品名称',
             prop: 'materialName',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '规格型号',
             prop: 'materialSpecification',
             width: 350
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '物料类型',
             prop: 'materialType',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '商家编码',
             prop: 'merchantCode',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '商家名称',
             prop: 'merchantName',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '订单号',
             prop: 'orderCode',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '订单时间',
             prop: 'orderDate',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '订单类型',
             prop: 'orderType',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '订单类型细分',
             prop: 'orderTypeDetail',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '收货送货地址',
             prop: 'receiptAddress',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '退货单号',
             prop: 'returnOrderCode',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '补贴结算系数',
             prop: 'subsidyCoefficient',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '嘉贤创建时间',
             prop: 'time',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '费用汇总',
             prop: 'totalCost',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '单价计算',
             prop: 'unitPrice',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '卸货上楼结算系数',
             prop: 'unloadUpstairsCoefficient',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '上楼卸货费用',
             prop: 'unloadUpstairsCost',
             width: 200
           }
-        },{
+        },
+        {
           columnAttributes: {
             label: '发货仓库编码',
             prop: 'warehouseCode',
@@ -351,7 +400,7 @@ export default {
             prop: 'warehouseName',
             width: 200
           }
-        },
+        }
       ]
     },
     formOutbound() {
@@ -474,17 +523,19 @@ export default {
             prop: 'warehouse',
             width: 200
           }
-        },
+        }
       ]
     }
   },
-  mounted() {},
+  mounted() {
+    this.getOrderTrackList2()
+  },
   methods: {
     handleChange() {
       this.tabsList[this.curTarget - 1].fun()
     },
-    getListOrderTrack() {
-      getListOrderTrack({
+    getOrderTrackList2() {
+      getOrderTrackList2({
         pageNum: 1,
         pageSize: -1,
         params: [
@@ -549,4 +600,5 @@ export default {
 .logistics {
   margin: 20px 0;
 }
+
 </style>

src/views/supply/transferOrder/transferOrderForm.vue

@@ -38,7 +38,7 @@
     <div v-if="!comDisabled">
       <template v-if="moduleType === 1">
         <el-button type="primary" size="mini" @click="onSubmit('WAIT')">提交</el-button>
-        <el-button size="mini" @click="onSubmit('SAVE')">保存</el-button>
+        <el-button size="mini" @click="onSubmit('WAIT')">保存</el-button>
       </template>
       <template v-else>
         <el-button type="primary" size="mini" @click="onSubmit">编辑</el-button>
@@ -48,7 +48,7 @@
     <!-- 审核 /详情-->
     <div v-if="moduleType === 3 || moduleType === 2">
       <el-button v-if="moduleType === 3" type="primary" size="mini" @click="onExamine('OK')">同意</el-button>
-      <el-button size="mini" @click="onInvoice('SAVE')">撤回</el-button>
+      <el-button size="mini" @click="onInvoice('WAIT')">撤回</el-button>
     </div>
   </div>
 </template>

src/views/supply/transferOrder/transferOrderList.vue

@@ -102,7 +102,7 @@ export default {
             >
               查看
             </el-button>
-            {row.status === 'WAIT' ? (
+            {row.status === 'WAIT' || row.status === 'SAVE' ? (
               <el-button
                 size='mini'
                 type='text'
@@ -115,7 +115,7 @@ export default {
                 审核
               </el-button>
             ) : null}
-            {row.status === 'SAVE' ? (
+            {row.status === 'WAIT' ? (
               <el-button
                 size='mini'
                 type='text'