From af131354da458e5b0f6efe8e57a5f88c8f1541ec Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 13 Jun 2024 17:54:47 +0800 Subject: [PATCH] =?UTF-8?q?2024-06-13=20=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qc/qc.js | 1 + src/views/modules/qc/FAIResultEntry.vue | 32 +++---- src/views/modules/qc/FQCResultEntry.vue | 32 +++---- src/views/modules/qc/IPQCResultEntry.vue | 32 +++---- src/views/modules/qc/IQCResultEntry.vue | 34 +++----- src/views/modules/qc/qcItem.vue | 89 ++++++++++++++++++-- src/views/modules/sys/menu-add-or-update.vue | 2 +- 7 files changed, 138 insertions(+), 84 deletions(-) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index e78b055..e78353f 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -167,6 +167,7 @@ export const actionFAIInspection = data => createAPI(`/pms/qc/actionFAIInspectio export const actionIPQCInspection = data => createAPI(`/pms/qc/actionIPQCInspection`,'post',data) export const actionFQCInspection = data => createAPI(`/pms/qc/actionFQCInspection`,'post',data) export const dataAcquisition = data => createAPI(`/pms/qc/dataAcquisition`,'post',data) +export const getEquipmentNoList = data => createAPI(`/pms/qc/getEquipmentNoList`,'post',data) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 40400ef..b05d061 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -2302,26 +2302,22 @@ site: this.detailData.site, buNo: this.detailData.buNo, inspectionNo: this.detailData.inspectionNo, + flag: 'fai' } dataAcquisition(tempDate).then(({data}) => { if (data.code === 0) { - this.acquisitionList = data.rows - if (this.acquisitionList.length > 0) { - this.$message({ - message: '数据采集成功', - type: 'success', - duration: 1500 - }) - } else { - this.$message({ - message: '未采集到数据信息!', - type: 'warning', - duration: 1500 - }) - } + // this.acquisitionList = data.rows + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 }) } this.loadFlag = false @@ -3278,7 +3274,7 @@ this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) - this.saveInformationData.subDetailList = this.acquisitionList + // this.saveInformationData.subDetailList = this.acquisitionList saveFAIDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -3358,7 +3354,7 @@ this.detailData.responsiblePersonName = row.responsiblePersonName this.getInspectionFormData() this.inspectorSearch() - this.acquisitionList = [] + // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 56a22c5..ce70ef7 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -2277,26 +2277,22 @@ site: this.detailData.site, buNo: this.detailData.buNo, inspectionNo: this.detailData.inspectionNo, + flag: 'fqc' } dataAcquisition(tempDate).then(({data}) => { if (data.code === 0) { - this.acquisitionList = data.rows - if (this.acquisitionList.length > 0) { - this.$message({ - message: '数据采集成功', - type: 'success', - duration: 1500 - }) - } else { - this.$message({ - message: '未采集到数据信息!', - type: 'warning', - duration: 1500 - }) - } + // this.acquisitionList = data.rows + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 }) } this.loadFlag = false @@ -3252,7 +3248,7 @@ this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) - this.saveInformationData.subDetailList = this.acquisitionList + // this.saveInformationData.subDetailList = this.acquisitionList saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -3332,7 +3328,7 @@ this.detailData.responsiblePersonName = row.responsiblePersonName this.getInspectionFormData() this.inspectorSearch() - this.acquisitionList = [] + // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 37eb12f..2e0ef2f 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -2331,26 +2331,22 @@ site: this.detailData.site, buNo: this.detailData.buNo, inspectionNo: this.detailData.inspectionNo, + flag: 'ipqc' } dataAcquisition(tempDate).then(({data}) => { if (data.code === 0) { - this.acquisitionList = data.rows - if (this.acquisitionList.length > 0) { - this.$message({ - message: '数据采集成功', - type: 'success', - duration: 1500 - }) - } else { - this.$message({ - message: '未采集到数据信息!', - type: 'warning', - duration: 1500 - }) - } + // this.acquisitionList = data.rows + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 }) } this.loadFlag = false @@ -3316,7 +3312,7 @@ this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) - this.saveInformationData.subDetailList = this.acquisitionList + // this.saveInformationData.subDetailList = this.acquisitionList saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -3398,7 +3394,7 @@ this.detailData.responsiblePersonName = row.responsiblePersonName this.getInspectionFormData() this.inspectorSearch() - this.acquisitionList = [] + // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 1b842f4..829f4be 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -1619,26 +1619,22 @@ site: this.detailData.site, buNo: this.detailData.buNo, inspectionNo: this.detailData.inspectionNo, + flag: 'iqc' } dataAcquisition(tempDate).then(({data}) => { if (data.code === 0) { - this.acquisitionList = data.rows - if (this.acquisitionList.length > 0) { - this.$message({ - message: '数据采集成功', - type: 'success', - duration: 1500 - }) - } else { - this.$message({ - message: '未采集到数据信息!', - type: 'warning', - duration: 1500 - }) - } + // this.acquisitionList = data.rows + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 }) } this.loadFlag = false @@ -2042,8 +2038,6 @@ getDataList () { this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex - //this.searchData.state = this.searchData.state.join(',') - console.log(this.searchData.states) qcIQCInspectionSearch(this.searchData).then(({data}) => { if (data.code === 0) { this.dataList = data.page.list @@ -2125,7 +2119,7 @@ this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) - this.saveInformationData.subDetailList = this.acquisitionList + // this.saveInformationData.subDetailList = this.acquisitionList saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2205,7 +2199,7 @@ this.detailData.responsiblePersonName = row.responsiblePersonName this.getInspectionFormData() this.inspectorSearch() - this.acquisitionList = [] + // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index c80f18c..e60ae2b 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -109,7 +109,7 @@ - + - + + + 采集标记 + + + - + @@ -205,8 +210,24 @@ - - 采集标记 + + + + + + + + + + + + + + @@ -283,7 +304,8 @@ qcItemDelete, // 删除项目 inspectionTypeSearch, // 查询检验类型 queryMethodList, // 查询检验方法 - getSiteAndBuByUserName + getSiteAndBuByUserName, + getEquipmentNoList, // 获取采集条件路径 } from "@/api/qc/qc.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' @@ -362,7 +384,12 @@ samplingLevelDesc: '', defaultSamplingProportion: '', collectionFlag: '', - collectionSource: '' + collectionSource: '', + collectionSourceList: [], + collectionMethod: '', + collectionMethodList: [], + collectionCondition: '', + collectionConditionList: [] }, // 检验项目展示标头 columnList: [ @@ -785,6 +812,7 @@ }, ], userBuList: [], + equipmentNoList: [], authSearch: false, authSave: false, authUpdate: false, @@ -829,6 +857,18 @@ }) }, + // 获取采集条件路径 + getEquipmentNoList () { + let tempData = { + bu: this.modalData.bu + } + getEquipmentNoList(tempData).then(({data}) => { + if (data.code === 0) { + this.equipmentNoList = data.rows + } + }) + }, + // 获取基础数据列表S getBaseList (val,type) { this.tagNo = val @@ -940,8 +980,14 @@ samplingLevelDesc: '', defaultSamplingProportion: '', collectionFlag: '', - collectionSource: '' + collectionSource: '', + collectionSourceList: [], + collectionMethod: '', + collectionMethodList: [], + collectionCondition: '', + collectionConditionList: [] } + this.getEquipmentNoList() this.modalDisableFlag = false this.modalFlag = true }, @@ -971,8 +1017,14 @@ samplingLevelDesc: row.samplingLevelDesc, defaultSamplingProportion: row.defaultSamplingProportion, collectionFlag: row.collectionFlag, - collectionSource: row.collectionSource + collectionSource: row.collectionSource, + collectionSourceList: row.collectionSource == null || row.collectionSource === '' ? [] : row.collectionSource.split(','), + collectionMethod: row.collectionMethod, + collectionMethodList: row.collectionMethod == null || row.collectionMethod === '' ? [] : row.collectionMethod.split(','), + collectionCondition: row.collectionCondition, + collectionConditionList: row.collectionCondition == null || row.collectionCondition === '' ? [] : row.collectionCondition.split(','), } + this.getEquipmentNoList() this.modalDisableFlag = true this.modalFlag = true }, @@ -1032,6 +1084,25 @@ this.$message.warning('请选择检验水平！') return } + if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList == null || this.modalData.collectionSourceList.length === 0)) { + this.$message.warning('请选择采集数据来源！') + return + } + if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionMethodList == null || this.modalData.collectionMethodList.length === 0)) { + this.$message.warning('请选择采集数据方式！') + return + } + if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionConditionList == null || this.modalData.collectionConditionList.length === 0)) { + this.$message.warning('请选择采集条件路径！') + return + } + if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList.length !== this.modalData.collectionMethodList.length || this.modalData.collectionSourceList.length !== this.modalData.collectionConditionList.length || this.modalData.collectionMethodList.length !== this.modalData.collectionConditionList.length)) { + this.$message.warning('采集数据的来源、方式、条件路径不对应！') + return + } + this.modalData.collectionSource = this.modalData.collectionSourceList.join(',') + this.modalData.collectionMethod = this.modalData.collectionMethodList.join(',') + this.modalData.collectionCondition = this.modalData.collectionConditionList.join(',') if (this.modalData.flag === '1') { qcItemSave(this.modalData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue index 08d4b4a..b0333b6 100644 --- a/src/views/modules/sys/menu-add-or-update.vue +++ b/src/views/modules/sys/menu-add-or-update.vue @@ -241,7 +241,7 @@ this.$refs['dataForm'].validate((valid) => { if (valid) { this.$http({ - url: this.$http.adornUrl(`/api/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`), + url: this.$http.adornUrl(`/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`), method: 'post', data: this.$http.adornData({ 'menuId': this.dataForm.menuId,