fix: 退货单

src/api/logisticsBill.js

@@ -6,6 +6,15 @@ export function getListCostBillV2(params) {
     data: params
   })
 }
+export function getOrderTrackList2(params) {
+  return request({
+    url: `/customer/frontOrder/orderTrackList?moduleId=${params.moduleId}`,
+    method: 'post',
+    data: params
+  })
+}
+
+
 
 export function exportListCostBillV2(data, name) {
   return postBlob({

src/components/LogisticsTabs/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="logistics">
     <div style="margin: 20px 0">
-      <el-radio-group v-model="curTarget" size="small">
+      <el-radio-group v-model="curTarget" size="small" @change="handleChange">
         <template v-for="(item, index) in tabsList">
           <el-radio-button v-if="item.show" :key="index" :label="item.value">{{ item.label }}</el-radio-button>
         </template>
       </el-radio-group>
     </div>
-    <el-card v-if="curTarget === 1 && tabsList[curTarget-1].show">
+    <el-card v-if="curTarget === 1 && tabsList[curTarget - 1].show">
       <div slot="header">
         <span>物流信息</span>
       </div>
@@ -35,7 +35,7 @@
         <div v-else class="tip">暂无物流信息</div>
       </div>
     </el-card>
-    <el-card v-if="curTarget === 2 && tabsList[curTarget-1].show">
+    <el-card v-if="curTarget === 2 && tabsList[curTarget - 1].show">
       <div slot="header">
         <span>物流费用</span>
       </div>
@@ -48,13 +48,12 @@
         />
       </div>
     </el-card>
-    <el-card v-if="curTarget === 3 && tabsList[curTarget-1].show">
+    <el-card v-if="curTarget === 3 && tabsList[curTarget - 1].show">
       <div slot="header">
         <span>出库条码</span>
       </div>
       <div>
         <zj-table
-          :table-attributes="defaultTableAttributes"
           :is-drop="true"
           :columns="formOutbound"
           :table-data="outboundData"
@@ -86,21 +85,25 @@ export default {
         {
           label: '物流状态',
           value: 1,
-          show: true
+          show: true,
+          fun: this.getListOrderTrack
         },
         {
           label: '物流费用',
           value: 2,
-          show: true
+          show: true,
+          fun: this.getListCostBillV2
         },
         {
           label: '出库条码',
           value: 3,
-          show: true
+          show: true,
+          fun: this.getListCodeV2
         }
       ],
       curTarget: 1,
       defaultTableAttributes: {
+        heigth: 300,
         border: true,
         headerCellClassName: 'headerRowColor',
         size: 'mini',
@@ -117,193 +120,382 @@ export default {
       return [
         {
           columnAttributes: {
-            label: '序号',
-            type: 'index'
+            label: '补贴费用',
+            prop: 'allowanceCost',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算状态',
-            prop: 'materialName'
+            label: '所属销售公司类型',
+            prop: 'belongCompanyType',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '调拨单号',
-            prop: 'orderCode'
+            label: '运费结算系数',
+            prop: 'coefficient',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '嘉贤单据号',
-            prop: 'materialName'
+            label: '备注',
+            prop: 'comment',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '存货编码',
-            prop: 'materialName'
+            label: '最终运费',
+            prop: 'cost',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物料代码',
-            prop: 'materialName'
+            label: '客户名称',
+            prop: 'customerName',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '产品名称',
-            prop: 'materialName'
+            label: '客户电话',
+            prop: 'customerPhone',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '规格型号',
-            prop: 'materialSpecification'
+            label: '无法生成的原因',
+            prop: 'errorResult',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '单价',
-            prop: 'price'
+            label: '是否已经对过帐',
+            prop: 'isAccountChecking',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '数量',
-            prop: 'qty'
+            label: '是否已经审核',
+            prop: 'isAudit',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物流费用',
-            prop: 'totalCost'
+            label: '是否完结',
+            prop: 'isFinish',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '仓储费用',
-            prop: 'materialName'
+            label: '实际是否卸货',
+            prop: 'isRealUnload',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '合计费用',
-            prop: 'materialName'
+            label: '实际是否上楼',
+            prop: 'isRealUpstairs',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '对账人',
-            prop: 'materialName'
+            label: '是否卸货',
+            prop: 'isUnload',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '对账日期',
-            prop: 'materialName'
+            label: '是否上楼',
+            prop: 'isUpstairs',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算人',
-            prop: 'materialName'
+            label: '物料名称',
+            prop: 'materialCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算日期',
-            prop: 'materialName'
+            label: '计费分类',
+            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',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '发货仓库名称',
+            prop: 'warehouseName',
+            width: 200
+          }
+        },
       ]
     },
     formOutbound() {
       return [
         {
           columnAttributes: {
-            label: '序号',
-            type: 'index'
+            label: '条码',
+            prop: 'barCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '条码状态',
-            prop: 'materialName'
+            label: '出库时间',
+            prop: 'consignerTime',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '签收状态',
-            prop: 'materialName'
+            label: '出库时间',
+            prop: 'consignerTimeV2',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '上墙状态',
-            prop: 'materialName'
+            label: '创建人',
+            prop: 'createBy',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '创建时间',
+            prop: 'createTime',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '送货时间',
+            prop: 'deliveryTime',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '送货时间',
+            prop: 'deliveryTimeV2',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '条码唯一id',
+            prop: 'id',
+            width: 200
           }
         },
         {
           columnAttributes: {
             label: '物料代码',
-            prop: 'materialName'
+            prop: 'materialCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '产品名称',
-            prop: 'materialName'
+            label: '物料类型',
+            prop: 'materialType',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '规格型号',
-            prop: 'materialName'
+            label: '销售订单号',
+            prop: 'orderNumber',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '内外机',
-            prop: 'materialName'
+            label: '收货人',
+            prop: 'receiptCompany',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物料条码',
-            prop: 'materialName'
+            label: '商家名称',
+            prop: 'salesCompany',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '出库条形码',
-            prop: 'materialName'
+            label: '规格',
+            prop: 'specification',
+            width: 350
           }
         },
         {
           columnAttributes: {
-            label: '签收日期',
-            prop: 'materialName'
+            label: '更新人',
+            prop: 'updateBy',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '上增日期',
-            prop: 'materialName'
+            label: '修改时间',
+            prop: 'updateTime',
+            width: 200
           }
-        }
+        },
+        {
+          columnAttributes: {
+            label: '发货仓库名称',
+            prop: 'warehouse',
+            width: 200
+          }
+        },
       ]
     }
   },
-  mounted() {
-    this.getListCodeV2()
-    this.getListCostBillV2()
-  },
+  mounted() {},
   methods: {
+    handleChange() {
+      this.tabsList[this.curTarget - 1].fun()
+    },
     getListOrderTrack() {
-      getListOrderTrack({ orderId: this.invoiceId }).then(res => {
-        this.logisticsDetail = res.data
+      getListOrderTrack({
+        pageNum: 1,
+        pageSize: -1,
+        params: [
+          {
+            param: 'sale_code',
+            compare: '=',
+            value: this.detailsId
+          }
+        ]
+      }).then(res => {
+        this.logisticsDetail = res.data.records
       })
     },
     getListCostBillV2() {
@@ -314,7 +506,7 @@ export default {
           {
             param: 'order_code',
             compare: '=',
-            value: this.invoiceId
+            value: this.detailsId
           }
         ]
       }).then(res => {

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -16,7 +16,7 @@
         </el-button>
       </template>
     </sales-table>
-    <LogisticsTabs v-if="details.status == 2 " style="margin:20px;" />
+    <LogisticsTabs v-if="details.status == 2 " style="margin:20px;" :details-id="detailsId" />
     <sales-dialog
       :dialog-visible="dialogVisible"
       :customer-number="customerNumber"
@@ -121,9 +121,8 @@ export default {
         this.$refs.header.screenForm.cityId = res.data.city
         this.$refs.header.screenForm.areaId = res.data.area
         this.$refs.header.screenForm.streetId = res.data.street
-        this.$refs.header.screenForm.stockType = res.data.stockType 
+        this.$refs.header.screenForm.stockType = res.data.stockType
       })
-
     }
   },
   methods: {

src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-page-header
-      :content="detailsId ? '编辑' : '新增'"
+      :content="detailsId ? '详情' : '新增'"
       style="padding: 20px 20px 0 20px"
       @back="handleBack"
     />
@@ -60,17 +60,12 @@ import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import ReturnSalesHeader from '@/components/ReturnSalesHeader/ReturnSalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
 import {
-  addFrontOrder,
   detailRefund,
-  getFrontOrderDetail,
   addRefund,
-  getFrontOrderList,
-  sbumitFrontOrder,
   sendRefund,
   updateRefund,
   listOrder
 } from '@/api/sales'
-import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
 export default {
   name: 'WarehouseForm',

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -20,15 +20,18 @@
         </div>
       </template>
       <template #events>
-        <div v-if="!detailsId">
-          <el-button type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
+        <div>
+          <el-button v-if="!detailsId" type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
+          <el-button v-else type="primary" size="mini" @click="handelSubmit(2)">提交</el-button>
           <el-button v-if="dis" size="mini" @click="onReset">重置</el-button>
-          <el-button  size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
+          <el-button v-if="details.stockType !=2 && !detailsId" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
+          <el-button v-if="details.stockType ==2 && detailsId" size="mini" @click="handleInform(2)">退货通知</el-button>
+
         </div>
-        <div v-else>
+        <!-- <div v-else>
           <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
           <el-button v-if="!detailsId" size="mini" @click="onReset">重置</el-button>
-        </div>
+        </div> -->
       </template>
       <template v-slot:custom="{ item: { row, $index } }">
         <div>{{ diffQty(row) }}</div>
@@ -60,17 +63,12 @@ import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import ReturnSalesHeader from '@/components/ReturnSalesHeader/ReturnSalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
 import {
-  addFrontOrder,
   detailRefund,
-  getFrontOrderDetail,
   addRefund,
-  getFrontOrderList,
-  sbumitFrontOrder,
   sendRefund,
   updateRefund,
   listOrder
 } from '@/api/sales'
-import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
 export default {
   name: 'WarehouseForm',

src/views/supply/pickup/components/pickup_form.vue

@@ -561,184 +561,361 @@ export default {
       return [
         {
           columnAttributes: {
-            label: '序号',
-            prop: 'materialName',
-            type: 'index'
+            label: '补贴费用',
+            prop: 'allowanceCost',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算状态',
-            prop: 'materialName'
+            label: '所属销售公司类型',
+            prop: 'belongCompanyType',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '调拨单号',
-            prop: 'materialName'
+            label: '运费结算系数',
+            prop: 'coefficient',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '嘉贤单据号',
-            prop: 'materialName'
+            label: '备注',
+            prop: 'comment',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '存货编码',
-            prop: 'materialName'
+            label: '最终运费',
+            prop: 'cost',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物料代码',
-            prop: 'materialName'
+            label: '客户名称',
+            prop: 'customerName',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '产品名称',
-            prop: 'materialName'
+            label: '客户电话',
+            prop: 'customerPhone',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '规格型号',
-            prop: 'materialName'
+            label: '无法生成的原因',
+            prop: 'errorResult',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '单价',
-            prop: 'materialName'
+            label: '是否已经对过帐',
+            prop: 'isAccountChecking',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '数量',
-            prop: 'materialName'
+            label: '是否已经审核',
+            prop: 'isAudit',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物流费用',
-            prop: 'materialName'
+            label: '是否完结',
+            prop: 'isFinish',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '仓储费用',
-            prop: 'materialName'
+            label: '实际是否卸货',
+            prop: 'isRealUnload',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '合计费用',
-            prop: 'materialName'
+            label: '实际是否上楼',
+            prop: 'isRealUpstairs',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '对账人',
-            prop: 'materialName'
+            label: '是否卸货',
+            prop: 'isUnload',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '对账日期',
-            prop: 'materialName'
+            label: '是否上楼',
+            prop: 'isUpstairs',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算人',
-            prop: 'materialName'
+            label: '物料名称',
+            prop: 'materialCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算日期',
-            prop: 'materialName'
+            label: '计费分类',
+            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',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '发货仓库名称',
+            prop: 'warehouseName',
+            width: 200
+          }
+        },
       ]
     },
     formOutbound() {
       return [
         {
           columnAttributes: {
-            label: '序号',
-            prop: 'materialName',
-            type: 'index'
+            label: '条码',
+            prop: 'barCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '条码状态',
-            prop: 'materialName'
+            label: '出库时间',
+            prop: 'consignerTime',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '签收状态',
-            prop: 'materialName'
+            label: '出库时间',
+            prop: 'consignerTimeV2',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '上墙状态',
-            prop: 'materialName'
+            label: '创建人',
+            prop: 'createBy',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '创建时间',
+            prop: 'createTime',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '送货时间',
+            prop: 'deliveryTime',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '送货时间',
+            prop: 'deliveryTimeV2',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '条码唯一id',
+            prop: 'id',
+            width: 200
           }
         },
         {
           columnAttributes: {
             label: '物料代码',
-            prop: 'materialName'
+            prop: 'materialCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '产品名称',
-            prop: 'materialName'
+            label: '物料类型',
+            prop: 'materialType',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '规格型号',
-            prop: 'materialName'
+            label: '销售订单号',
+            prop: 'orderNumber',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '内外机',
-            prop: 'materialName'
+            label: '收货人',
+            prop: 'receiptCompany',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物料条码',
-            prop: 'materialName'
+            label: '商家名称',
+            prop: 'salesCompany',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '出库条形码',
-            prop: 'materialName'
+            label: '规格',
+            prop: 'specification',
+            width: 350
           }
         },
         {
           columnAttributes: {
-            label: '签收日期',
-            prop: 'materialName'
+            label: '更新人',
+            prop: 'updateBy',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '上增日期',
-            prop: 'materialName'
+            label: '修改时间',
+            prop: 'updateTime',
+            width: 200
           }
-        }
+        },
+        {
+          columnAttributes: {
+            label: '发货仓库名称',
+            prop: 'warehouse',
+            width: 200
+          }
+        },
       ]
     }
   },

src/views/supply/transferOrder/transferOrderForm.vue

@@ -412,107 +412,361 @@ export default {
       return [
         {
           columnAttributes: {
-            label: '序号',
-            prop: 'materialName',
-            type: 'index'
+            label: '补贴费用',
+            prop: 'allowanceCost',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算状态',
-            prop: 'materialName'
+            label: '所属销售公司类型',
+            prop: 'belongCompanyType',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '调拨单号',
-            prop: 'materialName'
+            label: '运费结算系数',
+            prop: 'coefficient',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '嘉贤单据号',
-            prop: 'materialName'
+            label: '备注',
+            prop: 'comment',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '存货编码',
-            prop: 'materialName'
+            label: '最终运费',
+            prop: 'cost',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物料代码',
-            prop: 'materialName'
+            label: '客户名称',
+            prop: 'customerName',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '产品名称',
-            prop: 'materialName'
+            label: '客户电话',
+            prop: 'customerPhone',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '无法生成的原因',
+            prop: 'errorResult',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '是否已经对过帐',
+            prop: 'isAccountChecking',
+            width: 200
           }
         },
         {
           columnAttributes: {
+            label: '是否已经审核',
+            prop: 'isAudit',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '是否完结',
+            prop: 'isFinish',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '实际是否卸货',
+            prop: 'isRealUnload',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '实际是否上楼',
+            prop: 'isRealUpstairs',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '是否卸货',
+            prop: 'isUnload',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '是否上楼',
+            prop: 'isUpstairs',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '物料名称',
+            prop: 'materialCode',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '计费分类',
+            prop: 'materialCostType',
+            width: 200
+          }
+        },{
+          columnAttributes: {
+            label: '产品名称',
+            prop: 'materialName',
+            width: 200
+          }
+        },{
+          columnAttributes: {
             label: '规格型号',
-            prop: 'materialName'
+            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',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '单价',
-            prop: 'materialName'
+            label: '发货仓库名称',
+            prop: 'warehouseName',
+            width: 200
           }
         },
+      ]
+    },
+    formOutbound() {
+      return [
         {
           columnAttributes: {
-            label: '数量',
-            prop: 'materialName'
+            label: '条码',
+            prop: 'barCode',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '物流费用',
-            prop: 'materialName'
+            label: '出库时间',
+            prop: 'consignerTime',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '仓储费用',
-            prop: 'materialName'
+            label: '出库时间',
+            prop: 'consignerTimeV2',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '合计费用',
-            prop: 'materialName'
+            label: '创建人',
+            prop: 'createBy',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '对账人',
-            prop: 'materialName'
+            label: '创建时间',
+            prop: 'createTime',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '对账日期',
-            prop: 'materialName'
+            label: '送货时间',
+            prop: 'deliveryTime',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算人',
-            prop: 'materialName'
+            label: '送货时间',
+            prop: 'deliveryTimeV2',
+            width: 200
           }
         },
         {
           columnAttributes: {
-            label: '结算日期',
-            prop: 'materialName'
+            label: '条码唯一id',
+            prop: 'id',
+            width: 200
           }
-        }
+        },
+        {
+          columnAttributes: {
+            label: '物料代码',
+            prop: 'materialCode',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '物料类型',
+            prop: 'materialType',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '销售订单号',
+            prop: 'orderNumber',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '收货人',
+            prop: 'receiptCompany',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '商家名称',
+            prop: 'salesCompany',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '规格',
+            prop: 'specification',
+            width: 350
+          }
+        },
+        {
+          columnAttributes: {
+            label: '更新人',
+            prop: 'updateBy',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '修改时间',
+            prop: 'updateTime',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '发货仓库名称',
+            prop: 'warehouse',
+            width: 200
+          }
+        },
       ]
     },
     formLogisticsData() {