modify

@@ -2,17 +2,43 @@
   <div class="table-container">
   <div class="table-container">
     <el-row v-if="attrs.btnCofig.isBtn" style="margin-bottom: 15px">
     <el-row v-if="attrs.btnCofig.isBtn" style="margin-bottom: 15px">
       <el-col>
       <el-col>
-        <el-button
-          v-for="item in attrs.btnCofig.btnGroup"
+        <span
+          v-for="(item, i) in attrs.btnCofig.btnGroup"
           :key="item.btnName"
           :key="item.btnName"
+          :class="i == 0 ? 'first-span' : 'span'"
+        >
+          <el-button
             :type="item.type"
             :type="item.type"
             :icon="item.icon"
             :icon="item.icon"
             :round="item.round"
             :round="item.round"
             :size="item.size"
             :size="item.size"
             :loading="item.loading"
             :loading="item.loading"
             @click="handleClick(item)"
             @click="handleClick(item)"
+            v-if="item.btnName !== '导入' && item.btnName !== '导出'"
+            >{{ item.btnName }}</el-button
+          >
+          <el-upload
+            v-else
+            ref="upload"
+            :action="item.action"
+            :fileName="item.fileName"
+            :http-request="toUpload"
+            :on-remove="onRemoveUpload"
+            :limit="item.limit"
+            :accept="item.accept"
+            :show-file-list="false"
+            class="upload"
+          >
+            <el-button
+              :type="item.type"
+              :icon="item.icon"
+              :round="item.round"
+              :size="item.size"
+              :loading="item.loading"
               >{{ item.btnName }}</el-button
               >{{ item.btnName }}</el-button
             >
             >
+          </el-upload>
+        </span>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
     <el-table
     <el-table
@@ -231,6 +257,14 @@ export default {
         },
         },
       });
       });
     },
     },
+    // 选择上传
+    toUpload(options) {
+      this.$emit("upload", options);
+    },
+    //移除上传
+    onRemoveUpload(file, fileList) {
+      this.$emit("rmfile", { file, fileList });
+    },
   },
   },
   watch: {
   watch: {
     data() {
     data() {
@@ -250,4 +284,10 @@ export default {
       padding: 0;
       padding: 0;
     }
     }
   }
   }
+  .first-span,.span{
+    display: inline-block;
+  }
+  .span{
+    margin-left: 6px;
+  }
 </style>
 </style>

 <template>
 <template>
   <div class="error-container">
   <div class="error-container">
     <el-dialog
     <el-dialog
-      title="错误信息"
+      :width="width"
+      :title="title"
+      :center="center"
       :visible.sync="dialogVisible"
       :visible.sync="dialogVisible"
+      :close-on-click-modal="onModalClickClose"
       @open="dialogOpenEvent"
       @open="dialogOpenEvent"
       @close="dialogCloseEvent"
       @close="dialogCloseEvent"
     >
     >
-      <el-table :data="errorMessageData">
-        <el-table-column
-          type="index"
-          width="50"
-          align="center"
-        ></el-table-column>
-        <el-table-column label="错误信息" prop="errorMessage" width="200">
-          <template slot-scope="scope">
-            <div v-for="(m, key) in scope.row.errorMessage" :key="key">
-              {{ m }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+      <slot></slot>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="confirm">{{
+          confirmBtnName
+        }}</el-button>
+      </span>
     </el-dialog>
     </el-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
-  <script>
+<script>
 export default {
 export default {
+  props: {
+    width: {
+      type: String,
+      default: "50%",
+    },
+    title: {
+      type: String,
+      default: "标题",
+    },
+    center: {
+      type: String,
+      default: "center",
+    },
+    confirmBtnName: {
+      type: String,
+      default: "确 定",
+    },
+    onModalClickClose: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
   data() {
     return {
     return {
       dialogVisible: false,
       dialogVisible: false,
-      errorMessageData: [],
     };
     };
   },
   },
   computed: {},
   computed: {},
@@ -38,7 +55,6 @@ export default {
   methods: {
   methods: {
     dialogOpenEvent(data) {
     dialogOpenEvent(data) {
       if (data && data.length) {
       if (data && data.length) {
-        this.errorMessageData = data;
         console.log(data);
         console.log(data);
       }
       }
       this.dialogVisible = true;
       this.dialogVisible = true;
@@ -48,9 +64,19 @@ export default {
       this.dialogVisible = false;
       this.dialogVisible = false;
       this.$emit("close");
       this.$emit("close");
     },
     },
+    // 确认事件
+    confirm() {
+      this.dialogVisible = false;
+      this.$emit("confirm");
+    },
+    // 取消事件
+    cancel() {
+      this.dialogVisible = false;
+      this.$emit("cancel");
+    },
   },
   },
 };
 };
 </script>
 </script>
-  <style lang='scss' scoped>
+<style lang='scss' scoped>
 
 
-  </style>
+</style>

@@ -20,19 +20,69 @@
       :pageConfig="pageConfig"
       :pageConfig="pageConfig"
       @search="searchBtn"
       @search="searchBtn"
       @download="downloadTemplate"
       @download="downloadTemplate"
-      @upLoad="upLoadTemplate"
-      @export="exportTemplate"
+      @upload="toUpload"
+      @rmfile="onRemoveUpload"
       @delete="deleteData"
       @delete="deleteData"
       @sizeChange="handleSizeChange"
       @sizeChange="handleSizeChange"
       @currentChange="handleCurrentChange"
       @currentChange="handleCurrentChange"
     >
     >
     </yl-table>
     </yl-table>
+    <!-- <modle-view
+      ref="modleViewRef"
+      width="30%"
+      title="导入Excel"
+      confirmBtnName="导入Excel"
+      @confirm="dialogConfirm"
+    >
+      <el-form
+        :model="paramsForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="80px"
+      >
+        <el-row>
+          <el-col :span="20">
+            <el-form-item
+              label="商品名称"
+              prop="skuName"
+              size="small"
+              label-position="left"
+            >
+              <el-input
+                v-model="paramsForm.skuName"
+                placeholder="请输入商品名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item prop="file">
+              <el-upload
+                ref="upload"
+                action="/goods/uploadGoodsExcel"
+                name="file"
+                :http-request="toUpload"
+                :on-remove="onRemoveUpload"
+                :limit="1"
+                accept=".xlsx"
+                class="upload"
+              >
+                <el-button type="primary" icon="el-icon-upload2" size="small"
+                  >选择文件</el-button
+                >
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </modle-view> -->
   </div>
   </div>
 </template>
 </template>
-
 <script>
 <script>
 import YlForm from "@/components/YlForm";
 import YlForm from "@/components/YlForm";
 import YlTable from "@/components/YlTable";
 import YlTable from "@/components/YlTable";
+import ModleView from "./components/ModleView";
 import { formConfig } from "./formConfig";
 import { formConfig } from "./formConfig";
 import { tableAttr, columnHeader } from "./tableConfig";
 import { tableAttr, columnHeader } from "./tableConfig";
 export default {
 export default {
@@ -40,11 +90,21 @@ export default {
   components: {
   components: {
     YlForm,
     YlForm,
     YlTable,
     YlTable,
+    ModleView,
   },
   },
   data() {
   data() {
     return {
     return {
       formConfig: formConfig, // 表单配置项
       formConfig: formConfig, // 表单配置项
       queryForm: {}, // 表单参数
       queryForm: {}, // 表单参数
+      paramsForm: {
+        skuName: "",
+        file: null,
+      },
+      rules: {
+        skuName: [
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+        ],
+      },
       pageConfig: {
       pageConfig: {
         // 分页配置项
         // 分页配置项
         isPagination: true,
         isPagination: true,
@@ -63,17 +123,29 @@ export default {
   created() {},
   created() {},
   methods: {
   methods: {
     // 失焦事件
     // 失焦事件
-    blurEvent() {
-
+    blurEvent() {},
+    // 选择上传
+    toUpload(options) {
+      console.log(options);
+    },
+    //移除上传
+    onRemoveUpload(options) {
+      console.log(options);
     },
     },
     // 搜索
     // 搜索
     searchBtn() {
     searchBtn() {
       this.$refs.ruleForm.handleSearch("ruleForm", (val) => {});
       this.$refs.ruleForm.handleSearch("ruleForm", (val) => {});
     },
     },
+    // 确认对话框
+    dialogConfirm() {},
     // 下载
     // 下载
-    downloadTemplate() {},
+    downloadTemplate() {
+      // this.$refs.modleViewRef.dialogOpenEvent();
+    },
     // 上传
     // 上传
-    upLoadTemplate() {},
+    upLoadTemplate() {
+      // console.log(this.$refs.modleViewRef);
+    },
     // 导出
     // 导出
     exportTemplate() {},
     exportTemplate() {},
     // 删除
     // 删除

@@ -32,6 +32,10 @@ export const tableAttr = {
         round: false,
         round: false,
         loading: false,
         loading: false,
         event: "upLoad",
         event: "upLoad",
+        action: "/goods/uploadGoodsExcel",
+        fileName: "name",
+        limit: 1,
+        accept: ".xlsx",
       },
       },
       {
       {
         type: "primary",
         type: "primary",
@@ -41,6 +45,10 @@ export const tableAttr = {
         round: false,
         round: false,
         loading: false,
         loading: false,
         event: "export",
         event: "export",
+        action: "/goods/uploadGoodsExcel",
+        fileName: "name",
+        limit: 1,
+        accept: ".xlsx",
       },
       },
       {
       {
         type: "danger",
         type: "danger",
@@ -69,35 +77,36 @@ export const columnHeader = (deleteRow) => [
     width: "50",
     width: "50",
   },
   },
   {
   {
-    label: "货站名称",
+    label: "口岸",
     prop: "portName",
     prop: "portName",
     align: "center",
     align: "center",
     minWidth: 100,
     minWidth: 100,
   },
   },
   {
   {
-    label: "品名",
-    prop: "goodsName",
+    label: "HSCODE",
+    prop: "goodsCode",
     align: "center",
     align: "center",
     minWidth: 100,
     minWidth: 100,
   },
   },
   {
   {
-    label: "操作人",
-    prop: "updateUserName",
+    label: "创建时间",
+    prop: "createTime",
     align: "center",
     align: "center",
     minWidth: 100,
     minWidth: 100,
   },
   },
   {
   {
-    label: "操作时间",
-    prop: "updateTime",
+    label: "创建人",
+    prop: "createUserName",
     align: "center",
     align: "center",
     minWidth: 100,
     minWidth: 100,
   },
   },
   {
   {
-    label: "创建时间",
-    prop: "createTime",
+    label: "文件名",
+    prop: "fileName",
     align: "center",
     align: "center",
     minWidth: 100,
     minWidth: 100,
   },
   },
+
   {
   {
     label: "操作",
     label: "操作",
     prop: "operate",
     prop: "operate",

@@ -186,7 +186,7 @@ export default {
                             cancelButtonText: '取消',
                             cancelButtonText: '取消',
                             type: "warning",
                             type: "warning",
                         }).then(() => {
                         }).then(() => {
-                            this.statusChange({ id: val.id, status: status })
+                            this.statusChange({ id: val.id, status: status, tip: tip })
                         }).catch(() => { })
                         }).catch(() => { })
                     } else {
                     } else {
                         this.msgWarning(res.msg)
                         this.msgWarning(res.msg)
@@ -200,7 +200,7 @@ export default {
                     cancelButtonText: '取消',
                     cancelButtonText: '取消',
                     type: "warning",
                     type: "warning",
                 }).then(() => {
                 }).then(() => {
-                    this.statusChange({ id: val.id, status: status })
+                    this.statusChange({ id: val.id, status: status, tip: tip })
                 }).catch(() => { })
                 }).catch(() => { })
             }
             }
         },
         },