feat：

1. 订单详情发货记录调整显示字段并加入口跳转到销售发货单详情
2. 销售退货单选择发货单时表格调整显示字段
3. 订单详情去掉理赔入口

src/views/mallManagement/order/order_detail/index.vue

@@ -229,8 +229,8 @@
             <!-- <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="primary"
               @click="handleRefund(scope.row)"
               :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款</el-button> -->
-            <el-button v-if="!~['TIMEOUT'].indexOf(orderDetail.orderStatus)" size="mini"
-              @click="handleCompensate(scope.row)">理赔</el-button>
+            <!-- <el-button v-if="!~['TIMEOUT'].indexOf(orderDetail.orderStatus)" size="mini"
+              @click="handleCompensate(scope.row)">理赔</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -242,20 +242,17 @@
         <!-- 发货记录 -->
         <el-table :data="deliverList" style="width: 100%;" size="small" border>
           <el-table-column prop="deliveryId" align="center" label="发货单号" width="160"></el-table-column>
-          <el-table-column prop="brandName" align="center" label="品牌"></el-table-column>
-          <el-table-column prop="mainName" align="center" label="大类名称"></el-table-column>
-          <el-table-column prop="smallName" align="center" label="小类名称"></el-table-column>
-          <el-table-column prop="goodsName" align="center" label="商品名称" width="140"></el-table-column>
-          <el-table-column prop="goodsSpecName" align="center" label="规格型号" width="140"></el-table-column>
-          <el-table-column prop="goodsMaterialUnit" align="center" label="单位">
+          <el-table-column prop="status" align="center" label="状态">
             <template slot-scope="scope">
-              {{scope.row.goodsMaterialUnit == 'C' ? '整套' : scope.row.goodsMaterialUnit == 'I' ? '单个' : ''}}
+              {{ {SEND: '已发货', REFUND: '已退货', PART_REFUND: '部分退货', REFUND_PRICE: '仅退款'}[scope.row.status] }}
             </template>
           </el-table-column>
           <el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
-          <el-table-column prop="insideCodeQty" align="center" label="内机数量"></el-table-column>
-          <el-table-column prop="outCodeQty" align="center" label="外机数量"></el-table-column>
-          <el-table-column prop="partsCodeQty" align="center" label="配件数量"></el-table-column>
+          <el-table-column prop="refundNum" align="center" label="退货数量"></el-table-column>
+          <el-table-column prop="num" align="center" label="订单数量"></el-table-column>
+          <el-table-column prop="sendInsideCodeQty" align="center" label="内机数量"></el-table-column>
+          <el-table-column prop="sendOutCodeQty" align="center" label="外机数量"></el-table-column>
+          <el-table-column prop="sendPartsCodeQty" align="center" label="配件数量"></el-table-column>
           <el-table-column prop="storageStockName" align="center" label="发货仓库" width="100"></el-table-column>
           <el-table-column prop="pickType" align="center" label="发货方式">
             <template slot-scope="scope">
@@ -266,6 +263,7 @@
           <el-table-column prop="companyName" align="center" label="物流公司" width="100"></el-table-column>
           <el-table-column prop="pickName" align="center" label="提货人"></el-table-column>
           <el-table-column prop="pickPhone" align="center" label="提货人电话" width="110"></el-table-column>
+          <el-table-column align="center" prop="deliverTime" label="发货时间" min-width="160"></el-table-column>
           <el-table-column prop="createBy" align="center" label="操作人" width="140"></el-table-column>
           <el-table-column prop="createTime" align="center" label="操作时间" width="160"></el-table-column>
           <el-table-column align="center" label="操作" fixed="right">
@@ -273,6 +271,7 @@
 			 <!-- <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="text"
 			    @click="handleRefund(scope.row)" :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款
 			  </el-button> -->
+              <el-button type="text" size="small" @click="toDeliverDetail(scope.row.deliveryId)">详情</el-button>
               <el-button type="text" size="small" @click="returnOrder(scope.row.deliveryId)" v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus) && scope.row.status == 'SEND'">发起退货</el-button>
             </template>
           </el-table-column>
@@ -408,8 +407,8 @@
 				<el-col :span="24">
 					<el-card class="box-card">
 						<el-tabs v-model="typeIndex">
-						    <el-tab-pane v-if="orderDetail.orderStatus != 'YFH' && orderDetail.orderStatus != 'OVER'" label="发货数量" name="1"></el-tab-pane>
-						    <el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
+              <el-tab-pane v-if="orderDetail.orderStatus != 'YFH' && orderDetail.orderStatus != 'OVER'" label="发货数量" name="1"></el-tab-pane>
+              <el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
 						</el-tabs>
 						<br/>
 						<el-button size="small" v-show="typeIndex == 2 && joinCode" type="primary" @click="addCode()">新增</el-button>
@@ -941,6 +940,16 @@ export default {
         this.$successMsg('确认收款成功');
       })
     },
+
+    toDeliverDetail(deliveryId) {
+      this.$router.push({
+        name: "sales_deliver_order_list",
+        query: {
+          deliverId: deliveryId
+        }
+      })
+    },
+
     // 发起退货
     returnOrder(deliveryId) {
       this.$router.push({

src/views/mallManagement/order/sales_deliver_order_list/index.vue

@@ -78,7 +78,7 @@
                 {{scope.row.goodsMaterialUnit == 'C' ? '整套' : scope.row.goodsMaterialUnit == 'I' ? '单个' : ''}}
               </template>
             </el-table-column>
-            <el-table-column prop="sendNum" align="center" label="订单数量"></el-table-column>
+            <el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
             <el-table-column prop="refundNum" align="center" label="退货数量"></el-table-column>
             <el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
             <el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
@@ -206,7 +206,11 @@ export default {
   },
 
   created() {
-		
+		if(this.$route.query.deliverId) {
+      this.$nextTick(() => {
+        this.openDetail('detail', this.$route.query.deliverId)
+      })
+    }
   },
 
   methods: {

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -467,24 +467,28 @@
             <el-table-column align="center" prop="orderId" label="销售订单号" min-width="180"></el-table-column>
             <el-table-column align="center" prop="status" label="状态" min-width="80">
               <template slot-scope="scope">
-                {{{SEND: '已发货', REFUND: '已退货'}[scope.row.status]}}
+                {{ {SEND: '已发货', REFUND: '已退货', PART_REFUND: '部分退货', REFUND_PRICE: '仅退款'}[scope.row.status] }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="brandName" label="品牌" min-width="80"></el-table-column>
-            <el-table-column align="center" prop="mainName" label="大类" min-width="80"></el-table-column>
-            <el-table-column align="center" prop="smallName" label="小类" min-width="80"></el-table-column>
-            <el-table-column align="center" prop="goodsName" label="商品名称" min-width="200"></el-table-column>
-            <el-table-column align="center" prop="goodsSpecValue" label="规格型号" min-width="200"></el-table-column>
-            <el-table-column align="center" prop="sendNum" label="数量" min-width="80"></el-table-column>
-            <el-table-column align="center" prop="saleType" label="发货方式" min-width="80">
-              <template slot-scope="scope">
-                {{{YES: '自提', NO: '快递物流'}[scope.row.pickType]}}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="pickName" label="提货人" min-width="80"></el-table-column>
-            <el-table-column align="center" prop="pickPhone" label="提货人电话" min-width="120"></el-table-column>
-            <el-table-column align="center" prop="companyName" label="快递公司" min-width="120"></el-table-column>
-            <el-table-column align="center" prop="deliverTime" label="发货时间" min-width="160"></el-table-column>
+            <el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
+          <el-table-column prop="refundNum" align="center" label="退货数量"></el-table-column>
+          <el-table-column prop="num" align="center" label="订单数量"></el-table-column>
+          <el-table-column prop="sendInsideCodeQty" align="center" label="内机数量"></el-table-column>
+          <el-table-column prop="sendOutCodeQty" align="center" label="外机数量"></el-table-column>
+          <el-table-column prop="sendPartsCodeQty" align="center" label="配件数量"></el-table-column>
+          <el-table-column prop="storageStockName" align="center" label="发货仓库" width="100"></el-table-column>
+          <el-table-column prop="pickType" align="center" label="发货方式">
+            <template slot-scope="scope">
+              {{scope.row.pickType == 'YES' ? '自提' : '快递物流'}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="logisticsNo" align="center" label="快递单号" width="100"></el-table-column>
+          <el-table-column prop="companyName" align="center" label="物流公司" width="100"></el-table-column>
+          <el-table-column prop="pickName" align="center" label="提货人"></el-table-column>
+          <el-table-column prop="pickPhone" align="center" label="提货人电话" width="110"></el-table-column>
+          <el-table-column align="center" prop="deliverTime" label="发货时间" min-width="160"></el-table-column>
+          <el-table-column prop="createBy" align="center" label="操作人" width="140"></el-table-column>
+          <el-table-column prop="createTime" align="center" label="操作时间" width="160"></el-table-column>
           </el-table>
         </div>
         <div class="pagination clearfix">