Merge branch 'dev'

src/views/shop-information/components/DataTable.vue

@@ -26,8 +26,7 @@ const gridOptions: any = reactive({
     size: 'large',
     custom: true,
     slots: {
-      buttons: 'toolbar_buttons',
-      tools: 'toolbar_tools'
+      buttons: 'toolbar_buttons'
     }
   },
   rowConfig: {
@@ -93,10 +92,10 @@ async function fetchList() {
     country: splitCountry.value,
     company: company.value
   };
-  
+
   tempOperator.value = query.operatorName;
   tempCountry.value = query.country;
-  
+
   await useTableData(api.getInfoTableData, query, gridOptions);
   await gridRef.value.loadColumn(shopInfoColumns);
   gridOptions.showHeader = Boolean(gridOptions.data?.length);
@@ -127,7 +126,7 @@ function parameterChange() {
         <el-col :span="4">
           <div class="flex items-center gap-1.5">
             <span class="font-medium">运营</span>
-            <el-select v-model="operatorName" clearable collapse-tags collapse-tags-tooltip multiple
+            <el-select v-model="operatorName" clearable collapse-tags collapse-tags-tooltip filterable multiple
                        @blur="parameterChange"
                        @change="processParameter">
               <el-option v-for="item in operatorOption" :label="item" :value="item" />

src/views/shop-information/useColumns.tsx

@@ -291,7 +291,7 @@ export const shopCurrentColumns = [
     }
   },
   {
-    field: 'company', title: '公司名称', minWidth: 'auto', align: 'center',
+    field: 'company', title: '公司名称', width: 'auto', align: 'center',
     slots: {
       default({ row }: any) {
         return <span class={ 'font-medium' }>{ row.company ? row.company : '--' }</span>;
@@ -786,7 +786,7 @@ export const shopInfoColumns = [
     }
   },
   {
-    field: 'company', title: '公司名称', minWidth: 'auto', align: 'center',
+    field: 'company', title: '公司名称', width: 'auto', align: 'center',
     slots: {
       default({ row }: any) {
         return <span class={ 'font-medium' }>{ row.company ? row.company : '--' }</span>;