build

src/apis/service/sellOut/sellReturn/index.js

@@ -18,6 +18,7 @@ export default {
   getReason: (data, params) => http(api + 'resultlist', data, 'post', params),
   // 退货审核
   returnCheck: (data, params) => http(api + 'reorderexam', data, 'post', params),
-  child_list: (data, params) => http(api + 'reorder_child_list', data, 'post', params)
+  child_list: (data, params) => http(api + 'reorder_child_list', data, 'post', params),
+  reorderRool: (data, params) => http(api + 'reorderool', data, 'post', params)
 }
 

src/views/sellOut/beforeReturnGoodWorkOrder/columns.js

@@ -1,5 +1,5 @@
 export default [
-  { type: 'selection', fixed: 'left', _noset_: true },
+  // { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'saleReturnChildCode',
     label: '退货工单编号',
@@ -8,13 +8,53 @@ export default [
   {
     prop: 'outChildCode',
     label: '发货工单号',
-    span: 7
+    width: '160px'
   },
   {
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 5
+    width: '80px'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '150px'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '150px'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '150px'
+  },
+  {
+    prop: 'supplierName',
+    label: '业务公司名称',
+    width: '150px'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户编码',
+    width: '150px'
+  },
+  {
+    prop: 'customerName',
+    label: '客户名称',
+    width: '150px'
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退回仓库编码',
+    width: '150px'
+  },
+  {
+    prop: 'return_wsm_name',
+    label: '退回仓库名称',
+    width: '150px'
   },
   // {
   //   prop: 'apply_name',
@@ -24,7 +64,7 @@ export default [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 24
+    width: '150px'
   },
   {
     prop: '',

src/views/sellOut/beforeReturnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -2,18 +2,18 @@ const showColumns = [
   {
     prop: 'returnCode',
     label: '退货工单号',
-    span: 7
+    span: 8
   },
   {
     prop: 'outChildCode',
     label: '发货工单号',
-    span: 7
+    span: 8
   },
   {
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 6
+    span: 4
   },
   {
     prop: 'apply_name',
@@ -21,49 +21,53 @@ const showColumns = [
     span: 4
   },
   {
-    prop: 'send_wsm_code',
-    label: '发货仓库编码',
-    span: 6
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customerName',
+    label: '客户公司',
+    _slot_: 'customerName',
+    span: 12
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商',
+    _slot_: 'supplierName',
+    span: 12
   },
   {
     prop: 'return_wsm_code',
-    label: '退货仓库编码',
-    span: 6
+    label: '退货仓库',
+    _slot_: 'returnWsm',
+    span: 12
   },
   // {
-  //   prop: 'sale_price',
-  //   label: '销售价格',
-  //   span: 4
-  // },
-  // {
-  //   prop: 'total_price',
-  //   label: '总价',
-  //   span: 4
-  // },
-  // {
-  //   prop: 'num',
-  //   label: '下单数量',
-  //   span: 4
+  //   prop: 'send_wsm_code',
+  //   label: '发货仓库编码',
+  //   span: 12
   // },
   {
     prop: 'send_num',
     label: '发货数量',
-    span: 4
+    span: 5
   },
   {
     prop: 'return_num',
     label: '退货数量',
-    span: 4
+    span: 5
   },
   {
     prop: 'loss_num',
     label: '丢失数量',
-    span: 4
+    span: 5
   },
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 24
+    span: 9
   },
   {
     prop: 'remark',

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -25,19 +25,6 @@
                   ></el-tag>
                 </template>
 
-                <template slot="order_type">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (
-                        xs_order_type_options.find(
-                          (item) => item.id == sitem.order_type
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag>
-                </template>
-
                 <template slot="record">
                   <div class="ql-editor" v-html="sitem.record" />
                 </template>
@@ -53,6 +40,7 @@
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
+
                 <template slot="companyName">
                   <span>{{ sitem.companyName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
@@ -66,8 +54,21 @@
                   </el-popover>
                 </template>
 
-                <template slot="customer">
-                  <span>{{ sitem.customer_name }}</span>
+                <template slot="returnWsm">
+                  <span>{{ sitem.return_wsm_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>退货仓库编码:</span
+                        ><span>{{ sitem.return_wsm_code }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="customerName">
+                  <span>{{ sitem.customerName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -26,6 +26,26 @@ export default [
     label: '状态',
     _slot_: 'status'
   },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '150px'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '150px'
+  },
+  // {
+  //   prop: 'customer_code',
+  //   label: '客户公司编码',
+  //   width: '150px'
+  // },
+  // {
+  //   prop: 'customer_name',
+  //   label: '客户公司名称',
+  //   width: '150px'
+  // },
   {
     prop: 'return_wsm_code',
     label: '退货仓库编码',
@@ -96,11 +116,11 @@ export default [
   //   label: '客户名称',
   //   width: '160'
   // },
-  {
-    prop: 'send_num',
-    label: '下单数量',
-    width: '160'
-  },
+  // {
+  //   prop: 'send_num',
+  //   label: '下单数量',
+  //   width: '160'
+  // },
   // {
   //   prop: 'sale_price',
   //   label: '销售单价',

src/views/sellOut/returnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -21,15 +21,29 @@ const showColumns = [
     label: '创建人',
     span: 4
   },
+  {
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customer_code',
+    label: '客户公司',
+    _slot_: 'customer',
+    span: 12
+  },
   {
     prop: 'send_wsm_code',
-    label: '发货仓库编码',
-    span: 6
+    label: '发货仓库',
+    _slot_: 'sendWsm',
+    span: 12
   },
   {
     prop: 'return_wsm_code',
-    label: '退货仓库编码',
-    span: 6
+    label: '退货仓库',
+    _slot_: 'returnWsm',
+    span: 12
   },
   // {
   //   prop: 'sale_price',
@@ -64,7 +78,7 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 24
+    span: 12
   },
   {
     prop: 'remark',

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -50,13 +50,13 @@
                       <li>
                         <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
                       </li>
-                    </ul>
+                    </ul>f=
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
                 <template slot="companyName">
                   <span>{{ sitem.companyName }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
+                  <el-popover placement="top" width="360" trigger="hover">
                     <ul>
                       <li>
                         <span>业务公司编号:</span
@@ -67,9 +67,51 @@
                   </el-popover>
                 </template>
 
+                <template slot="returnWsm">
+                  <span>{{ sitem.return_wsm_name }}</span>
+                  <el-popover placement="top" width="360" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>退货仓库编号:</span
+                        ><span>{{ sitem.return_wsm_code }}</span>
+                      </li>
+                      <li>
+                        <span>退货仓库供应商编码:</span
+                        ><span>{{ sitem.return_supplierNo }}</span>
+                      </li>
+                      <li>
+                        <span>退货仓库供应商名称:</span
+                        ><span>{{ sitem.return_supplierName }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="sendWsm">
+                  <span>{{ sitem.send_wsm_name }}</span>
+                  <el-popover placement="top" width="360" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>发货仓库编号:</span
+                        ><span>{{ sitem.send_wsm_code }}</span>
+                      </li>
+                      <li>
+                        <span>发货仓库供应商编码:</span
+                        ><span>{{ sitem.send_supplierNo }}</span>
+                      </li>
+                      <li>
+                        <span>发货仓库供应商名称:</span
+                        ><span>{{ sitem.send_supplierName }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
                 <template slot="customer">
                   <span>{{ sitem.customer_name }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
+                  <el-popover placement="top" width="360" trigger="hover">
                     <ul>
                       <li>
                         <span>客户公司编号:</span

src/views/sellOut/salesOrder/components/child-list.vue

@@ -9,13 +9,12 @@
       row-key="key"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="42"> </el-table-column>
       <el-table-column
         show-overflow-tooltip
         prop="outChildCode"
         label="发货工单编号"
         width="160"
-      />
+      />s
 
       <el-table-column
         show-overflow-tooltip

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -43,18 +43,6 @@
           {{ scope.row.addr_info }}{{ scope.row.addr }}
         </template>
       </el-table-column>
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_name"
-        label="物流公司"
-        width="160"
-      />
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_code"
-        label="物流单号"
-        width="160"
-      />
       <el-table-column
         show-overflow-tooltip
         prop="sendtime"
@@ -132,19 +120,6 @@
               @click="openModal()"
             ></i>
           </el-tooltip>
-          <!-- <el-tooltip
-            effect="dark"
-            content="全部退货"
-            style="margin: 3px 0 0 8px"
-            v-if="status + '' === '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-refresh-left tb-icon"
-              style="color: #6954f0"
-              @click="openAllModal()"
-            ></i>
-          </el-tooltip> -->
         </template>
 
         <template slot-scope="scope">

src/views/sellOut/salesOrder/detail.vue

@@ -160,7 +160,7 @@
               />
             </el-collapse-item>
             <!-- TODO:修改 -->
-            <!-- <el-collapse-item title="发货单" name="3">
+            <el-collapse-item title="发货单" name="3">
               <order-out-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -168,10 +168,10 @@
                 :id="queryId"
                 @refresh="initData()"
               />
-            </el-collapse-item> -->
+            </el-collapse-item>
 
             <el-collapse-item title="发货工单" name="4">
-              <child-list :sitem="sitem"  />
+              <child-list v-if="newTime !== ''" :sitem="sitem"  />
             </el-collapse-item>
 
           </el-collapse>

src/views/sellOut/sellOutOrder/components/child-list.vue

@@ -9,7 +9,7 @@
       row-key="key"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="42"> </el-table-column>
+      <!-- <el-table-column type="selection" width="42"> </el-table-column> -->
       <el-table-column
         show-overflow-tooltip
         prop="outChildCode"

src/views/sellOut/sellReturn/detail.vue

@@ -326,6 +326,9 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
+    // async requsetReorderRool(returnCode){
+    //   let res = await asyncRequest.reorderRool({returnCode});
+    // },
     //供应商确认
     async handleSupplierConfirm(e){
       if (!this.loading) {
@@ -385,9 +388,9 @@ export default {
     },
     
     async initData() {
-      const { code, data, message } = await asyncRequest.detail({
-        returnCode: this.queryId,
-      });
+      const { code, data, message } = await asyncRequest.detail({ returnCode: this.queryId });
+      // const {data:roolData} = await asyncRequest.reorderRool({returnCode: this.queryId});
+      // console.log(roolData)
       if (code === 0) {
         const { is_stock, status } = data;
         this.is_stock = is_stock;

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -1,60 +1,70 @@
 export default [
-  { type: 'selection', fixed: 'left', _noset_: true },
+  // { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'saleReturnChildCode',
     label: '退货工单编号',
     width: '160'
   },
   {
-    prop: 'type',
-    label: '工单退货类型',
-    width: '160',
-    _slot_: 'type'
+    prop: 'outChildCode',
+    label: '发货工单号',
+    width: '160px'
   },
   {
-    prop: 'outChildCode',
-    label: '发货工单编号',
-    width: '160'
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '80px'
   },
   {
     prop: 'companyNo',
     label: '业务公司编号',
-    width: '160'
+    width: '150px'
   },
   {
     prop: 'companyName',
     label: '业务公司名称',
-    width: '160'
+    width: '150px'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '150px'
+  },
+  {
+    prop: 'supplierName',
+    label: '业务公司名称',
+    width: '150px'
   },
   {
     prop: 'customer_code',
     label: '客户编码',
-    width: '160'
+    width: '150px'
   },
   {
-    prop: 'customerNname',
+    prop: 'customerName',
     label: '客户名称',
-    width: '160'
+    width: '150px'
   },
   {
-    prop: 'num',
-    label: '下单数量',
-    width: '160'
+    prop: 'return_wsm_code',
+    label: '退回仓库编码',
+    width: '150px'
   },
   {
-    prop: 'sale_price',
-    label: '销售单价',
-    width: '160'
-  },
-  {
-    prop: 'total_price',
-    label: '销售合计 ',
-    width: '160'
+    prop: 'return_wsm_name',
+    label: '退回仓库名称',
+    width: '150px'
   },
+  // {
+  //   prop: 'apply_name',
+  //   label: '创建人',
+  //   span: 5
+  // },
   {
     prop: 'addtime',
-    label: '下单时间',
-    width: '160'
+    label: '创建时间',
+    width: '150px'
   },
   {
     prop: '',

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -2,18 +2,18 @@ const showColumns = [
   {
     prop: 'returnCode',
     label: '退货工单号',
-    span: 7
+    span: 8
   },
   {
     prop: 'outChildCode',
     label: '发货工单号',
-    span: 7
+    span: 8
   },
   {
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 6
+    span: 4
   },
   {
     prop: 'apply_name',
@@ -21,49 +21,53 @@ const showColumns = [
     span: 4
   },
   {
-    prop: 'send_wsm_code',
-    label: '发货仓库编码',
-    span: 6
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customerName',
+    label: '客户公司',
+    _slot_: 'customerName',
+    span: 12
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商',
+    _slot_: 'supplierName',
+    span: 12
   },
   {
     prop: 'return_wsm_code',
-    label: '退货仓库编码',
-    span: 6
+    label: '退货仓库',
+    _slot_: 'returnWsm',
+    span: 12
   },
   // {
-  //   prop: 'sale_price',
-  //   label: '销售价格',
-  //   span: 4
-  // },
-  // {
-  //   prop: 'total_price',
-  //   label: '总价',
-  //   span: 4
-  // },
-  // {
-  //   prop: 'num',
-  //   label: '下单数量',
-  //   span: 4
+  //   prop: 'send_wsm_code',
+  //   label: '发货仓库编码',
+  //   span: 12
   // },
   {
     prop: 'send_num',
     label: '发货数量',
-    span: 4
+    span: 5
   },
   {
     prop: 'return_num',
     label: '退货数量',
-    span: 4
+    span: 5
   },
   {
     prop: 'loss_num',
     label: '丢失数量',
-    span: 4
+    span: 5
   },
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 24
+    span: 9
   },
   {
     prop: 'remark',

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/detail.vue

@@ -25,21 +25,8 @@
                   ></el-tag>
                 </template>
 
-                <template slot="order_type">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (
-                        xs_order_type_options.find(
-                          (item) => item.id == sitem.order_type
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag>
-                </template>
-
                 <template slot="record">
-                  <div class="ql-editor"  v-html="sitem.record" />
+                  <div class="ql-editor" v-html="sitem.record" />
                 </template>
 
                 <template slot="supplierName">
@@ -53,6 +40,7 @@
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
+
                 <template slot="companyName">
                   <span>{{ sitem.companyName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
@@ -66,8 +54,21 @@
                   </el-popover>
                 </template>
 
-                <template slot="customer">
-                  <span>{{ sitem.customer_name }}</span>
+                <template slot="returnWsm">
+                  <span>{{ sitem.return_wsm_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>退货仓库编码:</span
+                        ><span>{{ sitem.return_wsm_code }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="customerName">
+                  <span>{{ sitem.customerName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
@@ -81,7 +82,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '12' && !isSupertube && ppowers.includes('1')">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '1' && !isSupertube && ppowers.includes('1')">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
 
@@ -131,7 +132,7 @@ export default {
   },
   data() {
     return {
-      visible: fsalse,
+      visible: false,
       activeTabs: "1",
       showColumns: showColumns,
       statusOptions: [

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -2,24 +2,100 @@ export default [
   { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'returnCode',
-    label: '退货工单编号',
+    label: '售后退货单号',
     width: '160'
   },
   {
     prop: 'type',
     label: '工单退货类型',
-    width: '160',
+    width: '100',
     _slot_: 'type'
   },
   {
     prop: 'outChildCode',
-    label: '发货工单编号'
+    label: '发货工单编号',
+    width: '140'
   },
   {
     prop: 'outCode',
     label: '发货单编号',
     width: '160'
   },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '150px'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '150px'
+  },
+  // {
+  //   prop: 'customer_code',
+  //   label: '客户公司编码',
+  //   width: '150px'
+  // },
+  // {
+  //   prop: 'customer_name',
+  //   label: '客户公司名称',
+  //   width: '150px'
+  // },
+  {
+    prop: 'return_wsm_code',
+    label: '退货仓库编码',
+    width: '130px'
+  },
+  {
+    prop: 'return_wsm_name',
+    label: '退货仓库名称',
+    width: '130px'
+  },
+  {
+    prop: 'return_contactor_name',
+    label: '退货仓库负责人',
+    width: '110px'
+  },
+  {
+    prop: 'return_supplierName',
+    label: '退货仓库供应商名称',
+    width: '130px'
+  },
+  {
+    prop: 'return_supplierNo',
+    label: '退货仓库供应商编码',
+    width: '130px'
+  },
+  {
+    prop: 'send_wsm_code',
+    label: '发货仓库编码',
+    width: '130px'
+  },
+  {
+    prop: 'send_wsm_name',
+    label: '发货仓库名称',
+    width: '130px'
+  },
+  {
+    prop: 'send_contactor_name',
+    label: '发货仓库负责人',
+    width: '110px'
+  },
+  {
+    prop: 'send_supplierName',
+    label: '发货仓库供应商名称',
+    width: '130px'
+  },
+  {
+    prop: 'send_supplierNo',
+    label: '发货仓库供应商编码',
+    width: '130px'
+  },
   // {
   //   prop: 'companyNo',
   //   label: '业务公司编号',
@@ -40,11 +116,11 @@ export default [
   //   label: '客户名称',
   //   width: '160'
   // },
-  {
-    prop: 'send_num',
-    label: '下单数量',
-    width: '160'
-  },
+  // {
+  //   prop: 'send_num',
+  //   label: '下单数量',
+  //   width: '160'
+  // },
   // {
   //   prop: 'sale_price',
   //   label: '销售单价',

src/views/supplierSellOut/supplierReturnWorkOrder/components/ShowDataTableColumns.js

@@ -21,15 +21,29 @@ const showColumns = [
     label: '创建人',
     span: 4
   },
+  {
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customer_code',
+    label: '客户公司',
+    _slot_: 'customer',
+    span: 12
+  },
   {
     prop: 'send_wsm_code',
-    label: '发货仓库编码',
-    span: 6
+    label: '发货仓库',
+    _slot_: 'sendWsm',
+    span: 12
   },
   {
     prop: 'return_wsm_code',
-    label: '退货仓库编码',
-    span: 6
+    label: '退货仓库',
+    _slot_: 'returnWsm',
+    span: 12
   },
   // {
   //   prop: 'sale_price',
@@ -64,7 +78,7 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 24
+    span: 12
   },
   {
     prop: 'remark',

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -25,10 +25,6 @@
                   ></el-tag>
                 </template>
 
-                <template slot="record">
-                  <div  class="ql-editor"  v-html="sitem.record"></div>
-                </template>
-
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"
@@ -42,6 +38,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="record">
+                  <div  class="ql-editor"  v-html="sitem.record"></div>
+                </template>
+
                 <template slot="supplierName">
                   <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
@@ -66,6 +66,48 @@
                   </el-popover>
                 </template>
 
+                <template slot="returnWsm">
+                  <span>{{ sitem.return_wsm_name }}</span>
+                  <el-popover placement="top" width="360" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>退货仓库编号:</span
+                        ><span>{{ sitem.return_wsm_code }}</span>
+                      </li>
+                      <li>
+                        <span>退货仓库供应商编码:</span
+                        ><span>{{ sitem.return_supplierNo }}</span>
+                      </li>
+                      <li>
+                        <span>退货仓库供应商名称:</span
+                        ><span>{{ sitem.return_supplierName }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="sendWsm">
+                  <span>{{ sitem.send_wsm_name }}</span>
+                  <el-popover placement="top" width="360" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>发货仓库编号:</span
+                        ><span>{{ sitem.send_wsm_code }}</span>
+                      </li>
+                      <li>
+                        <span>发货仓库供应商编码:</span
+                        ><span>{{ sitem.send_supplierNo }}</span>
+                      </li>
+                      <li>
+                        <span>发货仓库供应商名称:</span
+                        ><span>{{ sitem.send_supplierName }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
                 <template slot="customer">
                   <span>{{ sitem.customer_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">