库位订单和修改需退回订单详情的bug

src/views/marketing/dialog/index.vue

@@ -66,13 +66,7 @@
           <el-button type="primary" link @click="handleUpdate(row)">
             [编辑]
           </el-button>
-          <el-button
-            :type="row.status === '进行中' ? 'warning' : 'success'"
-            link
-            @click="handleStatusUpdate(row)"
-          >
-            [{{ row.status === '进行中' ? '停用' : '启用' }}]
-          </el-button>
+
           <el-button type="danger" link @click="handleDelete(row)">
             [删除]
           </el-button>

src/views/recycleOrder/components/order-timeline.vue

@@ -39,7 +39,7 @@ const loading = ref(false);
 //获取备注
 const getRemarks = async () => {
     if (!props.orderId || loading.value) return;
-    
+
     loading.value = true;
     try {
         const res = await request.get(`/order/remark/list?orderId=${props.orderId}`);

src/views/recycleOrder/needReturned/components/order-status.vue

@@ -13,8 +13,8 @@
 import { ref, reactive, watch } from 'vue';
 // 状态 0-创建(待付款) 1-已付款 2-已推送 3-已发货 4-已签收 5-已完成 6-已取消 7-超时取消
 const stepList = reactive([
-    { label: '创建', time: '', createdBy: '', stutus: '0' },
-    { label: '付款', time: '', createdBy: '', stutus: '1' },
+    { label: '创建', time: '', createdBy: '', stutus: '1' },
+    { label: '付款', time: '', createdBy: '', stutus: '2' },
     { label: '发货', time: '', createdBy: '', stutus: '3' },
     { label: '已签收', time: '', createdBy: '', stutus: '4' },
     { label: '完成', time: '', createdBy: '', stutus: '5' },
@@ -46,7 +46,7 @@ watch(() => props.logVoList, (newVal) => {
 }, { deep: true, immediate: true });
 
 const active = computed(() => {
-    let status = props.logVoList[props.logVoList.length - 1]?.status || 0;
+    let status = props.logVoList[0]?.status || 1;
     return stepList.findIndex(item => item.stutus == status) + 1;
 });
 

src/views/recycleOrder/needReturned/index.vue

@@ -196,7 +196,8 @@
     {
       label: '入库状态',
       prop: 'stockStatus',
-      formatter: (row) => (row.stockStatus == 1 ? '已入库' : '-')
+      formatter: (row) =>
+        row.stockStatus == 1 ? '已入库' : row.stockStatus == 0 ? '未入库' : '-'
     },
     { label: '是否首单', prop: 'firstOrder', slot: 'isFirstOrder' },
     { label: '备注', prop: 'remarkLabel', slot: 'remarks' },

src/views/recycleOrder/needReturned/refund-detail.vue

@@ -15,7 +15,7 @@
       header="图书清单"
       :body-style="{ paddingTop: '15px' }"
     >
-      <ele-data-table :data="detail.detailVoList" :columns="columns">
+      <ele-data-table :data="detail.detailVoList" :columns="columns" rowKey="id">
         <template #bookName="{ row }">
           <div class="book-name">
             <img :src="row.cover" style="width: 70px; height: 70px" alt="" />

src/views/recycleService/locationOrder/components/location-order-search.vue

@@ -31,7 +31,6 @@
           filterable: true,
           remote: true,
           remoteMethod: (query) => {
-            console.log('query', query);
             if (!query) {
               return [];
             }
@@ -48,9 +47,9 @@
           }
         }
       },
-      { type: 'input', label: '库位编码', prop: 'code' },
-      { type: 'input', label: '订单编号', prop: 'orderCode' },
-      { type: 'input', label: '物流编号', prop: 'logisticsCode' },
+      { type: 'input', label: '库位编码', prop: 'positionCode' },
+      { type: 'input', label: '订单编号', prop: 'orderId' },
+      { type: 'input', label: '物流编号', prop: 'waybillCode' },
     ];
   });
 
@@ -63,9 +62,9 @@
 
   const initKeys = reactive({
     godownId: '',
-    logisticsCode: '',
-    code: '',
-    orderCode: '',
+    positionCode: '',
+    waybillCode: '',
+    orderId: '',
   });
 
   const searchRef = ref(null);

src/views/recycleService/locationOrder/index.vue

@@ -37,22 +37,22 @@
 
   /** 表格列配置 */
   const columns = ref([
-    { type: 'index', width: 50, label: '#' },
+    { type: 'index', width: 70, label: '序号',align: 'center' },
     { label: '仓库名称', prop: 'godownName', align: 'center' },
-    { label: '库位编码', prop: 'code', align: 'center', minWidth: 140 },
-    { label: '订单编号', prop: 'orderCode', align: 'center' },
-    { label: '物流编号', prop: 'logisticsCode', align: 'center' },
-    { label: '数量', prop: 'number', align: 'center' },
-    { label: '不良数量', prop: 'nonumber', align: 'center' },
-    { label: '验货时间', prop: 'createTime', align: 'center', minWidth: 180 },
+    { label: '库位编码', prop: 'positionCode', align: 'center', minWidth: 140 },
+    { label: '订单编号', prop: 'orderId', align: 'center' },
+    { label: '物流编号', prop: 'waybillCode', align: 'center', minWidth: 180 },
+    { label: '数量', prop: 'num', align: 'center', formatter: (row) => 1 },
+    { label: '不良数量', prop: 'badNum', align: 'center' },
+    { label: '验货时间', prop: 'auditFinishTime', align: 'center', minWidth: 120 },
   ]);
 
   /** 页面组件实例 */
   const pageRef = ref(null);
 
   const pageConfig = reactive({
-    pageUrl: '/baseinfo/godownposition/pagelist',
-    exportUrl: '/baseinfo/godownposition/export',
+    pageUrl: '/baseinfo/godownposition/postionOrderList',
+    exportUrl: '/baseinfo/godownposition/postionOrderExport',
     fileName: '库位订单',
     cacheKey: 'locationOrderTable'
   });