diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 4e547d4..9b19268 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -161,13 +161,13 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: false
+            paramRequire: 0
           }
         ]
       },
       categoryList: [],
       // 资质列表
-      certificationList: []
+      certificationList: [],
     }
   },
   watch: {

diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 4e547d4..9b19268 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -161,13 +161,13 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: false
+            paramRequire: 0
           }
         ]
       },
       categoryList: [],
       // 资质列表
-      certificationList: []
+      certificationList: [],
     }
   },
   watch: {
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index 9ec5417..d2a221e 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -6,7 +6,7 @@
     const data = tableAry.map((user, index) => {
       const userArr = []
       for (const key in tableAry[0]) {
-        const item = user[key]
+        let item = user[key]
         // console.log(item,typeof(item));
         if(typeof(item)=="object"){
             item = JSON.stringify(item)

diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 4e547d4..9b19268 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -161,13 +161,13 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: false
+            paramRequire: 0
           }
         ]
       },
       categoryList: [],
       // 资质列表
-      certificationList: []
+      certificationList: [],
     }
   },
   watch: {
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index 9ec5417..d2a221e 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -6,7 +6,7 @@
     const data = tableAry.map((user, index) => {
       const userArr = []
       for (const key in tableAry[0]) {
-        const item = user[key]
+        let item = user[key]
         // console.log(item,typeof(item));
         if(typeof(item)=="object"){
             item = JSON.stringify(item)
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 9bc028d..b380ba1 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -45,6 +45,7 @@
     computed: {
         total() {
             let index = this.tableData.total / this.limit
+            console.log(this.tableData.total, this.limit)
             return Math.ceil(index)
         }
     },

diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 4e547d4..9b19268 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -161,13 +161,13 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: false
+            paramRequire: 0
           }
         ]
       },
       categoryList: [],
       // 资质列表
-      certificationList: []
+      certificationList: [],
     }
   },
   watch: {
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index 9ec5417..d2a221e 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -6,7 +6,7 @@
     const data = tableAry.map((user, index) => {
       const userArr = []
       for (const key in tableAry[0]) {
-        const item = user[key]
+        let item = user[key]
         // console.log(item,typeof(item));
         if(typeof(item)=="object"){
             item = JSON.stringify(item)
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 9bc028d..b380ba1 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -45,6 +45,7 @@
     computed: {
         total() {
             let index = this.tableData.total / this.limit
+            console.log(this.tableData.total, this.limit)
             return Math.ceil(index)
         }
     },
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 3157cbb..c5b9c07 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -60,11 +60,12 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
-        <el-button
+        <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
+          <el-button
           type="primary"
           icon="el-icon-folder-opened"
           class="btnItem"
@@ -72,6 +73,8 @@
         >
           导出
         </el-button>
+    </el-tooltip>
+        
       </div>
     </div>
     <el-table
@@ -85,6 +88,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" width="75" label="序号" />
@@ -109,7 +113,15 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
 
     <!-- 新增弹框 -->
     <edit-brand v-show="isShowAdd" ref="editBrand" @refresh="refresh" />
@@ -121,26 +133,27 @@
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 //  element ui Dialog
-import ElbrandDialog from '../../components/mycomponent/dialog/ElbrandDialog.vue'
-import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
-import DetailBrand from '@/views/product/detailBrand'
-import EditBrand from '@/views/product/editBrand'
+import ElbrandDialog from "../../components/mycomponent/dialog/ElbrandDialog.vue";
+import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
+import DetailBrand from "@/views/product/detailBrand";
+import EditBrand from "@/views/product/editBrand";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
-import { batchExportBrand } from '@/api/common'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
+import { batchExportBrand } from "@/api/common";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { outToExcel } from "../../utils/myUtils/exportToExcel";
+export default {
+  // 加入分页逻辑
   components: {
     DetailBrand,
     EditBrand,
     GroupPage,
     ElbrandDialog,
-    InfoDialog
+    InfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -149,13 +162,14 @@
       isShowAdd: false, // 显示新增,编辑
       dialogTitle: null,
       dataInfo: {}, // 新数据的chushixiang
-      selectInfo: { // 搜索框中的数据的数据
-        brandCode: '',
-        brandName: '',
-        brandProperty: ''
-      }
-
-    }
+      selectInfo: {
+        // 搜索框中的数据的数据
+        brandCode: "",
+        brandName: "",
+        brandProperty: "",
+      },
+      loading:false, // 表格的loading
+    };
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -164,101 +178,148 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addBrand() {
-      this.isShowAdd = true
-      this.$refs.editBrand.initDialog('create')
+      this.isShowAdd = true;
+      this.$refs.editBrand.initDialog("create");
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true
-      this.$refs.editBrand.initDialog('update', row)
+      this.isShowAdd = true;
+      this.$refs.editBrand.initDialog("update", row);
     },
     // 重置
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        brandCode: '',
-        brandName: '',
-        brandProperty: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        brandCode: "",
+        brandName: "",
+        brandProperty: "",
+      };
       // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+      // listPage(`limit=${this.limit}&offset=${this.offset}`, {})
     },
     detail(row) {
-      this.$refs.detailBrand.initDialog('detail', row)
+      this.$refs.detailBrand.initDialog("detail", row);
     },
 
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          console.log(res, "res");
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 删除
     Bdelete(row) {
-      console.log(row)
-      const id = row.id
-      Branddelete({ id: id }).then(res => {
-        console.log(res)
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          Branddelete({ id: id }).then((res) => {
+            console.log(res, "res");
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
 
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      // 先判断有无选中
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              console.log(res, "res");
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的品牌",
+          type: "error",
+        });
+      }
     },
-    //
+    // 导出到excel
     exportToExcel() {
-      // 全屏加载动画
+      // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportBrand(this.selectInfo).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `品牌列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    }
-  }
-}
+        text: "数据处理中,请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          outToExcel(res.rows);
+          loading.close(); // 关闭加载动画
+          this.$message({
+            message: "导出成功",
+            type: "success",
+          });
+        })
+        .catch((error) => {
+          loading.close(); // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: "error",
+          });
+        });
+      // batchExportBrand(this.selectInfo)
+      //   .then((res) => {
+      //     loading.close(); // 关闭加载动画
+      //     const blob = new Blob([res.data]);
+      //     const downloadElement = document.createElement("a");
+      //     const href = window.URL.createObjectURL(blob); // 创建下载的链接
+      //     downloadElement.href = href;
+      //     downloadElement.download = `品牌列表.xlsx`; // 下载后文件名
+      //     document.body.appendChild(downloadElement);
+      //     downloadElement.click(); // 点击下载
+      //     document.body.removeChild(downloadElement); // 下载完成移除元素
+      //     window.URL.revokeObjectURL(href); // 释放blob对象
+      //   })
+      //   .catch((res) => {
+      //     loading.close();
+      //   });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -294,9 +355,7 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
-
 }
 </style>

diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 4e547d4..9b19268 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -161,13 +161,13 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: false
+            paramRequire: 0
           }
         ]
       },
       categoryList: [],
       // 资质列表
-      certificationList: []
+      certificationList: [],
     }
   },
   watch: {
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index 9ec5417..d2a221e 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -6,7 +6,7 @@
     const data = tableAry.map((user, index) => {
       const userArr = []
       for (const key in tableAry[0]) {
-        const item = user[key]
+        let item = user[key]
         // console.log(item,typeof(item));
         if(typeof(item)=="object"){
             item = JSON.stringify(item)
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 9bc028d..b380ba1 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -45,6 +45,7 @@
     computed: {
         total() {
             let index = this.tableData.total / this.limit
+            console.log(this.tableData.total, this.limit)
             return Math.ceil(index)
         }
     },
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 3157cbb..c5b9c07 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -60,11 +60,12 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
-        <el-button
+        <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
+          <el-button
           type="primary"
           icon="el-icon-folder-opened"
           class="btnItem"
@@ -72,6 +73,8 @@
         >
           导出
         </el-button>
+    </el-tooltip>
+        
       </div>
     </div>
     <el-table
@@ -85,6 +88,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" width="75" label="序号" />
@@ -109,7 +113,15 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
 
     <!-- 新增弹框 -->
     <edit-brand v-show="isShowAdd" ref="editBrand" @refresh="refresh" />
@@ -121,26 +133,27 @@
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 //  element ui Dialog
-import ElbrandDialog from '../../components/mycomponent/dialog/ElbrandDialog.vue'
-import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
-import DetailBrand from '@/views/product/detailBrand'
-import EditBrand from '@/views/product/editBrand'
+import ElbrandDialog from "../../components/mycomponent/dialog/ElbrandDialog.vue";
+import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
+import DetailBrand from "@/views/product/detailBrand";
+import EditBrand from "@/views/product/editBrand";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
-import { batchExportBrand } from '@/api/common'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
+import { batchExportBrand } from "@/api/common";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { outToExcel } from "../../utils/myUtils/exportToExcel";
+export default {
+  // 加入分页逻辑
   components: {
     DetailBrand,
     EditBrand,
     GroupPage,
     ElbrandDialog,
-    InfoDialog
+    InfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -149,13 +162,14 @@
       isShowAdd: false, // 显示新增,编辑
       dialogTitle: null,
       dataInfo: {}, // 新数据的chushixiang
-      selectInfo: { // 搜索框中的数据的数据
-        brandCode: '',
-        brandName: '',
-        brandProperty: ''
-      }
-
-    }
+      selectInfo: {
+        // 搜索框中的数据的数据
+        brandCode: "",
+        brandName: "",
+        brandProperty: "",
+      },
+      loading:false, // 表格的loading
+    };
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -164,101 +178,148 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addBrand() {
-      this.isShowAdd = true
-      this.$refs.editBrand.initDialog('create')
+      this.isShowAdd = true;
+      this.$refs.editBrand.initDialog("create");
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true
-      this.$refs.editBrand.initDialog('update', row)
+      this.isShowAdd = true;
+      this.$refs.editBrand.initDialog("update", row);
     },
     // 重置
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        brandCode: '',
-        brandName: '',
-        brandProperty: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        brandCode: "",
+        brandName: "",
+        brandProperty: "",
+      };
       // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+      // listPage(`limit=${this.limit}&offset=${this.offset}`, {})
     },
     detail(row) {
-      this.$refs.detailBrand.initDialog('detail', row)
+      this.$refs.detailBrand.initDialog("detail", row);
     },
 
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          console.log(res, "res");
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 删除
     Bdelete(row) {
-      console.log(row)
-      const id = row.id
-      Branddelete({ id: id }).then(res => {
-        console.log(res)
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          Branddelete({ id: id }).then((res) => {
+            console.log(res, "res");
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
 
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      // 先判断有无选中
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              console.log(res, "res");
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的品牌",
+          type: "error",
+        });
+      }
     },
-    //
+    // 导出到excel
     exportToExcel() {
-      // 全屏加载动画
+      // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportBrand(this.selectInfo).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `品牌列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    }
-  }
-}
+        text: "数据处理中,请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          outToExcel(res.rows);
+          loading.close(); // 关闭加载动画
+          this.$message({
+            message: "导出成功",
+            type: "success",
+          });
+        })
+        .catch((error) => {
+          loading.close(); // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: "error",
+          });
+        });
+      // batchExportBrand(this.selectInfo)
+      //   .then((res) => {
+      //     loading.close(); // 关闭加载动画
+      //     const blob = new Blob([res.data]);
+      //     const downloadElement = document.createElement("a");
+      //     const href = window.URL.createObjectURL(blob); // 创建下载的链接
+      //     downloadElement.href = href;
+      //     downloadElement.download = `品牌列表.xlsx`; // 下载后文件名
+      //     document.body.appendChild(downloadElement);
+      //     downloadElement.click(); // 点击下载
+      //     document.body.removeChild(downloadElement); // 下载完成移除元素
+      //     window.URL.revokeObjectURL(href); // 释放blob对象
+      //   })
+      //   .catch((res) => {
+      //     loading.close();
+      //   });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -294,9 +355,7 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
-
 }
 </style>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index d01ea1d..549229d 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -55,14 +55,16 @@
         >
           删除
         </el-button>
-        <el-button
+        <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start"></el-tooltip>
+         <el-button
           type="primary"
           icon="el-icon-folder-opened"
           class="btnItem"
           @click="exportToExcel"
-        >
+         >
           导出
-        </el-button>
+         </el-button>
+      </el-tooltip>
       </div>
     </div>
 
@@ -77,9 +79,10 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column type="index" label="序号" />
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -172,7 +175,8 @@
         // 搜索框中的数据的数据
         categoryCode: '',
         categoryName: ''
-      }
+      },
+      loading:false
     }
   },
   mounted() {
@@ -205,16 +209,26 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         if (res.code === 200) {
           // 得到相关数据
           this.tableData = res.data.rows
+          this.loading = false
         }
+      }).catch(err => {
+        this.loading = false
       })
     },
     // 删除
     Cdelete(row) {
-      const id = row.id
+      this.$confirm(`确认删除此品类吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
         if (res.code === 200) {
@@ -225,11 +239,20 @@
           this.refresh()
         }
       })
+        })
+        .catch(() => {});
     },
     //  批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
+     if(this.$refs.multipleTable.selection.length !== 0){
+      this.$confirm(`确认删除选中的这些品类吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+         //  得到选中行
+       const dle_ary = this.$refs.multipleTable.selection
       const ids = []
       dle_ary.forEach((ele) => {
         ids.push(ele.id)
@@ -243,6 +266,15 @@
           this.refresh()
         }
       })
+        })
+        .catch(() => {});
+      
+     }else{
+      this.$message({
+          message: "请先勾选需要删除的品类",
+          type: "error",
+        });
+     }
     },
     //  编辑
     compile(row) {

diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 4e547d4..9b19268 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -161,13 +161,13 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: false
+            paramRequire: 0
           }
         ]
       },
       categoryList: [],
       // 资质列表
-      certificationList: []
+      certificationList: [],
     }
   },
   watch: {
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index 9ec5417..d2a221e 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -6,7 +6,7 @@
     const data = tableAry.map((user, index) => {
       const userArr = []
       for (const key in tableAry[0]) {
-        const item = user[key]
+        let item = user[key]
         // console.log(item,typeof(item));
         if(typeof(item)=="object"){
             item = JSON.stringify(item)
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 9bc028d..b380ba1 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -45,6 +45,7 @@
     computed: {
         total() {
             let index = this.tableData.total / this.limit
+            console.log(this.tableData.total, this.limit)
             return Math.ceil(index)
         }
     },
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 3157cbb..c5b9c07 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -60,11 +60,12 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
-        <el-button
+        <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
+          <el-button
           type="primary"
           icon="el-icon-folder-opened"
           class="btnItem"
@@ -72,6 +73,8 @@
         >
           导出
         </el-button>
+    </el-tooltip>
+        
       </div>
     </div>
     <el-table
@@ -85,6 +88,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" width="75" label="序号" />
@@ -109,7 +113,15 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
 
     <!-- 新增弹框 -->
     <edit-brand v-show="isShowAdd" ref="editBrand" @refresh="refresh" />
@@ -121,26 +133,27 @@
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 //  element ui Dialog
-import ElbrandDialog from '../../components/mycomponent/dialog/ElbrandDialog.vue'
-import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
-import DetailBrand from '@/views/product/detailBrand'
-import EditBrand from '@/views/product/editBrand'
+import ElbrandDialog from "../../components/mycomponent/dialog/ElbrandDialog.vue";
+import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
+import DetailBrand from "@/views/product/detailBrand";
+import EditBrand from "@/views/product/editBrand";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
-import { batchExportBrand } from '@/api/common'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
+import { batchExportBrand } from "@/api/common";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { outToExcel } from "../../utils/myUtils/exportToExcel";
+export default {
+  // 加入分页逻辑
   components: {
     DetailBrand,
     EditBrand,
     GroupPage,
     ElbrandDialog,
-    InfoDialog
+    InfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -149,13 +162,14 @@
       isShowAdd: false, // 显示新增,编辑
       dialogTitle: null,
       dataInfo: {}, // 新数据的chushixiang
-      selectInfo: { // 搜索框中的数据的数据
-        brandCode: '',
-        brandName: '',
-        brandProperty: ''
-      }
-
-    }
+      selectInfo: {
+        // 搜索框中的数据的数据
+        brandCode: "",
+        brandName: "",
+        brandProperty: "",
+      },
+      loading:false, // 表格的loading
+    };
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -164,101 +178,148 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addBrand() {
-      this.isShowAdd = true
-      this.$refs.editBrand.initDialog('create')
+      this.isShowAdd = true;
+      this.$refs.editBrand.initDialog("create");
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true
-      this.$refs.editBrand.initDialog('update', row)
+      this.isShowAdd = true;
+      this.$refs.editBrand.initDialog("update", row);
     },
     // 重置
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        brandCode: '',
-        brandName: '',
-        brandProperty: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        brandCode: "",
+        brandName: "",
+        brandProperty: "",
+      };
       // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+      // listPage(`limit=${this.limit}&offset=${this.offset}`, {})
     },
     detail(row) {
-      this.$refs.detailBrand.initDialog('detail', row)
+      this.$refs.detailBrand.initDialog("detail", row);
     },
 
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          console.log(res, "res");
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 删除
     Bdelete(row) {
-      console.log(row)
-      const id = row.id
-      Branddelete({ id: id }).then(res => {
-        console.log(res)
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          Branddelete({ id: id }).then((res) => {
+            console.log(res, "res");
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
 
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      // 先判断有无选中
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              console.log(res, "res");
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的品牌",
+          type: "error",
+        });
+      }
     },
-    //
+    // 导出到excel
     exportToExcel() {
-      // 全屏加载动画
+      // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportBrand(this.selectInfo).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `品牌列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    }
-  }
-}
+        text: "数据处理中,请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          outToExcel(res.rows);
+          loading.close(); // 关闭加载动画
+          this.$message({
+            message: "导出成功",
+            type: "success",
+          });
+        })
+        .catch((error) => {
+          loading.close(); // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: "error",
+          });
+        });
+      // batchExportBrand(this.selectInfo)
+      //   .then((res) => {
+      //     loading.close(); // 关闭加载动画
+      //     const blob = new Blob([res.data]);
+      //     const downloadElement = document.createElement("a");
+      //     const href = window.URL.createObjectURL(blob); // 创建下载的链接
+      //     downloadElement.href = href;
+      //     downloadElement.download = `品牌列表.xlsx`; // 下载后文件名
+      //     document.body.appendChild(downloadElement);
+      //     downloadElement.click(); // 点击下载
+      //     document.body.removeChild(downloadElement); // 下载完成移除元素
+      //     window.URL.revokeObjectURL(href); // 释放blob对象
+      //   })
+      //   .catch((res) => {
+      //     loading.close();
+      //   });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -294,9 +355,7 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
-
 }
 </style>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index d01ea1d..549229d 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -55,14 +55,16 @@
         >
           删除
         </el-button>
-        <el-button
+        <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start"></el-tooltip>
+         <el-button
           type="primary"
           icon="el-icon-folder-opened"
           class="btnItem"
           @click="exportToExcel"
-        >
+         >
           导出
-        </el-button>
+         </el-button>
+      </el-tooltip>
       </div>
     </div>
 
@@ -77,9 +79,10 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column type="index" label="序号" />
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -172,7 +175,8 @@
         // 搜索框中的数据的数据
         categoryCode: '',
         categoryName: ''
-      }
+      },
+      loading:false
     }
   },
   mounted() {
@@ -205,16 +209,26 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
         if (res.code === 200) {
           // 得到相关数据
           this.tableData = res.data.rows
+          this.loading = false
         }
+      }).catch(err => {
+        this.loading = false
       })
     },
     // 删除
     Cdelete(row) {
-      const id = row.id
+      this.$confirm(`确认删除此品类吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
         if (res.code === 200) {
@@ -225,11 +239,20 @@
           this.refresh()
         }
       })
+        })
+        .catch(() => {});
     },
     //  批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
+     if(this.$refs.multipleTable.selection.length !== 0){
+      this.$confirm(`确认删除选中的这些品类吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+         //  得到选中行
+       const dle_ary = this.$refs.multipleTable.selection
       const ids = []
       dle_ary.forEach((ele) => {
         ids.push(ele.id)
@@ -243,6 +266,15 @@
           this.refresh()
         }
       })
+        })
+        .catch(() => {});
+      
+     }else{
+      this.$message({
+          message: "请先勾选需要删除的品类",
+          type: "error",
+        });
+     }
     },
     //  编辑
     compile(row) {
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 1ae0ac6..ac15f56 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -26,7 +26,7 @@
       <el-row :gutter="20">
         <el-col :span="21">
           <el-form-item label="供应商" prop="supplierIds">
-            <el-select v-model="brandForm.supplierIdsStr" filterable clearable allow-create placeholder="请选择供应商">
+            <el-select v-model="brandForm.supplierIdsStr" multiple filterable clearable allow-create placeholder="请选择供应商">
               <el-option
                 v-for="item in supplierIdList"
                 :key="item.id"
@@ -88,7 +88,7 @@
         brandProperty: '',
         supplierIds: [],
         categoryIds: [],
-        supplierIdsStr: '',
+        supplierIdsStr: [],
         remark: ''
       }, // 表单
       textMap: {
@@ -111,7 +111,7 @@
   },
   watch: {
     'brandForm.supplierIdsStr'(newValue, oldValue) {
-      this.brandForm.supplierIds[0] = newValue
+      this.brandForm.supplierIds = newValue
     }
   },
   mounted() {
@@ -193,7 +193,6 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           add(this.brandForm).then(response => {
-            if (response === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
                 cancelButtonText: '否',
@@ -207,7 +206,6 @@
                 this.$emit('refresh')
                 this.dialogFormVisible = false
               })
-            }
           })
         }
       })
@@ -217,11 +215,9 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           update(this.brandForm).then(response => {
-            if (response === 200) {
               this.$message.success('修改成功')
               this.$emit('refresh')
               this.dialogFormVisible = false
-            }
           })
         }
       })