From 6fc643c8be040a10a84aeab437528ca3ab7ce7c0 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 17 Sep 2026 09:20:19 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-17=20=E9=A1=B9=E7=9B=AE=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=9C=A8=E6=96=B0=E5=A2=9E=E6=88=96=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=AD=A3=E5=BC=8F=E7=89=A9=E6=96=99=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8C=E2=80=9C=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E2=80=9D=E5=92=8C=E2=80=9C=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E2=80=9D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com_projectInfo-add-or-update.vue           | 17 ++++++++++++++---
 .../projectInfo/com_project_info_part.vue       | 15 ++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

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 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="项目年销售额CNY(K)">
+            <el-form-item class="project-amount-form-item">
+              <span slot="label" class="project-amount-label">项目年销售额CNY(K)</span>
               <el-input v-model="dataForm.projectAmount" :disabled="isProjectFieldDisabled('projectAmount')" @input="dataForm.projectAmount = dataForm.projectAmount.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace(/^(\d+\.\d{1,6}).*$/, '$1')"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="直接客户">
               <el-input v-model="dataForm.finalCustomerId" :disabled="isProjectFieldDisabled('finalCustomerId')"></el-input>
             </el-form-item>
@@ -96,7 +97,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="canSaveAction()" @click="dataFormSubmit()">{{'确定'}}</el-button>
+        <el-button type="primary" v-if="canSaveAction()" @click="dataFormSubmit()">{{'保存'}}</el-button>
         <el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>
         <el-button type="primary" v-if="canAgreeAction()" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
         <el-button type="primary" v-if="canRejectAction()" :loading="submitLoading" @click="openRejectModal">驳回</el-button>
@@ -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;
+  }
+
 </style>
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 = {