build

src/assets/js/statusList.js

@@ -3,15 +3,15 @@ const statusList = [
   { name: "禁用", code: 0 },
 ];
 const cg_order_type_options = [
-  { id: "1", label: "库存品" },
-  { id: "2", label: "非库存品" },
-  { id: "3", label: "采反" },
+  { id: "1", label: "库存商品" },
+  { id: "2", label: "非库存商品" },
+  { id: "3", label: "反馈商品" },
   { id: "4", label: "报备商品" },
 ]
 const xs_order_type_options = [
-  { id: "1", label: "库存品" },
-  { id: "2", label: "非库存品" },
-  { id: "3", label: "采购反馈" },
+  { id: "1", label: "库存商品" },
+  { id: "2", label: "非库存商品" },
+  { id: "3", label: "反馈商品" },
   { id: "4", label: "报备商品" },
 ]
 const cg_order_source_options = [

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -1,250 +1,228 @@
-//采返 销售订单展示字段
+// 采返 销售订单展示字段
 const reColumns = [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    span: 24,
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
   },
 
   {
-    prop: "cat",
-    label: "分类",
-    span: 8,
+    prop: 'cat',
+    label: '分类',
+    span: 8
   },
 
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 8,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 8
   },
-
-
-
   {
-    prop: "send_way",
-    label: "发货方式",
-    _slot_: "send_way",
-    span: 8,
+    prop: 'send_way',
+    label: '发货方式',
+    _slot_: 'send_way',
+    span: 8
   },
   {
-    prop: "unit",
-    label: "单位",
-    span: 4,
+    prop: 'unit',
+    label: '单位',
+    span: 4
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 4,
+    span: 4
   },
   {
-    prop: "pay_way",
-    label: "付款方式",
-    _slot_: "pay_way",
-    span: 4,
+    prop: 'pay_way',
+    label: '付款方式',
+    _slot_: 'pay_way',
+    span: 4
   },
 
-
   {
-    prop: "weight",
-    label: "商品总克重",
+    prop: 'weight',
+    label: '商品总克重',
     append: 'g',
-    span: 6,
+    span: 6
   },
 
-
   {
-    prop: "addtime",
-    label: "反馈时间",
-    span: 6,
+    prop: 'addtime',
+    label: '反馈时间',
+    span: 6
   },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    span: 4,
+    prop: 'cgder',
+    label: '供应商负责人',
+    span: 4
   },
   {
-    prop: "creater",
-    label: "商品创建人",
-    span: 4,
+    prop: 'creater',
+    label: '商品创建人',
+    span: 4
   },
   {
-    prop: "supply_area",
-    label: "供货区域",
-    _slot_: "supply_area",
-    span: 4,
+    prop: 'supply_area',
+    label: '供货区域',
+    _slot_: 'supply_area',
+    span: 4
   },
 
   {
-    prop: "good_img",
-    label: "商品图片",
-    _slot_: "good_img",
-    span: 12,
-
+    prop: 'good_img',
+    label: '商品图片',
+    _slot_: 'good_img',
+    span: 12
   },
   {
-    prop: "noble",
-    _slot_: "noble",
-    label: "贵金属信息",
-    span: 24,
+    prop: 'noble',
+    _slot_: 'noble',
+    label: '贵金属信息',
+    span: 24
   },
- 
-
 
   {
-    prop: "cost_desc",
-    label: "工艺说明",
-    span: 24,
+    prop: 'cost_desc',
+    label: '工艺说明',
+    span: 24
   },
   {
-    prop: "remark",
-    label: "采返备注",
-    span: 24,
-  },
-
-
+    prop: 'remark',
+    label: '采返备注',
+    span: 24
+  }
 
 ]
-//采返 采购商品字段
+// 采返 采购商品字段
 const coveColumns = [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    span: 24,
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
   },
 
   {
-    prop: "cat",
-    label: "分类",
-    span: 8,
+    prop: 'cat',
+    label: '分类',
+    span: 8
   },
 
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 8,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 8
   },
 
-
-
   {
-    prop: "send_way",
-    label: "发货方式",
-    _slot_: "send_way",
-    span: 8,
+    prop: 'send_way',
+    label: '发货方式',
+    _slot_: 'send_way',
+    span: 8
   },
   {
-    prop: "unit",
-    label: "单位",
-    span: 4,
+    prop: 'unit',
+    label: '单位',
+    span: 4
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 4,
+    span: 4
   },
   {
-    prop: "pay_way",
-    label: "付款方式",
-    _slot_: "pay_way",
-    span: 4,
+    prop: 'pay_way',
+    label: '付款方式',
+    _slot_: 'pay_way',
+    span: 4
   },
 
-
   {
-    prop: "weight",
-    label: "商品总克重",
+    prop: 'weight',
+    label: '商品总克重',
     append: 'g',
-    span: 6,
+    span: 6
   },
 
-
   {
-    prop: "addtime",
-    label: "反馈时间",
-    span: 6,
+    prop: 'addtime',
+    label: '反馈时间',
+    span: 6
   },
 
-
-
-
-
   {
-    prop: "expire_day",
-    label: "竞价有效期",
+    prop: 'expire_day',
+    label: '竞价有效期',
     append: '天',
     span: 4
   },
 
   {
-    prop: "delivery_day",
-    label: "物流时间",
+    prop: 'delivery_day',
+    label: '物流时间',
     append: '天',
     span: 4
   },
   {
-    prop: "work_day",
-    label: "生产工期",
+    prop: 'work_day',
+    label: '生产工期',
     append: '天',
     span: 4
   },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    span: 4,
+    prop: 'cgder',
+    label: '供应商负责人',
+    span: 4
   },
   {
-    prop: "good_creater",
-    label: "商品创建人",
-    span: 4,
+    prop: 'good_creater',
+    label: '商品创建人',
+    span: 4
   },
- 
-
 
   {
-    prop: "supply_area",
-    label: "供货区域",
-    _slot_: "supply_area",
-    span: 4,
+    prop: 'supply_area',
+    label: '供货区域',
+    _slot_: 'supply_area',
+    span: 4
   },
 
-
   {
-    prop: "good_img",
-    label: "商品图片",
-    _slot_: "good_img",
-    span: 24,
+    prop: 'good_img',
+    label: '商品图片',
+    _slot_: 'good_img',
+    span: 24
 
   },
   {
-    prop: "noble",
-    _slot_: "noble",
-    label: "贵金属信息",
-    span: 24,
+    prop: 'noble',
+    _slot_: 'noble',
+    label: '贵金属信息',
+    span: 24
   },
   {
-    prop: "cost_desc",
-    label: "工艺说明",
-    span: 24,
+    prop: 'cost_desc',
+    label: '工艺说明',
+    span: 24
   },
   {
-    prop: "remark",
-    label: "采返备注",
-    span: 24,
-  },
-
+    prop: 'remark',
+    label: '采返备注',
+    span: 24
+  }
 
 ]
-//商品上线字段
+// 商品上线字段
 const onlineColumns = [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    span: 24,
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
   },
 
   // {
@@ -258,41 +236,39 @@ const onlineColumns = [
   // },
 
   {
-    prop: "good_img",
-    _slot_: "good_img",
-    label: "商品主图",
+    prop: 'good_img',
+    _slot_: 'good_img',
+    label: '商品主图'
   },
   {
-    prop: "good_info_img",
-    _slot_: "good_info_img",
-    label: "详情图",
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情图'
   },
   {
-    prop: "company",
-    label: "业务企业名称",
-    _slot_: "company",
+    prop: 'company',
+    label: '业务企业名称',
+    _slot_: 'company'
   },
   // {
   //   prop: "online_reason",
   //   label: "上线原因",
   // },
 
-
-
   // {
   //   prop: "creater",
   //   label: "申请人",
   //   span: 6,
   // },
   {
-    prop: "platform_name",
-    label: "所属平台",
-    span: 6,
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 6
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 6,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 6
   },
   // {
   //   prop: "platform_code_en",
@@ -305,19 +281,17 @@ const onlineColumns = [
   //   span: 8,
   // },
   {
-    prop: "cat",
-    label: "分类",
-    span: 8,
+    prop: 'cat',
+    label: '分类',
+    span: 8
   },
 
-
   {
-    prop: "unit",
-    label: "单位",
-    span: 4,
+    prop: 'unit',
+    label: '单位',
+    span: 4
   },
 
-
   // {
   //   prop: "is_auth",
   //   label: "供应商权限",
@@ -326,63 +300,63 @@ const onlineColumns = [
   // },
 
   {
-    prop: "is_stock",
-    label: "是否库存品",
-    _slot_: "is_stock",
-    span: 6,
+    prop: 'is_stock',
+    label: '是否库存品',
+    _slot_: 'is_stock',
+    span: 6
   },
   {
-    prop: "supply_area",
-    label: "供货区域",
-    _slot_: "supply_area",
-    span: 6,
+    prop: 'supply_area',
+    label: '供货区域',
+    _slot_: 'supply_area',
+    span: 6
   },
   {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
-    span: 8,
+    prop: 'good_type',
+    label: '是否定制',
+    _slot_: 'good_type',
+    span: 8
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 4,
+    span: 4
   },
   {
-    prop: "delivery_day",
-    label: "物流时间",
+    prop: 'delivery_day',
+    label: '物流时间',
     append: '天',
-    span: 4,
+    span: 4
   },
   {
-    prop: "lead_time",
-    label: "供货周期",
+    prop: 'lead_time',
+    label: '供货周期',
     append: '天',
-    span: 4,
+    span: 4
   },
   {
-    prop: "sample_day",
-    label: "调样周期",
+    prop: 'sample_day',
+    label: '调样周期',
     append: '天',
-    span: 4,
+    span: 4
   },
   {
-    prop: "exclusive",
-    label: "专属类型",
-    _slot_: "exclusive",
-    span: 6,
+    prop: 'exclusive',
+    label: '专属类型',
+    _slot_: 'exclusive',
+    span: 6
   },
   {
-    prop: "weight",
-    label: "商品总克重",
+    prop: 'weight',
+    label: '商品总克重',
     append: 'g',
-    span: 6,
+    span: 6
   },
   {
-    prop: "noble",
-    _slot_: "noble",
-    label: "贵金属信息",
+    prop: 'noble',
+    _slot_: 'noble',
+    label: '贵金属信息'
   },
 
   // {
@@ -417,25 +391,25 @@ const onlineColumns = [
   // },
 
   {
-    prop: "delivery_place_cn",
-    label: "发货地",
-    span: 8,
+    prop: 'delivery_place_cn',
+    label: '发货地',
+    span: 8
   },
   {
-    prop: "customized",
-    label: "工期",
+    prop: 'customized',
+    label: '工期',
     append: '天',
-    span: 8,
+    span: 8
   },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    span: 4,
+    prop: 'cgder',
+    label: '供应商负责人',
+    span: 4
   },
   {
-    prop: "good_creater",
-    label: "商品创建人",
-    span: 4,
+    prop: 'good_creater',
+    label: '商品创建人',
+    span: 4
   },
   // {
   //   prop: "origin_place_cn",
@@ -443,8 +417,6 @@ const onlineColumns = [
   //   span: 8,
   // },
 
-
-
   // {
   //   prop: "cert_fee",
   //   label: "证书费(元)",
@@ -521,33 +493,30 @@ const onlineColumns = [
   //   span: 24,
   // },
   {
-    prop: "after_sales",
-    label: "售后说明",
-    span: 24,
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
   },
   {
-    prop: "good_remark",
-    label: "商品备注",
-    span: 24,
+    prop: 'good_remark',
+    label: '商品备注',
+    span: 24
   },
 
   {
-    prop: "craft_desc",
-    label: "工艺说明",
-    span: 24,
-  },
-
-
-
+    prop: 'craft_desc',
+    label: '工艺说明',
+    span: 24
+  }
 
 ]
-//商品成本字段
+// 商品成本字段
 const costColumns = [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    span: 24,
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
   },
 
   // {
@@ -561,77 +530,72 @@ const costColumns = [
   // },
 
   {
-    prop: "good_img",
-    _slot_: "good_img",
-    label: "商品主图",
+    prop: 'good_img',
+    _slot_: 'good_img',
+    label: '商品主图'
   },
 
   {
-    prop: "good_info_img",
-    _slot_: "good_info_img",
-    label: "详情图",
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情图'
   },
   {
-    prop: "company",
-    label: "业务企业名称",
-    _slot_: "company",
+    prop: 'company',
+    label: '业务企业名称',
+    _slot_: 'company'
   },
   {
-    prop: "supplierName",
-    label: "供应商名称",
-    _slot_: "supplierName",
+    prop: 'supplierName',
+    label: '供应商名称',
+    _slot_: 'supplierName'
   },
   {
-    prop: "cat",
-    label: "分类",
-    span: 8,
+    prop: 'cat',
+    label: '分类',
+    span: 8
   },
   {
-    prop: "unit",
-    label: "单位",
-    span: 4,
+    prop: 'unit',
+    label: '单位',
+    span: 4
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 6,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 6
   },
 
-
-
-
-
-
   {
-    prop: "is_auth",
-    label: "供应商权限",
-    _slot_: "is_auth",
-    span: 6,
+    prop: 'is_auth',
+    label: '供应商权限',
+    _slot_: 'is_auth',
+    span: 6
   },
 
   {
-    prop: "is_stock",
-    label: "是否库存品",
-    _slot_: "is_stock",
-    span: 6,
+    prop: 'is_stock',
+    label: '是否库存品',
+    _slot_: 'is_stock',
+    span: 6
   },
   {
-    prop: "supply_area",
-    label: "供货区域",
-    _slot_: "supply_area",
-    span: 6,
+    prop: 'supply_area',
+    label: '供货区域',
+    _slot_: 'supply_area',
+    span: 6
   },
   {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
-    span: 8,
+    prop: 'good_type',
+    label: '是否定制',
+    _slot_: 'good_type',
+    span: 8
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 4,
+    span: 4
   },
   // {
   //   prop: "delivery_day",
@@ -652,120 +616,119 @@ const costColumns = [
   //   span: 4,
   // },
   {
-    prop: "exclusive",
-    label: "专属类型",
-    _slot_: "exclusive",
-    span: 6,
+    prop: 'exclusive',
+    label: '专属类型',
+    _slot_: 'exclusive',
+    span: 6
   },
   {
-    prop: "weight",
-    label: "商品总克重",
+    prop: 'weight',
+    label: '商品总克重',
     append: 'g',
-    span: 6,
+    span: 6
   },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    span: 6,
+    prop: 'cgder',
+    label: '供应商负责人',
+    span: 6
   },
   {
-    prop: "creater",
-    label: "商品创建人",
-    span: 6,
+    prop: 'creater',
+    label: '商品创建人',
+    span: 6
   },
   {
-    prop: "noble",
-    _slot_: "noble",
-    label: "贵金属信息",
-    span: 24,
+    prop: 'noble',
+    _slot_: 'noble',
+    label: '贵金属信息',
+    span: 24
   },
   {
-    prop: "after_sales",
-    label: "售后说明",
-    span: 24,
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
   },
   {
-    prop: "good_remark",
-    label: "商品备注",
-    span: 24,
+    prop: 'good_remark',
+    label: '商品备注',
+    span: 24
   },
 
   {
-    prop: "craft_desc",
-    label: "工艺说明",
-    span: 24,
-  },
-
+    prop: 'craft_desc',
+    label: '工艺说明',
+    span: 24
+  }
 
 ]
-//是否定制
+// 是否定制
 const options1 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//专属类型
+// 专属类型
 const options2 = [
-  { id: "0", name: "非泰康" },
-  { id: "1", name: "泰康" },
+  { id: '0', name: '非泰康' },
+  { id: '1', name: '泰康' }
 ]
-//销售权限
+// 销售权限
 const options3 = [
-  { id: "0", name: "无销售权限" },
-  { id: "1", name: "有销售权限" },
+  { id: '0', name: '无销售权限' },
+  { id: '1', name: '有销售权限' }
 ]
 
-//是否库存品
+// 是否库存品
 const options4 = [
-  { id: "0", name: "非库存品" },
-  { id: "1", name: "库存品" },
+  { id: '0', name: '非库存品' },
+  { id: '1', name: '库存品' }
 ]
-//是否启用实时金价
+// 是否启用实时金价
 const options5 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//供货区域
+// 供货区域
 const options6 = [
-  { id: "1", name: "全国" },
-  { id: "2", name: "全国除偏远" },
+  { id: '1', name: '全国' },
+  { id: '2', name: '全国除偏远' }
 ]
-//是否启用阶梯
+// 是否启用阶梯
 const options7 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
 const options8 = [
   // { id: "0", name: "待提交" },
-  { id: "1", name: "待完善成本" },
-  { id: "2", name: "待产品审核" },
-  { id: "3", name: "待财务定价" },
-  { id: "4", name: "待财务审核定价" },
-  { id: "5", name: "待上线" },
-  { id: "6", name: "上线成功" },
-  { id: "7", name: "审核失败" },
-  { id: "8", name: "已下线" },
+  { id: '1', name: '待完善成本' },
+  { id: '2', name: '待产品审核' },
+  { id: '3', name: '待财务定价' },
+  { id: '4', name: '待财务审核定价' },
+  { id: '5', name: '待上线' },
+  { id: '6', name: '上线成功' },
+  { id: '7', name: '审核失败' },
+  { id: '8', name: '已下线' }
 ]
 
 const options9 = [
-  { id: "0", name: "现结" },
-  { id: "1", name: "月清" },
-  { id: "2", name: "双月清" },
+  { id: '0', name: '现结' },
+  { id: '1', name: '月清' },
+  { id: '2', name: '双月清' }
 ]
-//付款方式
+// 付款方式
 const options10 = [
-  { id: "0", name: "现结" },
-  { id: "1", name: "月清" },
-  { id: "2", name: "双月清" },
+  { id: '0', name: '现结' },
+  { id: '1', name: '月清' },
+  { id: '2', name: '双月清' }
 ]
-//发货方式
+// 发货方式
 const options11 = [
-  { id: "0", name: "公司自提" },
-  { id: "1", name: "供应商包邮" },
+  { id: '0', name: '公司自提' },
+  { id: '1', name: '供应商包邮' }
 ]
 
 const options12 = [
-  { id: "0", name: "一地" },
-  { id: "1", name: "多地" },
+  { id: '0', name: '一地' },
+  { id: '1', name: '多地' }
 ]
 export { onlineColumns, reColumns, costColumns, coveColumns, options1, options2, options3, options4, options5, options6, options7, options8, options9, options10, options11, options12 }
 

src/views/goodStore/goodsCost/columns.js

@@ -536,25 +536,32 @@ const rules = {
       trigger: 'blur'
     }
   ]
-
-  // is_step: {
-  //   required: true,
-  //   message: "请选择是否启用阶梯",
-  //   trigger: "change",
-  // },
 }
 
 const basicColumns = [
   {
     prop: 'cat_info',
     label: '商品分类',
-    span: 12,
+    span: 8,
     _slot_: 'cat_info'
   },
+  {
+    prop: 'good_img',
+    label: '商品主图',
+    _slot_: 'good_img',
+    span: 8
+  },
+  {
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情介绍',
+    span: 8
+  },
   {
     prop: 'good_name',
     label: '商品名称',
-    span: 12
+    _slot_: 'good_name',
+    span: 24
   },
   {
     prop: 'company',
@@ -606,53 +613,96 @@ const basicColumns = [
     span: 8
   },
   {
-    prop: 'noble_weight',
-    label: '贵金属重量',
-    _slot_: 'noble_weight',
-    span: 8
+    prop: 'noble',
+    _slot_: 'noble',
+    label: '贵金属信息',
+    span: 24
   },
   {
-    prop: 'noble_name',
-    label: '贵金属种类',
-    _slot_: 'noble_metal',
-    span: 8
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
   },
   {
-    prop: 'is_gold_price',
-    label: '启用实时金价',
-    _slot_: 'is_gold_price',
-    span: 8
+    prop: 'good_remark',
+    label: '商品备注',
+    span: 24
   },
   {
-    prop: 'is_diff',
-    label: '有无工差',
-    _slot_: 'is_diff',
-    span: 8
+    prop: 'craft_desc',
+    label: '工艺说明',
+    span: 24
   },
   {
-    prop: 'config',
-    label: '配置要求',
-    span: 8
+    prop: 'packing_way',
+    label: '包装方式',
+    span: 6
   },
   {
-    prop: 'other_config',
-    label: '其他配置要求',
-    span: 8
+    prop: 'packing_spec',
+    label: '装箱规格',
+    span: 6
   },
   {
-    prop: 'after_sales',
-    label: '售后说明',
-    span: 24
+    prop: 'packing_weight',
+    label: '装箱重量',
+    _slot_: 'packing_weight',
+    span: 6
   },
   {
-    prop: 'good_remark',
-    label: '商品备注',
-    span: 24
+    prop: 'packing_size',
+    label: '装箱尺寸',
+    span: 6
   },
   {
-    prop: 'craft_desc',
-    label: '工艺说明',
-    span: 24
+    prop: 'good_size',
+    label: '装箱尺寸',
+    span: 6
+  },
+  {
+    prop: 'good_bar',
+    label: '商品条形码',
+    span: 6
+  },
+  {
+    prop: 'packing_list',
+    label: '商品清单',
+    span: 12
+  },
+  {
+    prop: 'packing_spec',
+    label: '供货区域',
+    span: 6
+  },
+  {
+    prop: 'delivery_day',
+    label: '物流天数',
+    _slot_: 'delivery_day',
+    span: 6
+  },
+  {
+    prop: 'lead_time',
+    label: '供货周期',
+    _slot_: 'lead_time',
+    span: 6
+  },
+  {
+    prop: 'sample_day',
+    label: '调样周期',
+    _slot_: 'sample_day',
+    span: 6
+  },
+  {
+    prop: 'delivery_place',
+    label: '发货地',
+    span: 12,
+    _slot_: 'delivery_place'
+  },
+  {
+    prop: 'origin_place',
+    label: '产地',
+    span: 12,
+    _slot_: 'origin_place'
   }
 ]
 
@@ -739,18 +789,6 @@ const imageColumns = [
     label: '图片缩略',
     _slot_: 'good_thumb_img',
     span: 6
-  },
-  {
-    prop: 'good_img',
-    label: '商品主图',
-    _slot_: 'good_img',
-    span: 12
-  },
-  {
-    prop: 'good_info_img',
-    _slot_: 'good_info_img',
-    label: '详情介绍',
-    span: 6
   }
 ]
 

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -61,7 +61,7 @@
               <company-sort
                 :value="ruleForm.cat_id"
                 :placeholder="'商品分类'"
-                :disabled="type === 'view' || type === 'editBase' || type === 'editCoin'"
+                :disabled="type !== 'add'"
                 :size="'mini'"
                 :names="cat_id_name"
                 :isDetail="type !== 'add'"

src/views/goodStore/goodsCost/detail.vue

@@ -31,9 +31,63 @@
             <template v-else>
               <el-collapse-item title="基础信息" name="1">
               <show-data-table :columns="basicColumns" :sitem="sitem">
+                <template slot="good_img">
+                  <template v-if="sitem.good_img">
+                   <div style="max-height: 24px;overflow: hidden;">
+                    <el-image style="height: 24px;width: 24px;margin-right:5px" v-for="(img,index) in sitem.good_img.split(',')" :src="img" :preview-src-list="sitem.good_img.split(',')" :key="index" />
+                   </div>
+                  </template>
+                </template>
+
+                <template slot="good_info_img">
+                  <div style="max-height: 24px;overflow: hidden;">
+                    <el-image style="height: 24px;width: 24px" :src="sitem.good_info_img" :preview-src-list="[sitem.good_info_img]" />
+                  </div>
+                </template>
+
                 <template slot="cat_info">
                   {{sitem.cat_info ? sitem.cat_info.map(({name}) => name).join('_') : '--' }}
                 </template>
+
+                <template slot="good_name">
+                  <img
+                    v-if="sitem.good_thumb_img"
+                    v-viewer
+                    style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                    class="fl"
+                    :src="sitem.good_thumb_img"
+                    alt=""
+                  >
+                  <span>{{ sitem.good_name }}</span>
+                  <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
+                    <span v-if="i !== 0">-</span>
+                    <span v-else>_</span>
+                    <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+                  </span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li
+                        v-if=" newTime !== '' && isDisplayPrivateField('1')"
+                      >
+                        <span>商品成本编号：</span><span>{{ sitem.spuCode }}</span>
+                      </li>
+                    </ul>
+                    <i slot="reference" class="el-icon-warning-outline fr" />
+                  </el-popover>
+                </template>
+
+                <template slot="noble">
+                   <span
+                     v-if="sitem.noble_metal"
+                   >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+                     sitem.noble_name
+                   }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+                     sitem.is_gold_price + '' === "0" ? "不" : ""
+                   }}启用实时金价-{{ sitem.is_diff + '' === "1" ? "有" : "无" }}工差-{{
+                     sitem.config
+                   }}-{{ sitem.other_config }}</span>
+                  </template>
+                
                 <template slot="weight">
                   {{sitem.weight}}g
                 </template>
@@ -49,26 +103,11 @@
                 <template slot="noble_weight">{{sitem.noble_weight}}g</template>
                 <template slot="is_gold_price">{{String(sitem.is_gold_price) === '1' ? '是' : '否'}}</template>
                 <template slot="is_diff">{{String(sitem.is_diff) === '1' ? '有公差' : '无工差'}}</template>
-              </show-data-table>
-            </el-collapse-item>
-
-            <el-collapse-item title="规格信息" name="2">
-              <el-table :data="sitem.speclist" :size="'mini'" border style="width: 100%">
-                <el-table-column prop="spec_name" label="规格类型" />
-                <el-table-column prop="spec_value" label="规格值" />
-              </el-table>
-            </el-collapse-item>
 
-            <el-collapse-item title="包装信息" name="3">
-              <show-data-table :columns="packingColumns" :sitem="sitem">
                 <template slot="packing_weight">
                   {{sitem.packing_weight}}g
                 </template>
-              </show-data-table>
-            </el-collapse-item>
 
-            <el-collapse-item title="发货信息" name="4">
-              <show-data-table :columns="sendColumns" :sitem="sitem">
                 <template slot="delivery_day">{{sitem.delivery_day}}天</template>
                 <template slot="lead_time">{{sitem.lead_time}}天</template>
                 <template slot="sample_day">{{sitem.sample_day}}天</template>
@@ -77,24 +116,6 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="图片信息" name="5">
-              <show-data-table :columns="imageColumns" :sitem="sitem">
-                <template slot="good_thumb_img">
-                  <el-image style="height: 40px;width: 40px" :src="sitem.good_thumb_img" :preview-src-list="[sitem.good_thumb_img]" />
-                </template>
-
-                <template slot="good_img">
-                  <template v-if="sitem.good_img">
-                    <el-image style="height: 40px;width: 40px;margin-right: 10px" v-for="(img,index) in sitem.good_img.split(',')" :src="img" :preview-src-list="sitem.good_img.split(',')" :key="index" />
-                  </template>
-                </template>
-
-                <template slot="good_info_img">
-                    <el-image style="height: 40px;width: 40px" :src="sitem.good_info_img" :preview-src-list="[sitem.good_info_img]" />
-                </template>
-              </show-data-table>
-            </el-collapse-item>
-
             <el-collapse-item title="固定与阶梯成本" name="6" v-if="displayCostField">
               <show-data-table :columns="ladderColumns" :sitem="sitem">
                 <template slot="demo_fee">{{sitem.demo_fee}}元</template>
@@ -166,10 +187,11 @@ import baseForm from "./components/baseForm";
 import costForm from './components/costDetail'
 import ShowDataTable from '@/views/standingBook/components/detail-data-table.vue'
 import { basicColumns, packingColumns, sendColumns, imageColumns, ladderColumns } from './columns'
+import privateField from "@/mixins/privateField";
 
 export default {
   name: "goodsCostDetail",
-  mixins: [resToken],
+  mixins: [resToken,privateField],
   components: {
     ShowDataTable,
     baseForm,

src/views/goodStore/supplierGoodsCost/columns.js

@@ -108,11 +108,12 @@ const listCol = [
     label: '业务公司名称',
     width: '110px'
   },
-  // {
-  //   prop: 'charger_company_name',
-  //   label: '负责人部门',
-  //   minWidth: '150px'
-  // },
+  {
+    prop: 'charger_company_name',
+    label: '负责人部门',
+    minWidth: '150px'
+  },
+
   {
     prop: 'charger',
     label: '负责人',
@@ -249,6 +250,7 @@ const rules = {
   ],
   supplierNo: [
     {
+      type: 'array',
       required: true,
       message: '请选择供应商',
       trigger: 'change'
@@ -534,25 +536,32 @@ const rules = {
       trigger: 'blur'
     }
   ]
-
-  // is_step: {
-  //   required: true,
-  //   message: "请选择是否启用阶梯",
-  //   trigger: "change",
-  // },
 }
 
 const basicColumns = [
   {
     prop: 'cat_info',
     label: '商品分类',
-    span: 12,
+    span: 8,
     _slot_: 'cat_info'
   },
+  {
+    prop: 'good_img',
+    label: '商品主图',
+    _slot_: 'good_img',
+    span: 8
+  },
+  {
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情介绍',
+    span: 8
+  },
   {
     prop: 'good_name',
     label: '商品名称',
-    span: 12
+    _slot_: 'good_name',
+    span: 24
   },
   {
     prop: 'company',
@@ -604,53 +613,96 @@ const basicColumns = [
     span: 8
   },
   {
-    prop: 'noble_weight',
-    label: '贵金属重量',
-    _slot_: 'noble_weight',
-    span: 8
+    prop: 'noble',
+    _slot_: 'noble',
+    label: '贵金属信息',
+    span: 24
   },
   {
-    prop: 'noble_name',
-    label: '贵金属种类',
-    _slot_: 'noble_metal',
-    span: 8
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
   },
   {
-    prop: 'is_gold_price',
-    label: '启用实时金价',
-    _slot_: 'is_gold_price',
-    span: 8
+    prop: 'good_remark',
+    label: '商品备注',
+    span: 24
   },
   {
-    prop: 'is_diff',
-    label: '有无工差',
-    _slot_: 'is_diff',
-    span: 8
+    prop: 'craft_desc',
+    label: '工艺说明',
+    span: 24
   },
   {
-    prop: 'config',
-    label: '配置要求',
-    span: 8
+    prop: 'packing_way',
+    label: '包装方式',
+    span: 6
   },
   {
-    prop: 'other_config',
-    label: '其他配置要求',
-    span: 8
+    prop: 'packing_spec',
+    label: '装箱规格',
+    span: 6
   },
   {
-    prop: 'after_sales',
-    label: '售后说明',
-    span: 24
+    prop: 'packing_weight',
+    label: '装箱重量',
+    _slot_: 'packing_weight',
+    span: 6
   },
   {
-    prop: 'good_remark',
-    label: '商品备注',
-    span: 24
+    prop: 'packing_size',
+    label: '装箱尺寸',
+    span: 6
   },
   {
-    prop: 'craft_desc',
-    label: '工艺说明',
-    span: 24
+    prop: 'good_size',
+    label: '装箱尺寸',
+    span: 6
+  },
+  {
+    prop: 'good_bar',
+    label: '商品条形码',
+    span: 6
+  },
+  {
+    prop: 'packing_list',
+    label: '商品清单',
+    span: 12
+  },
+  {
+    prop: 'packing_spec',
+    label: '供货区域',
+    span: 6
+  },
+  {
+    prop: 'delivery_day',
+    label: '物流天数',
+    _slot_: 'delivery_day',
+    span: 6
+  },
+  {
+    prop: 'lead_time',
+    label: '供货周期',
+    _slot_: 'lead_time',
+    span: 6
+  },
+  {
+    prop: 'sample_day',
+    label: '调样周期',
+    _slot_: 'sample_day',
+    span: 6
+  },
+  {
+    prop: 'delivery_place',
+    label: '发货地',
+    span: 12,
+    _slot_: 'delivery_place'
+  },
+  {
+    prop: 'origin_place',
+    label: '产地',
+    span: 12,
+    _slot_: 'origin_place'
   }
 ]
 
@@ -737,18 +789,6 @@ const imageColumns = [
     label: '图片缩略',
     _slot_: 'good_thumb_img',
     span: 6
-  },
-  {
-    prop: 'good_img',
-    label: '商品主图',
-    _slot_: 'good_img',
-    span: 12
-  },
-  {
-    prop: 'good_info_img',
-    _slot_: 'good_info_img',
-    label: '详情介绍',
-    span: 6
   }
 ]
 

src/views/goodStore/supplierGoodsCost/components/baseForm.vue

@@ -63,7 +63,7 @@
               <company-sort
                 :value="ruleForm.cat_id"
                 :placeholder="'商品分类'"
-                :disabled="type === 'view' || type === 'editBase' || type === 'editCoin'"
+                :disabled="type !== 'add'"
                 :size="'mini'"
                 :names="cat_id_name"
                 :isDetail="type !== 'add'"

src/views/goodStore/supplierGoodsCost/detail.vue

@@ -31,6 +31,18 @@
             <template v-else>
               <el-collapse-item title="基础信息" name="1">
               <show-data-table :columns="basicColumns" :sitem="sitem">
+                <template slot="noble">
+                   <span
+                     v-if="sitem.noble_metal"
+                   >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+                     sitem.noble_name
+                   }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+                     sitem.is_gold_price + '' === "0" ? "不" : ""
+                   }}启用实时金价-{{ sitem.is_diff + '' === "1" ? "有" : "无" }}工差-{{
+                     sitem.config
+                   }}-{{ sitem.other_config }}</span>
+                  </template>
+
                 <template slot="cat_info">
                   {{sitem.cat_info ? sitem.cat_info.map(({name}) => name).join('_') : '--' }}
                 </template>
@@ -46,20 +58,57 @@
                 <template slot="is_exclusive">
                   {{String(sitem.is_exclusive) === '0' ? '非泰康' : '泰康'}}
                 </template>
+                
+                <template slot="good_name">
+                  <img
+                    v-if="sitem.good_thumb_img"
+                    v-viewer
+                    style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                    class="fl"
+                    :src="sitem.good_thumb_img"
+                    alt=""
+                  >
+                  <span>{{ sitem.good_name }}</span>
+                  <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
+                    <span v-if="i !== 0">-</span>
+                    <span v-else>_</span>
+                    <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+                  </span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li
+                        v-if=" newTime !== '' && isDisplayPrivateField('1')"
+                      >
+                        <span>商品成本编号：</span><span>{{ sitem.spuCode }}</span>
+                      </li>
+                    </ul>
+                    <i slot="reference" class="el-icon-warning-outline fr" />
+                  </el-popover>
+                </template>
+
                 <template slot="noble_weight">{{sitem.noble_weight}}g</template>
                 <template slot="is_gold_price">{{String(sitem.is_gold_price) === '1' ? '是' : '否'}}</template>
                 <template slot="is_diff">{{String(sitem.is_diff) === '1' ? '有公差' : '无工差'}}</template>
+
+                <template slot="delivery_day">{{sitem.delivery_day}}天</template>
+              <template slot="lead_time">{{sitem.lead_time}}天</template>
+              <template slot="sample_day">{{sitem.sample_day}}天</template>
+              <template slot="delivery_place">{{delivery_place}}</template>
+              <template slot="origin_place">{{origin_place}}</template>
+              <template slot="packing_weight">
+                {{sitem.packing_weight}}g
+              </template>
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="规格信息" name="2">
+            <!-- <el-collapse-item title="规格信息" name="2">
               <el-table :data="sitem.speclist" :size="'mini'" border style="width: 100%">
                 <el-table-column prop="spec_name" label="规格类型" />
                 <el-table-column prop="spec_value" label="规格值" />
               </el-table>
-            </el-collapse-item>
+            </el-collapse-item> -->
 
-            <el-collapse-item title="包装信息" name="3">
+            <!-- <el-collapse-item title="包装信息" name="3">
               <show-data-table :columns="packingColumns" :sitem="sitem">
                 <template slot="packing_weight">
                   {{sitem.packing_weight}}g
@@ -75,9 +124,9 @@
                 <template slot="delivery_place">{{delivery_place}}</template>
                 <template slot="origin_place">{{origin_place}}</template>
               </show-data-table>
-            </el-collapse-item>
+            </el-collapse-item> -->
 
-            <el-collapse-item title="图片信息" name="5">
+            <!-- <el-collapse-item title="图片信息" name="5">
               <show-data-table :columns="imageColumns" :sitem="sitem">
                 <template slot="good_thumb_img">
                   <el-image style="height: 40px;width: 40px" :src="sitem.good_thumb_img" :preview-src-list="[sitem.good_thumb_img]" />
@@ -93,7 +142,7 @@
                     <el-image style="height: 40px;width: 40px" :src="sitem.good_info_img" :preview-src-list="[sitem.good_info_img]" />
                 </template>
               </show-data-table>
-            </el-collapse-item>
+            </el-collapse-item> -->
 
             <el-collapse-item title="固定与阶梯成本" name="6" v-if="displayCostField">
               <show-data-table :columns="ladderColumns" :sitem="sitem">
@@ -165,10 +214,11 @@ import baseForm from "./components/baseForm";
 import costForm from './components/costDetail'
 import ShowDataTable from '@/views/standingBook/components/detail-data-table.vue'
 import { basicColumns, packingColumns, sendColumns, imageColumns, ladderColumns } from './columns'
+import privateField from "@/mixins/privateField";
 
 export default {
   name: "supplierGoodsCostDetail",
-  mixins: [resToken],
+  mixins: [resToken, privateField],
   components: {
     ShowDataTable,
     baseForm,

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

@@ -204,7 +204,7 @@ const showColumns = [
   },
   {
     prop: 'send_type',
-    label: '发货类型',
+    label: '下单方式',
     _slot_: 'send_type',
     span: 6
   },

src/views/sellOut/salesOrder/detail.vue

@@ -140,9 +140,9 @@
                 <template slot="send_type">
                   <el-tag :size="'mini'">{{
                     sitem.send_type + '' === "1"
-                      ? "直接发货"
+                      ? "有地址下单"
                       : sitem.send_type + '' === "2"
-                      ? "延迟发货"
+                      ? "无地址下单"
                       : "--"
                   }}</el-tag>
                 </template>

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

@@ -69,7 +69,7 @@ const showColumns = [
   },
   {
     prop: 'send_type',
-    label: '发货类型',
+    label: '下单方式',
     _slot_: 'send_type',
     span: 5
   },

src/views/sellOut/sellReturn/detail.vue

@@ -69,9 +69,9 @@
                 <template slot="send_type">
                   <el-tag :size="'mini'">{{
                     sitem.send_type + '' === "1"
-                      ? "直接发货"
+                      ? "有地址下单"
                       : sitem.send_type + '' === "2"
-                      ? "延迟发货"
+                      ? "无地址下单"
                       : "--"
                   }}</el-tag>
                 </template>

src/views/standingBook/components/detail10/columns.js

@@ -1,154 +1,151 @@
 
 const columns = [
   {
-    prop: "orderCode",
-    label: "订单编号",
-    span: 6,
+    prop: 'orderCode',
+    label: '订单编号',
+    span: 6
   },
   {
-    prop: "status",
-    label: "订单状态",
-    _slot_: "status",
-    span: 6,
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    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: "supplierName",
-    label: "销售方公司",
-    _slot_: "supplierName",
-    span: 12,
+    prop: 'supplierName',
+    label: '销售方公司',
+    _slot_: 'supplierName',
+    span: 12
   },
   {
-    prop: "companyName",
-    label: "购买方公司",
-    _slot_: "companyName",
-    span: 12,
+    prop: 'companyName',
+    label: '购买方公司',
+    _slot_: 'companyName',
+    span: 12
   },
 
-
   {
-    prop: "platform_name",
-    label: "所属平台",
-    span: 6,
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 6
   },
 
   {
-    prop: "arrive_time",
-    label: "要求到货时间",
-    span: 6,
+    prop: 'arrive_time',
+    label: '要求到货时间',
+    span: 6
   },
   {
-    prop: "paytime",
-    label: "承诺付款时间",
-    span: 6,
+    prop: 'paytime',
+    label: '承诺付款时间',
+    span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
   },
   {
-    prop: "good_num",
-    label: "购买数量",
-    span: 4,
+    prop: 'good_num',
+    label: '购买数量',
+    span: 4
   },
   {
-    prop: "send_num",
-    label: "已发数量",
-    span: 4,
+    prop: 'send_num',
+    label: '已发数量',
+    span: 4
   },
   {
-    prop: "wsend_num",
-    label: "未发数量",
-    span: 4,
+    prop: 'wsend_num',
+    label: '未发数量',
+    span: 4
   },
   {
-    prop: "th_num",
-    label: "退货数量",
-    span: 4,
+    prop: 'th_num',
+    label: '退货数量',
+    span: 4
   },
 
   {
-    prop: "proof_id",
-    label: "凭证文件",
-    _slot_: "proof_id",
-    span: 8,
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
+    span: 8
   },
 
-
   {
-    prop: "sale_price",
-    label: "售价",
-    _slot_:"sale_price",
+    prop: 'sale_price',
+    label: '售价',
+    _slot_: 'sale_price',
     append: '元',
-    span: 6,
+    span: 6
   },
   {
-    prop: "total_price",
-    label: "总金额",
-    _slot_:"total_price",
+    prop: 'total_price',
+    label: '总金额',
+    _slot_: 'total_price',
     append: '元',
-    span: 6,
+    span: 6
   },
 
-
   {
-    prop: "post_fee",
-    label: "物流费用",
+    prop: 'post_fee',
+    label: '物流费用',
     append: '元',
-    span: 6,
+    span: 6
   },
   {
-    prop: "send_type",
-    label: "发货类型",
-    _slot_: "send_type",
-    span: 6,
+    prop: 'send_type',
+    label: '下单方式',
+    _slot_: 'send_type',
+    span: 6
   },
 
   {
-    prop: "is_active",
-    label: "活动类型",
-    _slot_: "is_active",
-    span: 12,
+    prop: 'is_active',
+    label: '活动类型',
+    _slot_: 'is_active',
+    span: 12
   },
   {
-    prop: "useage",
-    label: "订单用途",
-    span: 12,
+    prop: 'useage',
+    label: '订单用途',
+    span: 12
   },
 
   {
-    prop: "remark",
-    label: "备注",
-    span: 24,
+    prop: 'remark',
+    label: '备注',
+    span: 24
   },
 
   {
-    prop: "platform_order",
-    label: "平台订单号",
-    span: 24,
+    prop: 'platform_order',
+    label: '平台订单号',
+    span: 24
   },
   {
-    prop: "workNo",
-    label: "其他单号",
-    span: 24,
-  },
+    prop: 'workNo',
+    label: '其他单号',
+    span: 24
+  }
 ]
 const statusOptions = [
-  { value: "0", label: "待发货" },
-        { value: "1", label: "待发货完成" },
-        { value: "2", label: "发货已完成" },
-        { value: "3", label: "订单已取消" },
-];
+  { value: '0', label: '待发货' },
+  { value: '1', label: '待发货完成' },
+  { value: '2', label: '发货已完成' },
+  { value: '3', label: '订单已取消' }
+]
 
-export { columns, statusOptions, }
+export { columns, statusOptions }

src/views/standingBook/components/detail10/main.vue

@@ -96,9 +96,9 @@
       <template slot="send_type">
         <el-tag :size="'mini'">{{
           sitem.send_type + '' === "1"
-            ? "直接发货"
+            ? "有地址下单"
             : sitem.send_type + '' === "2"
-            ? "延迟发货"
+            ? "无地址下单"
             : "--"
         }}</el-tag>
       </template>

src/views/standingBook/components/detail14/columns.js

@@ -5,35 +5,35 @@ const listColumens = [
   //   width:"160"
   // },
   {
-    prop: "returnCode",
-    label: "退货单编号",
-    width: "160"
+    prop: 'returnCode',
+    label: '退货单编号',
+    width: '160'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "good_code",
-    label: "商品属性编码",
-    width: "160"
+    prop: 'good_code',
+    label: '商品属性编码',
+    width: '160'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    'min-width': "180"
+    prop: 'good_name',
+    label: '商品名称',
+    'min-width': '180'
   },
   {
-    prop: "num",
-    label: "退货数量",
-    width: "110"
+    prop: 'num',
+    label: '退货数量',
+    width: '110'
   },
   {
-    prop: "total_num",
-    label: "订单总数",
-    width: "110"
+    prop: 'total_num',
+    label: '订单总数',
+    width: '110'
   },
   // {
   //   prop: "error_msg",
@@ -41,143 +41,134 @@ const listColumens = [
   //   width: "160"
   // },
 
-
-
-
   // {
   //   prop: "return_total",
   //   label: "退货总金额",
   //   width: "120"
   // },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    width: "70"
+    prop: 'apply_name',
+    label: '申请人',
+    width: '70'
   },
   {
-    prop: "addtime",
-    label: "申请时间",
+    prop: 'addtime',
+    label: '申请时间',
     sortable: true,
     width: 150
   },
   {
-    prop: "",
+    prop: '',
     width: 50,
-    label: "操作",
-    fixed: "right",
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-  },
+    _slot_: 'operation'
+  }
 
 ]
-const columns =  [
+const columns = [
   {
-    prop: "returnCode",
-    label: "退货单编号",
-    span: 7,
+    prop: 'returnCode',
+    label: '退货单编号',
+    span: 7
   },
   {
-    prop: "status",
-    label: "退货单状态",
-    _slot_: "status",
-    span: 5,
+    prop: 'status',
+    label: '退货单状态',
+    _slot_: 'status',
+    span: 5
   },
   {
-    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: "supplierName",
-    label: "销售方公司",
-    _slot_: "supplierName",
-    span: 12,
+    prop: 'supplierName',
+    label: '销售方公司',
+    _slot_: 'supplierName',
+    span: 12
   },
   {
-    prop: "companyName",
-    label: "购买方公司",
-    _slot_: "companyName",
-    span: 12,
+    prop: 'companyName',
+    label: '购买方公司',
+    _slot_: 'companyName',
+    span: 12
   },
 
   {
-    prop: "platform_name",
-    label: "所属平台",
-    span: 7,
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 7
   },
 
-
   {
-    prop: "good_num",
-    label: "购买数量",
-    span: 5,
+    prop: 'good_num',
+    label: '购买数量',
+    span: 5
   },
   {
-    prop: "send_num",
-    label: "已发数量",
-    span: 6,
+    prop: 'send_num',
+    label: '已发数量',
+    span: 6
   },
   {
-    prop: "wsend_num",
-    label: "未发数量",
-    span: 6,
+    prop: 'wsend_num',
+    label: '未发数量',
+    span: 6
   },
 
-
-
-
-
-
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 7,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 7
   },
   {
-    prop: "send_type",
-    label: "发货类型",
-    _slot_: "send_type",
-    span: 5,
+    prop: 'send_type',
+    label: '下单方式',
+    _slot_: 'send_type',
+    span: 5
   },
 
   {
-    prop: "error_msg",
-    label: "退货原因",
-    span: 12,
+    prop: 'error_msg',
+    label: '退货原因',
+    span: 12
   },
 
   {
-    prop: "remark",
-    label: "备注",
-    span: 24,
+    prop: 'remark',
+    label: '备注',
+    span: 24
   },
   {
-    prop: "addrinfo",
-    label: "发货申请信息",
-    _slot_: "addrinfo",
-    span: 24,
-  },
+    prop: 'addrinfo',
+    label: '发货申请信息',
+    _slot_: 'addrinfo',
+    span: 24
+  }
 
 ]
 const statusOptions = [
-  { value: "1", label: "待业务审批" },
-        { value: "2", label: "待专员审批" },
-        { value: "3", label: "待主管审批" },
-        { value: "4", label: "退货完成" },
-        { value: "5", label: "业务驳回" },
-        { value: "6", label: "采购驳回" },
-        { value: "7", label: "专员审批不通过" },
-];
+  { value: '1', label: '待业务审批' },
+  { value: '2', label: '待专员审批' },
+  { value: '3', label: '待主管审批' },
+  { value: '4', label: '退货完成' },
+  { value: '5', label: '业务驳回' },
+  { value: '6', label: '采购驳回' },
+  { value: '7', label: '专员审批不通过' }
+]
 
-export { columns, statusOptions,listColumens }
+export { columns, statusOptions, listColumens }

src/views/standingBook/components/detail14/main.vue

@@ -62,9 +62,9 @@
         <template slot="send_type">
           <el-tag :size="'mini'">{{
             sitem.send_type + '' === "1"
-              ? "直接发货"
+              ? "有地址下单"
               : sitem.send_type + '' === "2"
-              ? "延迟发货"
+              ? "无地址下单"
               : "--"
           }}</el-tag>
         </template>

src/views/supplierSellOut/supplierSellReturn/columns.js

@@ -5,65 +5,65 @@ export default [
   //   width:"160"
   // },
   {
-    prop: "returnCode",
-    label: "退货单编号",
-    width: "160",
+    prop: 'returnCode',
+    label: '退货单编号',
+    width: '160'
   },
   {
-    prop: "orderCode",
-    label: "销售订单编号",
-    width: "160",
+    prop: 'orderCode',
+    label: '销售订单编号',
+    width: '160'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "180px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '180px'
   },
   {
-    prop: "good_code",
-    label: "商品成本编码",
-    width: "160",
+    prop: 'good_code',
+    label: '商品成本编码',
+    width: '160'
   },
   {
-    prop: "skuCode",
-    label: "上线商品编码",
-    width: "160",
+    prop: 'skuCode',
+    label: '上线商品编码',
+    width: '160'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    "min-width": "180",
+    prop: 'good_name',
+    label: '商品名称',
+    'min-width': '180'
   },
   {
-    prop: "num",
-    label: "退货数量",
-    width: "110",
+    prop: 'num',
+    label: '退货数量',
+    width: '110'
   },
   {
-    prop: "total_num",
-    label: "订单总数",
-    width: "110",
+    prop: 'total_num',
+    label: '订单总数',
+    width: '110'
   },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "160",
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
   },
   {
-    prop: "companyName",
-    label: "业务公司名称",
-    "min-width": "135",
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
   },
   {
-    prop: "supplierNo",
-    label: "供应商编号",
-    width: "150",
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '150'
   },
   {
-    prop: "supplierName",
-    label: "供应商名称",
-    width: "150",
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '150'
   },
 
   // {
@@ -78,30 +78,30 @@ export default [
   //   width: "120"
   // },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    width: "70",
+    prop: 'apply_name',
+    label: '申请人',
+    width: '70'
   },
   {
-    prop: "addtime",
-    label: "申请时间",
+    prop: 'addtime',
+    label: '申请时间',
     sortable: true,
-    width: 150,
+    width: 150
   },
   {
-    prop: "",
+    prop: '',
     width: 50,
-    label: "操作",
-    fixed: "right",
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-  },
-];
+    _slot_: 'operation'
+  }
+]
 // page	是	string	页码
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号

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

@@ -69,7 +69,7 @@ const showColumns = [
   },
   {
     prop: 'send_type',
-    label: '发货类型',
+    label: '下单方式',
     _slot_: 'send_type',
     span: 5
   },

src/views/supplierSellOut/supplierSellReturn/detail.vue

@@ -69,9 +69,9 @@
                 <template slot="send_type">
                   <el-tag :size="'mini'">{{
                     sitem.send_type + '' === "1"
-                      ? "直接发货"
+                      ? "有地址下单"
                       : sitem.send_type + '' === "2"
-                      ? "延迟发货"
+                      ? "无地址下单"
                       : "--"
                   }}</el-tag>
                 </template>

src/views/youzan/othOrder/columns.js

@@ -1,120 +1,115 @@
-const columns= [
-  { type: "selection", fixed: "left", _noset_: true },
+const columns = [
+  { type: 'selection', fixed: 'left', _noset_: true },
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "155px",
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '155px'
   },
 
-
   // {
   //   prop: "good_code",
   //   label: "商品编码",
   //   width:"128"
   // },
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    width: '150'
   },
   {
-    prop: "good_class",
-    label: "商品分类",
-    width: "120"
+    prop: 'good_class',
+    label: '商品分类',
+    width: '120'
 
   },
 
   {
-    prop: "good_num",
-    label: "商品数量",
+    prop: 'good_num',
+    label: '商品数量'
   },
   {
-    prop: "sale_price",
-    label: "销售单价",
+    prop: 'sale_price',
+    label: '销售单价'
   },
   {
-    prop: "total_price",
-    label: "总价",
+    prop: 'total_price',
+    label: '总价'
   },
 
-
-
-
   {
-    prop: "status",
-    label: "订单状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    width: '120px'
   },
-  
+
   {
-    prop: "order_source",
-    label: "订单来源",
-    _slot_: "order_source",
-    width: "90px",
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '90px'
   },
   {
-    prop: "order_type",
-    label: "商品类型",
-    _slot_: "order_type",
-    width: "90px",
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '90px'
   },
   {
-    prop: "useage",
-    label: "订单用途",
-    width: "100px",
+    prop: 'useage',
+    label: '订单用途',
+    width: '100px'
   },
 
   {
-    prop: "customer_code",
-    label: "客户公司编码",
-    width: "155px",
+    prop: 'customer_code',
+    label: '客户公司编码',
+    width: '155px'
   },
   {
-    prop: "customerName",
-    label: "企业客户名称",
-    width: "125px",
+    prop: 'customerName',
+    label: '企业客户名称',
+    width: '125px'
   },
   {
-    prop: "supplierName",
-    label: "销售方公司",
-    width: "125px",
+    prop: 'supplierName',
+    label: '销售方公司',
+    width: '125px'
   },
   {
-    prop: "company_name",
-    label: "创建人部门",
-    minWidth: "100px",
+    prop: 'company_name',
+    label: '创建人部门',
+    minWidth: '100px'
   },
 
   {
-    prop: "apply_name",
-    label: "创建人",
-    width: "60px",
+    prop: 'apply_name',
+    label: '创建人',
+    width: '60px'
   },
 
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "145px",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '145px'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
+    width: '50px',
+    _slot_: 'operation'
+  }
 ]
 
-
 const addColumns = [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    span: 24,
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
   },
   // {
   //   prop: "good_info_img",
@@ -123,225 +118,222 @@ const addColumns = [
   //   span: 24,
   // },
   {
-    prop: "cat",
-    label: "分类",
-    _slot_: "cat",
-    span: 24,
+    prop: 'cat',
+    label: '分类',
+    _slot_: 'cat',
+    span: 24
   },
 
   {
-    prop: "is_stock",
-    label: "是否库存品",
-    _slot_: "is_stock",
-    span: 8,
+    prop: 'is_stock',
+    label: '是否库存品',
+    _slot_: 'is_stock',
+    span: 8
   },
 
   {
-    prop: "unit",
-    label: "单位",
-    span: 8,
+    prop: 'unit',
+    label: '单位',
+    span: 8
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 8,
+    span: 8
   },
 
   {
-    prop: "exclusive",
-    label: "专属类型",
-    _slot_: "exclusive",
-    span: 12,
+    prop: 'exclusive',
+    label: '专属类型',
+    _slot_: 'exclusive',
+    span: 12
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 12,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 12
   },
   {
-    prop: "weight",
-    label: "商品总克重",
-    _slot_: "weight",
-    span: 24,
+    prop: 'weight',
+    label: '商品总克重',
+    _slot_: 'weight',
+    span: 24
   },
   {
-    prop: "lead_time",
-    label: "工期",
-    span: 8,
+    prop: 'lead_time',
+    label: '工期',
+    span: 8
   },
   {
-    prop: "delivery_day",
-    label: "物流",
-    span: 8,
+    prop: 'delivery_day',
+    label: '物流',
+    span: 8
   },
   {
-    prop: "purchase",
-    label: "采购人员",
-    span: 8,
+    prop: 'purchase',
+    label: '采购人员',
+    span: 8
   },
   {
-    prop: "delivery_place_cn",
-    label: "发货地",
-    span: 24,
+    prop: 'delivery_place_cn',
+    label: '发货地',
+    span: 24
   },
   {
-    prop: "after_sales",
-    label: "售后说明",
-    span: 24,
-  },
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
+  }
 ]
 const showColumns = [
   {
-    prop: "orderCode",
-    label: "订单编号",
-    span: 6,
+    prop: 'orderCode',
+    label: '订单编号',
+    span: 6
   },
   {
-    prop: "status",
-    label: "订单状态",
-    _slot_: "status",
-    span: 6,
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    span: 6
   },
   {
-    prop: "order_source",
-    label: "订单来源",
-    _slot_: "order_source",
-    span: 4,
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    span: 4
   },
   {
-    prop: "order_type",
-    label: "商品类型",
-    _slot_: "order_type",
-    span: 4,
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    span: 4
   }, {
-    prop: "apply_name",
-    label: "创建人",
-    span: 4,
+    prop: 'apply_name',
+    label: '创建人',
+    span: 4
   },
 
   {
-    prop: "supplierName",
-    label: "销售方公司",
-    _slot_: "supplierName",
-    span: 12,
+    prop: 'supplierName',
+    label: '销售方公司',
+    _slot_: 'supplierName',
+    span: 12
   },
   {
-    prop: "companyName",
-    label: "购买方公司",
-    _slot_: "companyName",
-    span: 12,
+    prop: 'companyName',
+    label: '购买方公司',
+    _slot_: 'companyName',
+    span: 12
   },
 
-
   {
-    prop: "platform_name",
-    label: "所属平台",
-    span: 6,
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 6
   },
 
   {
-    prop: "arrive_time",
-    label: "要求到货时间",
-    span: 6,
+    prop: 'arrive_time',
+    label: '要求到货时间',
+    span: 6
   },
   {
-    prop: "paytime",
-    label: "承诺付款时间",
-    span: 6,
+    prop: 'paytime',
+    label: '承诺付款时间',
+    span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
   },
   {
-    prop: "good_num",
-    label: "购买数量",
-    span: 4,
+    prop: 'good_num',
+    label: '购买数量',
+    span: 4
   },
   {
-    prop: "send_num",
-    label: "已发数量",
-    span: 4,
+    prop: 'send_num',
+    label: '已发数量',
+    span: 4
   },
   {
-    prop: "wsend_num",
-    label: "未发数量",
-    span: 4,
+    prop: 'wsend_num',
+    label: '未发数量',
+    span: 4
   },
   {
-    prop: "th_num",
-    label: "退货数量",
-    span: 4,
+    prop: 'th_num',
+    label: '退货数量',
+    span: 4
   },
 
   {
-    prop: "proof_id",
-    label: "凭证文件",
-    _slot_: "proof_id",
-    span: 8,
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
+    span: 8
   },
 
-
   {
-    prop: "sale_price",
-    label: "售价",
+    prop: 'sale_price',
+    label: '售价',
     append: '元',
-    span: 6,
+    span: 6
   },
   {
-    prop: "total_price",
-    label: "总金额",
+    prop: 'total_price',
+    label: '总金额',
     append: '元',
-    span: 6,
+    span: 6
   },
 
-
   {
-    prop: "post_fee",
-    label: "物流费用",
+    prop: 'post_fee',
+    label: '物流费用',
     append: '元',
-    span: 6,
+    span: 6
   },
   {
-    prop: "send_type",
-    label: "发货类型",
-    _slot_: "send_type",
-    span: 6,
+    prop: 'send_type',
+    label: '下单方式',
+    _slot_: 'send_type',
+    span: 6
   },
 
   {
-    prop: "is_active",
-    label: "活动类型",
-    _slot_: "is_active",
-    span: 12,
+    prop: 'is_active',
+    label: '活动类型',
+    _slot_: 'is_active',
+    span: 12
   },
   {
-    prop: "useage",
-    label: "订单用途",
-    span: 12,
+    prop: 'useage',
+    label: '订单用途',
+    span: 12
   },
 
   {
-    prop: "remark",
-    label: "备注",
-    span: 24,
+    prop: 'remark',
+    label: '备注',
+    span: 24
   },
 
   {
-    prop: "platform_order",
-    label: "平台订单号",
-    span: 24,
+    prop: 'platform_order',
+    label: '平台订单号',
+    span: 24
   },
   {
-    prop: "workNo",
-    label: "其他单号",
-    span: 24,
-  },
+    prop: 'workNo',
+    label: '其他单号',
+    span: 24
+  }
 ]
 
-export{
+export {
   columns,
-  addColumns,showColumns
+  addColumns, showColumns
 }

src/views/youzan/othOrder/detail.vue

@@ -130,9 +130,9 @@
                 <template slot="send_type">
                   <el-tag :size="'mini'">{{
                     String(sitem.send_type) === "1"
-                      ? "直接发货"
+                      ? "有地址下单"
                       : String(sitem.send_type) === "2"
-                      ? "延迟发货"
+                      ? "无地址下单"
                       : "--"
                   }}</el-tag>
                 </template>