Merge branch 'v3.0' into company

src/views/businessReportQuery/businessSaleReport/index.vue

@@ -3,10 +3,9 @@
     <div v-if="powers.some((i) => i == '001') && currentCompany">
       <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
       <el-tabs v-model="activeName">
-        <el-tab-pane label="日报" name="table1"></el-tab-pane>
+        <!-- <el-tab-pane label="日报" name="table1"></el-tab-pane>
           <table1 v-if="activeName == 'table1'"></table1>
-        </el-tab-pane>
-
+        </el-tab-pane> -->
         <el-tab-pane label="竞价单报表" name="table2">
           <table2 v-if="activeName == 'table2'"></table2>
         </el-tab-pane>
@@ -179,7 +178,7 @@ export default {
   },
   data() {
     return {
-      activeName: "table1"
+      activeName: "table2"
     };
   },
   mounted(){

src/views/goodStore/supplierGoodsCost/columns.js

@@ -70,6 +70,12 @@ const listCol = [
     prop: 'brand_name',
     label: '品牌'
   },
+  {
+    prop: "create_source",
+    label: "来源",
+    _slot_: "create_source",
+    width: '110px'
+  },
   {
     prop: 'is_stock',
     label: '库存类型',

src/views/goodStore/supplierGoodsCost/index.vue

@@ -207,6 +207,19 @@
         </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 #is_combind="{ scope }">
+        <el-tag
+          size="mini"
+          :type="scope.row.is_combind === '1' ? '' : 'warning'"
+        >{{scope.row.is_combind === '1' ? '组合商品' : '非组合商品'}}</el-tag>
+      </template>
+
       <template #good_thumb_img="{ scope }">
         <div
           v-if="scope.row.good_thumb_img"

src/views/reportQuery/saleReport/index.vue

@@ -3,9 +3,9 @@
     <div v-if="powers.some((i) => i == '001')">
       <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
       <el-tabs v-model="activeName">
-        <el-tab-pane label="日报" name="table1"></el-tab-pane>
+        <!-- <el-tab-pane label="日报" name="table1"></el-tab-pane>
           <table1 v-if="activeName == 'table1'"></table1>
-        </el-tab-pane>
+        </el-tab-pane> -->
 
         <el-tab-pane label="竞价单报表" name="table2">
           <table2 v-if="activeName == 'table2'"></table2>
@@ -172,7 +172,7 @@ export default {
   },
   data() {
     return {
-      activeName: "table1"
+      activeName: "table2"
     };
   },
   methods: {