diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 84083a7..7a157ca 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -161,6 +161,7 @@ export const iqcRecordOverLoad = data => createAPI(`/pms/qc/iqcRecordOverLoad`,' export const uploadSopFile = data => createAPI(`/pms/qc/upload`,'post',data) export const getSiteAndBuByUserName = data => createAPI(`/pms/qc/getSiteAndBuByUserName`,'post',data) export const searchSeqInfo = data => createAPI(`/pms/qc/searchSeqInfo`,'post',data) +export const searchSeqInfo2 = data => createAPI(`/pms/qc/searchSeqInfo2`,'post',data) export const searchPartInfo = data => createAPI(`/pms/qc/searchPartInfo`,'post',data) // 获取采购类型 export const orderTypeSearch = data => createAPI(`/pms/qc/orderTypeSearch`,'post',data) diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 67dd210..74b8438 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -114,6 +114,9 @@ this.menuActiveName = '' this.$router.push({ name: 'home' }) }, + handleRefresh () { + this.$router.go(0) + }, // tabs, 刷新当前 tabsRefreshCurrentHandle () { var tab = this.$route diff --git a/src/views/modules/qc/DoInspectionBySeqNo.vue b/src/views/modules/qc/DoInspectionBySeqNo.vue new file mode 100644 index 0000000..60567ce --- /dev/null +++ b/src/views/modules/qc/DoInspectionBySeqNo.vue @@ -0,0 +1,977 @@ + + + diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index f0f5ac8..86f17bf 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -952,6 +952,16 @@ this.detailData.unqualifiedQty = num } }, + $route (newVal, oldVal) { + if (newVal.path !== oldVal.path) { + if (!this.authSearch) { + if (this.$route.params.inspectionNo) { + this.searchData.inspectionNo = this.$route.params.inspectionNo + this.getDataList2() + } + } + } + } }, data () { return { @@ -974,7 +984,6 @@ submitData:{ site: '', inspectionNo: '', - submit_flag: '', inspectionResult: '', submitList: [], }, @@ -1024,7 +1033,6 @@ inspectionTypeName:'', inspectorNo:'', inspectorName:'', - submit_flag:'', orderNo: '', operationDesc: '', operationNo: '', @@ -2251,7 +2259,7 @@ inspectionTypeNo: '' }, currentRow: {}, - saveLoading: false + saveLoading: false, } }, @@ -2294,6 +2302,10 @@ this.getUserRoleList() }, + activated () { + + }, + methods: { // 列表数据总结 getSummaries (param) { @@ -2972,7 +2984,6 @@ this.modalData.partNo = data.rows[0].partNo this.modalData.partDesc = data.rows[0].partDesc this.modalData.spec = data.rows[0].spec - this.modalData.operationDesc = data.rows[0].operationDesc this.modalData.qtyrequired = data.rows[0].qtyrequired this.modalData.lotsize = data.rows[0].lotsize } else { @@ -3049,7 +3060,6 @@ inspectionTypeName:'', inspectorNo:'', inspectorName:'', - submit_flag:'', orderNo: '', operationDesc: '', operationNo: '', @@ -3165,7 +3175,6 @@ inspectionTypeName:'', inspectorNo:'', inspectorName:'', - submit_flag:'', orderNo: '', operationDesc: '', operationNo: '', @@ -3295,6 +3304,53 @@ }) }, + // 获取主信息数据列表 + getDataList2 () { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + qcIPQCInspectionSearch(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + if (this.dataList.length > 0) { + // 开始检验 + this.$confirm(`确认开始检验?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let tempData = { + site: this.dataList[0].site, + buNo: this.dataList[0].buNo, + inspectionNo: this.dataList[0].inspectionNo, + actionBy: this.$store.state.user.name, + state: '待检验' + } + actionIPQCInspection(tempData).then(({data}) => { + if (data && data.code === 0) { + qcIPQCInspectionSearch(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + if (this.dataList.length > 0) { + // 打开检验单 + this.detailModal(this.dataList[0]) + this.$router.push() + } + } + }) + } + }) + }) + } + } + }) + }, + // 每页数 sizeChangeHandle (val) { this.pageSize = val @@ -3493,7 +3549,7 @@ this.detailData.notPassQty = row.notPassQty } this.getInspectionFormData() - this.inspectorSearch() + // this.inspectorSearch() // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 0d7c31e..92886ae 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -747,7 +747,7 @@ - 保存 + 保存 关闭 @@ -2106,6 +2106,7 @@ inspectionTypeNo: '' }, changeModalFlag: false, + batchLoading: false } }, @@ -2273,6 +2274,7 @@ submitList: JSON.parse(JSON.stringify(this.IQCSelections)), itemList: JSON.parse(JSON.stringify(this.batchDetailList)) } + this.batchLoading = true batchSaveIQCDetailedRecord(tempData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2288,6 +2290,9 @@ confirmButtonText: '确定' }) } + this.batchLoading = false + }).catch(()=>{ + this.batchLoading = false }) }) },