Merge remote-tracking branch 'origin/qirui-v2' into qirui-v2

src/views/componentsDVP/verify/dvpVerify.vue

@@ -879,7 +879,7 @@ export default {
       if (this.isEdit){
         this.editParam.testStartTime = dateString;
         // 当选择的开始时间大于结束时间时，清空结束时间，让用户重新选择结束时间
-        if (Date.parse(this.editParam.testStartTime) > Date.parse(this.editParam.testEndTime)) {
+        if (Date.parse(this.editParam.testStartTime) >= Date.parse(this.editParam.testEndTime)) {
           this.editParam.testEndTime = undefined;
         }
       } else {

src/views/fullVehicle/dvpPlan/index.vue

@@ -579,7 +579,7 @@ export default {
       _that.$api.initDvpList(_that.formData).then(res => {
         if (res.flag) {
           //清除之前添加的表头，防止重复添加
-          _that.tableColumns = _that.tableColumns.slice(0,5);
+          _that.tableColumns = _that.tableColumns.slice(0,6);
           //表头插入整车性能项目配置
           let columnData = res.inputData;
           if (Object.keys(columnData).length > 0) {

src/views/fullVehicle/verify/dvpVerify.vue

@@ -708,7 +708,7 @@ export default {
       if (this.isEdit){
         this.editParam.actualStartTime = dateString;
         // 当选择的开始时间大于结束时间时，清空结束时间，让用户重新选择结束时间
-        if (Date.parse(this.editParam.actualStartTime) > Date.parse(this.editParam.actualEndTime)) {
+        if (Date.parse(this.editParam.actualStartTime) >= Date.parse(this.editParam.actualEndTime)) {
           this.editParam.actualEndTime = undefined;
         }
       } else {

src/views/systemDVP/dvpPlan/index.vue

@@ -240,7 +240,7 @@
           </a-col>
           <!-- 开发目标要求 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item required :label="$t('base.info.development-objective-requirements')">
+            <a-form-item :label="$t('base.info.development-objective-requirements')">
               <a-input
                 v-model="editParam.targetRequire"
                 :disabled="true"
@@ -249,7 +249,7 @@
           </a-col>
           <!-- 试验标准 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item required :label="$t('base.info.Test-standards')">
+            <a-form-item :label="$t('base.info.Test-standards')">
               <a-input
                 v-model="editParam.testStandard"
                 :disabled="true"

src/views/systemDVP/verify/dvpVerify.vue

@@ -884,7 +884,7 @@ export default {
       if (this.isEdit) {
         this.editParam.actualStartTime = dateString;
         // 当选择的开始时间大于结束时间时，清空结束时间，让用户重新选择结束时间
-        if (Date.parse(this.editParam.actualStartTime) > Date.parse(this.editParam.actualEndTime)) {
+        if (Date.parse(this.editParam.actualStartTime) >= Date.parse(this.editParam.actualEndTime)) {
           this.editParam.actualEndTime = undefined;
         }
       } else {