新增批量导入，修改供应商bug

src/api/system/file/index.js

@@ -196,3 +196,17 @@ export async function importPBom(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+//批量导入
+export async function batchImportPBom(data) {
+  const formData = new FormData();
+  data.multiPartFiles.forEach((item, index) => {
+    formData.append(`multiPartFiles`, item);
+  });
+
+  const res = await request.post(`/main/bomCategory/batchImportPBom`, formData);
+  if (res.data.code === '0') {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/material/BOMmanage/components/BOM-search.vue

@@ -7,36 +7,34 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
-
-
-      <el-col v-bind="styleResponsive ?   { md: 5 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
         <el-form-item label="编码">
           <el-input
-             size="mini"
+            size="mini"
             clearable
             v-model.trim="where.categoryCode"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ?   { md: 5 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
         <el-form-item label="名称">
           <el-input
-             size="mini"
+            size="mini"
             clearable
             v-model.trim="where.categoryName"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ?   { md: 5 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
         <el-form-item label="状态">
           <el-select
             clearable
             v-model.trim="where.status"
             placeholder="请选择"
             class="w100"
-               size="mini"
+            size="mini"
           >
             <el-option
               v-for="item in Object.entries(statusOpt)"
@@ -53,10 +51,7 @@
         </el-form-item>
       </el-col> -->
 
-
-
-
-      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -68,20 +63,48 @@
             查询
           </el-button>
 
-          <el-button @click="reset" icon="el-icon-refresh" class="ele-btn-icon"    size="mini"
+          <el-button
+            @click="reset"
+            icon="el-icon-refresh"
+            class="ele-btn-icon"
+            size="mini"
             >重置</el-button
           >
+
+          <el-button
+            v-if="isUpload"
+            @click="uploadFile"
+            type="primary"
+            size="mini"
+            icon="el-icon-upload2"
+            plain
+            >批量导入</el-button
+          >
         </div>
       </el-col>
     </el-row>
+
+    <importDialog
+      :defModule="moudleName"
+      ref="importDialogRef"
+      @success="success"
+    />
   </el-form>
 </template>
 
 <script>
+  import importDialog from './import-dialog.vue';
   export default {
+    components: {
+      importDialog
+    },
     props: {
       statusOpt: Object,
-      categoryCode: String
+      categoryCode: String,
+      isUpload: {
+        type: Boolean,
+        default: false
+      }
     },
     data() {
       // 默认表单数据
@@ -90,13 +113,13 @@
         code: '',
         categoryCode: this.categoryCode,
         categoryName: '',
-        status: '',
-
+        status: ''
       };
       return {
         defaultWhere,
         // 表单数据
-        where: { ...defaultWhere }
+        where: { ...defaultWhere },
+        moudleName: 'mainUser'
       };
     },
     computed: {
@@ -114,6 +137,14 @@
       reset() {
         this.where = { ...this.defaultWhere };
         this.search();
+      },
+
+      uploadFile() {
+        this.$refs.importDialogRef.open();
+      },
+
+      success() {
+        this.search();
       }
     }
   };

src/views/material/BOMmanage/components/detailedList.vue

@@ -701,7 +701,7 @@
       },
 
       /* 表格数据源 */
-      datasource({ where, page, limit }) {
+      async datasource({ where, page, limit }) {
         // let that = this;
         // console.log(getBomPageCategoryId({
         //   ...where,
@@ -752,7 +752,7 @@
         //     });
         // });
 
-        let data = getBomPageCategoryId({
+        let data = await getBomPageCategoryId({
           ...where,
           pageNum: page,
           size: limit,
@@ -764,7 +764,13 @@
           data = this.listTow;
         }
 
-        console.log(data, 'data');
+        // data.list.forEach((item) => {
+        //   if (!item.supplierId && item.supplierList.length != 0) {
+        //     item.supplierId = item.supplierList[0].id;
+        //   }
+        // });
+
+        // console.log(data, 'data');
 
         return data;
       },

src/views/material/BOMmanage/components/import-dialog.vue

@@ -0,0 +1,164 @@
+<template>
+  <!-- 上传 -->
+  <el-dialog title="导入文件上传" :visible.sync="dialogVisible" width="40%">
+    <el-form label-width="110px" class="zw-criterion">
+      <el-form-item label="选择文件">
+        <el-upload
+          class="avatar-uploader"
+          action="#"
+          :show-file-list="false"
+          :http-request="handlSuccess"
+          :before-upload="beforeUpload"
+        >
+          <!-- x -->
+          <el-button icon="el-icon-plus" size="small" type="primary"
+            >文件上传</el-button
+          >
+          <div slot="tip" class="el-upload__tip">
+            只能上传excel文件，点击
+            <el-link
+              type="primary"
+              :underline="false"
+              @click="downLoadTemplate()"
+            >
+              下载模板</el-link
+            >
+          </div>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item label="上传列表">
+        <div class="imgs-box">
+          <p v-for="(item, index) in attaments" :key="index" class="imgs-p">
+            <span> {{ item.name }}</span>
+            <el-link @click="delFileList(index)" type="primary">删除</el-link>
+          </p>
+          <el-progress
+            v-if="progressVisible"
+            :percentage="percentage"
+            :status="uploadStatus"
+          />
+        </div>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
+      <el-button size="small" :loading="loading" @click="upload" type="primary"
+        >上 传</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { batchImportPBom } from '@/api/system/file/index.js';
+  import { downLoadBom } from '@/api/system/file/index.js';
+
+  export default {
+    props: {
+      defModule: '',
+      categoryId: {
+        type: String,
+        default: ''
+      }
+    },
+    //注册组件
+    data() {
+      return {
+        showViewer: false, // 显示查看器
+        dialogVisible: false,
+        uploadShow: false,
+        module: '',
+        attaments: [], //上传文件
+        file: '',
+        percentage: 0, // 进度百分比 (0-100)
+        progressVisible: false, // 是否显示进度条
+        uploadStatus: '', // 进度条状态 (success/exception)
+        loading: false
+      };
+    },
+    created() {},
+    methods: {
+      // handleProgress(event, file) {
+      //   this.progressVisible = true;
+      //   this.percentage = Math.floor(event.percent);  // 四舍五入取整
+      // },
+
+      open() {
+        this.attaments = [];
+        this.module = '';
+        this.dialogVisible = true;
+      },
+      //删除附件
+      delFileList(index) {
+        this.attaments.splice(index, 1);
+      },
+      //上传限制
+      beforeUpload(file) {
+        const isLt10M = file.size / 1024 / 1024 < 10;
+        if (!isLt10M) {
+          this.$message.error('导入单文件大小不能超过 10MB!');
+        }
+        return isLt10M;
+      },
+      //图片上传
+      handlSuccess(param) {
+        this.file = param.file;
+        this.attaments.push(param.file);
+      },
+
+      downLoadTemplate() {
+        downLoadBom();
+      },
+
+      // 文件上传
+      async upload() {
+        if (this.attaments.length == 0) {
+          return this.$message.warning('文件不能为空！');
+        }
+        this.module = this.$props.defModule;
+        this.loading = true;
+
+        await batchImportPBom({
+          module: this.module,
+          multiPartFiles: this.attaments
+        })
+          .then((res) => {
+            setTimeout(() => {
+              this.loading = false;
+            }, 2000);
+
+            this.$message.success('上传成功！');
+            this.dialogVisible = false;
+            this.$emit('success');
+          })
+          .catch((e) => {
+            this.loading = false;
+          });
+      }
+    }
+  };
+</script>
+
+<style lang="scss">
+  .zw-table-header {
+    float: right;
+  }
+
+  .imgs-box .imgs-p {
+    height: 30px;
+    background: #f0f3f3;
+    line-height: 30px;
+    width: 372px;
+    margin-bottom: 5px;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+  }
+  .zw-criterion-normal {
+    padding: 20px 0 0 0;
+  }
+  .el-main {
+    overflow: hidden;
+  }
+</style>

src/views/material/BOMmanage/index.vue

@@ -5,6 +5,7 @@
         @search="reload"
         :statusOpt="statusOpt"
         :categoryCode="where.categoryCode"
+        :isUpload="isUpload"
       />
 
       <!--  -->
@@ -397,7 +398,8 @@
         radioSubmit: 1,
 
         pageSize: this.$store.state.tablePageSize,
-        cacheKeyUrl: '68be265a-material-BOMmanage'
+        cacheKeyUrl: '68be265a-material-BOMmanage',
+        isUpload: true
       };
     },
 

vue.config.js

@@ -36,10 +36,10 @@ module.exports = {
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.251:18087',
+        // target: 'http://192.168.1.251:18087',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''