build

src/views/goodStore/goodsCost/columns.js

@@ -654,7 +654,13 @@ const basicColumns = [
     prop: 'noble',
     _slot_: 'noble',
     label: '贵金属信息',
-    span: 24
+    span: 18
+  },
+  {
+    label: '来源',
+    prop: 'create_source',
+    _slot_: 'create_source',
+    span: 6
   },
   {
     prop: 'after_sales',
@@ -836,32 +842,32 @@ const ladderColumns = [
     prop: 'demo_fee',
     label: '打样费',
     _slot_: 'demo_fee',
-    span: 5
+    span: 6
   },
   {
     prop: 'open_fee',
     label: '开模费',
     _slot_: 'open_fee',
-    span: 5
+    span: 6
   },
   {
     prop: 'sample_fee',
     _slot_: 'sample_fee',
     label: '调样费',
-    span: 5
+    span: 6
   },
   {
     prop: 'market_price',
     _slot_: 'market_price',
     label: '市场价',
-    span: 5
-  },
-  {
-    prop: 'cgd_price',
-    _slot_: 'cgd_price',
-    label: '采购价',
-    span: 4
+    span: 6
   },
+  // {
+  //   prop: 'cgd_price',
+  //   _slot_: 'cgd_price',
+  //   label: '采购价',
+  //   span: 4
+  // },
   {
     prop: 'data_table',
     label: '阶梯成本',

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

@@ -939,8 +939,11 @@
         </ul>
       </el-col>
       <el-col :span="23" class="dmain">
+        <el-row v-if="sitem.create_source === '1'" style="padding-left:20px;padding-bottom:10px;font-size:14px;font-weight:700">
+          来源: 咨询成交商品, 咨询采购价：{{sitem.cgd_price}} 元
+        </el-row>
         <el-row>
-          <el-col :span="type === 'add' ? 6 : 5">
+          <el-col :span="6">
             <el-form-item label="打样费" prop="demo_fee" label-width="75px">
               <digital-input
                 :values="ruleForm.demo_fee"
@@ -958,7 +961,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="type === 'add' ? 6 : 5">
+          <el-col :span="6">
             <el-form-item label="开模费" prop="open_fee" label-width="75px">
               <digital-input
                 :values="ruleForm.open_fee"
@@ -976,7 +979,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="type === 'add' ? 6 : 5">
+          <el-col :span="6">
             <el-form-item label="调样费" prop="sample_fee" label-width="75px">
               <digital-input
                 :values="ruleForm.sample_fee"
@@ -994,7 +997,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="type === 'add' ? 6 : 5">
+          <el-col :span="6">
             <el-form-item label="市场价" prop="market_price" label-width="75px">
               <digital-input
                 :values="ruleForm.market_price"
@@ -1013,7 +1016,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="4" v-if="type !== 'add'">
+          <!-- <el-col :span="4" v-if="type !== 'add'">
             <el-form-item label="采购价">
               <digital-input
                 :values="sitem.cgd_price"
@@ -1030,7 +1033,7 @@
                 @reschange="number_change($event, 'cgd_price')"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <!-- <el-col :span="6">
             <el-form-item label="启用阶梯" prop="is_step">

src/views/goodStore/goodsCost/detail.vue

@@ -50,6 +50,12 @@
                     </template>
                   </template>
 
+                  <template slot="create_source">
+                    <el-tag size="mini" :type="sitem.create_source === '1' ? 'warning' : ''">
+                       {{ sitem.create_source === "1" ? "咨询成交商品" : "手动创建商品" }}
+                    </el-tag> </span v-if="create_source === 1">,咨询采购价 {{ sitem.cgd_price }}</span>
+                  </template>
+
                   <template slot="is_combind">
                     {{
                     String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
@@ -365,7 +371,6 @@ export default {
       this.loading = false;
     },
     // 点击业务审核的保存按钮
-
     async examForm(e) {
       if (!this.loading) {
         let type = "";

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -223,15 +223,16 @@ const public_listCol = [
     span: 4
   },
   {
-    prop: 'sale_price',
-    label: '销售单价',
-    span: 4
+    label: '来源',
+    prop: 'create_source',
+    _slot_: 'create_source',
+    span: 8
   },
   {
     prop: 'market_url',
     label: '京东链接',
     _slot_: 'market_url',
-    span: 16
+    span: 12
   },
   {
     prop: 'after_sales',

src/views/goodStore/goodsOnline/columns.js

@@ -87,7 +87,12 @@ const listCol = [
     label: '平台名称',
     width: '100px'
   },
-
+  {
+    label: '来源',
+    prop: 'create_source',
+    _slot_: 'create_source',
+    width: '110px'
+  },
   {
     prop: 'is_stock',
     label: '商品类型',

src/views/goodStore/goodsOnline/detail.vue

@@ -141,6 +141,11 @@
                     "
                   />
                 </template>
+                <template slot="create_source">
+                    <el-tag size="mini" :type="sitem.create_source === '1' ? 'warning' : ''">
+                       {{ sitem.create_source === "1" ? "咨询成交商品" : "手动创建商品" }}
+                    </el-tag> </span v-if="create_source === 1">,咨询销售价 {{ sitem.sale_price }}</span>
+                  </template>
                 <template slot="is_stock">
                   <el-tag
                     :size="'mini'"

src/views/goodStore/goodsOnline/index.vue

@@ -233,6 +233,13 @@
           </el-row>
         </div>
       </template>
+
+      <template #create_source="{ scope }">
+        <el-tag size="mini" :type="scope.row.create_source === '1' ? 'warning' : ''">
+          {{ scope.row.create_source === "1" ? "咨询成交商品" : "手动创建商品" }}
+        </el-tag>
+      </template>
+      
       <template #good_thumb_img="{ scope }">
         <div
           v-if="scope.row.good_thumb_img"