init:版本说明

nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue

@@ -0,0 +1,125 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudMaterial from './material'
+import CRUD, { crud } from '@crud/crud'
+import { download2 } from '@/api/data'
+import { downloadFile } from '@/utils'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        // excelImport：请求接口 formdata：传递参数
+        crudMaterial.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        }).catch(err => {
+
+          const list = err.response.data.message
+          download2('/api/produceWorkorder/download', list).then(result => {
+            downloadFile(result, '错误信息汇总', 'xlsx')
+            crud.downloadLoading = false
+          })
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+

nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -24,12 +24,12 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
-          icon="el-icon-refresh"
+          type="warning"
+          icon="el-icon-upload2"
           size="mini"
-          @click="materialSync"
+          @click="uploadShow = true"
         >
-          物料同步
+          导入
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -106,9 +106,6 @@
         <el-table-column prop="material_spec" label="物料规格" width="140" />
         <el-table-column prop="material_model" label="物料型号" />
         <el-table-column prop="class_name" label="物料分类" width="140" />
-        <el-table-column prop="unit_name" label="计量单位" />
-        <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
-        <el-table-column prop="product_series_name" label="系列" />
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -141,6 +138,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <UploadDialog :dialog-show.sync="uploadShow"/>
   </div>
 </template>
 
@@ -151,6 +149,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import UploadDialog from './UploadDialog'
 
 const defaultForm = {
   material_id: null,
@@ -190,7 +189,7 @@ export default {
   name: 'Materia',
   // 数据字典
   dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -208,6 +207,7 @@ export default {
       classes2: [],
       classes3: [],
       fullscreenLoading: false,
+      uploadShow: false,
       measure_unit: [],
       productSeries: [],
       permission: {},

nladmin-ui/src/views/wms/basedata/material/material.js

@@ -55,4 +55,11 @@ export function materialSync(data) {
   })
 }
 
-export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries, materialSync }
+export function excelImport(data) {
+  return request({
+    url: 'api/Materia/importExcel',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, excelImport, getMaterOptType, isAlongMaterType, getProductSeries, materialSync }