diff --git a/src/api/qc/qc_report.js b/src/api/qc/qc_report.js
index 463adb1..1647a98 100644
--- a/src/api/qc/qc_report.js
+++ b/src/api/qc/qc_report.js
@@ -8,3 +8,6 @@ export const getIPQCReport = data => createAPI('/pms/qcReport/getIPQCReport','po
export const getFQASReport = data => createAPI('/pms/qcReport/getFQASReport','post',data)
// OQC报表查询
export const getOQCReport = data => createAPI('/pms/qcReport/getOQCReport','post',data)
+
+// 导出
+export const downloadQcRecord = data => createAPI('/pms/qcReport/downloadQcRecord','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/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 4e8e3b5..49485df 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -101,7 +101,7 @@
- 查询
+ 查询
新增
审核
删除
@@ -258,7 +258,7 @@
- 机台
+ 机台
@@ -334,7 +334,7 @@
-
+
@@ -368,7 +368,7 @@
-
+
@@ -383,8 +383,8 @@
-
-
+
+
@@ -392,14 +392,10 @@
-
-
-
-
+
+
+ 实际机台
+
协同人员
@@ -1030,7 +1026,8 @@
inspectionResult: '',
submitList: [],
},
- tagNo:'',
+ tagNo: '',
+ type: '',
searchData: {
site: '',
userName: this.$store.state.user.name,
@@ -1069,16 +1066,16 @@
dataList: [],
dataListSelections: [],
modalData: {
- flag:'',
+ flag: '',
site: '',
bu: '',
- inspectionNo:'',
+ inspectionNo: '',
partNo: '',
partDesc: '',
- inspectionTypeNo:'',
- inspectionTypeName:'',
- inspectorNo:'',
- inspectorName:'',
+ inspectionTypeNo: '',
+ inspectionTypeName: '',
+ inspectorNo: '',
+ inspectorName: '',
orderNo: '',
operationDesc: '',
operationNo: '',
@@ -1100,7 +1097,8 @@
sjzs: '',
boxNo: '',
createBy: '',
- importantFlag: ''
+ importantFlag: '',
+ actualResourceId: ''
},
// 展示列集
columnList1: [
@@ -1672,7 +1670,9 @@
responsiblePersonName: '',
passQty: '',
notPassQty: '',
- shiftDesc: ''
+ shiftDesc: '',
+ actualResourceId: '',
+ actualResourceDesc: ''
},
detailInformationFlag: false,
detailList: [],
@@ -1696,7 +1696,8 @@
responsiblePersonName: '',
subDetailList: [],
passQty: '',
- notPassQty: ''
+ notPassQty: '',
+ actualResourceId: ''
},
detailColumnList: [
{
@@ -2419,6 +2420,7 @@
currentRow: {},
currentDetailRow: {},
saveLoading: false,
+ searchLoading: false
}
},
@@ -3096,18 +3098,23 @@
},
// 获取基础数据列表S
- getBaseList (val,type) {
+ getBaseList (val, type) {
this.tagNo = val
+ this.type = type
this.$nextTick(() => {
let strVal = ''
if (val === 1052) {
this.searchSeqInfo()
this.seqDetailFlag = true
}
- if (val === 505) {
+ if (val === 505 && type === 1) {
strVal = this.modalData.resourceDesc
this.$refs.baseList.init(val, strVal)
}
+ if (val === 505 && type === 2) {
+ strVal = this.detailData.actualResourceDesc
+ this.$refs.baseList.init(val, strVal)
+ }
if (val === 509) {
strVal = this.detailData.responsiblePerson
this.$refs.baseList.init(val, strVal)
@@ -3129,10 +3136,14 @@
this.getOperationList()
//this.getPartList()
}
- if (this.tagNo === 505) {
+ if (this.tagNo === 505 && this.type === 1) {
this.modalData.resourceId = val.ResourceID
this.modalData.resourceDesc = val.ResourceDesc
}
+ if (this.tagNo === 505 && this.type === 2) {
+ this.detailData.actualResourceId = val.ResourceID
+ this.detailData.actualResourceDesc = val.ResourceDesc
+ }
if (this.tagNo === 509) {
this.detailData.responsiblePerson = val.SupplierID
}
@@ -3264,7 +3275,8 @@
sjzs: '',
boxNo: '',
createBy: this.$store.state.user.name,
- importantFlag: ''
+ importantFlag: '',
+ actualResourceId: ''
}
this.operationList = []
this.resourceList = []
@@ -3452,8 +3464,9 @@
this.$message.warning('请选择检验模板！')
return
}
+ this.modalData.actualResourceId = this.modalData.resourceId // 2025 04 14 新增实际机台 默认=机台
this.saveLoading = true
- if(this.modalData.flag === '1'){
+ if(this.modalData.flag === '1') {
saveOsInspection(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -3481,6 +3494,7 @@
// 获取主信息数据列表
getDataList () {
+ this.searchLoading = true
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
qcIPQCInspectionSearch(this.searchData).then(({data}) => {
@@ -3489,7 +3503,12 @@
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
+ this.searchLoading = false
+ } else {
+ this.searchLoading = false
}
+ }).catch(() => {
+ this.searchLoading = false
})
},
@@ -3654,6 +3673,7 @@
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
+ this.saveInformationData.actualResourceId = this.detailData.actualResourceId
// this.saveInformationData.subDetailList = this.acquisitionList
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
@@ -3731,6 +3751,8 @@
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.shiftDesc = row.shiftDesc
+ this.detailData.actualResourceId = row.actualResourceId
+ this.detailData.actualResourceDesc = row.actualResourceDesc
if (row.state === '待检验') {
this.detailData.passQty = row.samplingQty
} else {
@@ -3823,7 +3845,6 @@
})
}
})
- }).catch(() => {
})
},
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 2c3ca4e..2486590 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -109,7 +109,7 @@
- 查询
+ 查询
审核
删除
任务重载
@@ -2116,7 +2116,8 @@
},
changeModalFlag: false,
batchLoading: false,
- overLoading: false
+ overLoading: false,
+ searchLoading: false
}
},
@@ -2933,6 +2934,7 @@
// 获取主信息数据列表
getDataList () {
+ this.searchLoading = true
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
qcIQCInspectionSearch(this.searchData).then(({data}) => {
@@ -2941,7 +2943,12 @@
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
+ this.searchLoading = false
+ } else {
+ this.searchLoading = false
}
+ }).catch(() => {
+ this.searchLoading = false
})
},
@@ -3205,7 +3212,6 @@
})
}
})
- }).catch(() => {
})
},
diff --git a/src/views/modules/report/FQAS_report.vue b/src/views/modules/report/FQAS_report.vue
index 963aa92..0f2ebe7 100644
--- a/src/views/modules/report/FQAS_report.vue
+++ b/src/views/modules/report/FQAS_report.vue
@@ -9,7 +9,7 @@
-
+
-
+
@@ -59,7 +59,7 @@
-
+
@@ -95,20 +95,7 @@
查询
-
- {{ "导出" }}
-
+ 导出
@@ -200,6 +187,7 @@