diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index a449c8b..af487f7 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,28 +1,52 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
+  <el-dialog
+    :title="title"
+    width="1200px"
+    :visible.sync="dialogStatus"
+    append-to-body
+    @close="close"
+  >
     <div class="productAddDialog">
-      <div class="Dialog-title">
-        基本信息
-      </div>
+      <div class="Dialog-title">基本信息</div>
       <div class="Dialog-input">
-        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="addInfo"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品型号" prop="productCode">
-                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品名称" prop="productName">
-                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productName"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品品牌" prop="brandId">
-                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.brandId"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.id"
@@ -34,7 +58,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品品类" prop="categoryId">
-                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.categoryId"
+                  clearable
+                  placeholder="请输入产品品类"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -48,54 +77,78 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品版本" prop="productEdition">
-                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productEdition"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="国际69码" prop="internationalCode">
-                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.internationalCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="包装尺寸" prop="productPackageSize">
-                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productPackageSize"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品颜色" prop="productColor">
-                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productColor"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品状态" prop="productStatus">
-                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productStatus"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品材质" prop="productMaterialQuality">
-                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productMaterialQuality"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品重量" prop="productWeight">
-                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productWeight"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否为IOT产品" prop="productNetworkMode">
                 <el-radio-group v-model="addInfo.productNetworkMode">
-                  <el-radio label="1">
-                    是
-                  </el-radio>
-                  <el-radio label="0">
-                    否
-                  </el-radio>
+                  <el-radio label="1"> 是 </el-radio>
+                  <el-radio label="0"> 否 </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -112,109 +165,195 @@
             action="string"
             accept=".jpg,.jpeg,.png"
           >
-            <img v-if="addInfo.productPicture" :src="addInfo.productPicture" class="avatar">
+            <img
+              v-if="addInfo.productPicture"
+              :src="addInfo.productPicture"
+              class="avatar"
+            />
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </div>
       </div>
-      <div class="Dialog-desc">
-        产品参数
-      </div>
+      <div class="Dialog-desc">产品参数</div>
       <div class="parameters">
-        <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="paramsForm"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col v-for="param of paramValueList" :span="8">
-              <div style="width: 100%; display: flex;align-items: center; margin-top:10px">
-                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              <div
+                style="
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  margin-top: 10px;
+                "
+              >
+                <span style="margin-right: 10px"
+                  ><red-star
+                    v-show="param.paramRequire == 1"
+                    style="margin-right: 4px"
+                  />{{ param.paramName }}</span
+                >
+                <el-input
+                  v-model.trim="param.paramValue"
+                  type="text"
+                  placeholder=""
+                  style="flex: 1"
+                />
               </div>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { SelectList } from '@/api/product/brand'
-import { C_list, C_paramsList } from '@/api/product/category'
-import { add, productDetail, update } from '@/api/product/product'
-import RedStar from '@/components/mycomponent/redStar'
+import { getToken } from "@/utils/auth";
+import { Message } from "element-ui";
+import { SelectList } from "@/api/product/brand";
+import { C_list, C_paramsList } from "@/api/product/category";
+import { add, productDetail, update } from "@/api/product/product";
+import RedStar from "@/components/mycomponent/redStar";
 
 export default {
   components: { RedStar },
   props: {
     title: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       dialogStatus: false,
       myHeaders: { token: getToken() },
-      imageUrl: this.baseConfig.baseUrl + '/static/',
+      imageUrl: this.baseConfig.baseUrl + "/static/",
       categoryList: [],
       brandList: [],
-      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require("@/assets/global_images/photo.png"), // 默认图片路径
       rules: {
-        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
-        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
-        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
-        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
-        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
-        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
-        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
-        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
-        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
-        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
-        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+        productCode: [
+          {
+            required: true,
+            message: "产品型号不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: "产品名称不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        brandId: [
+          {
+            required: true,
+            message: "产品品牌不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        categoryId: [
+          {
+            required: true,
+            message: "产品品类不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productEdition: [
+          {
+            required: true,
+            message: "产品版本不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        internationalCode: [
+          {
+            required: true,
+            message: "国际69码不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productColor: [
+          {
+            required: true,
+            message: "产品颜色不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productPackageSize: [
+          {
+            required: true,
+            message: "包装尺寸不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productStatus: [
+          {
+            required: true,
+            message: "产品状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productMaterialQuality: [
+          {
+            required: true,
+            message: "产品材质不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productWeight: [
+          {
+            required: true,
+            message: "产品重量不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       addInfo: {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productNetworkMode: '1',
-        productPicture: ''
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productNetworkMode: "1",
+        productPicture: "",
       },
       paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
-      ]
-    }
+      ],
+    };
   },
   watch: {
-    'addInfo.categoryId'(val) {
-      this.fetchParams(val)
-    }
+    "addInfo.categoryId"(val) {
+      this.fetchParams(val);
+    },
   },
   created() {
-    this.fetchBrandList()
-    this.fetchCategoryList()
+    this.fetchBrandList();
+    this.fetchCategoryList();
   },
   methods: {
     initDialog(type, row) {
-      if (type === 'edit') {
+      if (type === "edit") {
         if (row.id) {
-          productDetail({ id: row.id }).then(data => {
+          productDetail({ id: row.id }).then((data) => {
             this.addInfo = {
               id: data.id,
               productCode: data.productCode,
@@ -229,66 +368,70 @@
               productColor: data.productColor,
               productMaterialQuality: data.productMaterialQuality,
               productNetworkMode: data.productNetworkMode,
-              productPicture: data.productPicture ? this.imageUrl + data.productPicture : '',
-              paramValueList: data.paramValues
-            }
+              productPicture: data.productPicture
+                ? this.imageUrl + data.productPicture
+                : "",
+              paramValueList: data.paramValues,
+            };
+            console.log(this.addInfo, "this.addInfo");
             // 如果有类型，去获取类型的参数
             // if (this.addInfo.categoryId) {
             //   this.fetchParams(this.addInfo.categoryId)
             // }
-          })
+          });
         }
       } else {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.resetForm()
+          this.$refs["dataForm"].clearValidate();
+        });
+        this.resetForm();
       }
-      this.dialogStatus = true
+      this.dialogStatus = true;
     },
     // 获取品牌列表
     fetchBrandList() {
-      SelectList().then(res => {
-        this.brandList = res
-      })
+      SelectList().then((res) => {
+        this.brandList = res;
+      });
     },
     // 获取品类列表
     fetchCategoryList() {
       const params = {
-        categoryCode: '',
-        categoryName: ''
-      }
-      C_list(params).then(res => {
-        this.categoryList = res.data
-      })
+        categoryCode: "",
+        categoryName: "",
+      };
+      C_list(params).then((res) => {
+        this.categoryList = res.data;
+      });
     },
     // 图片上传
     uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
+      console.log("uploadFile:" + file.file.name);
       // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.addInfo.productPicture = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-      })
+      this.getBase64(file.file).then((resBase64) => {
+        this.addInfo.productPicture =
+          "data:image/png;base64," + resBase64.split(",")[1]; // 直接拿到base64信息
+      });
     },
     // 上传前判断文件格式及大小
     beforeAvatarUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      let res = true;
+      console.log(file.size);
+      const isLt2M = file.size / 1024 < 200;
       if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        res = false;
       }
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
+        this.$message.error("上传图片大小不能超过 200KB!");
+        res = false;
       }
-      return res
+      return res;
     },
     // 上传成功后回显
     handleAvatarSuccess(response, file) {
-      console.log('handleSuccess')
+      console.log("handleSuccess");
       // const base_url = process.env.BASE_API + '/static/'
       // if (response.code === 200) {
       //   this.photo = base_url + response.data
@@ -298,92 +441,109 @@
     },
     getBase64(file) {
       return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
+        const reader = new FileReader();
+        let fileResult = "";
+        reader.readAsDataURL(file);
         // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
+        reader.onload = function () {
+          fileResult = reader.result;
+        };
         // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
+        reader.onerror = function (error) {
+          reject(error);
+        };
         // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+        reader.onloadend = function () {
+          resolve(fileResult);
+        };
+      });
     },
     // 获取品类参数列表
     fetchParams(categoryId) {
       if (categoryId) {
-        C_paramsList(categoryId).then(res => {
+        C_paramsList(categoryId).then((res) => {
           if (res.code === 200) {
             if (res.data.length > 0) {
-              this.paramValueList = res.data.map(item => {
-                const value = this.addInfo.paramValueList.filter(param => param.paramId === item.id)
-                const paramValue = value.length > 0 ? value[0].paramValue : ''
-                return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: paramValue }
-              })
+              this.paramValueList = res.data.map((item) => {
+                const value = this.addInfo.paramValueList.filter(
+                  (param) => param.paramId === item.id
+                );
+                const paramValue = value.length > 0 ? value[0].paramValue : "";
+                return {
+                  paramId: item.id,
+                  paramName: item.paramName,
+                  paramOrder: item.paramOrder,
+                  paramRequire: item.paramRequire,
+                  paramValue: paramValue,
+                };
+              });
+            } else {
+              this.paramValueList = [];
             }
           }
-        })
+        });
       }
     },
     // 重置表单
     resetForm() {
       this.addInfo = {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productPicture: '',
-        paramValueList: []
-      }
-      this.paramValueList = []
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productPicture: "",
+        paramValueList: [],
+      };
+      this.paramValueList = [];
     },
     close() {
-      this.dialogStatus = false
+      this.dialogStatus = false;
     },
     // 新增
     save() {
-      this.$refs['dataForm'].validate((valid) => {
-        const index = this.addInfo.productPicture.indexOf(this.imageUrl)
-        if (index > -1) {
-          this.addInfo.productPicture = this.addInfo.productPicture.substring(this.imageUrl.length)
-        }
-        this.addInfo.paramValueList = this.paramValueList.map(item => {
-          return {
-            paramId: item.paramId,
-            paramName: item.paramName,
-            paramValue: item.paramValue
+      this.$refs["dataForm"].validate((valid) => {
+        console.log(valid, "验证结果");
+        if (valid) {
+          const index = this.addInfo.productPicture.indexOf(this.imageUrl);
+          if (index > -1) {
+            this.addInfo.productPicture = this.addInfo.productPicture.substring(
+              this.imageUrl.length
+            );
           }
-        })
-        if (this.title === '新增产品') {
-          add(this.addInfo).then(res => {
-            Message.success('保存成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          this.addInfo.paramValueList = this.paramValueList.map((item) => {
+            return {
+              paramId: item.paramId,
+              paramName: item.paramName,
+              paramValue: item.paramValue,
+            };
+          });
+          if (this.title === "新增产品") {
+            add(this.addInfo).then((res) => {
+              Message.success("保存成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          } else {
+            update(this.addInfo).then((res) => {
+              Message.success("更新成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          }
         } else {
-          update(this.addInfo).then(res => {
-            Message.success('更新成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          Message.error("请先完整填写产品信息");
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -404,7 +564,7 @@
     padding: 10px 20px;
     display: flex;
     .inputContent {
-      flex:1;
+      flex: 1;
       margin-right: 30px;
     }
     .imageContent {
@@ -413,7 +573,7 @@
   }
 
   .Dialog-desc {
-    width:100%;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -489,7 +649,6 @@
 }
 </style>
 <style>
-
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -499,6 +658,6 @@
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 </style>

diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index a449c8b..af487f7 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,28 +1,52 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
+  <el-dialog
+    :title="title"
+    width="1200px"
+    :visible.sync="dialogStatus"
+    append-to-body
+    @close="close"
+  >
     <div class="productAddDialog">
-      <div class="Dialog-title">
-        基本信息
-      </div>
+      <div class="Dialog-title">基本信息</div>
       <div class="Dialog-input">
-        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="addInfo"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品型号" prop="productCode">
-                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品名称" prop="productName">
-                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productName"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品品牌" prop="brandId">
-                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.brandId"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.id"
@@ -34,7 +58,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品品类" prop="categoryId">
-                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.categoryId"
+                  clearable
+                  placeholder="请输入产品品类"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -48,54 +77,78 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品版本" prop="productEdition">
-                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productEdition"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="国际69码" prop="internationalCode">
-                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.internationalCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="包装尺寸" prop="productPackageSize">
-                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productPackageSize"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品颜色" prop="productColor">
-                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productColor"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品状态" prop="productStatus">
-                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productStatus"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品材质" prop="productMaterialQuality">
-                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productMaterialQuality"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品重量" prop="productWeight">
-                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productWeight"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否为IOT产品" prop="productNetworkMode">
                 <el-radio-group v-model="addInfo.productNetworkMode">
-                  <el-radio label="1">
-                    是
-                  </el-radio>
-                  <el-radio label="0">
-                    否
-                  </el-radio>
+                  <el-radio label="1"> 是 </el-radio>
+                  <el-radio label="0"> 否 </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -112,109 +165,195 @@
             action="string"
             accept=".jpg,.jpeg,.png"
           >
-            <img v-if="addInfo.productPicture" :src="addInfo.productPicture" class="avatar">
+            <img
+              v-if="addInfo.productPicture"
+              :src="addInfo.productPicture"
+              class="avatar"
+            />
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </div>
       </div>
-      <div class="Dialog-desc">
-        产品参数
-      </div>
+      <div class="Dialog-desc">产品参数</div>
       <div class="parameters">
-        <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="paramsForm"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col v-for="param of paramValueList" :span="8">
-              <div style="width: 100%; display: flex;align-items: center; margin-top:10px">
-                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              <div
+                style="
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  margin-top: 10px;
+                "
+              >
+                <span style="margin-right: 10px"
+                  ><red-star
+                    v-show="param.paramRequire == 1"
+                    style="margin-right: 4px"
+                  />{{ param.paramName }}</span
+                >
+                <el-input
+                  v-model.trim="param.paramValue"
+                  type="text"
+                  placeholder=""
+                  style="flex: 1"
+                />
               </div>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { SelectList } from '@/api/product/brand'
-import { C_list, C_paramsList } from '@/api/product/category'
-import { add, productDetail, update } from '@/api/product/product'
-import RedStar from '@/components/mycomponent/redStar'
+import { getToken } from "@/utils/auth";
+import { Message } from "element-ui";
+import { SelectList } from "@/api/product/brand";
+import { C_list, C_paramsList } from "@/api/product/category";
+import { add, productDetail, update } from "@/api/product/product";
+import RedStar from "@/components/mycomponent/redStar";
 
 export default {
   components: { RedStar },
   props: {
     title: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       dialogStatus: false,
       myHeaders: { token: getToken() },
-      imageUrl: this.baseConfig.baseUrl + '/static/',
+      imageUrl: this.baseConfig.baseUrl + "/static/",
       categoryList: [],
       brandList: [],
-      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require("@/assets/global_images/photo.png"), // 默认图片路径
       rules: {
-        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
-        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
-        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
-        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
-        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
-        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
-        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
-        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
-        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
-        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
-        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+        productCode: [
+          {
+            required: true,
+            message: "产品型号不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: "产品名称不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        brandId: [
+          {
+            required: true,
+            message: "产品品牌不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        categoryId: [
+          {
+            required: true,
+            message: "产品品类不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productEdition: [
+          {
+            required: true,
+            message: "产品版本不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        internationalCode: [
+          {
+            required: true,
+            message: "国际69码不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productColor: [
+          {
+            required: true,
+            message: "产品颜色不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productPackageSize: [
+          {
+            required: true,
+            message: "包装尺寸不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productStatus: [
+          {
+            required: true,
+            message: "产品状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productMaterialQuality: [
+          {
+            required: true,
+            message: "产品材质不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productWeight: [
+          {
+            required: true,
+            message: "产品重量不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       addInfo: {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productNetworkMode: '1',
-        productPicture: ''
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productNetworkMode: "1",
+        productPicture: "",
       },
       paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
-      ]
-    }
+      ],
+    };
   },
   watch: {
-    'addInfo.categoryId'(val) {
-      this.fetchParams(val)
-    }
+    "addInfo.categoryId"(val) {
+      this.fetchParams(val);
+    },
   },
   created() {
-    this.fetchBrandList()
-    this.fetchCategoryList()
+    this.fetchBrandList();
+    this.fetchCategoryList();
   },
   methods: {
     initDialog(type, row) {
-      if (type === 'edit') {
+      if (type === "edit") {
         if (row.id) {
-          productDetail({ id: row.id }).then(data => {
+          productDetail({ id: row.id }).then((data) => {
             this.addInfo = {
               id: data.id,
               productCode: data.productCode,
@@ -229,66 +368,70 @@
               productColor: data.productColor,
               productMaterialQuality: data.productMaterialQuality,
               productNetworkMode: data.productNetworkMode,
-              productPicture: data.productPicture ? this.imageUrl + data.productPicture : '',
-              paramValueList: data.paramValues
-            }
+              productPicture: data.productPicture
+                ? this.imageUrl + data.productPicture
+                : "",
+              paramValueList: data.paramValues,
+            };
+            console.log(this.addInfo, "this.addInfo");
             // 如果有类型，去获取类型的参数
             // if (this.addInfo.categoryId) {
             //   this.fetchParams(this.addInfo.categoryId)
             // }
-          })
+          });
         }
       } else {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.resetForm()
+          this.$refs["dataForm"].clearValidate();
+        });
+        this.resetForm();
       }
-      this.dialogStatus = true
+      this.dialogStatus = true;
     },
     // 获取品牌列表
     fetchBrandList() {
-      SelectList().then(res => {
-        this.brandList = res
-      })
+      SelectList().then((res) => {
+        this.brandList = res;
+      });
     },
     // 获取品类列表
     fetchCategoryList() {
       const params = {
-        categoryCode: '',
-        categoryName: ''
-      }
-      C_list(params).then(res => {
-        this.categoryList = res.data
-      })
+        categoryCode: "",
+        categoryName: "",
+      };
+      C_list(params).then((res) => {
+        this.categoryList = res.data;
+      });
     },
     // 图片上传
     uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
+      console.log("uploadFile:" + file.file.name);
       // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.addInfo.productPicture = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-      })
+      this.getBase64(file.file).then((resBase64) => {
+        this.addInfo.productPicture =
+          "data:image/png;base64," + resBase64.split(",")[1]; // 直接拿到base64信息
+      });
     },
     // 上传前判断文件格式及大小
     beforeAvatarUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      let res = true;
+      console.log(file.size);
+      const isLt2M = file.size / 1024 < 200;
       if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        res = false;
       }
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
+        this.$message.error("上传图片大小不能超过 200KB!");
+        res = false;
       }
-      return res
+      return res;
     },
     // 上传成功后回显
     handleAvatarSuccess(response, file) {
-      console.log('handleSuccess')
+      console.log("handleSuccess");
       // const base_url = process.env.BASE_API + '/static/'
       // if (response.code === 200) {
       //   this.photo = base_url + response.data
@@ -298,92 +441,109 @@
     },
     getBase64(file) {
       return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
+        const reader = new FileReader();
+        let fileResult = "";
+        reader.readAsDataURL(file);
         // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
+        reader.onload = function () {
+          fileResult = reader.result;
+        };
         // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
+        reader.onerror = function (error) {
+          reject(error);
+        };
         // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+        reader.onloadend = function () {
+          resolve(fileResult);
+        };
+      });
     },
     // 获取品类参数列表
     fetchParams(categoryId) {
       if (categoryId) {
-        C_paramsList(categoryId).then(res => {
+        C_paramsList(categoryId).then((res) => {
           if (res.code === 200) {
             if (res.data.length > 0) {
-              this.paramValueList = res.data.map(item => {
-                const value = this.addInfo.paramValueList.filter(param => param.paramId === item.id)
-                const paramValue = value.length > 0 ? value[0].paramValue : ''
-                return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: paramValue }
-              })
+              this.paramValueList = res.data.map((item) => {
+                const value = this.addInfo.paramValueList.filter(
+                  (param) => param.paramId === item.id
+                );
+                const paramValue = value.length > 0 ? value[0].paramValue : "";
+                return {
+                  paramId: item.id,
+                  paramName: item.paramName,
+                  paramOrder: item.paramOrder,
+                  paramRequire: item.paramRequire,
+                  paramValue: paramValue,
+                };
+              });
+            } else {
+              this.paramValueList = [];
             }
           }
-        })
+        });
       }
     },
     // 重置表单
     resetForm() {
       this.addInfo = {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productPicture: '',
-        paramValueList: []
-      }
-      this.paramValueList = []
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productPicture: "",
+        paramValueList: [],
+      };
+      this.paramValueList = [];
     },
     close() {
-      this.dialogStatus = false
+      this.dialogStatus = false;
     },
     // 新增
     save() {
-      this.$refs['dataForm'].validate((valid) => {
-        const index = this.addInfo.productPicture.indexOf(this.imageUrl)
-        if (index > -1) {
-          this.addInfo.productPicture = this.addInfo.productPicture.substring(this.imageUrl.length)
-        }
-        this.addInfo.paramValueList = this.paramValueList.map(item => {
-          return {
-            paramId: item.paramId,
-            paramName: item.paramName,
-            paramValue: item.paramValue
+      this.$refs["dataForm"].validate((valid) => {
+        console.log(valid, "验证结果");
+        if (valid) {
+          const index = this.addInfo.productPicture.indexOf(this.imageUrl);
+          if (index > -1) {
+            this.addInfo.productPicture = this.addInfo.productPicture.substring(
+              this.imageUrl.length
+            );
           }
-        })
-        if (this.title === '新增产品') {
-          add(this.addInfo).then(res => {
-            Message.success('保存成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          this.addInfo.paramValueList = this.paramValueList.map((item) => {
+            return {
+              paramId: item.paramId,
+              paramName: item.paramName,
+              paramValue: item.paramValue,
+            };
+          });
+          if (this.title === "新增产品") {
+            add(this.addInfo).then((res) => {
+              Message.success("保存成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          } else {
+            update(this.addInfo).then((res) => {
+              Message.success("更新成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          }
         } else {
-          update(this.addInfo).then(res => {
-            Message.success('更新成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          Message.error("请先完整填写产品信息");
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -404,7 +564,7 @@
     padding: 10px 20px;
     display: flex;
     .inputContent {
-      flex:1;
+      flex: 1;
       margin-right: 30px;
     }
     .imageContent {
@@ -413,7 +573,7 @@
   }
 
   .Dialog-desc {
-    width:100%;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -489,7 +649,6 @@
 }
 </style>
 <style>
-
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -499,6 +658,6 @@
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 </style>
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index d2a221e..b14957b 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -1,6 +1,6 @@
 
 import {export_json_to_excel} from '../Export2Excel'
-const outToExcel = (tableAry) => {
+const outToExcel = (tableAry,filename = '') => {
     console.log(tableAry, '全部数据')
     const header = Object.keys(tableAry[0])
     const data = tableAry.map((user, index) => {
@@ -19,7 +19,8 @@
     // //把定义好的header和data放进export_json_to_excel的函数里作为参数
     export_json_to_excel({
       header,
-      data
+      data,
+      filename
     })
 }
 

diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index a449c8b..af487f7 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,28 +1,52 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
+  <el-dialog
+    :title="title"
+    width="1200px"
+    :visible.sync="dialogStatus"
+    append-to-body
+    @close="close"
+  >
     <div class="productAddDialog">
-      <div class="Dialog-title">
-        基本信息
-      </div>
+      <div class="Dialog-title">基本信息</div>
       <div class="Dialog-input">
-        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="addInfo"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品型号" prop="productCode">
-                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品名称" prop="productName">
-                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productName"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品品牌" prop="brandId">
-                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.brandId"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.id"
@@ -34,7 +58,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品品类" prop="categoryId">
-                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.categoryId"
+                  clearable
+                  placeholder="请输入产品品类"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -48,54 +77,78 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品版本" prop="productEdition">
-                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productEdition"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="国际69码" prop="internationalCode">
-                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.internationalCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="包装尺寸" prop="productPackageSize">
-                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productPackageSize"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品颜色" prop="productColor">
-                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productColor"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品状态" prop="productStatus">
-                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productStatus"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品材质" prop="productMaterialQuality">
-                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productMaterialQuality"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品重量" prop="productWeight">
-                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productWeight"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否为IOT产品" prop="productNetworkMode">
                 <el-radio-group v-model="addInfo.productNetworkMode">
-                  <el-radio label="1">
-                    是
-                  </el-radio>
-                  <el-radio label="0">
-                    否
-                  </el-radio>
+                  <el-radio label="1"> 是 </el-radio>
+                  <el-radio label="0"> 否 </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -112,109 +165,195 @@
             action="string"
             accept=".jpg,.jpeg,.png"
           >
-            <img v-if="addInfo.productPicture" :src="addInfo.productPicture" class="avatar">
+            <img
+              v-if="addInfo.productPicture"
+              :src="addInfo.productPicture"
+              class="avatar"
+            />
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </div>
       </div>
-      <div class="Dialog-desc">
-        产品参数
-      </div>
+      <div class="Dialog-desc">产品参数</div>
       <div class="parameters">
-        <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="paramsForm"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col v-for="param of paramValueList" :span="8">
-              <div style="width: 100%; display: flex;align-items: center; margin-top:10px">
-                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              <div
+                style="
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  margin-top: 10px;
+                "
+              >
+                <span style="margin-right: 10px"
+                  ><red-star
+                    v-show="param.paramRequire == 1"
+                    style="margin-right: 4px"
+                  />{{ param.paramName }}</span
+                >
+                <el-input
+                  v-model.trim="param.paramValue"
+                  type="text"
+                  placeholder=""
+                  style="flex: 1"
+                />
               </div>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { SelectList } from '@/api/product/brand'
-import { C_list, C_paramsList } from '@/api/product/category'
-import { add, productDetail, update } from '@/api/product/product'
-import RedStar from '@/components/mycomponent/redStar'
+import { getToken } from "@/utils/auth";
+import { Message } from "element-ui";
+import { SelectList } from "@/api/product/brand";
+import { C_list, C_paramsList } from "@/api/product/category";
+import { add, productDetail, update } from "@/api/product/product";
+import RedStar from "@/components/mycomponent/redStar";
 
 export default {
   components: { RedStar },
   props: {
     title: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       dialogStatus: false,
       myHeaders: { token: getToken() },
-      imageUrl: this.baseConfig.baseUrl + '/static/',
+      imageUrl: this.baseConfig.baseUrl + "/static/",
       categoryList: [],
       brandList: [],
-      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require("@/assets/global_images/photo.png"), // 默认图片路径
       rules: {
-        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
-        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
-        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
-        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
-        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
-        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
-        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
-        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
-        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
-        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
-        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+        productCode: [
+          {
+            required: true,
+            message: "产品型号不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: "产品名称不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        brandId: [
+          {
+            required: true,
+            message: "产品品牌不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        categoryId: [
+          {
+            required: true,
+            message: "产品品类不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productEdition: [
+          {
+            required: true,
+            message: "产品版本不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        internationalCode: [
+          {
+            required: true,
+            message: "国际69码不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productColor: [
+          {
+            required: true,
+            message: "产品颜色不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productPackageSize: [
+          {
+            required: true,
+            message: "包装尺寸不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productStatus: [
+          {
+            required: true,
+            message: "产品状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productMaterialQuality: [
+          {
+            required: true,
+            message: "产品材质不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productWeight: [
+          {
+            required: true,
+            message: "产品重量不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       addInfo: {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productNetworkMode: '1',
-        productPicture: ''
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productNetworkMode: "1",
+        productPicture: "",
       },
       paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
-      ]
-    }
+      ],
+    };
   },
   watch: {
-    'addInfo.categoryId'(val) {
-      this.fetchParams(val)
-    }
+    "addInfo.categoryId"(val) {
+      this.fetchParams(val);
+    },
   },
   created() {
-    this.fetchBrandList()
-    this.fetchCategoryList()
+    this.fetchBrandList();
+    this.fetchCategoryList();
   },
   methods: {
     initDialog(type, row) {
-      if (type === 'edit') {
+      if (type === "edit") {
         if (row.id) {
-          productDetail({ id: row.id }).then(data => {
+          productDetail({ id: row.id }).then((data) => {
             this.addInfo = {
               id: data.id,
               productCode: data.productCode,
@@ -229,66 +368,70 @@
               productColor: data.productColor,
               productMaterialQuality: data.productMaterialQuality,
               productNetworkMode: data.productNetworkMode,
-              productPicture: data.productPicture ? this.imageUrl + data.productPicture : '',
-              paramValueList: data.paramValues
-            }
+              productPicture: data.productPicture
+                ? this.imageUrl + data.productPicture
+                : "",
+              paramValueList: data.paramValues,
+            };
+            console.log(this.addInfo, "this.addInfo");
             // 如果有类型，去获取类型的参数
             // if (this.addInfo.categoryId) {
             //   this.fetchParams(this.addInfo.categoryId)
             // }
-          })
+          });
         }
       } else {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.resetForm()
+          this.$refs["dataForm"].clearValidate();
+        });
+        this.resetForm();
       }
-      this.dialogStatus = true
+      this.dialogStatus = true;
     },
     // 获取品牌列表
     fetchBrandList() {
-      SelectList().then(res => {
-        this.brandList = res
-      })
+      SelectList().then((res) => {
+        this.brandList = res;
+      });
     },
     // 获取品类列表
     fetchCategoryList() {
       const params = {
-        categoryCode: '',
-        categoryName: ''
-      }
-      C_list(params).then(res => {
-        this.categoryList = res.data
-      })
+        categoryCode: "",
+        categoryName: "",
+      };
+      C_list(params).then((res) => {
+        this.categoryList = res.data;
+      });
     },
     // 图片上传
     uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
+      console.log("uploadFile:" + file.file.name);
       // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.addInfo.productPicture = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-      })
+      this.getBase64(file.file).then((resBase64) => {
+        this.addInfo.productPicture =
+          "data:image/png;base64," + resBase64.split(",")[1]; // 直接拿到base64信息
+      });
     },
     // 上传前判断文件格式及大小
     beforeAvatarUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      let res = true;
+      console.log(file.size);
+      const isLt2M = file.size / 1024 < 200;
       if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        res = false;
       }
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
+        this.$message.error("上传图片大小不能超过 200KB!");
+        res = false;
       }
-      return res
+      return res;
     },
     // 上传成功后回显
     handleAvatarSuccess(response, file) {
-      console.log('handleSuccess')
+      console.log("handleSuccess");
       // const base_url = process.env.BASE_API + '/static/'
       // if (response.code === 200) {
       //   this.photo = base_url + response.data
@@ -298,92 +441,109 @@
     },
     getBase64(file) {
       return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
+        const reader = new FileReader();
+        let fileResult = "";
+        reader.readAsDataURL(file);
         // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
+        reader.onload = function () {
+          fileResult = reader.result;
+        };
         // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
+        reader.onerror = function (error) {
+          reject(error);
+        };
         // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+        reader.onloadend = function () {
+          resolve(fileResult);
+        };
+      });
     },
     // 获取品类参数列表
     fetchParams(categoryId) {
       if (categoryId) {
-        C_paramsList(categoryId).then(res => {
+        C_paramsList(categoryId).then((res) => {
           if (res.code === 200) {
             if (res.data.length > 0) {
-              this.paramValueList = res.data.map(item => {
-                const value = this.addInfo.paramValueList.filter(param => param.paramId === item.id)
-                const paramValue = value.length > 0 ? value[0].paramValue : ''
-                return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: paramValue }
-              })
+              this.paramValueList = res.data.map((item) => {
+                const value = this.addInfo.paramValueList.filter(
+                  (param) => param.paramId === item.id
+                );
+                const paramValue = value.length > 0 ? value[0].paramValue : "";
+                return {
+                  paramId: item.id,
+                  paramName: item.paramName,
+                  paramOrder: item.paramOrder,
+                  paramRequire: item.paramRequire,
+                  paramValue: paramValue,
+                };
+              });
+            } else {
+              this.paramValueList = [];
             }
           }
-        })
+        });
       }
     },
     // 重置表单
     resetForm() {
       this.addInfo = {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productPicture: '',
-        paramValueList: []
-      }
-      this.paramValueList = []
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productPicture: "",
+        paramValueList: [],
+      };
+      this.paramValueList = [];
     },
     close() {
-      this.dialogStatus = false
+      this.dialogStatus = false;
     },
     // 新增
     save() {
-      this.$refs['dataForm'].validate((valid) => {
-        const index = this.addInfo.productPicture.indexOf(this.imageUrl)
-        if (index > -1) {
-          this.addInfo.productPicture = this.addInfo.productPicture.substring(this.imageUrl.length)
-        }
-        this.addInfo.paramValueList = this.paramValueList.map(item => {
-          return {
-            paramId: item.paramId,
-            paramName: item.paramName,
-            paramValue: item.paramValue
+      this.$refs["dataForm"].validate((valid) => {
+        console.log(valid, "验证结果");
+        if (valid) {
+          const index = this.addInfo.productPicture.indexOf(this.imageUrl);
+          if (index > -1) {
+            this.addInfo.productPicture = this.addInfo.productPicture.substring(
+              this.imageUrl.length
+            );
           }
-        })
-        if (this.title === '新增产品') {
-          add(this.addInfo).then(res => {
-            Message.success('保存成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          this.addInfo.paramValueList = this.paramValueList.map((item) => {
+            return {
+              paramId: item.paramId,
+              paramName: item.paramName,
+              paramValue: item.paramValue,
+            };
+          });
+          if (this.title === "新增产品") {
+            add(this.addInfo).then((res) => {
+              Message.success("保存成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          } else {
+            update(this.addInfo).then((res) => {
+              Message.success("更新成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          }
         } else {
-          update(this.addInfo).then(res => {
-            Message.success('更新成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          Message.error("请先完整填写产品信息");
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -404,7 +564,7 @@
     padding: 10px 20px;
     display: flex;
     .inputContent {
-      flex:1;
+      flex: 1;
       margin-right: 30px;
     }
     .imageContent {
@@ -413,7 +573,7 @@
   }
 
   .Dialog-desc {
-    width:100%;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -489,7 +649,6 @@
 }
 </style>
 <style>
-
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -499,6 +658,6 @@
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 </style>
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index d2a221e..b14957b 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -1,6 +1,6 @@
 
 import {export_json_to_excel} from '../Export2Excel'
-const outToExcel = (tableAry) => {
+const outToExcel = (tableAry,filename = '') => {
     console.log(tableAry, '全部数据')
     const header = Object.keys(tableAry[0])
     const data = tableAry.map((user, index) => {
@@ -19,7 +19,8 @@
     // //把定义好的header和data放进export_json_to_excel的函数里作为参数
     export_json_to_excel({
       header,
-      data
+      data,
+      filename
     })
 }
 
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 3956bd0..6638e3b 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -13,9 +13,9 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="search(10, 1)">查询</el-button>
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">重置</el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="reset">导出</el-button>
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
     <el-table
@@ -63,7 +63,7 @@
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '@/utils/myUtils/mixins/listPage'
 import { listPage } from '@/api/distributor/distributor'
-
+import { outToExcel } from '@/utils/myUtils/exportToExcel'
 export default { // 加入分页逻辑
   components: {
     DistributorDetail,
@@ -93,15 +93,51 @@
         this.tableData = res
       })
     },
+    search(limit, offset){
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * limit)
+        })
+        this.tableData = res
+      })
+    },
     reset() {
       this.selectInfo = {
         distributorCode: '',
         distributorName: ''
       }
+      this.search(10, 1)
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    }
+    },
+    exportToExcel() {
+      console.log('导出')
+      // 全屏加载动画;
+      const loading = this.$loading({
+        lock: true,
+        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",
+          });
+        });
+    },
   }
 }
 </script>

diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index a449c8b..af487f7 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,28 +1,52 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
+  <el-dialog
+    :title="title"
+    width="1200px"
+    :visible.sync="dialogStatus"
+    append-to-body
+    @close="close"
+  >
     <div class="productAddDialog">
-      <div class="Dialog-title">
-        基本信息
-      </div>
+      <div class="Dialog-title">基本信息</div>
       <div class="Dialog-input">
-        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="addInfo"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品型号" prop="productCode">
-                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品名称" prop="productName">
-                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productName"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品品牌" prop="brandId">
-                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.brandId"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.id"
@@ -34,7 +58,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品品类" prop="categoryId">
-                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.categoryId"
+                  clearable
+                  placeholder="请输入产品品类"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -48,54 +77,78 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品版本" prop="productEdition">
-                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productEdition"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="国际69码" prop="internationalCode">
-                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.internationalCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="包装尺寸" prop="productPackageSize">
-                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productPackageSize"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品颜色" prop="productColor">
-                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productColor"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品状态" prop="productStatus">
-                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productStatus"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品材质" prop="productMaterialQuality">
-                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productMaterialQuality"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品重量" prop="productWeight">
-                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productWeight"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否为IOT产品" prop="productNetworkMode">
                 <el-radio-group v-model="addInfo.productNetworkMode">
-                  <el-radio label="1">
-                    是
-                  </el-radio>
-                  <el-radio label="0">
-                    否
-                  </el-radio>
+                  <el-radio label="1"> 是 </el-radio>
+                  <el-radio label="0"> 否 </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -112,109 +165,195 @@
             action="string"
             accept=".jpg,.jpeg,.png"
           >
-            <img v-if="addInfo.productPicture" :src="addInfo.productPicture" class="avatar">
+            <img
+              v-if="addInfo.productPicture"
+              :src="addInfo.productPicture"
+              class="avatar"
+            />
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </div>
       </div>
-      <div class="Dialog-desc">
-        产品参数
-      </div>
+      <div class="Dialog-desc">产品参数</div>
       <div class="parameters">
-        <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="paramsForm"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col v-for="param of paramValueList" :span="8">
-              <div style="width: 100%; display: flex;align-items: center; margin-top:10px">
-                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              <div
+                style="
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  margin-top: 10px;
+                "
+              >
+                <span style="margin-right: 10px"
+                  ><red-star
+                    v-show="param.paramRequire == 1"
+                    style="margin-right: 4px"
+                  />{{ param.paramName }}</span
+                >
+                <el-input
+                  v-model.trim="param.paramValue"
+                  type="text"
+                  placeholder=""
+                  style="flex: 1"
+                />
               </div>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { SelectList } from '@/api/product/brand'
-import { C_list, C_paramsList } from '@/api/product/category'
-import { add, productDetail, update } from '@/api/product/product'
-import RedStar from '@/components/mycomponent/redStar'
+import { getToken } from "@/utils/auth";
+import { Message } from "element-ui";
+import { SelectList } from "@/api/product/brand";
+import { C_list, C_paramsList } from "@/api/product/category";
+import { add, productDetail, update } from "@/api/product/product";
+import RedStar from "@/components/mycomponent/redStar";
 
 export default {
   components: { RedStar },
   props: {
     title: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       dialogStatus: false,
       myHeaders: { token: getToken() },
-      imageUrl: this.baseConfig.baseUrl + '/static/',
+      imageUrl: this.baseConfig.baseUrl + "/static/",
       categoryList: [],
       brandList: [],
-      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require("@/assets/global_images/photo.png"), // 默认图片路径
       rules: {
-        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
-        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
-        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
-        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
-        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
-        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
-        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
-        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
-        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
-        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
-        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+        productCode: [
+          {
+            required: true,
+            message: "产品型号不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: "产品名称不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        brandId: [
+          {
+            required: true,
+            message: "产品品牌不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        categoryId: [
+          {
+            required: true,
+            message: "产品品类不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productEdition: [
+          {
+            required: true,
+            message: "产品版本不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        internationalCode: [
+          {
+            required: true,
+            message: "国际69码不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productColor: [
+          {
+            required: true,
+            message: "产品颜色不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productPackageSize: [
+          {
+            required: true,
+            message: "包装尺寸不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productStatus: [
+          {
+            required: true,
+            message: "产品状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productMaterialQuality: [
+          {
+            required: true,
+            message: "产品材质不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productWeight: [
+          {
+            required: true,
+            message: "产品重量不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       addInfo: {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productNetworkMode: '1',
-        productPicture: ''
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productNetworkMode: "1",
+        productPicture: "",
       },
       paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
-      ]
-    }
+      ],
+    };
   },
   watch: {
-    'addInfo.categoryId'(val) {
-      this.fetchParams(val)
-    }
+    "addInfo.categoryId"(val) {
+      this.fetchParams(val);
+    },
   },
   created() {
-    this.fetchBrandList()
-    this.fetchCategoryList()
+    this.fetchBrandList();
+    this.fetchCategoryList();
   },
   methods: {
     initDialog(type, row) {
-      if (type === 'edit') {
+      if (type === "edit") {
         if (row.id) {
-          productDetail({ id: row.id }).then(data => {
+          productDetail({ id: row.id }).then((data) => {
             this.addInfo = {
               id: data.id,
               productCode: data.productCode,
@@ -229,66 +368,70 @@
               productColor: data.productColor,
               productMaterialQuality: data.productMaterialQuality,
               productNetworkMode: data.productNetworkMode,
-              productPicture: data.productPicture ? this.imageUrl + data.productPicture : '',
-              paramValueList: data.paramValues
-            }
+              productPicture: data.productPicture
+                ? this.imageUrl + data.productPicture
+                : "",
+              paramValueList: data.paramValues,
+            };
+            console.log(this.addInfo, "this.addInfo");
             // 如果有类型，去获取类型的参数
             // if (this.addInfo.categoryId) {
             //   this.fetchParams(this.addInfo.categoryId)
             // }
-          })
+          });
         }
       } else {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.resetForm()
+          this.$refs["dataForm"].clearValidate();
+        });
+        this.resetForm();
       }
-      this.dialogStatus = true
+      this.dialogStatus = true;
     },
     // 获取品牌列表
     fetchBrandList() {
-      SelectList().then(res => {
-        this.brandList = res
-      })
+      SelectList().then((res) => {
+        this.brandList = res;
+      });
     },
     // 获取品类列表
     fetchCategoryList() {
       const params = {
-        categoryCode: '',
-        categoryName: ''
-      }
-      C_list(params).then(res => {
-        this.categoryList = res.data
-      })
+        categoryCode: "",
+        categoryName: "",
+      };
+      C_list(params).then((res) => {
+        this.categoryList = res.data;
+      });
     },
     // 图片上传
     uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
+      console.log("uploadFile:" + file.file.name);
       // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.addInfo.productPicture = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-      })
+      this.getBase64(file.file).then((resBase64) => {
+        this.addInfo.productPicture =
+          "data:image/png;base64," + resBase64.split(",")[1]; // 直接拿到base64信息
+      });
     },
     // 上传前判断文件格式及大小
     beforeAvatarUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      let res = true;
+      console.log(file.size);
+      const isLt2M = file.size / 1024 < 200;
       if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        res = false;
       }
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
+        this.$message.error("上传图片大小不能超过 200KB!");
+        res = false;
       }
-      return res
+      return res;
     },
     // 上传成功后回显
     handleAvatarSuccess(response, file) {
-      console.log('handleSuccess')
+      console.log("handleSuccess");
       // const base_url = process.env.BASE_API + '/static/'
       // if (response.code === 200) {
       //   this.photo = base_url + response.data
@@ -298,92 +441,109 @@
     },
     getBase64(file) {
       return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
+        const reader = new FileReader();
+        let fileResult = "";
+        reader.readAsDataURL(file);
         // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
+        reader.onload = function () {
+          fileResult = reader.result;
+        };
         // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
+        reader.onerror = function (error) {
+          reject(error);
+        };
         // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+        reader.onloadend = function () {
+          resolve(fileResult);
+        };
+      });
     },
     // 获取品类参数列表
     fetchParams(categoryId) {
       if (categoryId) {
-        C_paramsList(categoryId).then(res => {
+        C_paramsList(categoryId).then((res) => {
           if (res.code === 200) {
             if (res.data.length > 0) {
-              this.paramValueList = res.data.map(item => {
-                const value = this.addInfo.paramValueList.filter(param => param.paramId === item.id)
-                const paramValue = value.length > 0 ? value[0].paramValue : ''
-                return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: paramValue }
-              })
+              this.paramValueList = res.data.map((item) => {
+                const value = this.addInfo.paramValueList.filter(
+                  (param) => param.paramId === item.id
+                );
+                const paramValue = value.length > 0 ? value[0].paramValue : "";
+                return {
+                  paramId: item.id,
+                  paramName: item.paramName,
+                  paramOrder: item.paramOrder,
+                  paramRequire: item.paramRequire,
+                  paramValue: paramValue,
+                };
+              });
+            } else {
+              this.paramValueList = [];
             }
           }
-        })
+        });
       }
     },
     // 重置表单
     resetForm() {
       this.addInfo = {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productPicture: '',
-        paramValueList: []
-      }
-      this.paramValueList = []
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productPicture: "",
+        paramValueList: [],
+      };
+      this.paramValueList = [];
     },
     close() {
-      this.dialogStatus = false
+      this.dialogStatus = false;
     },
     // 新增
     save() {
-      this.$refs['dataForm'].validate((valid) => {
-        const index = this.addInfo.productPicture.indexOf(this.imageUrl)
-        if (index > -1) {
-          this.addInfo.productPicture = this.addInfo.productPicture.substring(this.imageUrl.length)
-        }
-        this.addInfo.paramValueList = this.paramValueList.map(item => {
-          return {
-            paramId: item.paramId,
-            paramName: item.paramName,
-            paramValue: item.paramValue
+      this.$refs["dataForm"].validate((valid) => {
+        console.log(valid, "验证结果");
+        if (valid) {
+          const index = this.addInfo.productPicture.indexOf(this.imageUrl);
+          if (index > -1) {
+            this.addInfo.productPicture = this.addInfo.productPicture.substring(
+              this.imageUrl.length
+            );
           }
-        })
-        if (this.title === '新增产品') {
-          add(this.addInfo).then(res => {
-            Message.success('保存成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          this.addInfo.paramValueList = this.paramValueList.map((item) => {
+            return {
+              paramId: item.paramId,
+              paramName: item.paramName,
+              paramValue: item.paramValue,
+            };
+          });
+          if (this.title === "新增产品") {
+            add(this.addInfo).then((res) => {
+              Message.success("保存成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          } else {
+            update(this.addInfo).then((res) => {
+              Message.success("更新成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          }
         } else {
-          update(this.addInfo).then(res => {
-            Message.success('更新成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          Message.error("请先完整填写产品信息");
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -404,7 +564,7 @@
     padding: 10px 20px;
     display: flex;
     .inputContent {
-      flex:1;
+      flex: 1;
       margin-right: 30px;
     }
     .imageContent {
@@ -413,7 +573,7 @@
   }
 
   .Dialog-desc {
-    width:100%;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -489,7 +649,6 @@
 }
 </style>
 <style>
-
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -499,6 +658,6 @@
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 </style>
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index d2a221e..b14957b 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -1,6 +1,6 @@
 
 import {export_json_to_excel} from '../Export2Excel'
-const outToExcel = (tableAry) => {
+const outToExcel = (tableAry,filename = '') => {
     console.log(tableAry, '全部数据')
     const header = Object.keys(tableAry[0])
     const data = tableAry.map((user, index) => {
@@ -19,7 +19,8 @@
     // //把定义好的header和data放进export_json_to_excel的函数里作为参数
     export_json_to_excel({
       header,
-      data
+      data,
+      filename
     })
 }
 
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 3956bd0..6638e3b 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -13,9 +13,9 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="search(10, 1)">查询</el-button>
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">重置</el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="reset">导出</el-button>
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
     <el-table
@@ -63,7 +63,7 @@
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '@/utils/myUtils/mixins/listPage'
 import { listPage } from '@/api/distributor/distributor'
-
+import { outToExcel } from '@/utils/myUtils/exportToExcel'
 export default { // 加入分页逻辑
   components: {
     DistributorDetail,
@@ -93,15 +93,51 @@
         this.tableData = res
       })
     },
+    search(limit, offset){
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * limit)
+        })
+        this.tableData = res
+      })
+    },
     reset() {
       this.selectInfo = {
         distributorCode: '',
         distributorName: ''
       }
+      this.search(10, 1)
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    }
+    },
+    exportToExcel() {
+      console.log('导出')
+      // 全屏加载动画;
+      const loading = this.$loading({
+        lock: true,
+        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",
+          });
+        });
+    },
   }
 }
 </script>
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 0cf79bc..a84eeeb 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -334,9 +334,9 @@
           console.log(ids);
           batchDelete({ ids: ids }).then((res) => {
             this.$message({
-            message: "删除成功",
-            type: "success",
-          });
+              message: "删除成功",
+              type: "success",
+            });
             this.refresh();
           });
         });
@@ -365,6 +365,23 @@
     exportToExcel() {
       listPage("offset=1", {}).then((res) => {
         console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        res.rows = res.rows.map((item) => {
+          return {
+            产品名称: item.productName,
+            产品品牌: item.brandName,
+            产品型号: item.productCode,
+            产品品类: item.categoryStr,
+            产品颜色: item.productColor,
+            产品材质: item.productMaterialQuality,
+            产品状态: item.productStatus,
+            产品版本: item.productEdition,
+            规格: item.productPackageSize,
+            重量: item.productWeight,
+            国际69码: item.internationalCode,
+            更新时间: item.updateTime,
+          };
+        });
         this.ExportTable = res.rows;
         const header = Object.keys(res.rows[0]);
         console.log(header);
@@ -383,6 +400,7 @@
         export_json_to_excel({
           header,
           data,
+          filename: "产品列表",
         });
       });
     },

diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index a449c8b..af487f7 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,28 +1,52 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
+  <el-dialog
+    :title="title"
+    width="1200px"
+    :visible.sync="dialogStatus"
+    append-to-body
+    @close="close"
+  >
     <div class="productAddDialog">
-      <div class="Dialog-title">
-        基本信息
-      </div>
+      <div class="Dialog-title">基本信息</div>
       <div class="Dialog-input">
-        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="addInfo"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品型号" prop="productCode">
-                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品名称" prop="productName">
-                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productName"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品品牌" prop="brandId">
-                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.brandId"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.id"
@@ -34,7 +58,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品品类" prop="categoryId">
-                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.categoryId"
+                  clearable
+                  placeholder="请输入产品品类"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -48,54 +77,78 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品版本" prop="productEdition">
-                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productEdition"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="国际69码" prop="internationalCode">
-                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.internationalCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="包装尺寸" prop="productPackageSize">
-                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productPackageSize"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品颜色" prop="productColor">
-                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productColor"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品状态" prop="productStatus">
-                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productStatus"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品材质" prop="productMaterialQuality">
-                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productMaterialQuality"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品重量" prop="productWeight">
-                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productWeight"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否为IOT产品" prop="productNetworkMode">
                 <el-radio-group v-model="addInfo.productNetworkMode">
-                  <el-radio label="1">
-                    是
-                  </el-radio>
-                  <el-radio label="0">
-                    否
-                  </el-radio>
+                  <el-radio label="1"> 是 </el-radio>
+                  <el-radio label="0"> 否 </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -112,109 +165,195 @@
             action="string"
             accept=".jpg,.jpeg,.png"
           >
-            <img v-if="addInfo.productPicture" :src="addInfo.productPicture" class="avatar">
+            <img
+              v-if="addInfo.productPicture"
+              :src="addInfo.productPicture"
+              class="avatar"
+            />
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </div>
       </div>
-      <div class="Dialog-desc">
-        产品参数
-      </div>
+      <div class="Dialog-desc">产品参数</div>
       <div class="parameters">
-        <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="paramsForm"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col v-for="param of paramValueList" :span="8">
-              <div style="width: 100%; display: flex;align-items: center; margin-top:10px">
-                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              <div
+                style="
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  margin-top: 10px;
+                "
+              >
+                <span style="margin-right: 10px"
+                  ><red-star
+                    v-show="param.paramRequire == 1"
+                    style="margin-right: 4px"
+                  />{{ param.paramName }}</span
+                >
+                <el-input
+                  v-model.trim="param.paramValue"
+                  type="text"
+                  placeholder=""
+                  style="flex: 1"
+                />
               </div>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { SelectList } from '@/api/product/brand'
-import { C_list, C_paramsList } from '@/api/product/category'
-import { add, productDetail, update } from '@/api/product/product'
-import RedStar from '@/components/mycomponent/redStar'
+import { getToken } from "@/utils/auth";
+import { Message } from "element-ui";
+import { SelectList } from "@/api/product/brand";
+import { C_list, C_paramsList } from "@/api/product/category";
+import { add, productDetail, update } from "@/api/product/product";
+import RedStar from "@/components/mycomponent/redStar";
 
 export default {
   components: { RedStar },
   props: {
     title: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       dialogStatus: false,
       myHeaders: { token: getToken() },
-      imageUrl: this.baseConfig.baseUrl + '/static/',
+      imageUrl: this.baseConfig.baseUrl + "/static/",
       categoryList: [],
       brandList: [],
-      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require("@/assets/global_images/photo.png"), // 默认图片路径
       rules: {
-        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
-        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
-        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
-        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
-        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
-        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
-        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
-        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
-        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
-        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
-        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+        productCode: [
+          {
+            required: true,
+            message: "产品型号不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: "产品名称不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        brandId: [
+          {
+            required: true,
+            message: "产品品牌不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        categoryId: [
+          {
+            required: true,
+            message: "产品品类不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productEdition: [
+          {
+            required: true,
+            message: "产品版本不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        internationalCode: [
+          {
+            required: true,
+            message: "国际69码不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productColor: [
+          {
+            required: true,
+            message: "产品颜色不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productPackageSize: [
+          {
+            required: true,
+            message: "包装尺寸不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productStatus: [
+          {
+            required: true,
+            message: "产品状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productMaterialQuality: [
+          {
+            required: true,
+            message: "产品材质不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productWeight: [
+          {
+            required: true,
+            message: "产品重量不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       addInfo: {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productNetworkMode: '1',
-        productPicture: ''
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productNetworkMode: "1",
+        productPicture: "",
       },
       paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
-      ]
-    }
+      ],
+    };
   },
   watch: {
-    'addInfo.categoryId'(val) {
-      this.fetchParams(val)
-    }
+    "addInfo.categoryId"(val) {
+      this.fetchParams(val);
+    },
   },
   created() {
-    this.fetchBrandList()
-    this.fetchCategoryList()
+    this.fetchBrandList();
+    this.fetchCategoryList();
   },
   methods: {
     initDialog(type, row) {
-      if (type === 'edit') {
+      if (type === "edit") {
         if (row.id) {
-          productDetail({ id: row.id }).then(data => {
+          productDetail({ id: row.id }).then((data) => {
             this.addInfo = {
               id: data.id,
               productCode: data.productCode,
@@ -229,66 +368,70 @@
               productColor: data.productColor,
               productMaterialQuality: data.productMaterialQuality,
               productNetworkMode: data.productNetworkMode,
-              productPicture: data.productPicture ? this.imageUrl + data.productPicture : '',
-              paramValueList: data.paramValues
-            }
+              productPicture: data.productPicture
+                ? this.imageUrl + data.productPicture
+                : "",
+              paramValueList: data.paramValues,
+            };
+            console.log(this.addInfo, "this.addInfo");
             // 如果有类型，去获取类型的参数
             // if (this.addInfo.categoryId) {
             //   this.fetchParams(this.addInfo.categoryId)
             // }
-          })
+          });
         }
       } else {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.resetForm()
+          this.$refs["dataForm"].clearValidate();
+        });
+        this.resetForm();
       }
-      this.dialogStatus = true
+      this.dialogStatus = true;
     },
     // 获取品牌列表
     fetchBrandList() {
-      SelectList().then(res => {
-        this.brandList = res
-      })
+      SelectList().then((res) => {
+        this.brandList = res;
+      });
     },
     // 获取品类列表
     fetchCategoryList() {
       const params = {
-        categoryCode: '',
-        categoryName: ''
-      }
-      C_list(params).then(res => {
-        this.categoryList = res.data
-      })
+        categoryCode: "",
+        categoryName: "",
+      };
+      C_list(params).then((res) => {
+        this.categoryList = res.data;
+      });
     },
     // 图片上传
     uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
+      console.log("uploadFile:" + file.file.name);
       // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.addInfo.productPicture = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-      })
+      this.getBase64(file.file).then((resBase64) => {
+        this.addInfo.productPicture =
+          "data:image/png;base64," + resBase64.split(",")[1]; // 直接拿到base64信息
+      });
     },
     // 上传前判断文件格式及大小
     beforeAvatarUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      let res = true;
+      console.log(file.size);
+      const isLt2M = file.size / 1024 < 200;
       if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        res = false;
       }
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
+        this.$message.error("上传图片大小不能超过 200KB!");
+        res = false;
       }
-      return res
+      return res;
     },
     // 上传成功后回显
     handleAvatarSuccess(response, file) {
-      console.log('handleSuccess')
+      console.log("handleSuccess");
       // const base_url = process.env.BASE_API + '/static/'
       // if (response.code === 200) {
       //   this.photo = base_url + response.data
@@ -298,92 +441,109 @@
     },
     getBase64(file) {
       return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
+        const reader = new FileReader();
+        let fileResult = "";
+        reader.readAsDataURL(file);
         // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
+        reader.onload = function () {
+          fileResult = reader.result;
+        };
         // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
+        reader.onerror = function (error) {
+          reject(error);
+        };
         // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+        reader.onloadend = function () {
+          resolve(fileResult);
+        };
+      });
     },
     // 获取品类参数列表
     fetchParams(categoryId) {
       if (categoryId) {
-        C_paramsList(categoryId).then(res => {
+        C_paramsList(categoryId).then((res) => {
           if (res.code === 200) {
             if (res.data.length > 0) {
-              this.paramValueList = res.data.map(item => {
-                const value = this.addInfo.paramValueList.filter(param => param.paramId === item.id)
-                const paramValue = value.length > 0 ? value[0].paramValue : ''
-                return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: paramValue }
-              })
+              this.paramValueList = res.data.map((item) => {
+                const value = this.addInfo.paramValueList.filter(
+                  (param) => param.paramId === item.id
+                );
+                const paramValue = value.length > 0 ? value[0].paramValue : "";
+                return {
+                  paramId: item.id,
+                  paramName: item.paramName,
+                  paramOrder: item.paramOrder,
+                  paramRequire: item.paramRequire,
+                  paramValue: paramValue,
+                };
+              });
+            } else {
+              this.paramValueList = [];
             }
           }
-        })
+        });
       }
     },
     // 重置表单
     resetForm() {
       this.addInfo = {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productPicture: '',
-        paramValueList: []
-      }
-      this.paramValueList = []
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productPicture: "",
+        paramValueList: [],
+      };
+      this.paramValueList = [];
     },
     close() {
-      this.dialogStatus = false
+      this.dialogStatus = false;
     },
     // 新增
     save() {
-      this.$refs['dataForm'].validate((valid) => {
-        const index = this.addInfo.productPicture.indexOf(this.imageUrl)
-        if (index > -1) {
-          this.addInfo.productPicture = this.addInfo.productPicture.substring(this.imageUrl.length)
-        }
-        this.addInfo.paramValueList = this.paramValueList.map(item => {
-          return {
-            paramId: item.paramId,
-            paramName: item.paramName,
-            paramValue: item.paramValue
+      this.$refs["dataForm"].validate((valid) => {
+        console.log(valid, "验证结果");
+        if (valid) {
+          const index = this.addInfo.productPicture.indexOf(this.imageUrl);
+          if (index > -1) {
+            this.addInfo.productPicture = this.addInfo.productPicture.substring(
+              this.imageUrl.length
+            );
           }
-        })
-        if (this.title === '新增产品') {
-          add(this.addInfo).then(res => {
-            Message.success('保存成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          this.addInfo.paramValueList = this.paramValueList.map((item) => {
+            return {
+              paramId: item.paramId,
+              paramName: item.paramName,
+              paramValue: item.paramValue,
+            };
+          });
+          if (this.title === "新增产品") {
+            add(this.addInfo).then((res) => {
+              Message.success("保存成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          } else {
+            update(this.addInfo).then((res) => {
+              Message.success("更新成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          }
         } else {
-          update(this.addInfo).then(res => {
-            Message.success('更新成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          Message.error("请先完整填写产品信息");
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -404,7 +564,7 @@
     padding: 10px 20px;
     display: flex;
     .inputContent {
-      flex:1;
+      flex: 1;
       margin-right: 30px;
     }
     .imageContent {
@@ -413,7 +573,7 @@
   }
 
   .Dialog-desc {
-    width:100%;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -489,7 +649,6 @@
 }
 </style>
 <style>
-
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -499,6 +658,6 @@
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 </style>
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index d2a221e..b14957b 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -1,6 +1,6 @@
 
 import {export_json_to_excel} from '../Export2Excel'
-const outToExcel = (tableAry) => {
+const outToExcel = (tableAry,filename = '') => {
     console.log(tableAry, '全部数据')
     const header = Object.keys(tableAry[0])
     const data = tableAry.map((user, index) => {
@@ -19,7 +19,8 @@
     // //把定义好的header和data放进export_json_to_excel的函数里作为参数
     export_json_to_excel({
       header,
-      data
+      data,
+      filename
     })
 }
 
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 3956bd0..6638e3b 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -13,9 +13,9 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="search(10, 1)">查询</el-button>
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">重置</el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="reset">导出</el-button>
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
     <el-table
@@ -63,7 +63,7 @@
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '@/utils/myUtils/mixins/listPage'
 import { listPage } from '@/api/distributor/distributor'
-
+import { outToExcel } from '@/utils/myUtils/exportToExcel'
 export default { // 加入分页逻辑
   components: {
     DistributorDetail,
@@ -93,15 +93,51 @@
         this.tableData = res
       })
     },
+    search(limit, offset){
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * limit)
+        })
+        this.tableData = res
+      })
+    },
     reset() {
       this.selectInfo = {
         distributorCode: '',
         distributorName: ''
       }
+      this.search(10, 1)
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    }
+    },
+    exportToExcel() {
+      console.log('导出')
+      // 全屏加载动画;
+      const loading = this.$loading({
+        lock: true,
+        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",
+          });
+        });
+    },
   }
 }
 </script>
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 0cf79bc..a84eeeb 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -334,9 +334,9 @@
           console.log(ids);
           batchDelete({ ids: ids }).then((res) => {
             this.$message({
-            message: "删除成功",
-            type: "success",
-          });
+              message: "删除成功",
+              type: "success",
+            });
             this.refresh();
           });
         });
@@ -365,6 +365,23 @@
     exportToExcel() {
       listPage("offset=1", {}).then((res) => {
         console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        res.rows = res.rows.map((item) => {
+          return {
+            产品名称: item.productName,
+            产品品牌: item.brandName,
+            产品型号: item.productCode,
+            产品品类: item.categoryStr,
+            产品颜色: item.productColor,
+            产品材质: item.productMaterialQuality,
+            产品状态: item.productStatus,
+            产品版本: item.productEdition,
+            规格: item.productPackageSize,
+            重量: item.productWeight,
+            国际69码: item.internationalCode,
+            更新时间: item.updateTime,
+          };
+        });
         this.ExportTable = res.rows;
         const header = Object.keys(res.rows[0]);
         console.log(header);
@@ -383,6 +400,7 @@
         export_json_to_excel({
           header,
           data,
+          filename: "产品列表",
         });
       });
     },
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 58c8ca9..2a7b833 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -5,27 +5,62 @@
       <div class="productInput">
         SN码 (固定标识):
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.snCode" placeholder="请输入SN码固定标识" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.snCode"
+            placeholder="请输入SN码固定标识"
+            clearable
+            class="product-input"
+          />
         </div>
         个数:
         <div class="inputBox" style="width: 220px">
-          <el-input v-model="selectInfo.snQuantity" placeholder="请输入SN码固定标识个数" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.snQuantity"
+            placeholder="请输入SN码固定标识个数"
+            clearable
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click=" BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
+        <el-button
+          type="primary"
+          icon="el-icon-folder-opened"
+          class="btnItem"
+          @click="exportToExcel"
+        >
           导出
         </el-button>
       </div>
@@ -49,19 +84,11 @@
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
 
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -69,101 +96,151 @@
       </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"
+    />
     <!-- 新增弹框 -->
     <sn-code-ruls-dialog :is-show-add="isShowAdd" @close="closeAdd" />
-    <sn-ruls-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
+    <sn-ruls-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import SnCodeRulsDialog from '../../components/mycomponent/dialog/snCodeRulsDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import SnRulsInfoDialog from '../../components/mycomponent/dialog/snRulsInfoDialog.vue'
+import SnCodeRulsDialog from "../../components/mycomponent/dialog/snCodeRulsDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import SnRulsInfoDialog from "../../components/mycomponent/dialog/snRulsInfoDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { S_listPage, S_batchDelete, S_delete } from '../../api/product/snCodeRuls'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import {
+  S_listPage,
+  S_batchDelete,
+  S_delete,
+} from "../../api/product/snCodeRuls";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { outToExcel } from "../../utils/myUtils/exportToExcel";
 export default {
   components: {
     SnCodeRulsDialog,
     GroupPage,
-    SnRulsInfoDialog
+    SnRulsInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
-      selectInfo: { // 搜索框中的数据的数据
-        snCode: '',
-        snQuantity: ''
-      }
-    }
+      selectInfo: {
+        // 搜索框中的数据的数据
+        snCode: "",
+        snQuantity: "",
+      },
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      this.loading = true
-      S_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 = false
-      })
+      this.loading = true;
+      S_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 = false;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        snCode: '',
-        snQuantity: ''
-      }
+        snCode: "",
+        snQuantity: "",
+      };
     },
     exportToExcel() {
-      S_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
-      })
+      S_listPage("limit=1000000000&offset=1", {}).then((res) => {
+        let list = res.rows.map(item => {
+          return {
+            'SN码': item.snCode,
+            'SN码个数': item.snQuantity,
+            'SN码说明': item.snIllustration,
+            '更新时间': item.updateTime
+          }
+        })
+        outToExcel(list,'SN码规则列表');
+      });
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      S_batchDelete({ ids: ids }).then(res => {
-        this.$message({
-          message: '删除成功',
-          type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        this.refresh()
-      })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            S_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的SN码",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      const id = row.id
-      S_delete({ id: id }).then(res => {
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-        this.refresh()
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          S_delete({ id: id }).then((res) => {
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -200,7 +277,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {

diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index a449c8b..af487f7 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,28 +1,52 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
+  <el-dialog
+    :title="title"
+    width="1200px"
+    :visible.sync="dialogStatus"
+    append-to-body
+    @close="close"
+  >
     <div class="productAddDialog">
-      <div class="Dialog-title">
-        基本信息
-      </div>
+      <div class="Dialog-title">基本信息</div>
       <div class="Dialog-input">
-        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="addInfo"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品型号" prop="productCode">
-                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品名称" prop="productName">
-                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productName"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品品牌" prop="brandId">
-                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.brandId"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.id"
@@ -34,7 +58,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品品类" prop="categoryId">
-                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                <el-select
+                  v-model="addInfo.categoryId"
+                  clearable
+                  placeholder="请输入产品品类"
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -48,54 +77,78 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品版本" prop="productEdition">
-                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productEdition"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="国际69码" prop="internationalCode">
-                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.internationalCode"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="包装尺寸" prop="productPackageSize">
-                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productPackageSize"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品颜色" prop="productColor">
-                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productColor"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品状态" prop="productStatus">
-                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productStatus"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品材质" prop="productMaterialQuality">
-                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productMaterialQuality"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="产品重量" prop="productWeight">
-                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+                <el-input
+                  v-model.trim="addInfo.productWeight"
+                  type="text"
+                  placeholder="必填"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否为IOT产品" prop="productNetworkMode">
                 <el-radio-group v-model="addInfo.productNetworkMode">
-                  <el-radio label="1">
-                    是
-                  </el-radio>
-                  <el-radio label="0">
-                    否
-                  </el-radio>
+                  <el-radio label="1"> 是 </el-radio>
+                  <el-radio label="0"> 否 </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -112,109 +165,195 @@
             action="string"
             accept=".jpg,.jpeg,.png"
           >
-            <img v-if="addInfo.productPicture" :src="addInfo.productPicture" class="avatar">
+            <img
+              v-if="addInfo.productPicture"
+              :src="addInfo.productPicture"
+              class="avatar"
+            />
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </div>
       </div>
-      <div class="Dialog-desc">
-        产品参数
-      </div>
+      <div class="Dialog-desc">产品参数</div>
       <div class="parameters">
-        <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
+        <el-form
+          ref="paramsForm"
+          class="inputContent"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col v-for="param of paramValueList" :span="8">
-              <div style="width: 100%; display: flex;align-items: center; margin-top:10px">
-                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              <div
+                style="
+                  width: 100%;
+                  display: flex;
+                  align-items: center;
+                  margin-top: 10px;
+                "
+              >
+                <span style="margin-right: 10px"
+                  ><red-star
+                    v-show="param.paramRequire == 1"
+                    style="margin-right: 4px"
+                  />{{ param.paramName }}</span
+                >
+                <el-input
+                  v-model.trim="param.paramValue"
+                  type="text"
+                  placeholder=""
+                  style="flex: 1"
+                />
               </div>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { Message } from 'element-ui'
-import { SelectList } from '@/api/product/brand'
-import { C_list, C_paramsList } from '@/api/product/category'
-import { add, productDetail, update } from '@/api/product/product'
-import RedStar from '@/components/mycomponent/redStar'
+import { getToken } from "@/utils/auth";
+import { Message } from "element-ui";
+import { SelectList } from "@/api/product/brand";
+import { C_list, C_paramsList } from "@/api/product/category";
+import { add, productDetail, update } from "@/api/product/product";
+import RedStar from "@/components/mycomponent/redStar";
 
 export default {
   components: { RedStar },
   props: {
     title: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       dialogStatus: false,
       myHeaders: { token: getToken() },
-      imageUrl: this.baseConfig.baseUrl + '/static/',
+      imageUrl: this.baseConfig.baseUrl + "/static/",
       categoryList: [],
       brandList: [],
-      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require("@/assets/global_images/photo.png"), // 默认图片路径
       rules: {
-        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
-        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
-        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
-        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
-        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
-        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
-        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
-        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
-        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
-        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
-        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+        productCode: [
+          {
+            required: true,
+            message: "产品型号不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: "产品名称不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        brandId: [
+          {
+            required: true,
+            message: "产品品牌不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        categoryId: [
+          {
+            required: true,
+            message: "产品品类不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productEdition: [
+          {
+            required: true,
+            message: "产品版本不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        internationalCode: [
+          {
+            required: true,
+            message: "国际69码不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productColor: [
+          {
+            required: true,
+            message: "产品颜色不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productPackageSize: [
+          {
+            required: true,
+            message: "包装尺寸不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productStatus: [
+          {
+            required: true,
+            message: "产品状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productMaterialQuality: [
+          {
+            required: true,
+            message: "产品材质不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        productWeight: [
+          {
+            required: true,
+            message: "产品重量不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       addInfo: {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productNetworkMode: '1',
-        productPicture: ''
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productNetworkMode: "1",
+        productPicture: "",
       },
       paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
-      ]
-    }
+      ],
+    };
   },
   watch: {
-    'addInfo.categoryId'(val) {
-      this.fetchParams(val)
-    }
+    "addInfo.categoryId"(val) {
+      this.fetchParams(val);
+    },
   },
   created() {
-    this.fetchBrandList()
-    this.fetchCategoryList()
+    this.fetchBrandList();
+    this.fetchCategoryList();
   },
   methods: {
     initDialog(type, row) {
-      if (type === 'edit') {
+      if (type === "edit") {
         if (row.id) {
-          productDetail({ id: row.id }).then(data => {
+          productDetail({ id: row.id }).then((data) => {
             this.addInfo = {
               id: data.id,
               productCode: data.productCode,
@@ -229,66 +368,70 @@
               productColor: data.productColor,
               productMaterialQuality: data.productMaterialQuality,
               productNetworkMode: data.productNetworkMode,
-              productPicture: data.productPicture ? this.imageUrl + data.productPicture : '',
-              paramValueList: data.paramValues
-            }
+              productPicture: data.productPicture
+                ? this.imageUrl + data.productPicture
+                : "",
+              paramValueList: data.paramValues,
+            };
+            console.log(this.addInfo, "this.addInfo");
             // 如果有类型，去获取类型的参数
             // if (this.addInfo.categoryId) {
             //   this.fetchParams(this.addInfo.categoryId)
             // }
-          })
+          });
         }
       } else {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.resetForm()
+          this.$refs["dataForm"].clearValidate();
+        });
+        this.resetForm();
       }
-      this.dialogStatus = true
+      this.dialogStatus = true;
     },
     // 获取品牌列表
     fetchBrandList() {
-      SelectList().then(res => {
-        this.brandList = res
-      })
+      SelectList().then((res) => {
+        this.brandList = res;
+      });
     },
     // 获取品类列表
     fetchCategoryList() {
       const params = {
-        categoryCode: '',
-        categoryName: ''
-      }
-      C_list(params).then(res => {
-        this.categoryList = res.data
-      })
+        categoryCode: "",
+        categoryName: "",
+      };
+      C_list(params).then((res) => {
+        this.categoryList = res.data;
+      });
     },
     // 图片上传
     uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
+      console.log("uploadFile:" + file.file.name);
       // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.addInfo.productPicture = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-      })
+      this.getBase64(file.file).then((resBase64) => {
+        this.addInfo.productPicture =
+          "data:image/png;base64," + resBase64.split(",")[1]; // 直接拿到base64信息
+      });
     },
     // 上传前判断文件格式及大小
     beforeAvatarUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      let res = true;
+      console.log(file.size);
+      const isLt2M = file.size / 1024 < 200;
       if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        res = false;
       }
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
+        this.$message.error("上传图片大小不能超过 200KB!");
+        res = false;
       }
-      return res
+      return res;
     },
     // 上传成功后回显
     handleAvatarSuccess(response, file) {
-      console.log('handleSuccess')
+      console.log("handleSuccess");
       // const base_url = process.env.BASE_API + '/static/'
       // if (response.code === 200) {
       //   this.photo = base_url + response.data
@@ -298,92 +441,109 @@
     },
     getBase64(file) {
       return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
+        const reader = new FileReader();
+        let fileResult = "";
+        reader.readAsDataURL(file);
         // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
+        reader.onload = function () {
+          fileResult = reader.result;
+        };
         // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
+        reader.onerror = function (error) {
+          reject(error);
+        };
         // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+        reader.onloadend = function () {
+          resolve(fileResult);
+        };
+      });
     },
     // 获取品类参数列表
     fetchParams(categoryId) {
       if (categoryId) {
-        C_paramsList(categoryId).then(res => {
+        C_paramsList(categoryId).then((res) => {
           if (res.code === 200) {
             if (res.data.length > 0) {
-              this.paramValueList = res.data.map(item => {
-                const value = this.addInfo.paramValueList.filter(param => param.paramId === item.id)
-                const paramValue = value.length > 0 ? value[0].paramValue : ''
-                return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: paramValue }
-              })
+              this.paramValueList = res.data.map((item) => {
+                const value = this.addInfo.paramValueList.filter(
+                  (param) => param.paramId === item.id
+                );
+                const paramValue = value.length > 0 ? value[0].paramValue : "";
+                return {
+                  paramId: item.id,
+                  paramName: item.paramName,
+                  paramOrder: item.paramOrder,
+                  paramRequire: item.paramRequire,
+                  paramValue: paramValue,
+                };
+              });
+            } else {
+              this.paramValueList = [];
             }
           }
-        })
+        });
       }
     },
     // 重置表单
     resetForm() {
       this.addInfo = {
-        productCode: '',
-        brandId: '',
-        categoryId: '',
-        productPackageSize: '',
-        productStatus: '',
-        productWeight: '',
-        productName: '',
-        productEdition: '',
-        internationalCode: '',
-        productColor: '',
-        productMaterialQuality: '',
-        productPicture: '',
-        paramValueList: []
-      }
-      this.paramValueList = []
+        productCode: "",
+        brandId: "",
+        categoryId: "",
+        productPackageSize: "",
+        productStatus: "",
+        productWeight: "",
+        productName: "",
+        productEdition: "",
+        internationalCode: "",
+        productColor: "",
+        productMaterialQuality: "",
+        productPicture: "",
+        paramValueList: [],
+      };
+      this.paramValueList = [];
     },
     close() {
-      this.dialogStatus = false
+      this.dialogStatus = false;
     },
     // 新增
     save() {
-      this.$refs['dataForm'].validate((valid) => {
-        const index = this.addInfo.productPicture.indexOf(this.imageUrl)
-        if (index > -1) {
-          this.addInfo.productPicture = this.addInfo.productPicture.substring(this.imageUrl.length)
-        }
-        this.addInfo.paramValueList = this.paramValueList.map(item => {
-          return {
-            paramId: item.paramId,
-            paramName: item.paramName,
-            paramValue: item.paramValue
+      this.$refs["dataForm"].validate((valid) => {
+        console.log(valid, "验证结果");
+        if (valid) {
+          const index = this.addInfo.productPicture.indexOf(this.imageUrl);
+          if (index > -1) {
+            this.addInfo.productPicture = this.addInfo.productPicture.substring(
+              this.imageUrl.length
+            );
           }
-        })
-        if (this.title === '新增产品') {
-          add(this.addInfo).then(res => {
-            Message.success('保存成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          this.addInfo.paramValueList = this.paramValueList.map((item) => {
+            return {
+              paramId: item.paramId,
+              paramName: item.paramName,
+              paramValue: item.paramValue,
+            };
+          });
+          if (this.title === "新增产品") {
+            add(this.addInfo).then((res) => {
+              Message.success("保存成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          } else {
+            update(this.addInfo).then((res) => {
+              Message.success("更新成功");
+              this.$emit("refresh");
+              this.dialogStatus = false;
+            });
+          }
         } else {
-          update(this.addInfo).then(res => {
-            Message.success('更新成功')
-            this.$emit('refresh')
-            this.dialogStatus = false
-          })
+          Message.error("请先完整填写产品信息");
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -404,7 +564,7 @@
     padding: 10px 20px;
     display: flex;
     .inputContent {
-      flex:1;
+      flex: 1;
       margin-right: 30px;
     }
     .imageContent {
@@ -413,7 +573,7 @@
   }
 
   .Dialog-desc {
-    width:100%;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -489,7 +649,6 @@
 }
 </style>
 <style>
-
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -499,6 +658,6 @@
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 </style>
diff --git a/src/utils/myUtils/exportToExcel.js b/src/utils/myUtils/exportToExcel.js
index d2a221e..b14957b 100644
--- a/src/utils/myUtils/exportToExcel.js
+++ b/src/utils/myUtils/exportToExcel.js
@@ -1,6 +1,6 @@
 
 import {export_json_to_excel} from '../Export2Excel'
-const outToExcel = (tableAry) => {
+const outToExcel = (tableAry,filename = '') => {
     console.log(tableAry, '全部数据')
     const header = Object.keys(tableAry[0])
     const data = tableAry.map((user, index) => {
@@ -19,7 +19,8 @@
     // //把定义好的header和data放进export_json_to_excel的函数里作为参数
     export_json_to_excel({
       header,
-      data
+      data,
+      filename
     })
 }
 
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 3956bd0..6638e3b 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -13,9 +13,9 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="search(10, 1)">查询</el-button>
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">重置</el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="reset">导出</el-button>
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
     <el-table
@@ -63,7 +63,7 @@
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '@/utils/myUtils/mixins/listPage'
 import { listPage } from '@/api/distributor/distributor'
-
+import { outToExcel } from '@/utils/myUtils/exportToExcel'
 export default { // 加入分页逻辑
   components: {
     DistributorDetail,
@@ -93,15 +93,51 @@
         this.tableData = res
       })
     },
+    search(limit, offset){
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * limit)
+        })
+        this.tableData = res
+      })
+    },
     reset() {
       this.selectInfo = {
         distributorCode: '',
         distributorName: ''
       }
+      this.search(10, 1)
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    }
+    },
+    exportToExcel() {
+      console.log('导出')
+      // 全屏加载动画;
+      const loading = this.$loading({
+        lock: true,
+        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",
+          });
+        });
+    },
   }
 }
 </script>
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 0cf79bc..a84eeeb 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -334,9 +334,9 @@
           console.log(ids);
           batchDelete({ ids: ids }).then((res) => {
             this.$message({
-            message: "删除成功",
-            type: "success",
-          });
+              message: "删除成功",
+              type: "success",
+            });
             this.refresh();
           });
         });
@@ -365,6 +365,23 @@
     exportToExcel() {
       listPage("offset=1", {}).then((res) => {
         console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        res.rows = res.rows.map((item) => {
+          return {
+            产品名称: item.productName,
+            产品品牌: item.brandName,
+            产品型号: item.productCode,
+            产品品类: item.categoryStr,
+            产品颜色: item.productColor,
+            产品材质: item.productMaterialQuality,
+            产品状态: item.productStatus,
+            产品版本: item.productEdition,
+            规格: item.productPackageSize,
+            重量: item.productWeight,
+            国际69码: item.internationalCode,
+            更新时间: item.updateTime,
+          };
+        });
         this.ExportTable = res.rows;
         const header = Object.keys(res.rows[0]);
         console.log(header);
@@ -383,6 +400,7 @@
         export_json_to_excel({
           header,
           data,
+          filename: "产品列表",
         });
       });
     },
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 58c8ca9..2a7b833 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -5,27 +5,62 @@
       <div class="productInput">
         SN码 (固定标识):
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.snCode" placeholder="请输入SN码固定标识" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.snCode"
+            placeholder="请输入SN码固定标识"
+            clearable
+            class="product-input"
+          />
         </div>
         个数:
         <div class="inputBox" style="width: 220px">
-          <el-input v-model="selectInfo.snQuantity" placeholder="请输入SN码固定标识个数" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.snQuantity"
+            placeholder="请输入SN码固定标识个数"
+            clearable
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click=" BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
+        <el-button
+          type="primary"
+          icon="el-icon-folder-opened"
+          class="btnItem"
+          @click="exportToExcel"
+        >
           导出
         </el-button>
       </div>
@@ -49,19 +84,11 @@
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
 
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -69,101 +96,151 @@
       </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"
+    />
     <!-- 新增弹框 -->
     <sn-code-ruls-dialog :is-show-add="isShowAdd" @close="closeAdd" />
-    <sn-ruls-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
+    <sn-ruls-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import SnCodeRulsDialog from '../../components/mycomponent/dialog/snCodeRulsDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import SnRulsInfoDialog from '../../components/mycomponent/dialog/snRulsInfoDialog.vue'
+import SnCodeRulsDialog from "../../components/mycomponent/dialog/snCodeRulsDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import SnRulsInfoDialog from "../../components/mycomponent/dialog/snRulsInfoDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { S_listPage, S_batchDelete, S_delete } from '../../api/product/snCodeRuls'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import {
+  S_listPage,
+  S_batchDelete,
+  S_delete,
+} from "../../api/product/snCodeRuls";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { outToExcel } from "../../utils/myUtils/exportToExcel";
 export default {
   components: {
     SnCodeRulsDialog,
     GroupPage,
-    SnRulsInfoDialog
+    SnRulsInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
-      selectInfo: { // 搜索框中的数据的数据
-        snCode: '',
-        snQuantity: ''
-      }
-    }
+      selectInfo: {
+        // 搜索框中的数据的数据
+        snCode: "",
+        snQuantity: "",
+      },
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      this.loading = true
-      S_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 = false
-      })
+      this.loading = true;
+      S_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 = false;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        snCode: '',
-        snQuantity: ''
-      }
+        snCode: "",
+        snQuantity: "",
+      };
     },
     exportToExcel() {
-      S_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
-      })
+      S_listPage("limit=1000000000&offset=1", {}).then((res) => {
+        let list = res.rows.map(item => {
+          return {
+            'SN码': item.snCode,
+            'SN码个数': item.snQuantity,
+            'SN码说明': item.snIllustration,
+            '更新时间': item.updateTime
+          }
+        })
+        outToExcel(list,'SN码规则列表');
+      });
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      S_batchDelete({ ids: ids }).then(res => {
-        this.$message({
-          message: '删除成功',
-          type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        this.refresh()
-      })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            S_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的SN码",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      const id = row.id
-      S_delete({ id: id }).then(res => {
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-        this.refresh()
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          S_delete({ id: id }).then((res) => {
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -200,7 +277,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {
diff --git a/src/views/supplier/supplierList.vue b/src/views/supplier/supplierList.vue
index 1d51ad1..c49722b 100644
--- a/src/views/supplier/supplierList.vue
+++ b/src/views/supplier/supplierList.vue
@@ -5,15 +5,30 @@
       <div class="productInput">
         供应商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.supplierCode" placeholder="请输入编号" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.supplierCode"
+            placeholder="请输入编号"
+            clearable
+            class="product-input"
+          />
         </div>
         供应商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.supplierName" placeholder="请输入名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.supplierName"
+            placeholder="请输入名称"
+            clearable
+            class="product-input"
+          />
         </div>
         供应商状态
         <div class="inputBox" style="width: 200px">
-          <el-select v-model="selectInfo.supplierStatus" clearable placeholder="供应商状态" style="width: 200px">
+          <el-select
+            v-model="selectInfo.supplierStatus"
+            clearable
+            placeholder="供应商状态"
+            style="width: 200px"
+          >
             <el-option
               v-for="item in supplierStatusOptions"
               :key="item.id"
@@ -24,13 +39,28 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
+        <el-button
+          type="primary"
+          icon="el-icon-folder-opened"
+          class="btnItem"
+          @click="exportToExcel"
+        >
           导出
         </el-button>
       </div>
@@ -53,8 +83,14 @@
       <el-table-column prop="supplierStatusName" label="供应商状态" />
       <el-table-column prop="preReviewResultName" label="资料预审结果" />
       <el-table-column prop="inputReviewResultName" label="录库评审结果" />
-      <el-table-column prop="latestQuarterlyEvaluateResultName" label="最近季度评价结果" />
-      <el-table-column prop="latestAnnualAssessResultName" label="最新年度考核结果" />
+      <el-table-column
+        prop="latestQuarterlyEvaluateResultName"
+        label="最近季度评价结果"
+      />
+      <el-table-column
+        prop="latestAnnualAssessResultName"
+        label="最新年度考核结果"
+      />
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="detail(scope.row)">
@@ -65,7 +101,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"
+    />
     <!-- 新增弹框 -->
     <supplier-detail ref="supplierDetail" />
   </div>
@@ -73,67 +117,94 @@
 
 <script>
 // 组件
-import GroupPage from '@/components/mycomponent/groupPage'
-import SupplierDetail from '@/views/supplier/supplierDetail'
+import GroupPage from "@/components/mycomponent/groupPage";
+import SupplierDetail from "@/views/supplier/supplierDetail";
 // 逻辑
-import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
-import { getDictByCode } from '@/api/system/dict'
-import { listMixin } from '@/utils/myUtils/mixins/listPage'
-import { listPage } from '@/api/supplier/supplier'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "@/utils/myUtils/changeTableTr";
+import { getDictByCode } from "@/api/system/dict";
+import { listMixin } from "@/utils/myUtils/mixins/listPage";
+import { listPage } from "@/api/supplier/supplier";
+import { outToExcel } from '@/utils/myUtils/exportToExcel'
+export default {
+  // 加入分页逻辑
   components: {
     SupplierDetail,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        supplierCode: '',
-        supplierName: '',
-        supplierStatus: ''
+        supplierCode: "",
+        supplierName: "",
+        supplierStatus: "",
       },
-      supplierStatusOptions: []
-    }
+      supplierStatusOptions: [],
+    };
   },
   mounted() {
-    this.getSupplierStatusDict()
-    this.getListPage()
+    this.getSupplierStatusDict();
+    this.getListPage();
   },
   methods: {
     tableRowClassName: tableRowClassName,
     getSupplierStatusDict() {
-      getDictByCode('supplierStatus').then(response => {
+      getDictByCode("supplierStatus").then((response) => {
         if (response.code === 200) {
-          this.supplierStatusOptions = response.data
+          this.supplierStatusOptions = response.data;
         }
-      })
+      });
     },
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        supplierCode: '',
-        supplierName: '',
-        supplierStatus: ''
-      }
+        supplierCode: "",
+        supplierName: "",
+        supplierStatus: "",
+      };
     },
     detail(row) {
-      this.$refs.supplierDetail.initDialog('detail', row)
+      this.$refs.supplierDetail.initDialog("detail", row);
     },
     exportToExcel() {
-
-    }
-  }
-}
+      console.log('导出')
+      // 全屏加载动画;
+      const loading = this.$loading({
+        lock: true,
+        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",
+          });
+        });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -169,7 +240,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {