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

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

@@ -4,7 +4,7 @@
       <a-row :gutter="24">
         <!--零部件编号-->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('workbench.compoment-number')">
+          <a-form-item :label="$t('workbench.compoment-number')" required>
             <a-select v-model="editParam.partCode" @change="cascadeSelect" :filter-option="handleFilterDataList" mode="multiple" allowClear :placeholder="$t('global-btn.please-select') + $t('workbench.compoment-number')">
               <a-select-option
                 v-for='item in partInfoList'
@@ -18,7 +18,7 @@
         </a-col>
         <!--零部件名称-->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('workbench.compoment-name')">
+          <a-form-item :label="$t('workbench.compoment-name')" required>
             <a-select v-model="editParam.partName" :filter-option="handleFilterDataList" mode="multiple" allowClear :placeholder="$t('global-btn.please-select') + $t('workbench.compoment-name')">
               <a-select-option
                 v-for='item in cascadeList'
@@ -32,31 +32,31 @@
         </a-col>
         <!--试验类型-->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('plan.dvp.test-type')">
+          <a-form-item :label="$t('plan.dvp.test-type')" required>
             <a-select v-model="editParam.testType" :options="testTypeList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('plan.dvp.please_select-test-type')"></a-select>
           </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-source')">
+          <a-form-item :label="$t('plan.dvp.test-source')" required>
             <a-select v-model="editParam.testSource" :options="testSourceList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-source')"></a-select>
           </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-project')">
+          <a-form-item :label="$t('plan.dvp.test-project')" required>
             <a-input v-model.trim="editParam.testProject" :maxLength='128' allowClear :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')">
+          <a-form-item :label="$t('base.info.development-objective-requirements')" required>
             <a-input v-model.trim="editParam.targetRequire" :maxLength='500' 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')">
+          <a-form-item :label="$t('base.info.Test-standards')" required>
             <a-input v-model.trim="editParam.testStandard" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
           </a-form-item>
         </a-col>
@@ -76,49 +76,49 @@
         <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')">
+            <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.test-user')">
+            <a-form-item :label="$t('plan.dvp.test-user')" required>
               <a-select v-model="editParam.testOwner" :options="testOwnerList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-user')"></a-select>
             </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-step')">
+            <a-form-item :label="$t('plan.dvp.test-step')" required>
               <a-input v-model.trim="editParam.testStep" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-step')"/>
             </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-count')">
+            <a-form-item :label="$t('plan.dvp.test-count')" required>
               <a-input-number v-model.number="editParam.testFrequency" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-count')" style="width: 100%"></a-input-number>
             </a-form-item>
           </a-col>
           <!--样本数量-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('plan.dvp.number-of-samples')">
+            <a-form-item :label="$t('plan.dvp.number-of-samples')" required>
               <a-input-number v-model.number="editParam.sampleNumber" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.number-of-samples')" style="width: 100%"></a-input-number>
             </a-form-item>
           </a-col>
           <!--样件类型-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('plan.dvp.sample-type')">
+            <a-form-item :label="$t('plan.dvp.sample-type')" required>
               <a-input v-model.trim="editParam.sampleType" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.sample-type')"/>
             </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')">
+            <a-form-item :label="$t('plan.dvp.scheduled-start-time')" required>
                <a-date-picker v-model="editParam.planStartTime" :disabled-date="disabledStartDate" @change="handleEditStartTime" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.scheduled-start-time')" allowClear valueFormat="YYYY/MM/DD" style="width: 100%"/>
             </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-end-time')">
+            <a-form-item :label="$t('plan.dvp.scheduled-end-time')" required>
                <a-date-picker v-model="editParam.planEndTime" :disabled-date="disabledEndDate" @change="handleEditEndTime" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.scheduled-end-time')"  allowClear valueFormat="YYYY/MM/DD" style="width: 100%" />
             </a-form-item>
           </a-col>
@@ -126,7 +126,7 @@
         <span v-else>
           <!--等效实验报告编号-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('plan.dvp.equivalent-experiment-report-number')">
+            <a-form-item :label="$t('plan.dvp.equivalent-experiment-report-number')" required>
               <a-select v-model="editParam.equivalentId" :options="equivalentList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.equivalent-experiment-report-number')"></a-select>
             </a-form-item>
           </a-col>
@@ -286,10 +286,99 @@ export default {
       }
     },
 
+		/**
+		 * 非空校验 判断是否为空
+		 * @returns {boolean}
+		 */
+		isNull() {
+			let _that = this;
+			let message = [];
+      // 零部件编号
+			if (!_that.editParam.partCode) {
+				message.push(_that.$t('global-btn.please-select') + _that.$t('workbench.compoment-number'));
+			}
+      // 零部件名称
+			if (!_that.editParam.partName) {
+				message.push(_that.$t('global-btn.please-select') + _that.$t('workbench.compoment-name'));
+			}
+      // 试验类型
+			if (!_that.editParam.testType) {
+				message.push(_that.$t('plan.dvp.please_select-test-type'));
+			}
+      // 试验来源
+			if (!_that.editParam.testSource) {
+				message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.test-source'));
+			}
+      // 试验项目
+			if (!_that.editParam.testProject) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-project'));
+			}
+      // 开发目标要求
+			if (!_that.editParam.targetRequire) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('base.info.development-objective-requirements'));
+			}
+      // 试验标准
+			if (!_that.editParam.testStandard) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('base.info.Test-standards'));
+			}
+      // 非等效试验时校验以下数据
+      if (_that.editParam.isEquivalent === 0) {
+        // 测试地点
+        if (!_that.editParam.testSite) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-site'));
+        }
+        // 测试负责人
+        if (!_that.editParam.testOwner) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.test-user'));
+        }
+        // 测试阶段
+        if (!_that.editParam.testStep) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-step'));
+        }
+        // 测试次数
+        if (!_that.editParam.testFrequency) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-count'));
+        }
+        // 样本数量
+        if (!_that.editParam.sampleNumber) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.number-of-samples'));
+        }
+        // 样件类型
+        if (!_that.editParam.sampleType) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.sample-type'));
+        }
+        // 计划开始时间
+        if (!_that.editParam.planStartTime) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.scheduled-start-time'));
+        }
+        // 计划结束时间
+        if (!_that.editParam.planEndTime) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.scheduled-end-time'));
+        }
+      } else {    
+        // 等效实现时校验
+        // 等效试验报告编号    
+        if (!_that.editParam.equivalentId) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.equivalent-experiment-report-number'));
+        }
+      }
+			if (message && message.length > 0) {
+				for (let i = 0; i < message.length; i++) {
+					_that.$notification.warning({message: message[i]});
+				}
+				return false;
+			}
+			return true;
+		},
+
     /**
      * 保存
      */
     saveDvpEdit() {
+      // 非空校验
+      if (!this.isNull()) {
+				return false;
+			}
       // 零部件编号处理
       let partCodeList = [];
       if (this.editParam.partCode && this.editParam.partCode.length > 0) {

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

@@ -34,31 +34,31 @@
         </a-col>
         <!--试验类型-->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('plan.dvp.test-type')">
+          <a-form-item :label="$t('plan.dvp.test-type')" required>
             <a-select v-model="editParam.testType" :options="testTypeList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('plan.dvp.please_select-test-type')"></a-select>
           </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-source')">
+          <a-form-item :label="$t('plan.dvp.test-source')" required>
             <a-select v-model="editParam.testSource" :options="testSourceList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-source')"></a-select>
           </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-project')">
+          <a-form-item :label="$t('plan.dvp.test-project')" required>
             <a-input v-model.trim="editParam.testProject" :maxLength='128' allowClear :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')">
+          <a-form-item :label="$t('base.info.development-objective-requirements')" required>
             <a-input v-model.trim="editParam.targetRequire" :maxLength='500' 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')">
+        <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" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('base.info.Test-standards')"/>
           </a-form-item>
         </a-col>
@@ -78,64 +78,64 @@
         <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')">
+            <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.test-user')">
+            <a-form-item :label="$t('plan.dvp.test-user')" required>
               <a-select v-model="editParam.testOwner" :options="testOwnerList" :filter-option="handleFilterDataList"  allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.test-user')"></a-select>
             </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-step')">
+            <a-form-item :label="$t('plan.dvp.test-step')" required>
               <a-input v-model.trim="editParam.testStep" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-step')"/>
             </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-count')">
+            <a-form-item :label="$t('plan.dvp.test-count')" required>
               <a-input-number v-model.number="editParam.testFrequency" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.test-count')" style="width: 100%"></a-input-number>
             </a-form-item>
           </a-col>
           <!--样本数量-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('plan.dvp.number-of-samples')">
+            <a-form-item :label="$t('plan.dvp.number-of-samples')" required>
               <a-input-number v-model.number="editParam.sampleNumber" :defaultValue="0" :min="1" :max="999" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.number-of-samples')" style="width: 100%"></a-input-number>
             </a-form-item>
           </a-col>
           <!--样件类型-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('plan.dvp.sample-type')">
+            <a-form-item :label="$t('plan.dvp.sample-type')" required>
               <a-input v-model.trim="editParam.sampleType" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.sample-type')"/>
             </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')">
+            <a-form-item :label="$t('plan.dvp.scheduled-start-time')" required>
                <a-date-picker v-model="editParam.planStartTime" :disabled-date="disabledStartDate"  @change="handleEditStartTime"  allowClear valueFormat="YYYY/MM/DD" style="width: 100%" :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.scheduled-end-time')">
-               <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-enter') + $t('plan.dvp.scheduled-end-time')"/>
+            <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>
         </span>
         <span v-else>
           <!--等效实验报告编号-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('plan.dvp.equivalent-experiment-report-number')">
+            <a-form-item :label="$t('plan.dvp.equivalent-experiment-report-number')" required>
               <a-select v-model="editParam.equivalentId" :options="equivalentList" :filter-option="handleFilterDataList" allowClear :placeholder="$t('global-btn.please-select') + $t('plan.dvp.equivalent-experiment-report-number')"></a-select>
             </a-form-item>
           </a-col>
         </span>
         <!--材料清单编号-->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-          <a-form-item :label="$t('plan.dvp.material-number')">
+          <a-form-item :label="$t('plan.dvp.material-number')" required>
             <a-input v-model.trim="editParam.materialInventoryCode" :maxLength='50' allowClear :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.material-number')"/>
           </a-form-item>
         </a-col>
@@ -150,7 +150,7 @@
         <!--上传材料清单 -->
         <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
           <a-row>
-            <a-form-item :label="$t('plan.dvp.upload-material-list')">
+            <a-form-item :label="$t('plan.dvp.upload-material-list')" required>
               <a-upload-dragger
                   name="file"
                   :multiple="false"
@@ -339,10 +339,99 @@ export default {
 
     },
 
+		/**
+		 * 非空校验 判断是否为空
+		 * @returns {boolean}
+		 */
+		isNull() {
+			let _that = this;
+			let message = [];
+      // 试验类型
+			if (!_that.editParam.testType) {
+				message.push(_that.$t('plan.dvp.please_select-test-type'));
+			}
+      // 试验来源
+			if (!_that.editParam.testSource) {
+				message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.test-source'));
+			}
+      // 试验项目
+			if (!_that.editParam.testProject) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-project'));
+			}
+      // 开发目标要求
+			if (!_that.editParam.targetRequire) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('base.info.development-objective-requirements'));
+			}
+      // 试验标准
+			if (!_that.editParam.testStandard) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('base.info.Test-standards'));
+			}
+      // 非等效试验时校验以下数据
+      if (_that.editParam.isEquivalent === 0) {
+        // 测试地点
+        if (!_that.editParam.testSite) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-site'));
+        }
+        // 测试负责人
+        if (!_that.editParam.testOwner) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.test-user'));
+        }
+        // 测试阶段
+        if (!_that.editParam.testStep) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-step'));
+        }
+        // 测试次数
+        if (!_that.editParam.testFrequency) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.test-count'));
+        }
+        // 样本数量
+        if (!_that.editParam.sampleNumber) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.number-of-samples'));
+        }
+        // 样件类型
+        if (!_that.editParam.sampleType) {
+          message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.sample-type'));
+        }
+        // 计划开始时间
+        if (!_that.editParam.planStartTime) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.scheduled-start-time'));
+        }
+        // 计划结束时间
+        if (!_that.editParam.planEndTime) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.scheduled-end-time'));
+        }
+      } else {    
+        // 等效实现时校验
+        // 等效试验报告编号    
+        if (!_that.editParam.equivalentId) {
+          message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.equivalent-experiment-report-number'));
+        }
+      }
+      // 材料清单编号
+			if (!_that.editParam.materialInventoryCode) {
+				message.push(_that.$t('global-btn.please-enter') + _that.$t('plan.dvp.material-number'));
+			}
+      // 材料清单附件  
+			if (_that.fileList.length == 0) {
+				message.push(_that.$t('global-message.warn..message.warn.select-file'));
+			}
+			if (message && message.length > 0) {
+				for (let i = 0; i < message.length; i++) {
+					_that.$notification.warning({message: message[i]});
+				}
+				return false;
+			}
+			return true;
+		},
+
     /**
      * 确认按钮
      */
     save() {
+      // 非空校验
+      if (!this.isNull()) {
+				return false;
+			}
       let data = {
         dvpId: this.$store.getters.dvpId,
         testId: this.editParam.testId,

src/views/componentsDVP/verify/dvpVerify.vue

@@ -208,7 +208,7 @@
           </a-col>
           <!-- 测试开始日期 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('verity.dvp.test.start.date')">
+            <a-form-item :label="$t('verity.dvp.test.start.date')" required>
               <a-date-picker
                 :placeholder="$t('global-btn.please-select') + $t('verity.dvp.test.start.date')"
                 class="width100"
@@ -221,7 +221,7 @@
           </a-col>
           <!-- 测试结束日期 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('verity.dvp.test.end.date')">
+            <a-form-item :label="$t('verity.dvp.test.end.date')" required>
               <a-date-picker
                 :placeholder="$t('global-btn.please-select') + $t('verity.dvp.test.end.date')"
                 class="width100"
@@ -234,11 +234,10 @@
           </a-col>
           <!-- 是否通过 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('verity.dvp.is.pass')">
+            <a-form-item :label="$t('verity.dvp.is.pass')" required>
               <a-select
                 v-model="editParam.isPass"
-                :placeholder="$t('global-btn.please-select') + $t('verity.dvp.is.pass')"
-                allowClear>
+                :placeholder="$t('global-btn.please-select') + $t('verity.dvp.is.pass')">
                 <a-select-option value="1">{{ $t('global-btn.yes') }}</a-select-option>
                 <a-select-option value="0">{{ $t('global-btn.no') }}</a-select-option>
               </a-select>
@@ -246,7 +245,7 @@
           </a-col>
           <!-- 试验报告编号 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('verity.dvp.test.report.number')">
+            <a-form-item :label="$t('verity.dvp.test.report.number')" required>
               <a-input
                 v-model.trim="editParam.testReportCode"
                 :placeholder="$t('global-btn.please-enter') + $t('verity.dvp.test.report.number')"
@@ -257,7 +256,7 @@
           </a-col>
           <!-- 测试结果及分析 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('verity.dvp.test.result.analysis')">
+            <a-form-item :label="$t('verity.dvp.test.result.analysis')" required>
               <a-input
                 v-model.trim="editParam.testResultAnalyse"
                 :placeholder="$t('global-btn.please-enter') + $t('verity.dvp.test.result.analysis')"
@@ -268,7 +267,7 @@
           </a-col>
           <!-- 改进措施计划 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('verity.dvp.improvement.measures')">
+            <a-form-item :label="$t('verity.dvp.improvement.measures')" required>
               <a-input
                 v-model.trim="editParam.modifiedMeasure"
                 :placeholder="$t('global-btn.please-enter') + $t('verity.dvp.improvement.measures')"
@@ -279,7 +278,7 @@
           </a-col>
           <!-- 上传试验报告 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('global-btn.upload.test.report')">
+            <a-form-item :label="$t('global-btn.upload.test.report')" required>
               <a-upload-dragger
                 name="file"
                 :multiple="false"
@@ -302,7 +301,7 @@
           </a-col>
           <!-- 上传材料报告 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('global-btn.upload.material.report')">
+            <a-form-item :label="$t('global-btn.upload.material.report')" required>
               <a-upload-dragger
                 name="file"
                 :multiple="false"

src/views/fullVehicle/verify/dvpVerify.vue

@@ -174,7 +174,7 @@
           </a-col>
           <!-- 样车实际提供时间 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-actual-delivery-time')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-actual-delivery-time')" required>
               <a-date-picker
                   :placeholder="$t('dvp.full.vehicle.dvp.please-select-vehicle-actual-delivery-time')"
                   class="width100"
@@ -187,7 +187,7 @@
           </a-col>
           <!-- 实际开始时间 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-start-time')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-start-time')" required>
               <a-date-picker
                   :placeholder="$t('dvp.full.vehicle.dvp.please-select-actual-start-time')"
                   class="width100"
@@ -200,7 +200,7 @@
           </a-col>
           <!-- 实际结束时间 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-end-time')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-end-time')" required>
               <a-date-picker
                   :placeholder="$t('dvp.full.vehicle.dvp.please-select-actual-end-time')"
                   class="width100"
@@ -213,7 +213,7 @@
           </a-col>
           <!-- 车辆VIN -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-vin')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-vin')" required>
               <a-input
                   v-model="editParam.vin"
                   :placeholder="$t('dvp.full.vehicle.dvp.please-enter-vehicle-vin')"
@@ -224,7 +224,7 @@
           </a-col>
           <!-- 试验报告编号 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.test-report-code')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.test-report-code')" required>
               <a-input
                   v-model="editParam.testReportCode"
                   :placeholder="$t('dvp.full.vehicle.dvp.please-enter-test-report-code')"
@@ -233,8 +233,9 @@
               />
             </a-form-item>
           </a-col>
+          <!-- 试验报告 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.upload-test-report')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.upload-test-report')" required>
               <a-upload-dragger
                   name="file"
                   :multiple="false"

src/views/systemDVP/verify/dvpVerify.vue

@@ -167,7 +167,7 @@
           </a-col>
           <!-- 实际开始时间 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-start-time')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-start-time')" required>
               <a-date-picker
                 :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.actual-start-time')"
                 style="width: 100%"
@@ -180,7 +180,7 @@
           </a-col>
           <!-- 实际结束时间 -->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-end-time')">
+            <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-end-time')" required>
               <a-date-picker
                 :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.actual-end-time')"
                 style="width: 100%"
@@ -193,7 +193,7 @@
           </a-col>
           <!--DV是否完成-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-form-item :label="$t('base.info.is-DV-completed')" >
+            <a-form-item :label="$t('base.info.is-DV-completed')" required>
               <a-select v-model="editParam.isFinish"  :disabled="isFinishDisabled" :placeholder="$t('global-btn.please-select') + $t('base.info.is-DV-completed')">
                 <a-select-option :value="1">{{ $t('global-btn.yes') }}</a-select-option>
                 <a-select-option :value="0">{{ $t('global-btn.no') }}</a-select-option>
@@ -206,7 +206,7 @@
         <!-- 当DV完成值为是的时候，显示表格 -->
         <div class="p12" v-if="editParam.isFinish == 1">
           <!-- 整改记录表格 -->
-          <a-form-item :label="$t('base.info.rectification-record')">
+          <a-form-item :label="$t('base.info.rectification-record')" required>
           <a-table
             :columns="editColumns"
             :dataSource="editTableData"