diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue
index 31da44b..0322c8a 100644
--- a/src/views/modules/sampleTracking/projectProofTracking.vue
+++ b/src/views/modules/sampleTracking/projectProofTracking.vue
@@ -32,10 +32,10 @@
一键创建项目/物料
修改项目/物料
- 新增打样
- 同步到NPI
{{ batchEditMode ? '取消修改' : '批量修改' }}
保存修改
+ 新增打样
+ 同步到NPI
@@ -221,8 +221,15 @@
-
-
+
+
+
+
+
@@ -420,9 +427,6 @@
-
-
-
+
+
+
-
-
-
-
+
@@ -821,7 +825,15 @@ export default {
{ label: 'Delivery&Package', code: 'deliveryPackage', planField: 'deliveryPackagePlanDate', actualField: 'deliveryPackageActualDate', statusField: 'deliveryPackageStatus' }
],
projectCategoryList: ['Low Risk', 'High Risk', 'Sustaining'],
- cProjectRegionList: ['Global', 'APAC', 'CHINA', 'EU', 'US', 'Mexico', 'Other'],
+ cProjectRegionList: [
+ { cProjectRegion: 'Global' },
+ { cProjectRegion: 'APAC' },
+ { cProjectRegion: 'CHINA' },
+ { cProjectRegion: 'EU' },
+ { cProjectRegion: 'US' },
+ { cProjectRegion: 'Mexico' },
+ { cProjectRegion: 'Other' }
+ ],
priorityList: ['Low', 'Middle', 'High'],
projectStatusList: ['草稿', '进行中', '已关闭'],
partTypeList: ['Active', 'On hold', 'Cancel', 'EOL'],
@@ -1400,6 +1412,12 @@ export default {
if (!inData.priorityLevel) {
inData.priorityLevel = ''
}
+ // 弹窗仅展示一个立项日期输入,提交时同步到项目与物料两个日期字段,避免物料立项日期被误判为空
+ if (!this.isBlankValue(inData.projectCreationDate)) {
+ inData.buildDate = inData.projectCreationDate
+ } else if (!this.isBlankValue(inData.buildDate)) {
+ inData.projectCreationDate = inData.buildDate
+ }
return inData
},
validateOneKeySubmitPayload (inData) {
@@ -1554,9 +1572,9 @@ export default {
proofingNo: current.proofingNo || '',
proofingStatus: current.proofingStatus || '进行中',
proofingNumber: current.proofingNumber || 1,
- projectCreationDate: project.projectCreationDate || '',
+ projectCreationDate: project.projectCreationDate || part.buildDate || '',
projectCloseDate: project.projectCloseDate || '',
- buildDate: part.buildDate || '',
+ buildDate: part.buildDate || project.projectCreationDate || '',
closeDate: part.closeDate || '',
comments: current.comments || '',
planStartDate: current.planStartDate || '',