build

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -2,19 +2,14 @@ export default [
   { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'id',
-    label: '售后退货工单ID',
-    width: '105px'
+    label: 'ID',
+    width: '40px'
   },
   {
     prop: 'returnCode',
     label: '售后退货单号',
     width: '160'
   },
-  {
-    prop: 'orderCode',
-    label: '订单编号',
-    width: '160px'
-  },
   {
     prop: 'outChildCode',
     label: '发货工单编号',
@@ -25,9 +20,15 @@ export default [
     label: '发货单编号',
     width: '160'
   },
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '160px'
+  },
   {
     prop: 'status',
     label: '状态',
+    width: '105px',
     _slot_: 'status'
   },
   {

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -184,8 +184,8 @@ export default {
       showColumns: showColumns,
       visible:false,
       statusOptions: [
-        { value: "1", label: "待收货" },
-        { value: "2", label: "已收货" }
+        { value: "1", label: "待主流程收货" },
+        { value: "2", label: "主流程已收货" }
       ],
       newTime: "",
       spuCode:"",

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -32,12 +32,12 @@
                 <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
-              <el-col :span="4" style="margin-right:10px">
+              <!-- <el-col :span="4" style="margin-right:10px">
                 <el-select placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <el-option label="待收货" value="1" />
                   <el-option label="已收货" value="2" />
                 </el-select>
-              </el-col>
+              </el-col> -->
 
 
               <el-col :span="4" style="width: 150px;margin-left:10px">
@@ -251,8 +251,8 @@ export default {
       sitem: null,
       // 状态
       statusOptions: [
-        { value: "1", label: "待收货" },
-        { value: "2", label: "已收货" },
+        { value: "1", label: "待主流程收货" },
+        { value: "2", label: "主流程已收货" },
       ],
       loading: false,
       showModel: false,

src/views/sellOut/sellAfterApply/columns.js

@@ -103,11 +103,10 @@ const columns = [
   //     label:"异常原因",
   // },
   // {
-  //     prop:"except_code",
-  //     label:"期望意愿",
-  //   _slot_: "except_code",
-  //   width:100,
-
+  //   prop: 'except_code',
+  //   label: '期望意愿',
+  //   _slot_: 'except_code',
+  //   width: 100
   // },
   {
     prop: 'company_name',
@@ -165,14 +164,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
   },
   {
@@ -193,6 +197,11 @@ const sellshowColumns = [
     _slot_: 'is_stock',
     span: 6
   },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 6
+  },
   {
     prop: 'is_receive',
     label: '期望结果',
@@ -222,31 +231,26 @@ 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: 'except_code',
+  //   label: '期望',
+  //   _slot_: 'except_code',
+  //   span: 6
+  // },
   {
     prop: 'error_msg',
     label: '异常原因',
-    span: 10
+    span: 6
   },
   {
     prop: 'loop_total',
@@ -267,9 +271,10 @@ const sellshowColumns = [
     span: 12
   },
   {
-    prop: 'xx',
+    prop: 'wsm_name',
     label: '业务公司退回仓库',
-    span: 12
+    span: 12,
+    _slot_: 'returnWsm'
   },
   {
     prop: 'post_fee',

src/views/sellOut/sellAfterApply/detail.vue

@@ -56,6 +56,28 @@
                 </el-popover>
               </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="status">
                   <el-tag
                     :size="'mini'"

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

@@ -75,6 +75,7 @@ const showColumns = [
   {
     prop: 'is_addr',
     label: '退货类型',
+    _slot_: 'is_addr',
     span: 4
   },
   {

src/views/sellOut/sellReturn/detail.vue

@@ -20,6 +20,11 @@
                     "
                   ></el-tag>
                 </template>
+
+                <template slot="is_addr">
+                  <el-tag size="mini">{{sitem.is_addr === '0' ? '无地址退货' : sitem.is_addr === '1' ? '有地址退货' : '--'}}</el-tag>
+                </template>
+
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -2,19 +2,14 @@ export default [
   { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'id',
-    label: '售后退货工单ID',
-    width: '105px'
+    label: 'ID',
+    width: '40px'
   },
   {
     prop: 'returnCode',
     label: '售后退货单号',
     width: '160'
   },
-  {
-    prop: 'orderCode',
-    label: '订单编号',
-    width: '160px'
-  },
   {
     prop: 'outChildCode',
     label: '发货工单编号',
@@ -25,9 +20,15 @@ export default [
     label: '发货单编号',
     width: '160'
   },
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '160px'
+  },
   {
     prop: 'status',
     label: '状态',
+    width: '105px',
     _slot_: 'status'
   },
   {
@@ -85,7 +86,7 @@ export default [
   {
     prop: 'apply_name',
     label: '申请人',
-    width: '80px'
+    width: '120px'
   },
   {
     prop: '',

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -188,8 +188,8 @@ export default {
       order_type:"",
       showColumns: showColumns,
       statusOptions: [
-        { value: "1", label: "待收货" },
-        { value: "2", label: "已收货" }
+        { value: "1", label: "待主流程收货" },
+        { value: "2", label: "主流程已收货" }
       ],
       xs_order_type_options,
       sitem: null, //传给组件

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -238,8 +238,8 @@ export default {
       sitem: null,
       // 状态
       statusOptions: [
-        { value: "1", label: "待收货" },
-        { value: "2", label: "已收货" }
+        { value: "1", label: "待主流程收货" },
+        { value: "2", label: "主流程已收货" }
       ],
       loading: false,
       showModel: false,