From 8c199ed37b24548fc6e1f5d90a657ea9380a53b5 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:05:34 +0800 Subject: [PATCH] =?UTF-8?q?2024.1.26=201=E3=80=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=B8=85=E5=8D=95=20=20=20=20=20=20=20=20=20=20=202=E3=80=81?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E3=80=81=E7=BB=B4=E4=BF=9D=E6=A8=A1=E7=89=88?= =?UTF-8?q?-=E7=82=B9=E6=A3=80=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=203=E3=80=81=E7=82=B9=E6=A3=80?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=9D=E8=AE=A1=E5=88=92=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=204=E3=80=81=E7=BB=B4=E4=BF=AE=E5=8F=8D=E9=A6=88-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=20=20=20=20=20=20=20=20=205=E3=80=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=20=20=20=20=20=20=20=20=206=E3=80=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=207=E3=80=81=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=81=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=208=E3=80=81=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/eam/com_eam_object_add_update.vue | 53 ++++++++++++++++++- src/views/modules/eam/eamFeedBack.vue | 9 +++- .../modules/eam/eamWorkPlanForMaintenance.vue | 9 +++- src/views/modules/qc/qcItem.vue | 23 ++++++-- src/views/modules/qc/qcTemplate.vue | 19 +++++-- 5 files changed, 101 insertions(+), 12 deletions(-) diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue index cf1dc3a..ee3f429 100644 --- a/src/views/modules/eam/com_eam_object_add_update.vue +++ b/src/views/modules/eam/com_eam_object_add_update.vue @@ -446,7 +446,7 @@ export default { if (this.tagNo === 26) { //设置参数 this.pageData.locationID = val.LocationID; - this.$set(this.pageData,'locationName',val.LocationName) + this.pageData.locationName = val.LocationName; } else if (this.tagNo === 27) { //设置参数 this.pageData.familyID = val.FamilyID; @@ -479,22 +479,71 @@ export default { this.tagNo = val this.$nextTick(() => { let strVal = '' + let conSql = '' if (val === 26) { strVal = this.pageData.locationID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.pageData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } }else if (val === 27) { strVal = this.pageData.familyID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.pageData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } }else if (val === 28) { strVal = this.pageData.groupID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.pageData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } }else if (val === 29) { strVal = this.pageData.supplierID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.pageData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } }else if (val === 30) { strVal = this.pageData.manufacturerID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.pageData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } }else if (val === 503) { strVal = this.pageData.resourceID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and site = '" + this.pageData.bu.split('_')[0] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } }else if (val === 204) { strVal = this.pageData.deptID + if (this.pageData.bu === null || this.pageData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.pageData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } } - this.$refs.baseList.init(val, strVal) }) }, diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue index 31728e0..60630f4 100644 --- a/src/views/modules/eam/eamFeedBack.vue +++ b/src/views/modules/eam/eamFeedBack.vue @@ -810,13 +810,20 @@ this.tagNo = val this.$nextTick(() => { let strVal = '' + let conSql = '' if (val === 201) { strVal = this.modalData.planOperator this.$refs.baseList.init(val, strVal) } if (val === 200) { strVal = this.saveModalData.objectID - this.$refs.baseList.init(val, strVal) + if (this.saveModalData.bu === null || this.saveModalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.saveModalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } } if (val === 1055) { strVal = this.saveModalData.defectID diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index f0c1f97..509c7e4 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -1985,6 +1985,7 @@ // 获取基础数据列表S getBaseList (val,type) { this.tagNo = val + let conSql = '' this.$nextTick(() => { let strVal = '' if (val === 200 && this.modalDisableFlag !== true) { @@ -1993,7 +1994,13 @@ } if (val === 32) { strVal = this.modalData.propertiesCode - this.$refs.baseList.init(val, strVal) + if (this.modalData.bu === null || this.modalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } } if (val === 201) { strVal = this.modalData.operator diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index 3ee7cdd..d3daf9f 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -806,16 +806,29 @@ this.tagNo = val this.$nextTick(() => { let strVal = '' - if (val === 1036) { - strVal = this.modalData.methodNo - this.$refs.baseList.init(val, strVal) - } + let conSql = '' if (val === 207) { strVal = this.modalData.samplingProgrammeNo - this.$refs.baseList.init(val, strVal) + if (this.modalData.bu === null || this.modalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } } if (val === 208) { strVal = this.modalData.samplingLevelNo + if (this.modalData.bu === null || this.modalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } + } + if (val === 1036) { + strVal = this.modalData.methodNo this.$refs.baseList.init(val, strVal) } }) diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index a0b3fda..b1c8dac 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -1066,14 +1066,27 @@ this.tagNo = val this.$nextTick(() => { let strVal = '' + let conSql = '' if (val === 207) { strVal = this.modalData.samplingProgrammeNo - this.$refs.baseList.init(val, strVal) + if (this.modalData.bu === null || this.modalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } } if (val === 208) { strVal = this.modalData.samplingLevelNo - this.$refs.baseList.init(val, strVal) - } + if (this.modalData.bu === null || this.modalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } + } }) },