feat(发货申请、售后申请):更新售后申请详情字段

src/views/sellOut/sellAfterApply/columns.js

@@ -252,7 +252,28 @@ const sellshowColumns = [
     prop: 'loop_total',
     _slot_: 'loop_total',
     label: '更改次数',
-    span: 24
+    span: 12
+  },
+  {
+    prop: 'addr',
+    label: '收货地址',
+    _slot_: 'addr',
+    span: 12
+  },
+  {
+    prop: 'post_fee',
+    label: '退货物流费用',
+    span: 6
+  },
+  {
+    prop: 'post_company',
+    label: '退货物流公司',
+    span: 6
+  },
+  {
+    prop: 'post_code',
+    label: '退货物流单号',
+    span: 12
   },
   {
     prop: 'error_img',

src/views/sellOut/sellAfterApply/detail.vue

@@ -11,6 +11,11 @@
                 :sitem="sitem"
                 :columns="sellshowColumns"
               >
+                <template slot="addr">
+                  <span>
+                    {{ sitem.contactor }}---{{ sitem.mobile }}---{{ sitem.addr_cn }}{{ sitem.addr }}
+                  </span>
+                </template>
               <template slot="company">
                 <span>{{ sitem.companyName }}</span>
                 <el-popover placement="top" width="300" trigger="hover">

src/views/sellOut/sellOutOrder/detail.vue

@@ -66,18 +66,18 @@
                     "
                   ></el-tag>
                 </template>
-                <template slot="order_type">
+                <!-- <template slot="order_type">
                   <el-tag
                     :size="'mini'"
                     v-text="
                       (
                         xs_order_type_options.find(
-                          (item) => item.id == sitem.order_type
+                          (item) => item.id == resitem.order_type
                         ) || {}
                       ).label || '--'
                     "
                   ></el-tag>
-                </template>
+                </template> -->
                 <template slot="sale_price">
                   <!-- <span>{{
                     private_field &&
@@ -163,6 +163,68 @@
                 "
                 :columns="rshowColumns"
               >
+                 <template slot="company">
+                   <span>{{ resitem.companyName }}</span>
+                   <el-popover placement="top" width="300" trigger="hover">
+                     <ul>
+                       <li>
+                         <span>业务企业编号：</span><span>{{ resitem.companyNo }}</span>
+                       </li>
+                     </ul>
+                     <i slot="reference" class="el-icon-warning-outline fr" />
+                   </el-popover>
+                 </template>
+
+                 <template slot="supplier">
+                <span>{{ resitem.supplierName }}</span>
+                <el-popover placement="top" width="300" trigger="hover">
+                  <ul>
+                    <li>
+                      <span>供应商编号：</span><span>{{ resitem.supplierNo }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+               
+                 <template slot="customer">
+                   <span>{{ resitem.customer_name }}</span>
+                   <el-popover placement="top" width="300" trigger="hover">
+                     <ul>
+                       <li>
+                         <span>客户公司编号：</span><span>{{ resitem.customer_code }}</span>
+                       </li>
+                     </ul>
+                     <i slot="reference" class="el-icon-warning-outline fr" />
+                   </el-popover>
+                 </template>
+
+                 <template slot="order_source">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_source_options.find(
+                          (item) => item.id == resitem.order_source
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                <template slot="is_stock">
+                  <el-tag
+                    :size="'mini'"
+                    :type="sitem.status == '0' ? 'warning' : ''"
+                    v-text="
+                      ((stockOptions).find(
+                          (item) => String(item.id) === String( resitem.is_stock)
+                        ) || {}
+                      ).name || '--'
+                    "
+                  ></el-tag>
+                </template>
+
                 <template slot="status">
                   <el-tag
                     :size="'mini'"
@@ -365,7 +427,7 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
 import { showColumns } from "./columns";
 import { sellshowColumns } from "@/views/sellOut/sellAfterApply/columns";
-import { xs_order_type_options } from "@/assets/js/statusList";
+import { xs_order_type_options, xs_order_source_options } from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
 import { shareWebUrl } from "@/config";
 import returnExpress from "./components/returnExpress";
@@ -403,7 +465,12 @@ export default {
   },
   data() {
     return {
+      stockOptions:[
+        { id: "0", name: "非库存品" },
+        { id: "1", name: "库存品" },
+      ],
       xs_order_type_options,
+      xs_order_source_options,
       returnCode: "",
       returnCode_type: "",
       activeTabs: "1",
@@ -413,35 +480,35 @@ export default {
       showColumns: showColumns,
       rshowColumns: sellshowColumns,
       returnShowColumns: [
-        {
-          prop: "is_th",
-          label: "物流承担方",
-          _slot_: "is_th",
-          span: 6,
-        },
-        {
-          prop: "addr",
-          label: "收货地址",
-          _slot_: "addr",
-          span: 18,
-        },
+        // {
+        //   prop: "is_th",
+        //   label: "物流承担方",
+        //   _slot_: "is_th",
+        //   span: 6,
+        // },
+        // {
+        //   prop: "addr",
+        //   label: "收货地址",
+        //   _slot_: "addr",
+        //   span: 18,
+        // },
       ],
       returnShowResColumns: [
-        {
-          prop: "post_fee",
-          label: "退货物流费用",
-          span: 6,
-        },
-        {
-          prop: "post_company",
-          label: "退货物流公司",
-          span: 6,
-        },
-        {
-          prop: "post_code",
-          label: "退货物流单号",
-          span: 12,
-        },
+        // {
+        //   prop: "post_fee",
+        //   label: "退货物流费用",
+        //   span: 6,
+        // },
+        // {
+        //   prop: "post_company",
+        //   label: "退货物流公司",
+        //   span: 6,
+        // },
+        // {
+        //   prop: "post_code",
+        //   label: "退货物流单号",
+        //   span: 12,
+        // },
       ],
       sitem: null,
       resitem: null,