合并代码

2022-12-28 16:12:31 +08:00
parent 469265a730 44e9ead529
commit b05f2bf3c9
63 changed files with 3391 additions and 210 deletions
@@ -23,6 +23,17 @@
                                 :triggerChange="false" :dictCode="'region'"/>
            </div>
          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('brand')">
+                <span>{{$t('brand')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.brand"
+                                 :placeholder="$t('PleaseSelect')+$t('brand')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'brand'"/>
+            </div>
+          </a-col>
          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
               <a-col :md="6" :sm="24">
                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>