build

src/views/sellOut/sellAfterApply/columns.js

@@ -1,34 +1,55 @@
 const columns = [
   { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'returnCode',
+    label: '售后退货单',
+    width: '160'
+  },
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '160'
+  },
   {
     prop: 'orderCode',
     label: '订单编号',
     width: '160'
   },
   {
-    prop: 'returnCode',
-    label: '售后退货单',
-    width: '160'
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: 'company_name',
-    label: '申请人部门',
-    minWidth: '150px'
+    prop: 'has_account',
+    label: '供应商端',
+    _slot_: 'has_account',
+    width: '0px'
   },
+  // {
+  //   prop: 'order_source',
+  //   label: '订单来源',
+  //   _slot_: 'order_source',
+  //   width: '90px'
+  // },
   {
-    prop: 'apply_name',
-    label: '申请人'
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '85'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85'
   },
   // {
   //   prop: "orderCode",
   //   label: "销售订单编号",
   //   width:"160"
   // },
-  {
-    prop: 'outCode',
-    label: '发货单编号',
-    width: '160'
-  },
   {
     prop: 'total_num',
     label: '出库总数'
@@ -89,34 +110,13 @@ const columns = [
 
   // },
   {
-    prop: 'has_account',
-    label: '供应商端',
-    _slot_: 'has_account',
-    width: '120px'
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '120px'
-  },
-  // {
-  //   prop: 'order_source',
-  //   label: '订单来源',
-  //   _slot_: 'order_source',
-  //   width: '90px'
-  // },
-  {
-    prop: 'order_type',
-    label: '商品类型',
-    _slot_: 'order_type',
-    width: '85'
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '85'
+    prop: 'apply_name',
+    label: '申请人'
   },
   {
     prop: 'addtime',

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -42,12 +42,11 @@
                 <search-stock
                   :is-detail="false"
                   :size="'mini'"
-                  :disabled="isStock"
                   :value="list[scope.$index].return_wsm_code"
                   :placeholder="'仓库名称'"
                   :is-relation="true"
                   :wsmtype="'5'"
-                  :company-no="isStock ? list[scope.$index].wsm_code : currentCompany"
+                  :company-no="currentCompany"
                   :disbaled="!currentCompany"
                   :names="''"
                   @searchChange="onStockChange($event, scope.$index)"
@@ -89,21 +88,15 @@ export default {
           trigger: 'change'
         }]
       })
-    },
-    isStock() {
-      const { order_type } = this.sitem
-      return order_type === '2'
     }
   },
   async mounted() {
     this.$nextTick(async() => {
       const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
-      const { order_type } = this.sitem
-      const isStock = order_type === '2'
 
       switch (code) {
         case 0:
-          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: isStock ? [item.wsm_code] : '' }))
+          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
           break
         default:
           this.$message.warning(message)

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -1,15 +1,10 @@
 const columns = [
+  { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'returnCode',
     label: '售后退货单',
     width: '160'
   },
-
-  // {
-  //   prop: "orderCode",
-  //   label: "销售订单编号",
-  //   width:"160"
-  // },
   {
     prop: 'outCode',
     label: '发货单编号',
@@ -26,6 +21,35 @@ const columns = [
     _slot_: 'status',
     width: '120px'
   },
+  {
+    prop: 'has_account',
+    label: '供应商端',
+    _slot_: 'has_account',
+    width: '0px'
+  },
+  // {
+  //   prop: 'order_source',
+  //   label: '订单来源',
+  //   _slot_: 'order_source',
+  //   width: '90px'
+  // },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '85'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85'
+  },
+  // {
+  //   prop: "orderCode",
+  //   label: "销售订单编号",
+  //   width:"160"
+  // },
   {
     prop: 'total_num',
     label: '出库总数'
@@ -40,6 +64,36 @@ const columns = [
     label: '商品名称',
     width: '150'
   },
+  {
+    prop: 'customer_code',
+    label: '客户公司编码',
+    width: '150'
+  },
+  {
+    prop: 'customer_name',
+    label: '客户公司名称',
+    width: '150'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '150'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '150'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '150'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '150'
+  },
   // {
   //     prop:"error_num",
   //     label:"异常数量",
@@ -55,16 +109,19 @@ const columns = [
   //   width:100,
 
   // },
-
   {
-    prop: 'companyNo',
-    label: '业务公司编号',
-    width: '160'
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: 'companyName',
-    label: '业务公司名称',
-    'min-width': '135'
+    prop: 'apply_name',
+    label: '申请人'
+  },
+  {
+    prop: 'addtime',
+    label: '添加时间',
+    width: 150
   },
 
   // {
@@ -80,36 +137,18 @@ const columns = [
   //   label:"费用承担方",
   //   width:"100",
   //   _slot_: "post_own",
+
+  // },
+  // {
+  //   prop: 'customer_code',
+  //   label: '客户编码',
+  //   width: '150'
+  // },
+  // {
+  //   prop: 'customer_name',
+  //   label: '客户名称',
+  //   width: '200'
   // },
-  {
-    prop: 'supplierNo',
-    label: '供应商编号',
-    width: '160'
-  },
-  {
-    prop: 'supplierName',
-    label: '供应商名称',
-    width: '160'
-  },
-  {
-    prop: 'customer_name',
-    label: '客户名称',
-    width: '200'
-  },
-  {
-    prop: 'company_name',
-    label: '申请人部门',
-    minWidth: '150px'
-  },
-  {
-    prop: 'apply_name',
-    label: '申请人'
-  },
-  {
-    prop: 'addtime',
-    label: '添加时间',
-    width: 150
-  },
   {
     prop: '',
     label: '操作',
@@ -136,19 +175,47 @@ const sellshowColumns = [
     label: '发货单编号',
     span: 6
   },
-
   {
     prop: 'order_type',
     label: '订单类别',
     _slot_: 'order_type',
     span: 6
   },
-
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    span: 6
+  },
+  {
+    prop: 'is_stock',
+    label: '商品类型',
+    _slot_: 'is_stock',
+    span: 6
+  },
   {
     prop: 'is_receive',
     label: '期望结果',
     _slot_: 'is_receive',
-    span: 6
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    _slot_: 'company',
+    span: 12
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    _slot_: 'supplier',
+    span: 12
+  },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    _slot_: 'customer',
+    span: 12
   },
   {
     prop: 'addtime',
@@ -156,70 +223,68 @@ const sellshowColumns = [
     span: 6
   },
   {
-    prop: 'total_num',
-    label: '发货总数量',
-    span: 4
+    prop: 'apply_name',
+    label: '申请人',
+    span: 6
   },
   {
     prop: 'error_num',
     label: '异常数量',
     span: 4
   },
-
   {
-    prop: 'apply_name',
-    label: '申请人',
+    prop: 'total_num',
+    label: '发货总数量',
     span: 4
   },
-
+  {
+    prop: 'except_code',
+    label: '期望',
+    _slot_: 'except_code',
+    span: 6
+  },
   {
     prop: 'error_msg',
     label: '异常原因',
+    span: 10
+  },
+  {
+    prop: 'loop_total',
+    _slot_: 'loop_total',
+    label: '更改次数',
+    span: 12
+  },
+  {
+    prop: 'addr',
+    label: '收货地址',
+    _slot_: 'addr',
+    span: 12
+  },
+  {
+    prop: 'post_fee',
+    label: '退货物流费用',
     span: 6
   },
   {
-    prop: 'except_code',
-    label: '期望',
-    _slot_: 'except_code',
+    prop: 'post_company',
+    label: '退货物流公司',
     span: 6
   },
   {
-    prop: 'loop_total',
-    label: '循环次数',
-    span: 4
+    prop: 'post_code',
+    label: '退货物流单号',
+    span: 12
   },
   {
     prop: 'error_img',
     label: '异常图片',
     _slot_: 'error_img',
-    span: 8
+    span: 24
   },
   {
     prop: 'error_remark',
     label: '备注',
     span: 24
   }
-  // {
-  //   prop: "sale_price",
-  //   label: "销售单价",
-  // },
-  // {
-  //   prop: "origin_price",
-  //   label: "采购单价",
-  // },
-
-  // {
-  //   prop: "sale_price",
-  //   label: "商品单价",
-  // },
-  // {
-  //   prop: "total_price",
-  //   label: "发货单总价",
-  // },
-
-  // {
-  //   prop: "updatetime",
-  //   label: "更新时间",
-  // },
 ]
 export { columns, sellshowColumns }