1

src/views/modules/sampleTracking/projectProofTracking.vue

@@ -32,10 +32,10 @@
         <el-row :gutter="8" type="flex" class="button-row" >
             <el-button type="primary" @click="openOneKeyDialog">一键创建项目/物料</el-button>
             <el-button type="warning" plain @click="openOneKeyDialog('edit')">修改项目/物料</el-button>
-            <el-button type="primary" @click="openCreateProofDialog()">新增打样</el-button>
-            <el-button type="success" :loading="syncNpiLoading" @click="syncToNpi()">同步到NPI</el-button>
             <el-button type="warning" @click="toggleBatchEdit">{{ batchEditMode ? '取消修改' : '批量修改' }}</el-button>
             <el-button v-if="batchEditMode" type="success" @click="saveBatchPlan">保存修改</el-button>
+          <el-button type="primary" @click="openCreateProofDialog()">新增打样</el-button>
+          <el-button type="success" :loading="syncNpiLoading" @click="syncToNpi()">同步到NPI</el-button>
         </el-row>
       </el-form-item>
     </el-form>
@@ -221,8 +221,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="最终客户编码">
-              <el-input v-model="oneKeyForm.finalCustomerId" style="width: 100%"></el-input>
+            <el-form-item label="区域">
+              <el-select v-model="oneKeyForm.cProjectRegion" placeholder="请选择" clearable style="width: 100%">
+                <el-option
+                  v-for="i in cProjectRegionList"
+                  :key="i.cProjectRegion"
+                  :label="i.cProjectRegion"
+                  :value="i.cProjectRegion">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -420,9 +427,6 @@
               <el-input v-model.number="oneKeyForm.proofingNumber" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="16" v-if="oneKeyDialogMode !== 'edit'">
           <el-col :span="6">
             <el-form-item label="打样开始日期">
               <el-date-picker
@@ -434,6 +438,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row :gutter="16" v-if="oneKeyDialogMode !== 'edit'">
           <el-col :span="6">
             <el-form-item label="预计交付日期">
               <el-date-picker
@@ -445,10 +452,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="16">
-          <el-col :span="24">
+          <el-col :span="18">
             <el-form-item label="备注">
               <el-input type="textarea" :rows="2" v-model="oneKeyForm.remark" style="width: 100%"></el-input>
             </el-form-item>
@@ -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 || '',