diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
index 8c61400..9241763 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
@@ -217,13 +217,13 @@ export default {
       supplierList:[],
       // 表头
       columns: [
+        // {
+        //   title: '单据ID',
+        //   align: 'center',
+        //   dataIndex: 'id'
+        // },
         {
-          title: '单据ID',
-          align: 'center',
-          dataIndex: 'id'
-        },
-        {
-          title: '编码',
+          title: '入库单编码',
           align: 'center',
           dataIndex: 'code'
         },
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
index 06edf62..648bccc 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
@@ -125,6 +125,24 @@
         :customRow="clickThenSelect"
         @change="handleTableChange">
 
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color=blue>
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
+        <span slot="type" slot-scope="type">
+          <a-tag :key="type" color=pink>
+            {{ solutionShipmentType(type) }}
+          </a-tag>
+        </span>
+
+        <span slot="customerCode" slot-scope="customerCode">
+          <a-tag :key="customerCode" color=pink>
+            {{ solutionCustomer(customerCode) }}
+          </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -194,8 +212,16 @@
     data () {
       return {
         description: '历史出库单管理页面',
+        companyList:[],
+        shipmentTypeList:[],
+        customerList:[],
         // 表头
         columns: [
+          // {
+          //   title: '单据ID',
+          //   align: 'center',
+          //   dataIndex: 'id'
+          // },
           {
             title:'出库单编码',
             align:"center",