diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 3e4aa0c..1edbaef 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -233,11 +233,16 @@
@click="printList">
打印
-
+
+
导出
-
+
@@ -1314,6 +1319,17 @@
end = this.tableData.length
}
return this.tableData.slice(start,end)
+ },
+ // 导出字段映射
+ exportFields () {
+ let fields = {}
+ // 添加固定的状态列
+ fields['状态'] = 'state'
+ // 添加动态列
+ this.columnList1.forEach(item => {
+ fields[item.columnLabel] = item.columnProp
+ })
+ return fields
}
},
watch: {
@@ -4323,21 +4339,6 @@
}
},
- async exportExcel() {
- this.searchData.limit = -1
- this.searchData.page = 1
- excel.exportTable({
- url: "/pms/qc/qcFQCInspectionSearch",
- columnMapping: this.columnList, //可以直接用table，不需要的列就剔除
- mergeSetting: [],//需要合并的列
- params: this.searchData,
- fileName: this.exportName+".xlsx",
- rowFetcher: res => res.data,
- columnFormatter: [],
- dropColumns: [],
- })
- },
-
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 16e95ec..e481e8e 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -262,11 +262,16 @@
@click="printList">
打印
-
+
+
导出
-
+
@@ -1526,6 +1531,17 @@
end = this.tableData.length
}
return this.tableData.slice(start,end)
+ },
+ // 导出字段映射
+ exportFields () {
+ let fields = {}
+ // 添加固定的状态列
+ fields['状态'] = 'state'
+ // 添加动态列
+ this.columnList1.forEach(item => {
+ fields[item.columnLabel] = item.columnProp
+ })
+ return fields
}
},
watch: {
@@ -4655,21 +4671,6 @@
}
},
- async exportExcel() {
- this.searchData.limit = -1
- this.searchData.page = 1
- excel.exportTable({
- url: "/pms/qc/qcIPQCInspectionSearch",
- columnMapping: this.columnList, //可以直接用table，不需要的列就剔除
- mergeSetting: [],//需要合并的列
- params: this.searchData,
- fileName: this.exportName+".xlsx",
- rowFetcher: res => res.data,
- columnFormatter: [],
- dropColumns: [],
- })
- },
-
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 641cea8..a763ef3 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -251,11 +251,16 @@
@click="printList">
打印
-
+
+
导出
-
+
@@ -1156,6 +1161,17 @@
end = this.tableData.length
}
return this.tableData.slice(start,end)
+ },
+ // 导出字段映射
+ exportFields () {
+ let fields = {}
+ // 添加固定的状态列
+ fields['状态'] = 'state'
+ // 添加动态列
+ this.columnList1.forEach(item => {
+ fields[item.columnLabel] = item.columnProp
+ })
+ return fields
}
},
watch: {
@@ -3524,20 +3540,6 @@
}
},
- async exportExcel() {
- this.searchData.limit = -1
- this.searchData.page = 1
- excel.exportTable({
- url: "/pms/qc/qcIQCInspectionSearch",
- columnMapping: this.columnList, //可以直接用table，不需要的列就剔除
- mergeSetting: [],//需要合并的列
- params: this.searchData,
- fileName: this.exportName+".xlsx",
- rowFetcher: res => res.data,
- columnFormatter: [],
- dropColumns: [],
- })
- },
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index 8ce2841..f984ab8 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -219,17 +219,12 @@
任务重载
+ class="el-button el-button--medium">
导出
@@ -1015,6 +1010,17 @@
end = this.tableData.length
}
return this.tableData.slice(start,end)
+ },
+ // 导出字段映射
+ exportFields () {
+ let fields = {}
+ // 添加固定的状态列
+ fields['状态'] = 'state'
+ // 添加动态列
+ this.columnList1.forEach(item => {
+ fields[item.columnLabel] = item.columnProp
+ })
+ return fields
}
},
watch: {
@@ -3367,34 +3373,6 @@
}
},
- //导出excel
- async createExportData () {
- this.searchData.limit = -1
- this.searchData.page = 1
- await qcOQCInspectionSearch(this.searchData).then(({data}) => {
- this.exportList = data.page.list
- })
- return this.exportList
- },
-
- startDownload() {},
-
- finishDownload() {},
-
- fields () {
- let json = "{"
- this.columnList1.forEach((item, index) => {
- if (index == this.columnList1.length - 1) {
- json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
- } else {
- json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
- }
- })
- json += "}"
- let s = eval("(" + json + ")")
- return s
- },
-
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {