2026-09-17

项目物料在新增或导入时，正式物料不需要校验“应用描述”和“产品类别”必填

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>

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 = {