零部件DVP-编辑dvp计划-模板添加的DVP无法编辑

src/views/componentsDVP/dvpPlan/edit.vue

@@ -1213,10 +1213,10 @@ export default {
       this.$refs.editTableRow.editParam.equivalentId = val.equivalentTestId;
       this.$refs.editTableRow.editParam.testSite = val.testSite;
       this.$refs.editTableRow.editParam.testOwner = val.testOwnerId || undefined;
-      this.$refs.editTableRow.editParam.testStep = val.testStep;
+      this.$refs.editTableRow.editParam.testStep = val.testStepd || undefined;
       this.$refs.editTableRow.editParam.testFrequency = val.testFrequency;
       this.$refs.editTableRow.editParam.sampleNumber = val.sampleNumber;
-      this.$refs.editTableRow.editParam.sampleType = val.sampleType;
+      this.$refs.editTableRow.editParam.sampleType = val.sampleTyped || undefined;
       this.$refs.editTableRow.editParam.planStartTime = val.planStartTime;
       this.$refs.editTableRow.editParam.planEndTime = val.planEndTime;
       this.$refs.editTableRow.editParam.isEquivalent = val.isEquivalent;

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

@@ -55,28 +55,6 @@
               :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-project')"/>
           </a-form-item>
         </a-col>
-        <!--开发目标要求-->
-        <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('base.info.development-objective-requirements')" required>
-            <a-input
-              v-model.trim="editParam.targetRequire"
-              :disabled="dataSource && dataSource !== '0'"
-              :maxLength='1000'
-              allowClear
-              :placeholder="$t('global-btn.please-enter') + $t('base.info.development-objective-requirements')"/>
-          </a-form-item>
-        </a-col>
-        <!--试验标准-->
-        <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24" >
-          <a-form-item :label="$t('base.info.Test-standards')" required>
-            <a-input
-              v-model.trim="editParam.testStandard"
-              :disabled="dataSource && dataSource !== '0'"
-              :maxLength='1000'
-              allowClear
-              :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
-          </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>
@@ -103,6 +81,28 @@
             </a-select>
           </a-form-item>
         </a-col>
+        <!--开发目标要求-->
+        <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
+          <a-form-item :label="$t('base.info.development-objective-requirements')" required>
+            <a-input
+              v-model.trim="editParam.targetRequire"
+              :disabled="dataSource && dataSource !== '0' && dataSource !== '1'"
+              :maxLength='1000'
+              allowClear
+              :placeholder="$t('global-btn.please-enter') + $t('base.info.development-objective-requirements')"/>
+          </a-form-item>
+        </a-col>
+        <!--试验标准-->
+        <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24" >
+          <a-form-item :label="$t('base.info.Test-standards')" required>
+            <a-input
+              v-model.trim="editParam.testStandard"
+              :disabled="dataSource && dataSource !== '0' && dataSource !== '1'"
+              :maxLength='1000'
+              allowClear
+              :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
+          </a-form-item>
+        </a-col>
         <!-- 是否开展试验项目 -->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
           <a-form-item required :label="$t('base.info.whether-to-develop-experimental-projects')">