暂存

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

@@ -1538,7 +1538,7 @@ export default {
         cert_fee * 100 +
         delivery_fee * 100 +
         other_fee * 100;
-      if (this.is_noble && is_gold_price) {
+      if (this.is_noble && is_gold_price==='1') {
         let a = noble_price * 100;
         let b = noble_weight * 1000;
         let c = cost_fee * 100;

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -226,97 +226,63 @@ const public_listCol = [
 
 ]
 const purchase_listCol = [
-  {
-    prop: "spuCode",
-    label: "商品成本编号",
-    span: 7,
-  },
-  {
-    prop: "supplierNo",
-    label: "供应商编号",
-    span: 7,
-  },
+  // {
+  //   prop: "spuCode",
+  //   label: "商品成本编号",
+  //   span: 7,
+  // },
+  // {
+  //   prop: "supplierNo",
+  //   label: "供应商编号",
+  //   span: 7,
+  // },
   {
     prop: "supplierName",
     label: "供应商名称",
-    span: 10,
+    span: 12,
   },
   {
-    prop: "is_auth",
-    label: "供应商权限",
-    _slot_: "is_auth",
+    prop: "cgd_gold_price",
+    label: "供应商采购金价",
+    append: '元/g',
     span: 6,
   },
 
-
   {
-    prop: "cert_fee",
-    label: "证书费",
-    append: '元',
-    span: 6,
-  },
-  {
-    prop: "packing_fee",
-    label: "包装费",
-    append: '元',
-    span: 6,
-  },
-  {
-    prop: "cost_fee",
-    label: "成本工艺费",
-    append: '元',
+    prop: "is_auth",
+    label: "供应商权限",
+    _slot_: "is_auth",
     span: 6,
   },
-
   {
-    prop: "mark_fee",
-    label: "加标费",
-    append: '元',
-    span: 6,
+    prop: "is_step",
+    label: "启用成本阶梯",
+    _slot_: "is_step",
+    span: 4,
   },
   {
     prop: "demo_fee",
-    label: "打样费",
-    append: '元',
-    span: 6,
+    label: "打样费(元)",
+    span: 5,
   },
   {
     prop: "open_fee",
-    label: "开模费",
-    append: '元/件',
-    span: 6,
+    label: "开模费(元/件)",
+    span: 5,
   },
 
   {
     prop: "sample_fee",
-    label: "调样费",
-    append: '元',
-    span: 6,
+    label: "调样费(元)",
+    span: 5,
   },
   {
     prop: "market_price",
-    label: "市场价",
-    append: '元',
-    span: 6,
-  },
-  {
-    prop: "nake_price",
-    label: "裸价",
-    append: '元',
-    span: 6,
-  },
-  {
-    prop: "cgd_gold_price",
-    label: "供应商采购金价",
-    append: '元/g',
-    span: 6,
-  },
-  {
-    prop: "is_step",
-    label: "启用成本阶梯",
-    _slot_: "is_step",
-    span: 6,
+    label: "市场价(元)",
+    span: 5,
   },
+ 
+  
   {
     prop: "nakelist",
     label: "采购起订量",

src/views/goodStore/goodsOnline/detail.vue

@@ -147,9 +147,14 @@
                       style="width: 99%; margin: 10px 10px 10px 0"
                     >
                       <el-table-column prop="min_num" label="起订量(>=)" />
-                      <el-table-column prop="nake_fee" label="成本合计" />
+                      <el-table-column prop="nake_fee" label="成本单价" />
                       <el-table-column prop="cost_fee" label="工艺费" />
                       <el-table-column prop="delivery_fee" label="物流费" />
+                      <el-table-column prop="cert_fee" label="证书费" />
+                      <el-table-column prop="mark_fee" label="加标费" />
+                      <el-table-column prop="package_fee" label="包装费" />
+                      <el-table-column prop="other_fee" label="其他费用" />
+                      <el-table-column prop="nake_total" label="成本合计" />
                     </el-table>
                   </div>
                   <div v-else>--</div>

src/views/sellOut/sellOutOrder/ShowDataTableColumns.js

@@ -1,21 +1,25 @@
 export default [
   {
     prop: "outCode",
-    label: "出库单号",
+    label: "发货申请单号",
+    span:6
   },
   {
     prop: "status",
     label: "出库单状态",
     _slot_: "status",
+    span:6
   },
   {
     prop: "orderCode",
-    label: "销售订单编号",
+    label: "订单编号",
+    span:6
   },
   {
     prop: "order_type",
     label: "订单类别",
     _slot_: "order_type",
+    span:6
   },
   {
     prop: "apply_name",