add:增加物料导入；

2025-07-10 16:04:05 +08:00
parent 97f90cfefe
commit 3ffe2cde2f
7 changed files with 275 additions and 45 deletions
--- a/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
@@ -0,0 +1,115 @@
+<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 crudbucketrecord from '@/views/wms/basedata/material/material'
+import CRUD, { crud } from '@crud/crud'
+
+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)
+        crudbucketrecord.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -16,20 +16,30 @@
          />
        </el-col>
        <el-col :span="8">
-          <rrOperation />
+          <rrOperation/>
        </el-col>
      </el-row>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
      <crudOperation>
+        <!--        <el-button-->
+        <!--          slot="right"-->
+        <!--          class="filter-item"-->
+        <!--          type="success"-->
+        <!--          icon="el-icon-refresh"-->
+        <!--          size="mini"-->
+        <!--          @click="materialSync"-->
+        <!--        >-->
+        <!--          物料同步-->
+        <!--        </el-button>-->
        <el-button
          slot="right"
          class="filter-item"
          type="success"
-          icon="el-icon-refresh"
+          icon="el-icon-upload2"
          size="mini"
-          @click="materialSync"
+          @click="uploadShow = true"
        >
-          物料同步
+          导入
        </el-button>
      </crudOperation>
      <!--表单组件-->
@@ -43,20 +53,19 @@
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
          <el-row>
            <el-col :span="8">
-              <el-form-item label="物料编码" prop="material_code" >
-                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" />
+              <el-form-item label="物料编码" prop="material_code">
+                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="物料名称" prop="material_name">
-                <el-input v-model="form.material_name" style="width: 200px;" />
+                <el-input v-model="form.material_name" style="width: 200px;"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-
              <el-form-item label="规格" prop="material_spec">
                <label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
-                <el-input v-model="form.material_spec" style="width: 200px;" />
+                <el-input v-model="form.material_spec" style="width: 200px;"/>
              </el-form-item>
            </el-col>
          </el-row>
@@ -64,34 +73,37 @@
            <el-col :span="8">
              <el-form-item label="型号" prop="material_model">
                <label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
-                <el-input v-model="form.material_model" style="width: 200px;" />
+                <el-input v-model="form.material_model" style="width: 200px;"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="外部标识" prop="ext_id">
-                <el-input v-model="form.ext_id" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="静置时间" prop="standing_time">
-                <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="是否启用" prop="is_used">
-                <el-radio v-model="form.is_used" label="0">否</el-radio>
-                <el-radio v-model="form.is_used" label="1">是</el-radio>
+                <el-input v-model="form.ext_id" style="width: 200px;"/>
              </el-form-item>
            </el-col>
          </el-row>
+<!--          <el-row>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="静置时间" prop="standing_time">-->
+<!--                <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟"-->
+<!--                                 style="width: 200px;"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="是否启用" prop="is_used">-->
+<!--                <el-radio v-model="form.is_used" label="0">否</el-radio>-->
+<!--                <el-radio v-model="form.is_used" label="1">是</el-radio>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="text" @click="crud.cancelCU">取消</el-button>
          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
        </div>
      </el-dialog>
+      <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
      <!--表格渲染-->
      <el-table
        ref="table"
@@ -101,14 +113,14 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column prop="material_code" label="物料编码" width="160" />
-        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
-        <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 prop="material_code" label="物料编码" width="160"/>
+        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip/>
+        <el-table-column prop="material_spec" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('material_spec',crud.data,'物料规格')" label="物料规格"/>
+        <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
@@ -121,8 +133,8 @@
            />
          </template>
        </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column prop="update_optname" label="修改人"/>
+        <el-table-column prop="update_time" label="修改时间" width="135"/>
        <el-table-column
          v-permission="['admin','Materialbase:edit','Materialbase:del']"
          fixed="right"
@@ -139,7 +151,7 @@
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination />
+      <pagination/>
    </div>
  </div>
 </template>
@@ -151,6 +163,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 +203,7 @@ export default {
  name: 'Materia',
  // 数据字典
  dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
@@ -207,6 +220,7 @@ export default {
      classes1: [],
      classes2: [],
      classes3: [],
+      uploadShow: false,
      fullscreenLoading: false,
      measure_unit: [],
      productSeries: [],
--- a/nladmin-ui/src/views/wms/basedata/material/material.js
+++ b/nladmin-ui/src/views/wms/basedata/material/material.js
@@ -55,4 +55,12 @@ export function materialSync(data) {
  })
 }

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