build

src/components/globalComponents/logis-time-line/main.vue

@@ -36,7 +36,7 @@
         </div>
       </el-step>
     </el-steps>
-    <div class="nodate">{{ orderCodeList[0] }} 暂无快递进程。</div>
+    <div v-else class="nodate">{{ orderCodeList[0] }} 暂无快递进程。</div>
   </div>
 </template>
 

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

@@ -212,7 +212,7 @@ const coveColumns = [
     span: 24,
   },
   {
-    prop: "craft_desc",
+    prop: "cost_desc",
     label: "工艺说明",
     span: 24,
   },

src/config/env.development.js

@@ -7,10 +7,8 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    userApi: "http://inv.test241.wanyuhengtong.com/",
-    baseApi: "http://stock.test241.wanyuhengtong.com/",
-    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // baseApi: 'http://stock.api.wanyuhengtong.com/',
+    userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   webUrl: "http://share.sitw.wanyuhengtong.com/#/test-good-share?id=",
   fileURL: `https://api2.edusit.zretchome.com`,

src/views/youzan/othTransferOrderLog/good_columns.js

@@ -1,40 +1,39 @@
-
 //是否定制
 const options1 = [
   { id: "0", name: "否" },
   { id: "1", name: "是" },
-]
+];
 //专属类型
 const options2 = [
   { id: "0", name: "非泰康" },
   { id: "1", name: "泰康" },
-]
+];
 //销售权限
 const options3 = [
   { id: "0", name: "无销售权限" },
   { id: "1", name: "有销售权限" },
-]
+];
 
 //是否库存品
 const options4 = [
   { id: "0", name: "非库存品" },
   { id: "1", name: "库存品" },
-]
+];
 //是否启用实时金价
 const options5 = [
   { id: "0", name: "否" },
   { id: "1", name: "是" },
-]
+];
 //供货区域
 const options6 = [
   { id: "1", name: "全国" },
   { id: "2", name: "全国除偏远" },
-]
+];
 //是否启用阶梯
 const options7 = [
   { id: "0", name: "否" },
   { id: "1", name: "是" },
-]
+];
 const options8 = [
   { id: "0", name: "待产品审核" },
   { id: "1", name: "待执行上线" },
@@ -42,7 +41,7 @@ const options8 = [
   { id: "6", name: "上线成功" },
   { id: "7", name: "上线失败" },
   { id: "8", name: "已下线" },
-]
+];
 const listCol = [
   {
     prop: "skuCode",
@@ -141,7 +140,7 @@ const listCol = [
     width: "110px",
     _slot_: "operation",
   },
-]
+];
 const rules = {
   platform: [
     {
@@ -164,8 +163,7 @@ const rules = {
       trigger: "blur",
     },
   ],
-
-}
+};
 const public_listCol = [
   {
     prop: "good_name",
@@ -189,8 +187,6 @@ const public_listCol = [
     span: 8,
   },
 
-
-
   {
     prop: "creater",
     label: "申请人",
@@ -222,8 +218,6 @@ const public_listCol = [
     span: 6,
   },
 
-
-
   {
     prop: "exclusive",
     label: "专属类型",
@@ -233,11 +227,10 @@ const public_listCol = [
   {
     prop: "weight",
     label: "商品总克重",
-    append: 'g',
+    append: "g",
     span: 6,
   },
 
-
   {
     prop: "packing_list",
     label: "包装清单",
@@ -256,7 +249,7 @@ const public_listCol = [
   {
     prop: "packing_weight",
     label: "装箱重量",
-    append: 'g',
+    append: "g",
     span: 6,
   },
   {
@@ -306,7 +299,7 @@ const public_listCol = [
     prop: "good_type",
     label: "是否定制",
     _slot_: "good_type",
-    span: 6
+    span: 6,
   },
 
   {
@@ -317,26 +310,26 @@ const public_listCol = [
   {
     prop: "tax",
     label: "税点",
-    append: '%',
+    append: "%",
     span: 4,
   },
 
   {
     prop: "delivery_day",
     label: "物流时间",
-    append: '天',
+    append: "天",
     span: 4,
   },
   {
     prop: "lead_time",
     label: "供货周期",
-    append: '天',
-    span: 4
+    append: "天",
+    span: 4,
   },
   {
     prop: "sample_day",
     label: "调样周期",
-    append: '天',
+    append: "天",
     span: 4,
   },
 
@@ -352,7 +345,6 @@ const public_listCol = [
     span: 24,
   },
 
-
   {
     prop: "after_sales",
     label: "售后说明",
@@ -363,8 +355,8 @@ const public_listCol = [
     label: "工艺说明",
     span: 24,
   },
-]
-const sale_listCol=[
+];
+const sale_listCol = [
   {
     prop: "yz_cat_info",
     label: "有赞公有分类",
@@ -388,8 +380,8 @@ const sale_listCol=[
     _slot_: "nakelist",
     span: 24,
   },
-]
-const  is_support_barter_list= [
+];
+const is_support_barter_list = [
   {
     value: "1",
     label: "支持",
@@ -398,77 +390,158 @@ const  is_support_barter_list= [
     value: "0",
     label: "不支持",
   },
-]
-const item_type_options=[
+];
+const item_type_options = [
   {
     value: "0",
-    label: "普通商品", 
-    status:'1'
+    label: "普通商品",
+    status: "1",
   },
   {
     value: "3",
-    label: "UMP降价拍", 
-    status:'0'
+    label: "UMP降价拍",
+    status: "0",
   },
   {
     value: "5",
-    label: "外卖商品", 
-    status:'0'
+    label: "外卖商品",
+    status: "0",
   },
   {
     value: "10",
-    label: "分销商品", 
-    status:'0'
+    label: "分销商品",
+    status: "0",
   },
   {
     value: "20",
-    label: "会员卡商品", 
-    status:'0'
+    label: "会员卡商品",
+    status: "0",
   },
   {
     value: "21",
-    label: "礼品卡商品", 
-    status:'0'
+    label: "礼品卡商品",
+    status: "0",
   },
   {
     value: "22",
-    label: "团购券", 
-    status:'0'
+    label: "团购券",
+    status: "0",
   },
   {
     value: "25",
-    label: "批发商品", 
-    status:'0'
+    label: "批发商品",
+    status: "0",
   },
   {
     value: "30",
-    label: "收银台商品", 
-    status:'0'
+    label: "收银台商品",
+    status: "0",
   },
   {
     value: "31",
-    label: "知识付费商品", 
-    status:'0'
+    label: "知识付费商品",
+    status: "0",
   },
   {
     value: "35",
-    label: "酒店商品", 
-    status:'0'
+    label: "酒店商品",
+    status: "0",
   },
   {
     value: "40",
-    label: "美业商品", 
-    status:'0'
+    label: "美业商品",
+    status: "0",
   },
   {
     value: "60",
-    label: "虚拟商品", 
-    status:'0'
+    label: "虚拟商品",
+    status: "0",
   },
   {
     value: "61",
-    label: "电子卡券", 
-    status:'0'
-  }
-]
-export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules,public_listCol,sale_listCol,is_support_barter_list,item_type_options }
+    label: "电子卡券",
+    status: "0",
+  },
+];
+const purchase_listCol = [
+  // {
+  //   prop: "spuCode",
+  //   label: "商品成本编号",
+  //   span: 7,
+  // },
+  // {
+  //   prop: "supplierNo",
+  //   label: "供应商编号",
+  //   span: 7,
+  // },
+  {
+    prop: "supplierName",
+    label: "供应商名称",
+    _slot_: "supplierName",
+    span: 12,
+  },
+  {
+    prop: "cgd_gold_price",
+    label: "供应商采购金价",
+    append: "元/g",
+    span: 6,
+  },
+
+  {
+    prop: "is_auth",
+    label: "供应商权限",
+    _slot_: "is_auth",
+    span: 6,
+  },
+  {
+    prop: "is_step",
+    label: "启用成本阶梯",
+    _slot_: "is_step",
+    span: 4,
+  },
+  {
+    prop: "demo_fee",
+    label: "打样费(元)",
+    span: 5,
+  },
+  {
+    prop: "open_fee",
+    label: "开模费(元/件)",
+    span: 5,
+  },
+
+  {
+    prop: "sample_fee",
+    label: "调样费(元)",
+    span: 5,
+  },
+  {
+    prop: "market_price",
+    label: "市场价(元)",
+    span: 5,
+  },
+
+  {
+    prop: "nakelist",
+    label: "采购起订量",
+    _slot_: "nakelist",
+    span: 24,
+  },
+];
+export {
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  listCol,
+  rules,
+  public_listCol,
+  sale_listCol,
+  is_support_barter_list,
+  item_type_options,
+  purchase_listCol,
+};

src/views/youzan/othTransferOrderLog/good_detail.vue

@@ -112,6 +112,65 @@
         >
       </template>
     </show-data-table>
+    <show-data-table
+      :newTime="newTime"
+      v-if="
+        newTime !== '' &&
+        private_field &&
+        private_field.length > 0 &&
+        private_field.some((item) => item == '1')
+      "
+      :sitem="sitem"
+      :columns="purchase_listCol"
+    >
+      <template slot="supplierName">
+        <span>{{ sitem.supplierName }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="is_auth">
+        <el-tag
+          :size="'mini'"
+          v-text="(options3.find((item) => item.id == sitem.is_auth) || {}).name || '--'"
+        />
+      </template>
+
+      <template slot="is_step">
+        <el-tag
+          :size="'mini'"
+          v-text="(options7.find((item) => item.id == sitem.is_step) || {}).name || '--'"
+        />
+      </template>
+
+      <template slot="nakelist">
+        <div v-if="nakelist">
+          <el-table
+            :data="nakelist"
+            :size="'mini'"
+            border
+            stripe
+            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="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>
+      </template>
+    </show-data-table>
 
     <show-data-table
       :newTime="newTime"
@@ -201,6 +260,7 @@ import {
   public_listCol,
   sale_listCol,
   is_support_barter_list,
+  purchase_listCol,
 } from "./good_columns";
 import { isArray } from "@/utils/validate";
 export default {
@@ -233,6 +293,7 @@ export default {
       options6,
       options7,
       options8,
+      purchase_listCol,
       ladderlist: [],
       nakelist: [],
       spuCode: "",