From 59d34a93e47246f5f282df5c045c3a3e51c86c83 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Mon, 22 Jan 2024 17:15:49 +0800 Subject: [PATCH] =?UTF-8?q?2024.1.22=20=E5=8D=95=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E5=8D=95=E4=BB=B7=20=20=E5=8D=8F=E5=90=8C=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/eam/eamWorkOrderForMaintenance.vue | 2 +- src/views/modules/eam/eamWorkPlanForCheck.vue | 2 +- src/views/modules/eam/eamWorkPlanForMaintenance.vue | 2 +- .../modules/partspare/partspare-add-or-update.vue | 10 +++++----- src/views/modules/partspare/partspare.vue | 5 +---- src/views/modules/qc/qcPartAttribute.vue | 2 ++ .../modules/reportWorkOrder/reportDefectOrder.vue | 2 +- .../modules/reportWorkOrder/reportMaintenanceOrder.vue | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue index cd85913..b0d5525 100644 --- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue +++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue @@ -1515,7 +1515,7 @@ getRoleNameList () { this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/sys/role/list'), + url: this.$http.adornUrl('/sys/role/list2'), method: 'get', params: this.$http.adornParams({ 'page': this.pageIndex, diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index ea3af6a..8e09434 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -1904,7 +1904,7 @@ getRoleNameList () { this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/sys/role/list'), + url: this.$http.adornUrl('/sys/role/list2'), method: 'get', params: this.$http.adornParams({ 'page': this.pageIndex, diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index eea5220..f0c1f97 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -1792,7 +1792,7 @@ getRoleNameList () { this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/sys/role/list'), + url: this.$http.adornUrl('/sys/role/list2'), method: 'get', params: this.$http.adornParams({ 'page': this.pageIndex, diff --git a/src/views/modules/partspare/partspare-add-or-update.vue b/src/views/modules/partspare/partspare-add-or-update.vue index 953827b..3fbc568 100644 --- a/src/views/modules/partspare/partspare-add-or-update.vue +++ b/src/views/modules/partspare/partspare-add-or-update.vue @@ -22,10 +22,10 @@ - + - + @@ -192,15 +192,15 @@ export default { return; } if (!this.dataForm.averagePrice) { - this.$message.warning("计价单位不能为空") + this.$message.warning("单价不能为空") return; } if (isNaN(this.dataForm.averagePrice)) { - this.$message.warning("计价单位必须为整数或小数!") + this.$message.warning("单价必须为整数或小数!") return; } if (!this.dataForm.umid) { - this.$message.warning("单价单位不能为空") + this.$message.warning("单位不能为空") return; } if (!this.dataForm.estUseQty) { diff --git a/src/views/modules/partspare/partspare.vue b/src/views/modules/partspare/partspare.vue index d387061..77b7c08 100644 --- a/src/views/modules/partspare/partspare.vue +++ b/src/views/modules/partspare/partspare.vue @@ -252,8 +252,6 @@ export default { fixed: '', columnWidth: 140, }, - - { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, @@ -263,7 +261,7 @@ export default { columnProp: 'umid', headerAlign: "center", align: "left", - columnLabel: '单价单位', + columnLabel: '单位', columnHidden: false, columnImage: false, columnSortable: false, @@ -272,7 +270,6 @@ export default { fixed: '', columnWidth: 140, }, - { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 716b526..fa0e767 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -1297,6 +1297,7 @@ userBuList: [], partInfoList: [], partDetailData: { + buNo: '', partNo: '', partDesc: '', seqNo: '', @@ -1340,6 +1341,7 @@ }, searchPartInfo () { + this.partDetailData.buNo = this.modalData.bu if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) { this.partInfoList = [] this.partDisableFlag = true diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index d8c6e1d..6b2e390 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -1105,7 +1105,7 @@ getRoleNameList () { this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/sys/role/list'), + url: this.$http.adornUrl('/sys/role/list2'), method: 'get', params: this.$http.adornParams({ 'page': this.pageIndex, diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index e24d36a..340d38e 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -1306,7 +1306,7 @@ getRoleNameList () { this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/sys/role/list'), + url: this.$http.adornUrl('/sys/role/list2'), method: 'get', params: this.$http.adornParams({ 'page': this.pageIndex,