厂家卷号匹配到多条入场卷号，请为每行选择对应记录
@@ -339,6 +350,7 @@
import * as XLSX from 'xlsx';
import { listChemicalItem, getChemicalItem, delChemicalItem, addChemicalItem, updateChemicalItem, batchAddChemicalItem } from "@/api/mes/qc/chemicalItem";
import CoilSelector from "@/components/CoilSelector";
+import CombinedImport from "@/components/CombinedImport";
import { listMaterialCoil } from "@/api/wms/coil";
const CHEMI_TEMPLATE_HEADERS = ['入场钢卷号', '厂家卷号', 'C(%)', 'Si(%)', 'Mn(%)', 'P(%)', 'S(%)', 'Als(%)', 'Al(%)', 'Ti(%)', 'Cr(%)', 'Ni(%)', 'Cu(%)', 'N(%)', 'Fe(%)', 'B(%)'];
@@ -365,7 +377,8 @@ const CHEMI_HEADER_MAP = {
export default {
name: "ChemicalItem",
components: {
- CoilSelector
+ CoilSelector,
+ CombinedImport
},
computed: {},
data() {
@@ -437,6 +450,7 @@ export default {
supplierCoilNoLoading: false,
ambiguousVisible: false,
ambiguousRows: [],
+ combinedImportVisible: false,
};
},
created() {
@@ -577,6 +591,9 @@ export default {
openImportDialog() {
this.importDialogVisible = true;
},
+ openCombinedImport() {
+ this.combinedImportVisible = true;
+ },
importHandleFileChange(file) {
if (this.importValidateLoading || this.importLoading) return;
this.importFile = file.raw;
diff --git a/klp-ui/src/views/mes/qc/certificate/physics.vue b/klp-ui/src/views/mes/qc/certificate/physics.vue
index fa32d86b..0daa022e 100644
--- a/klp-ui/src/views/mes/qc/certificate/physics.vue
+++ b/klp-ui/src/views/mes/qc/certificate/physics.vue
@@ -104,6 +104,15 @@
@click="openImportDialog"
>导入
+
+ 综合导入
+
+
+
厂家卷号匹配到多条入场卷号，请为每行选择对应记录
@@ -371,6 +382,7 @@
import * as XLSX from 'xlsx';
import { listPhysicalItem, getPhysicalItem, delPhysicalItem, addPhysicalItem, updatePhysicalItem, batchAddPhysicalItem } from "@/api/mes/qc/physicalItem";
import CoilSelector from "@/components/CoilSelector";
+import CombinedImport from "@/components/CombinedImport";
import { listMaterialCoil } from "@/api/wms/coil";
const PHYS_TEMPLATE_HEADERS = [
@@ -397,7 +409,8 @@ const PHYS_HEADER_MAP = {
export default {
name: "PhysicalItem",
components: {
- CoilSelector
+ CoilSelector,
+ CombinedImport
},
computed: {},
data() {
@@ -465,6 +478,7 @@ export default {
supplierCoilNoLoading: false,
ambiguousVisible: false,
ambiguousRows: [],
+ combinedImportVisible: false,
};
},
created() {
@@ -601,6 +615,9 @@ export default {
openImportDialog() {
this.importDialogVisible = true;
},
+ openCombinedImport() {
+ this.combinedImportVisible = true;
+ },
importHandleFileChange(file) {
if (this.importValidateLoading || this.importLoading) return;
this.importFile = file.raw;