返厂入库明细编辑修改

applications/dee-mes/src/privateComponents/components/FlowEdit/index.vue

@@ -7,6 +7,7 @@
 <template>
   <div class="flow-edit">
     <edit-purchase v-if="purchaseVis" :basic-data="basicData" />
+    <InStorageRecalEdit v-if="InStorageRecallVis" :basic-data="basicData" />
     <dee-as-com
       v-else
       style="border:none;"
@@ -17,9 +18,10 @@
 </template>
 <script>
 import EditPurchase from '@/privateComponents/components/PurchasingWarehousingNewOrEdit'
+import InStorageRecalEdit from '@/privateComponents/components/InStorageRecallItemCom'
 export default {
   name: 'FlowEdit', // name写在组件的最前方,自定义组件为必填
-  components: { EditPurchase },
+  components: { EditPurchase, InStorageRecalEdit },
   props: {
     basicData: {
       type: Object,
@@ -32,7 +34,8 @@ export default {
         typeName: 'InStorageRecall',
         layKey: 'edit_applyApproval'
       },
-      purchaseVis: false
+      purchaseVis: false,
+      InStorageRecallVis: false
     }
   },
   inject: {
@@ -51,10 +54,12 @@ export default {
         if (val && val.subTypeName) {
           switch (val.subTypeName) {
             case 'InStorageRecall':
-              this.cmpOptions = {
-                typeName: 'InStorageRecall', // 返厂入库
-                layKey: 'edit_applyApproval'
-              }
+              // this.cmpOptions = {
+              //   typeName: 'InStorageRecall', // 返厂入库
+              //   layKey: 'edit_applyApproval'
+              // }
+              // 采购入库
+              this.InStorageRecallVis = true
               break
             case 'InStorageExpire':
               this.cmpOptions = {

applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/importFile.vue

+/**
+* @Description:  采购入库导入
+* @author xioln
+* @date 2023-06-21
+* @FilePath: applications/dee-mes/src/privateComponents/components/ProcurementWarehousingImport/index.vue
+*/
+<template>
+  <div class="procurement-Warehousing-import">
+    <dee-dialog
+      :visible="dialogVisible"
+      title="导入"
+      width="40%"
+      @handleClose="close"
+    >
+      <el-form ref="fileForm" label-width="100px">
+        <el-form-item label="选择文件">
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xlsx, .xlsm, .xls"
+            :auto-upload="false"
+            action="#"
+            :limit="1"
+            :file-list="fileList"
+            :on-change="handleChange"
+            :on-exceed="handleExceed"
+            :on-remove="handleRemove"
+          >
+            <el-button size="small" style="width: 400px; text-align: right">
+              <i class="fa fa-folder-open-o" />
+            </el-button>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          :disabled="uploading"
+          @click="handleImportExcel"
+        >确定导入</el-button>
+      </div>
+    </dee-dialog>
+  </div>
+</template>
+<script>
+import { post } from '@/utils/http'
+
+export default {
+  componentName: '导入',
+  name: 'ProcurementWarehousingImport', // name写在组件的最前方,自定义组件为必填
+  components: {},
+  props: {
+    param: {
+      type: Object,
+      required: true
+    }
+    // baseComInfo: {
+    //   type: Object,
+    //   default: () => { }
+    // }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [], // 文件列表
+      file: {},
+      uploading: true // 默认置灰确定导入按钮
+
+    }
+  },
+  computed: {},
+  created() {
+    // 初始化数据
+  },
+  mounted() {
+    this.$nextTick(() => {
+      // this.handleExcel()
+    })
+  },
+  methods: {
+    open() {
+      this.dialogVisible = true
+    },
+    close() {
+      this.dialogVisible = false
+    },
+    // 文件状态改变触发
+    handleChange(file) { // (file,fileList)参数
+      this.uploading = false
+      this.file = file
+    },
+    // 文件超出个数限制
+    handleExceed() {
+      this.$message.warning('仅允许上传一个文件！')
+    },
+    // 移除文件
+    handleRemove() {
+      this.uploading = true
+    },
+    // 导入excel
+    handleImportExcel() {
+      if (!this.file.size) {
+        this.$message.warning('请选择上传的文件')
+        return
+      }
+      this.uploading = true
+
+      if (this.param.id) {
+        this.upLoadExcel(this.param.id)
+      } else {
+        post('/InventoryRequest/batch/recursionAdd', this.param).then(res => {
+          if (res.items.id) {
+            this.upLoadExcel(res.items.id, 'newData')
+          }
+        }).catch((err) => {
+          console.log(err)
+        })
+      }
+    },
+    // 上传excel
+    upLoadExcel(id, isNew) {
+      const formData = new FormData()
+      formData.append('file', this.file.raw)
+      this.$api.apiUploadFile(`/InStorageRequestItem/importByExcel?id=${id}`, formData).then(res => { // 调用接口
+        this.uploading = false
+        this.$utils.showMessageSuccess(res.data.message)
+        const reqId = isNew ? id : null
+        this.$emit('refreshTable', reqId)
+        this.close()
+      }).catch(err => {
+        this.uploading = false
+        // this.$utils.showMessageError(err)
+        console.log('err', err)
+      })
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.procurement-Warehousing-import {
+  .dialog-footer{
+    margin-right: 25px;
+  }
+}
+</style>