From 46972609f6e9c279296eb4724d467a5911c9907c Mon Sep 17 00:00:00 2001
From: limengyang <2509946015@qq.com>
Date: Tue, 16 Apr 2024 17:35:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(lmy):=20=E5=8C=BA=E5=9F=9F=E7=8E=B0?=
 =?UTF-8?q?=E8=B4=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalSpotManage/components/list.vue      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/regionalSpotManage/components/list.vue b/src/views/regionalSpotManage/components/list.vue
index feb9289..117697f 100644
--- a/src/views/regionalSpotManage/components/list.vue
+++ b/src/views/regionalSpotManage/components/list.vue
@@ -183,6 +183,7 @@
     delAreaList.value = result;
     const curArr = delAreaList.value.map((it) => it.cityCode);
     for (const k of allAreaList.value) {
+      k.disabled = false;
       if (curArr.includes(k.cityId)) {
         addCheckboxValue.value.push(k.cityId as number);
         k.disabled = true;
@@ -427,7 +428,7 @@
         class="top-search"
       >
         <Row :gutter="20">
-          <Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24">
+          <Col :span="5">
             <FormItem label="品牌名称" name="brandList">
               <!-- <Input v-model:value="searchForm.brands" allow-clear placeholder="请输入品牌名称" /> -->
               <a-select
@@ -454,12 +455,12 @@
               </a-select>
             </FormItem>
           </Col>
-          <Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24">
+          <Col :span="5">
             <FormItem label="货号" name="goodsNo">
               <Input v-model:value="searchForm.goodsNo" allow-clear placeholder="请输入货号" />
             </FormItem>
           </Col>
-          <Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24">
+          <Col :span="5">
             <FormItem label="现货区域" name="areaIds">
               <Select
                 v-model:value="searchForm.areaIds"
@@ -478,7 +479,7 @@
               </Select>
             </FormItem>
           </Col>
-          <Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24">
+          <Col :span="5">
             <FormItem label="商品分组" name="types">
               <Select
                 v-model:value="searchForm.types"
@@ -494,10 +495,14 @@
               </Select>
             </FormItem>
           </Col>
-          <Col :span="24" style="display: flex; justify-content: space-between">
+          <Col :span="4">
             <div>
+              <Button style="margin-right: 5px" @click="onRset">重置</Button>
               <Button type="primary" style="margin: 0 5px" @click="onSearch">查询</Button>
-              <Button style="margin: 0 5px" @click="onRset">重置</Button>
+            </div>
+          </Col>
+          <Col :span="24" style="display: flex; justify-content: space-between">
+            <div>
               <Button type="primary" @click="addProduct" style="margin: 0 5px">新增商品</Button>
               <Button type="primary" @click="batchImport" style="margin: 0 5px">批量导入</Button>
               <Button type="primary" @click="batchDel" style="margin: 0 5px">批量删除</Button>
-- 
2.24.1