修改布局

src/views/purchaseIn/deliveryWorkOrder/components/ShowDataTableColumns.js

@@ -84,17 +84,17 @@ const showColumns = [
   {
     prop: 'addr_contactor',
     label: '收货人',
-    span: 8
+    span: 6
   },
   {
     prop: 'addr_mobile',
     label: '收货电话',
-    span: 8
+    span: 6
   },
   {
     prop: 'addr',
     label: '收货地址',
-    span: 8
+    span: 12
   },
   {
     prop: 'remark',

src/views/sellOut/sellOutOrder/columns.js

@@ -1,24 +1,24 @@
 const columns = [
   {
-    type: 'selection',
-    fixed: 'left',
-    _noset_: true
+    type: "selection",
+    fixed: "left",
+    _noset_: true,
   },
   {
-    prop: 'outCode',
-    label: '发货单编号',
-    width: '156'
+    prop: "outCode",
+    label: "发货单编号",
+    width: "156",
   },
 
   {
-    prop: 'orderCode',
-    label: '订单编号',
-    width: '156'
+    prop: "orderCode",
+    label: "订单编号",
+    width: "156",
   },
   {
-    prop: 'cgdNo',
-    label: '采购单编号',
-    width: '156'
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "156",
   },
 
   // {
@@ -27,52 +27,52 @@ const columns = [
   //   width: "160"
   // },
   {
-    prop: 'send_num',
-    label: '发货数量',
-    span: 6
+    prop: "send_num",
+    label: "发货数量",
+    span: 6,
   },
   {
-    prop: 'use_type',
-    label: '平台类型',
-    _slot_: 'use_type'
+    prop: "use_type",
+    label: "平台类型",
+    _slot_: "use_type",
   },
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '120px'
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
   },
   {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '100px'
+    prop: "order_source",
+    label: "订单来源",
+    _slot_: "order_source",
+    width: "100px",
   },
   {
-    prop: 'order_type',
-    label: '商品类型',
-    _slot_: 'order_type',
-    width: '100'
+    prop: "order_type",
+    label: "商品类型",
+    _slot_: "order_type",
+    width: "100",
   },
   {
-    prop: 'wsm_supplier',
-    label: '供应商',
-    minWidth: '150px'
+    prop: "wsm_supplier",
+    label: "供应商",
+    minWidth: "150px",
   },
   {
-    prop: 'good_class',
-    label: '商品分类',
-    width: '150'
+    prop: "good_class",
+    label: "商品分类",
+    width: "150",
   },
   {
-    prop: 'good_code',
-    label: '商品编码',
-    width: '140'
+    prop: "good_code",
+    label: "商品编码",
+    width: "140",
   },
   {
-    prop: 'good_name',
-    label: '商品名称',
-    width: '150'
+    prop: "good_name",
+    label: "商品名称",
+    width: "150",
   },
   // {
   //   prop: "supplierNo",
@@ -81,76 +81,76 @@ const columns = [
   // },
 
   {
-    prop: 'customer_code',
-    label: '客户编码',
-    width: '150'
+    prop: "customer_code",
+    label: "客户编码",
+    width: "150",
   },
   {
-    prop: 'company_name',
-    label: '客户名称',
-    width: '200'
+    prop: "company_name",
+    label: "客户名称",
+    width: "200",
   },
   {
-    prop: 'companyNo',
-    label: '业务公司编号',
-    width: '160'
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
   },
   {
-    prop: 'companyName',
-    label: '业务公司名称',
-    'min-width': '135'
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
   },
   {
-    prop: 'contactor',
-    label: '联系人',
-    width: '70'
+    prop: "contactor",
+    label: "联系人",
+    width: "70",
   },
   {
-    prop: 'mobile',
-    label: '联系电话',
-    width: '100'
+    prop: "mobile",
+    label: "联系电话",
+    width: "100",
   },
   {
-    prop: 'post_name',
-    label: '物流公司'
+    prop: "post_name",
+    label: "物流公司",
   },
   {
-    prop: 'post_code',
-    label: '物流单号'
+    prop: "post_code",
+    label: "物流单号",
   },
   {
-    prop: 'post_fee',
-    label: '物流费用'
+    prop: "post_fee",
+    label: "物流费用",
   },
   {
-    prop: 'sendtime',
-    label: '发货时间',
-    width: '140'
+    prop: "sendtime",
+    label: "发货时间",
+    width: "140",
   },
   {
-    prop: 'apply_name',
-    label: '申请人',
-    width: '70px'
+    prop: "apply_name",
+    label: "申请人",
+    width: "70px",
   },
   {
-    prop: 'company_name',
-    label: '申请人部门',
-    width: '120px'
+    prop: "company_name",
+    label: "申请人部门",
+    width: "120px",
   },
   {
-    prop: 'addtime',
-    label: '添加时间',
-    width: 150
+    prop: "addtime",
+    label: "添加时间",
+    width: 150,
   },
   {
-    prop: '',
-    label: '操作',
-    fixed: 'right',
+    prop: "",
+    label: "操作",
+    fixed: "right",
     _noset_: true,
-    _slot_: 'operation',
-    width: 80
-  }
-]
+    _slot_: "operation",
+    width: 80,
+  },
+];
 
 // const showColumns = [
 //   {
@@ -265,107 +265,108 @@ const columns = [
 
 const showColumns = [
   {
-    prop: 'outCode',
-    label: '发货单号',
-    span: 6
+    prop: "outCode",
+    label: "发货单号",
+    span: 6,
   },
   {
-    prop: 'platform_order',
-    label: '平台订单编号',
-    span: 6
+    prop: "platform_order",
+    label: "平台订单编号",
+    span: 6,
   },
   {
-    prop: 'status',
-    label: '发货单状态',
-    _slot_: 'status',
-    span: 6
+    prop: "status",
+    label: "发货单状态",
+    _slot_: "status",
+    span: 6,
   },
   {
-    prop: 'orderCode',
-    label: '订单编号',
-    span: 6
+    prop: "orderCode",
+    label: "订单编号",
+    span: 6,
   },
   {
-    prop: 'order_type',
-    label: '商品类型',
-    _slot_: 'order_type',
-    span: 6
+    prop: "order_type",
+    label: "商品类型",
+    _slot_: "order_type",
+    span: 6,
   },
 
   {
-    prop: 'apply_name',
-    label: '申请人',
-    span: 6
+    prop: "apply_name",
+    label: "申请人",
+    span: 6,
   },
   {
-    prop: 'send_num',
-    label: '发货数量',
-    span: 6
+    prop: "send_num",
+    label: "发货数量",
+    span: 4,
   },
   {
-    prop: 'check_num',
-    label: '验收数量',
-    span: 6
+    prop: "check_num",
+    label: "验收数量",
+    span: 4,
   },
   {
-    prop: 'sendtime',
-    label: '发货时间',
-    span: 6
+    prop: "error_num",
+    label: "异常数量",
+    span: 4,
   },
   {
-    prop: 'error_num',
-    label: '异常数量',
-    span: 6
+    prop: "sendtime",
+    label: "发货时间",
+    span: 6,
   },
+
   {
-    prop: 'sale_price',
-    label: '商品单价',
-    _slot_: 'sale_price',
-    span: 6
+    prop: "sale_price",
+    label: "商品单价",
+    _slot_: "sale_price",
+    span: 6,
   },
   {
-    prop: 'total_price',
-    label: '总价',
-    _slot_: 'total_price',
-    span: 6
+    prop: "total_price",
+    label: "总价",
+    _slot_: "total_price",
+    span: 6,
   },
 
   {
-    prop: 'addtime',
-    label: '创建时间',
-    span: 6
-  },
-  {
-    prop: 'post_code',
-    label: '物流编号',
-    span: 12
+    prop: "addtime",
+    label: "创建时间",
+    span: 6,
   },
+
   {
-    prop: 'post_code',
-    label: '快递公司',
-    span: 6
+    prop: "post_code",
+    label: "快递公司",
+    span: 6,
   },
 
   {
-    prop: 'post_fee',
-    label: '物流费用',
-    span: 6
+    prop: "post_fee",
+    label: "物流费用",
+    span: 6,
+  },  {
+    prop: "post_code",
+    label: "物流编号",
+    span: 12,
   },
   {
-    prop: 'contactor',
-    label: '收货联系人',
-    span: 6
+    prop: "contactor",
+    label: "收货联系人",
+    span: 6,
   },
   {
-    prop: 'mobile',
-    label: '收货联系人电话',
-    span: 4
+    prop: "mobile",
+    label: "收货联系人电话",
+    span: 6,
   },
   {
-    prop: 'addr',
-    label: '收货地址',
-    span: 8
-  }
+    prop: "addr",
+    label: "收货地址",
+    span: 12,
+  },
   // {
   //   prop: 'remark',
   //   label: '发货备注',
@@ -377,81 +378,81 @@ const showColumns = [
   //   _slot_: 'saleinfo',
   //   span: 24
   // }
-]
+];
 const rshowColumns = [
   {
-    prop: 'returnCode',
-    label: '售后申请单号',
-    span: 6
+    prop: "returnCode",
+    label: "售后申请单号",
+    span: 6,
   },
   {
-    prop: 'addtime',
-    label: '创建时间',
-    span: 6
+    prop: "addtime",
+    label: "创建时间",
+    span: 6,
   },
   {
-    prop: 'apply_name',
-    label: '申请人',
-    span: 6
+    prop: "apply_name",
+    label: "申请人",
+    span: 6,
   },
 
   {
-    prop: 'post_name',
-    label: '快递公司',
-    span: 6
+    prop: "post_name",
+    label: "快递公司",
+    span: 6,
   },
   {
-    prop: 'post_code',
-    label: '物流编号',
-    span: 6
+    prop: "post_code",
+    label: "物流编号",
+    span: 6,
   },
   {
-    prop: 'post_fee',
-    label: '物流费用',
-    span: 6
+    prop: "post_fee",
+    label: "物流费用",
+    span: 6,
   },
   {
-    prop: 'sendtime',
-    label: '发货时间',
-    span: 6
+    prop: "sendtime",
+    label: "发货时间",
+    span: 6,
   },
 
   {
-    prop: 'send_num',
-    label: '发货数量',
-    span: 6
+    prop: "send_num",
+    label: "发货数量",
+    span: 6,
   },
   {
-    prop: 'check_num',
-    label: '验收数量',
-    span: 6
+    prop: "check_num",
+    label: "验收数量",
+    span: 6,
   },
 
   {
-    prop: 'error_num',
-    label: '异常数量',
-    span: 6
+    prop: "error_num",
+    label: "异常数量",
+    span: 6,
   },
   {
-    prop: 'sale_price',
-    label: '商品单价',
-    span: 6
+    prop: "sale_price",
+    label: "商品单价",
+    span: 6,
   },
   {
-    prop: 'total_price',
-    label: '发货单总价',
-    span: 6
+    prop: "total_price",
+    label: "发货单总价",
+    span: 6,
   },
   {
-    prop: 'addtime',
-    label: '发货方式',
-    span: 6
+    prop: "addtime",
+    label: "发货方式",
+    span: 6,
   },
 
   {
-    prop: 'mobile',
-    label: '收货联系人电话',
-    span: 6
+    prop: "mobile",
+    label: "收货联系人电话",
+    span: 6,
   },
 
   // {
@@ -460,116 +461,116 @@ const rshowColumns = [
   //   span: 24
   // },
   {
-    prop: 'error_remark',
-    label: '备注',
-    span: 24
-  }
-]
+    prop: "error_remark",
+    label: "备注",
+    span: 24,
+  },
+];
 const sendOutOrderColumns = [
   {
-    type: 'index',
-    label: '序号',
-    width: '70px'
+    type: "index",
+    label: "序号",
+    width: "70px",
   },
   {
-    prop: 'value25',
-    label: '发货单号',
-    width: '156px'
+    prop: "value25",
+    label: "发货单号",
+    width: "156px",
   },
 
   {
-    prop: 'value5',
-    label: '订单编号',
-    width: '156px'
+    prop: "value5",
+    label: "订单编号",
+    width: "156px",
   },
   {
-    prop: 'value8',
-    label: '产品名称',
-    'min-width': '180px'
+    prop: "value8",
+    label: "产品名称",
+    "min-width": "180px",
   },
   {
-    prop: 'value9',
-    label: '规格',
-    'min-width': '180px'
+    prop: "value9",
+    label: "规格",
+    "min-width": "180px",
   },
   {
-    prop: 'value10',
-    label: '单位',
-    width: '45px'
+    prop: "value10",
+    label: "单位",
+    width: "45px",
   },
   {
-    prop: 'value20',
-    label: '发货数量',
-    width: '100px'
+    prop: "value20",
+    label: "发货数量",
+    width: "100px",
   },
 
   {
-    prop: 'value21',
-    label: '收货人',
-    width: '70px'
+    prop: "value21",
+    label: "收货人",
+    width: "70px",
   },
   {
-    prop: 'value22',
-    label: '联系方式',
-    width: '110px'
+    prop: "value22",
+    label: "联系方式",
+    width: "110px",
   },
   {
-    prop: 'value23',
-    label: '收货地址',
-    width: '150px'
+    prop: "value23",
+    label: "收货地址",
+    width: "150px",
   },
   {
-    prop: 'value26',
-    label: '平台订单号',
-    width: '150px'
+    prop: "value26",
+    label: "平台订单号",
+    width: "150px",
   },
   {
-    prop: 'value27',
-    label: '发货单物流公司',
-    width: '150px'
+    prop: "value27",
+    label: "发货单物流公司",
+    width: "150px",
   },
   {
-    prop: 'value28',
-    label: '发货单物流单号',
-    width: '150px'
+    prop: "value28",
+    label: "发货单物流单号",
+    width: "150px",
   },
   {
-    prop: 'value29',
-    label: '发货单物流费用',
-    width: '140px'
+    prop: "value29",
+    label: "发货单物流费用",
+    width: "140px",
   },
   {
-    prop: 'value30',
-    label: '发货单备注',
-    'min-width': '150px'
-  }
-]
+    prop: "value30",
+    label: "发货单备注",
+    "min-width": "150px",
+  },
+];
 const head = [
-  '序号',
-  '发货工单号',
-  '发货单编号	',
-  '销售订单编号	',
-  '供应商端	',
-  '状态	',
-  '商品类型	',
-  '订单来源	',
-  '总数量	',
-  '仓库编号	',
-  '仓库名称	',
-  '商品成本编码	',
-  '商品上线编码	',
-  '业务公司编号	',
-  '业务公司名称	',
-  '客户编号	',
-  '客户名称	',
-  '供应商编号	',
-  '供应商名称	',
-  '下单时间	',
-  '申请人	',
-  '对接类型	',
-  '物流公司	',
-  '物流单号	',
-  '物流费用'
-]
+  "序号",
+  "发货工单号",
+  "发货单编号	",
+  "销售订单编号	",
+  "供应商端	",
+  "状态	",
+  "商品类型	",
+  "订单来源	",
+  "总数量	",
+  "仓库编号	",
+  "仓库名称	",
+  "商品成本编码	",
+  "商品上线编码	",
+  "业务公司编号	",
+  "业务公司名称	",
+  "客户编号	",
+  "客户名称	",
+  "供应商编号	",
+  "供应商名称	",
+  "下单时间	",
+  "申请人	",
+  "对接类型	",
+  "物流公司	",
+  "物流单号	",
+  "物流费用",
+];
 
-export { columns, showColumns, rshowColumns, sendOutOrderColumns, head }
+export { columns, showColumns, rshowColumns, sendOutOrderColumns, head };

src/views/supplierPurchaseIn/supplierDeliveryWorkOrder/components/ShowDataTableColumns.js

@@ -84,17 +84,17 @@ const showColumns = [
   {
     prop: 'addr_contactor',
     label: '收货人',
-    span: 8
+    span: 6
   },
   {
     prop: 'addr_mobile',
     label: '收货电话',
-    span: 8
+    span: 6
   },
   {
     prop: 'addr',
     label: '收货地址',
-    span: 8
+    span: 12
   },
   {
     prop: 'remark',