diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index 3e95192..64c666d 100644 --- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -71,11 +71,12 @@ - + + 项目年销售额CNY(K) - + @@ -96,7 +97,7 @@ - {{'确定'}} + {{'保存'}} {{'关闭'}} 同意 驳回 @@ -1252,4 +1253,14 @@ height: auto; } + .project-amount-form-item .el-form-item__label { + overflow: visible; + } + + .project-amount-label { + display: inline-block; + width: 160px; + white-space: nowrap; + } + diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index 29059bf..94f5fe4 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -3041,9 +3041,10 @@ import CodeGeneration from "../../code/generation.vue"; this.searchTypeChange() }, - /** - * 新增项目物料 - */ + isTemporaryImportPart (row) { + return row && row.status === 'N' + }, + saveProjectPartModal () { if (this.partList2.some(x => x.buNo == null || x.buNo === '')) { this.$message.warning('BU不能为空!') @@ -3053,12 +3054,12 @@ import CodeGeneration from "../../code/generation.vue"; this.$message.warning('客户料号不能为空!') return } - if (this.partList2.some(x => x.applicationDesc == null || String(x.applicationDesc).trim() === '')) { - this.$message.warning('应用描述不能为空!') + if (this.partList2.some(x => this.isTemporaryImportPart(x) && (x.applicationDesc == null || String(x.applicationDesc).trim() === ''))) { + this.$message.warning('临时物料应用描述不能为空!') return } - if (this.partList2.some(x => x.productCategory == null || x.productCategory === '')) { - this.$message.warning('产品类别不能为空!') + if (this.partList2.some(x => this.isTemporaryImportPart(x) && (x.productCategory == null || x.productCategory === ''))) { + this.$message.warning('临时物料产品类别不能为空!') return } let tempData = {