更改达沃特销售利润和明细

src/views/statisticAnalysis/salesDetails/index.vue

@@ -10,6 +10,12 @@
           </el-button>
           <el-button type="info" size="small" @click="switchDialog = !switchDialog">报表打印</el-button>
         </template>
+        <template slot="brandSearch">
+          <el-select v-model="search.brand" filterable clearable>
+            <el-option v-for="(item, index) in brandOption" :key="index" :label="item.dictValue"
+                       :value="item.dictValue" />
+          </el-select>
+        </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
@@ -52,6 +58,7 @@ export default {
   data() {
     return {
       form: {},
+      brandOption:[],
       search: {
         careteTime:[defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
       },
@@ -116,8 +123,7 @@ export default {
           {
             label: "品牌",
             prop: "brand",
-            // hide: true,
-            // showColumn: false,
+            type: "select",
             search: true
           },
           {
@@ -191,7 +197,9 @@ export default {
   async created() {
     this.option = await this.getColumnData(this.getColumnName(130.1), this.optionBack);
     // this.option = this.optionBack
-    console.log(this.option);
+    this.getWorkDicts('brand').then(res => {
+      this.brandOption = res.data.data;
+    })
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

src/views/statisticAnalysis/salesProfitN/index.vue

@@ -82,7 +82,7 @@ export default {
         searchSpan: 8,
         border: true,
         index: true,
-        addBtn: true,
+        addBtn: false,
         viewBtn: false,
         editBtn: false,
         delBtn: false,