add:增加aps的Bom数据相关功能；rev:修改一些uuid改为id,optid,optName改为id,name;

mes/qd/src/views/wms/pdm/base/bom/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 crudBom from '@/api/wms/pdm/bom'
+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)
+        // excelImport：请求接口 formdata：传递参数
+        crudBom.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>
+

mes/qd/src/views/wms/pdm/base/bom/index.vue

@@ -12,6 +12,16 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadShow = true"
+        >
+          导入
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -43,23 +53,23 @@
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bom_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="bom_name" label="BOM单名称"  min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="material_code" label="物料编码"  min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="material_name" label="物料名称"  min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="material_spec" label="物料规格"  min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="processroute_uuid" label="产品工艺路线"  min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="yield_rate" label="成材率百分比"  :formatter="rounding"   min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="endproduct_rate" label="成品率百分比"  :formatter="rounding"   min-width="110" show-overflow-tooltip  />
-        <el-table-column prop="bom_status" label="BOM单状态"  min-width="110" show-overflow-tooltip >
+        <el-table-column prop="bom_name" label="BOM单名称" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="material_code" label="物料编码" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="material_name" label="物料名称" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="material_spec" label="物料规格" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="processroute_uuid" label="产品工艺路线" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="yield_rate" label="成材率百分比" :formatter="rounding" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="endproduct_rate" label="成品率百分比" :formatter="rounding" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="bom_status" label="BOM单状态" min-width="110" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.BOM_STATUS[scope.row.bom_status] }}
           </template>
         </el-table-column>
         <el-table-column prop="detail_count" label="明细数" />
-        <el-table-column prop="remark" label="备注"  min-width="110" show-overflow-tooltip  />
+        <el-table-column prop="remark" label="备注" min-width="110" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
-        <el-table-column prop="update_optname" label="修改人"  />
+        <el-table-column prop="update_optname" label="修改人" />
         <el-table-column prop="update_time" label="修改时间" min-width="150" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -76,6 +86,11 @@
       <pagination />
     </div>
     <AddDialog />
+    <UploadDialog
+      :dialog-show.sync="uploadShow"
+      @tableChanged3="tableChanged3"
+    />
+    <Dialog :dialog-show.sync="dialogShow" />
   </div>
 </template>
 
@@ -87,12 +102,13 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/pdm/base/bom/AddDialog'
+import UploadDialog from '@/views/wms/pdm/base/bom/UploadDialog'
 
 const defaultForm = { bom_uuid: null, bom_code: null, bom_name: null, material_uuid: null, processroute_uuid: null, yield_rate: null, endproduct_rate: null, bom_status: null, detail_count: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
   name: 'Bom',
   dicts: ['BOM_STATUS'],
-  components: { pagination, crudOperation, rrOperation, udOperation, AddDialog },
+  components: { pagination, crudOperation, rrOperation, udOperation, AddDialog, UploadDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: 'BOM单管理', url: 'api/bom', idField: 'bom_uuid', sort: 'bom_uuid,desc',
@@ -107,6 +123,7 @@ export default {
   },
   data() {
     return {
+      uploadShow: false,
       permission: {
       },
       rules: {
@@ -149,6 +166,9 @@ export default {
         return true
       }
     },
+    tableChanged3() {
+      this.crud.toQuery()
+    },
     // 取消提交
     cancelSubmit(row) {
       crudBom.cancelSubmit({ bom_uuid: row.bom_uuid }).then(res => {