diff --git a/src/api/qc/qc_report.js b/src/api/qc/qc_report.js index f75e58b..3a891c3 100644 --- a/src/api/qc/qc_report.js +++ b/src/api/qc/qc_report.js @@ -17,3 +17,6 @@ export const getIPQCDetailReport = data => createAPI('/pms/qcReport/getIPQCDetai export const getFAIDetailReport = data => createAPI('/pms/qcReport/getFAIDetailReport','post',data) // FQC报表明细查询 export const getFQCDetailReport = data => createAPI('/pms/qcReport/getFQCDetailReport','post',data) + +// 导出 +export const downloadQcDetailRecord = data => createAPI('/pms/qcReport/downloadQcDetailRecord','post',data, 'download') diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index a8a3222..ffd5299 100644 --- a/src/utils/httpRequest.js +++ b/src/utils/httpRequest.js @@ -146,14 +146,14 @@ instance2.interceptors.response.use(response => { }) -export const createAPI = (url, method, data) => { +export const createAPI = (url, method, data, type) => { let config = {} if (method === 'get') { config.params = data } else { config.data = data } - if (data === 777){ // 下载功能的请求 + if (data === 777 || type === 'download'){ // 下载功能的请求 return instance2({ url, method, diff --git a/src/views/modules/outReport/report081.vue b/src/views/modules/outReport/report081.vue new file mode 100644 index 0000000..d7987ee --- /dev/null +++ b/src/views/modules/outReport/report081.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report082.vue b/src/views/modules/outReport/report082.vue new file mode 100644 index 0000000..beec325 --- /dev/null +++ b/src/views/modules/outReport/report082.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report083.vue b/src/views/modules/outReport/report083.vue new file mode 100644 index 0000000..801f7ca --- /dev/null +++ b/src/views/modules/outReport/report083.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report084.vue b/src/views/modules/outReport/report084.vue new file mode 100644 index 0000000..1ed392e --- /dev/null +++ b/src/views/modules/outReport/report084.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report085.vue b/src/views/modules/outReport/report085.vue new file mode 100644 index 0000000..59bb7e9 --- /dev/null +++ b/src/views/modules/outReport/report085.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report086.vue b/src/views/modules/outReport/report086.vue new file mode 100644 index 0000000..d5bdc0c --- /dev/null +++ b/src/views/modules/outReport/report086.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report087.vue b/src/views/modules/outReport/report087.vue new file mode 100644 index 0000000..a5552f2 --- /dev/null +++ b/src/views/modules/outReport/report087.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report088.vue b/src/views/modules/outReport/report088.vue new file mode 100644 index 0000000..73b8a75 --- /dev/null +++ b/src/views/modules/outReport/report088.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report089.vue b/src/views/modules/outReport/report089.vue new file mode 100644 index 0000000..fdbe194 --- /dev/null +++ b/src/views/modules/outReport/report089.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report090.vue b/src/views/modules/outReport/report090.vue new file mode 100644 index 0000000..fd11ddc --- /dev/null +++ b/src/views/modules/outReport/report090.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report091.vue b/src/views/modules/outReport/report091.vue new file mode 100644 index 0000000..1e219f3 --- /dev/null +++ b/src/views/modules/outReport/report091.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report092.vue b/src/views/modules/outReport/report092.vue new file mode 100644 index 0000000..6165d34 --- /dev/null +++ b/src/views/modules/outReport/report092.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report093.vue b/src/views/modules/outReport/report093.vue new file mode 100644 index 0000000..bb374ac --- /dev/null +++ b/src/views/modules/outReport/report093.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report094.vue b/src/views/modules/outReport/report094.vue new file mode 100644 index 0000000..4a525bd --- /dev/null +++ b/src/views/modules/outReport/report094.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report095.vue b/src/views/modules/outReport/report095.vue new file mode 100644 index 0000000..09324b0 --- /dev/null +++ b/src/views/modules/outReport/report095.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report096.vue b/src/views/modules/outReport/report096.vue new file mode 100644 index 0000000..468d7cd --- /dev/null +++ b/src/views/modules/outReport/report096.vue @@ -0,0 +1,52 @@ + + + + + + diff --git a/src/views/modules/outReport/report097.vue b/src/views/modules/outReport/report097.vue new file mode 100644 index 0000000..079f99a --- /dev/null +++ b/src/views/modules/outReport/report097.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report098.vue b/src/views/modules/outReport/report098.vue new file mode 100644 index 0000000..c502ec8 --- /dev/null +++ b/src/views/modules/outReport/report098.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report099.vue b/src/views/modules/outReport/report099.vue new file mode 100644 index 0000000..aab4385 --- /dev/null +++ b/src/views/modules/outReport/report099.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/outReport/report100.vue b/src/views/modules/outReport/report100.vue new file mode 100644 index 0000000..913a2ff --- /dev/null +++ b/src/views/modules/outReport/report100.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/modules/report/IPQC_detail_report.vue b/src/views/modules/report/IPQC_detail_report.vue new file mode 100644 index 0000000..5dbc4c9 --- /dev/null +++ b/src/views/modules/report/IPQC_detail_report.vue @@ -0,0 +1,1238 @@ + + + + diff --git a/src/views/modules/report/IPQC_report.vue b/src/views/modules/report/IPQC_report.vue index c51d6be..802d265 100644 --- a/src/views/modules/report/IPQC_report.vue +++ b/src/views/modules/report/IPQC_report.vue @@ -613,13 +613,13 @@ { userId: this.$store.state.user.name, functionId: 107001003, - serialNumber: '107001003Table1UmName', + serialNumber: '107001003Table1UmId', tableId: "107001003Table1", tableName: "IPQC报表", - columnProp: 'umName', + columnProp: 'umId', headerAlign: "center", align: "left", - columnLabel: '单位', + columnLabel: '计量单位', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/report/IQC_detail_report.vue b/src/views/modules/report/IQC_detail_report.vue index 82da061..81aa640 100644 --- a/src/views/modules/report/IQC_detail_report.vue +++ b/src/views/modules/report/IQC_detail_report.vue @@ -116,21 +116,8 @@ - 查询 - - {{ "导出" }} - + 查询 + 导出 @@ -139,6 +126,8 @@ :height="height" :data="dataList" border + v-loading="searchLoading" + element-loading-text="拼命加载中" @row-click="IQCClickRow" :row-style="rowStyle" style="width: 100%;"> @@ -174,21 +163,18 @@