build

src/views/sellOut/sellAfterApply/columns.js

@@ -122,32 +122,6 @@ const columns = [
     label: '添加时间',
     width: 150
   },
-
-  // {
-  //   prop:"post_company",
-  //   label:"快递名称",
-  // },
-  // {
-  //   prop:"post_fee",
-  //   label:"物流费",
-  // },
-  // {
-  //   prop:"post_own",
-  //   label:"费用承担方",
-  //   width:"100",
-  //   _slot_: "post_own",
-
-  // },
-  // {
-  //   prop: 'customer_code',
-  //   label: '客户编码',
-  //   width: '150'
-  // },
-  // {
-  //   prop: 'customer_name',
-  //   label: '客户名称',
-  //   width: '200'
-  // },
   {
     prop: '',
     label: '操作',
@@ -241,12 +215,6 @@ const sellshowColumns = [
     label: '发货总数量',
     span: 6
   },
-  // {
-  //   prop: 'except_code',
-  //   label: '期望',
-  //   _slot_: 'except_code',
-  //   span: 6
-  // },
   {
     prop: 'error_msg',
     label: '异常原因',

src/views/sellOut/sellAfterApply/index.vue

@@ -569,7 +569,6 @@ export default {
       this.parmValue.company_name = this.select === "company_name" ? this.s_input : ""; // 申请人部门
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
-
       const res = await asyncRequest.list({
         ...model,
         supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -159,14 +159,19 @@ const sellshowColumns = [
     span: 6
   },
   {
-    prop: 'status',
-    label: '售后退货单状态',
-    _slot_: 'status',
+    prop: 'outCode',
+    label: '发货单编号',
     span: 6
   },
   {
-    prop: 'outCode',
-    label: '发货单编号',
+    prop: 'orderCode',
+    label: '销售订单编号',
+    span: 6
+  },
+  {
+    prop: 'status',
+    label: '售后退货单状态',
+    _slot_: 'status',
     span: 6
   },
   {
@@ -187,6 +192,11 @@ const sellshowColumns = [
     _slot_: 'is_stock',
     span: 6
   },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 6
+  },
   {
     prop: 'is_receive',
     label: '期望结果',
@@ -216,31 +226,20 @@ const sellshowColumns = [
     label: '创建时间',
     span: 6
   },
-  {
-    prop: 'apply_name',
-    label: '申请人',
-    span: 6
-  },
   {
     prop: 'error_num',
     label: '异常数量',
-    span: 4
+    span: 6
   },
   {
     prop: 'total_num',
     label: '发货总数量',
-    span: 4
-  },
-  {
-    prop: 'except_code',
-    label: '期望',
-    _slot_: 'except_code',
     span: 6
   },
   {
     prop: 'error_msg',
     label: '异常原因',
-    span: 10
+    span: 6
   },
   {
     prop: 'loop_total',
@@ -250,10 +249,22 @@ const sellshowColumns = [
   },
   {
     prop: 'addr',
-    label: '收货地址',
+    label: '客户退回地址',
     _slot_: 'addr',
     span: 12
   },
+  {
+    prop: 'error_img',
+    label: '异常图片',
+    _slot_: 'error_img',
+    span: 12
+  },
+  {
+    prop: 'wsm_name',
+    label: '业务公司退回仓库',
+    span: 12,
+    _slot_: 'returnWsm'
+  },
   {
     prop: 'post_fee',
     label: '退货物流费用',
@@ -269,12 +280,6 @@ const sellshowColumns = [
     label: '退货物流单号',
     span: 12
   },
-  {
-    prop: 'error_img',
-    label: '异常图片',
-    _slot_: 'error_img',
-    span: 24
-  },
   {
     prop: 'error_remark',
     label: '备注',

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -24,6 +24,29 @@
                     "
                   ></el-tag>
                 </template>
+
+              <template slot="returnWsm">
+                <span>{{ sitem.wsm_name }}</span>
+                <el-popover placement="top" width="400" trigger="hover">
+                  <ul>
+                    <li><h3>退货仓库</h3></li>
+                    <li>
+                      <span>编码:</span><span>{{ sitem.wsm_code }}</span>
+                    </li>
+                    <li>
+                      <span>名称:</span><span>{{ sitem.wsm_name }}</span>
+                    </li>
+                    <li>
+                      <span>所在供应商编码:</span><span>{{ sitem.wsm_supplierNo }}</span>
+                    </li>
+                    <li>
+                      <span>所在供应商名称:</span><span>{{ sitem.wsm_supplier }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"