系统、零部件DVP由fmea推送的试验可修改并保存

src/views/componentsDVP/dvpPlan/editModal/editTableRow.vue

@@ -77,20 +77,6 @@
               :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
           </a-form-item>
         </a-col>
-        <!--计划结束时间-->
-        <a-col v-if="editParam.isEquivalent === 0 && !isCarryOutFlag" :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('plan.dvp.scheduled-end-time')" required>
-            <a-date-picker
-              v-model="editParam.planEndTime"
-              :disabled-date="disabledEndDate"
-              @change="handleEditEndTime"
-              :disabled="dataSource && dataSource === '2'"
-              allowClear
-              valueFormat="YYYY/MM/DD"
-              style="width: 100%"
-              :placeholder="$t('global-btn.please-select') + $t('plan.dvp.scheduled-end-time')"/>
-          </a-form-item>
-        </a-col>
         <!--试验类型-->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
           <a-form-item :label="$t('plan.dvp.test-type')" required>
@@ -165,6 +151,16 @@
           </a-col>
           <!-- 选择了非等效试验，显示对应的表单项 -->
           <span v-if="editParam.isEquivalent === 0">
+            <!--测试地点-->
+            <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
+              <a-form-item :label="$t('plan.dvp.test-site')" required>
+                <a-input
+                    v-model.trim="editParam.testSite"
+                    :maxLength='50'
+                    allowClear
+                    :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-site')"/>
+              </a-form-item>
+            </a-col>
               <!--计划开始时间-->
             <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
               <a-form-item :label="$t('plan.dvp.scheduled-start-time')" required>
@@ -178,14 +174,17 @@
                    :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.scheduled-start-time')"/>
               </a-form-item>
             </a-col>
-            <!--测试地点-->
-            <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-              <a-form-item :label="$t('plan.dvp.test-site')" required>
-                <a-input
-                  v-model.trim="editParam.testSite"
-                  :maxLength='50'
-                  allowClear
-                  :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-site')"/>
+            <!--计划结束时间-->
+            <a-col v-if="editParam.isEquivalent === 0 && !isCarryOutFlag" :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
+              <a-form-item :label="$t('plan.dvp.scheduled-end-time')" required>
+                <a-date-picker
+                    v-model="editParam.planEndTime"
+                    :disabled-date="disabledEndDate"
+                    @change="handleEditEndTime"
+                    allowClear
+                    valueFormat="YYYY/MM/DD"
+                    style="width: 100%"
+                    :placeholder="$t('global-btn.please-select') + $t('plan.dvp.scheduled-end-time')"/>
               </a-form-item>
             </a-col>
             <!--测试负责人-->
@@ -625,7 +624,7 @@ export default {
 
     // 比较变更数据是否进行了修改
     compareData() {
-      // 使用lodash的isEqual进行深度比较  
+      // 使用lodash的isEqual进行深度比较
       return lodash.isEqual(this.editParam, this.originalEditParam);
     },
 

src/views/systemDVP/dvpPlan/index.vue

@@ -372,7 +372,6 @@
           <a-col :lg='16'  :md='24' :sm='24' :xl='12'  :xs='24'>
             <a-form-item required :label="$t('plan.dvp.scheduled-end-time')">
               <a-date-picker v-model="editParam.planEndTime"
-              :disabled="this.editParam.testSource === 1"
               :disabled-date="disabledEndDate"
               @change="handleEditEndTime"
               style="width: 100%"
@@ -1123,7 +1122,7 @@ export default {
 
     // 比较变更数据是否进行了修改
     compareData() {
-      // 使用lodash的isEqual进行深度比较  
+      // 使用lodash的isEqual进行深度比较
       return lodash.isEqual(this.editParam, this.originalEditParam);
     },