DVP问题编号158：整车DVP-DVP验证弹窗 的【样车提交时间】、【实际开展时间】、【实际结束时间】字段均可进行任选，不做任何逻辑限制

DVP问题编号160：整车DVP-DVP计划-DVP计划编辑页面-试验负责人字段显示异常
DVP问题编号165：172、174：为同一个问题； 更改等效试验逻辑
DVP问题编号156： DVP系统中分配任务中为，零部件工程师应该调整为试验工程师

src/locales/lang/en-US/baseInfo.js

@@ -62,8 +62,8 @@ export default {
     'workbench.please-enter-product-engineer' : 'Please Enter Product Engineer',
     'workbench.material-engineer' : 'Material Engineer',
     'workbench.please-enter-material-engineer' : 'Please Enter Material Engineer',
-    'workbench.parts-engineer' : 'Parts Engineer',
-    'workbench.please-enter-parts-engineer' : 'Please Enter Parts Engineer',
+    'workbench.parts-engineer' : 'Test Engineer',
+    'workbench.please-enter-parts-engineer' : 'Please Enter Test Engineer',
     'workbench.management-fnd-code':'FND Code',
     'workbench.compoment-number':'Compoment Number',
     'workbench.compoment-name':'Compoment Name',

src/locales/lang/zh-CN/baseInfo.js

@@ -65,8 +65,8 @@ export default {
     'workbench.please-enter-product-engineer' : '请输入产品工程师',
     'workbench.material-engineer' : '材料工程师',
     'workbench.please-enter-material-engineer' : '请输入材料工程师',
-    'workbench.parts-engineer' : '零部件工程师',
-    'workbench.please-enter-parts-engineer' : '请输入零部件工程师',
+    'workbench.parts-engineer' : '试验工程师',
+    'workbench.please-enter-parts-engineer' : '请输入试验工程师',
     'workbench.management-fnd-code':'FND编码',
     'workbench.compoment-number': '零部件编号',
     'workbench.compoment-name': '零部件名称',

src/views/componentsDVP/verify/dvpVerify.vue

@@ -78,6 +78,19 @@
                 />
               </a-form-item>
             </a-col>
+            <!-- 是否等效 -->
+            <a-col :lg="8" :md="12" :sm="24" :xl="6" :xs="24">
+              <a-form-item :label="$t('plan.dvp.is-it-an-equivalent-test')">
+                <a-select
+                  v-model="queryParam.isEquivalent"
+                  :placeholder="$t('global-btn.please-select') + $t('plan.dvp.is-it-an-equivalent-test')"
+                  :defaultValue="'1'"
+                  allowClear>
+                  <a-select-option :value="'1'">{{ $t('plan.dvp.non-equivalent-experiment') }}</a-select-option>
+                  <a-select-option :value="'0'">{{ $t('plan.dvp.equivalent-experiment') }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
           </span>
           <a-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
             <a-form-item class='tr' :label="'\xa0'">
@@ -393,7 +406,8 @@ export default {
         testEndTime: undefined,         // 试验结束时间
         testResult: undefined,          // 试验结果
         testReportCode: undefined,      // 试验报告编号
-        isPass: undefined               // 是否通过
+        isPass: undefined,               // 是否通过
+        isEquivalent: '1'                // 是否等效实验 默认查非等效
       },
       /** 分页实体 */
       pagination: {
@@ -473,6 +487,17 @@ export default {
           dataIndex: 'testProject',
           ellipsis: true
         },
+        {
+          // 是否等效
+          title: () => this.$t('plan.dvp.is-it-an-equivalent-test'),
+          width: 150,
+          align: 'center',
+          dataIndex: 'isEquivalent',
+          ellipsis: true,
+          customRender: val => {
+            return val === '1' ? this.$t('plan.dvp.non-equivalent-experiment') : this.$t('plan.dvp.equivalent-experiment');
+          }
+        },
         {
           // 测试开始日期
           title: () => this.$t('verity.dvp.test.start.date'),
@@ -790,6 +815,7 @@ export default {
         testEndEndTime: _that.queryParam.testEndEndTime,
         testReportCode: _that.queryParam.testReportCode,
         testResult: _that.queryParam.testResult,
+        isEquivalent: _that.queryParam.isEquivalent,
         pagination: {
           pageSize: _that.pagination.pageSize,
           pageCurrent: _that.pagination.pageCurrent
@@ -838,6 +864,7 @@ export default {
       this.queryParam.testEndEndTime = undefined;
       this.queryParam.testResult = undefined;
       this.queryParam.testReportCode = undefined;
+      this.queryParam.isEquivalent = '1';
       this.list();
     },
     /**

src/views/fullVehicle/dvpPlan/components/addDvpTest.vue

@@ -164,6 +164,8 @@ export default {
 	},
 	data() {
 		return {
+      // 试验负责人ID
+      testOwnerId: undefined,
       /** 动态下拉选框  */
       selectDataList: [],
       /** 试验类型字典  */
@@ -331,7 +333,7 @@ export default {
         message.push(_this.$t('global-constant.please-enter') + _this.$t('plan.dvp.test-location'));
       }
       // 试验负责人
-      if (!_this.formData.testOwner) {
+      if (!_this.testOwnerId) {
         message.push(_this.$t('global-constant.please-select') + _this.$t('plan.dvp.study-director'));
       }
       // 项目节点
@@ -408,7 +410,7 @@ export default {
         return false;
       }
       // 试验负责人
-      if (_this.formData.testOwner !== _this.addFormData.testOwner) {
+      if (_this.testOwnerId !== _this.testOwnerId) {
         return false;
       }
       // 项目节点
@@ -462,7 +464,7 @@ export default {
         testType: _this.formData.testType,
         vehicleCount: _this.formData.count,
         testSite: _this.formData.testSite,
-        engineerUserId: _this.formData.testOwner,
+        engineerUserId: _this.testOwnerId,
         prototypePlanTime: _this.formData.prototypePlanTime,
         planStartTime: _this.formData.planStartTime,
         planEndTime: _this.formData.planEndTime,
@@ -553,7 +555,7 @@ export default {
       if (!val) {
         this.getTestOwner();
       }
-      this.formData.testOwner = val;
+      this.testOwnerId = val;
     },
     /**
      * 试验负责人过滤配置

src/views/fullVehicle/dvpPlan/components/dvpPlan.vue

@@ -863,7 +863,7 @@ export default {
         if (res.flag) {
           this.addFormData = res.data.dvpFullVehiclePlanInitModel;
           this.addFormData.node = record.nodeId;
-          this.addFormData.testOwner = res.data.dvpFullVehiclePlanInitModel.testOwnerId;
+          this.$refs.addDvpTest.testOwnerId = res.data.dvpFullVehiclePlanInitModel.testOwnerId;
           this.addFlag = true;
           this.permissionFlag = 2;
           this.performanceModule = record.performanceModule;

src/views/fullVehicle/verify/dvpVerify.vue

@@ -186,7 +186,6 @@
                   :placeholder="$t('dvp.full.vehicle.dvp.please-select-vehicle-actual-delivery-time')"
                   class="width100"
                   valueFormat="YYYY/MM/DD"
-                  :disabled-date="disabledDeliveryDate"
                   @change='changeDeliveryTime'
                   v-model="editParam.prototypeActualTime"
               />
@@ -211,7 +210,6 @@
                   :placeholder="$t('dvp.full.vehicle.dvp.please-select-actual-end-time')"
                   class="width100"
                   valueFormat="YYYY/MM/DD"
-                  :disabled-date="disabledEndDate"
                   @change='changeEndTime'
                   v-model="editParam.actualEndTime"
               />
@@ -870,9 +868,9 @@ export default {
       if (this.isEdit){
         this.editParam.actualStartTime = dateString;
         // 当选择的开始时间大于结束时间时，清空结束时间，让用户重新选择结束时间
-        if (Date.parse(this.editParam.actualStartTime) >= Date.parse(this.editParam.actualEndTime)) {
-          this.editParam.actualEndTime = undefined;
-        }
+        // if (Date.parse(this.editParam.actualStartTime) >= Date.parse(this.editParam.actualEndTime)) {
+        //   this.editParam.actualEndTime = undefined;
+        // }
       } else {
         this.queryParam.actualStartStartTime = dateString[0];
         this.queryParam.actualStartEndTime = dateString[1];