src/App.vue

@@ -504,7 +504,9 @@ export default {
       } else {
         // 检验数据是否填写完整
         let frequencyFlag = false; // DVP频次完整标记
-        let changeFlag = false; // 变更处理完成标记
+        let ecrChangeFlag = false; // ECR推送变更处理完成标记
+        let planFlag = false; // DVP计划完整标记
+        let changeFlag = false; // 主动变更完成标记
         let dvpId = _that.$store.getters.dvpId;
         let materialsEngineerId = undefined; // 材料工程师id
         let testEngineerId = undefined; // 试验工程师id
@@ -519,6 +521,8 @@ export default {
           if (!res.flag) {
             _that.checkDataFlag = false;
             frequencyFlag = res.message === "frequency";
+            ecrChangeFlag = res.message === "ecrChange";
+            planFlag = res.message === "plan";
             changeFlag = res.message === "change";
             data = res.data;
             if (data) {
@@ -536,10 +540,14 @@ export default {
         if (!_that.checkDataFlag) {
           if (frequencyFlag) {
             _that.$message.warning(_that.$t('dvp.full.vehicle.dvp.dvp-frequency') + _that.$t('dvp.check-data-complete'));
-          } else if (changeFlag) {
+          } else if (ecrChangeFlag) {
             _that.$message.warning(_that.$t('dvp.check-change-data-complete'));
-            // 变更管理未完成--变更管理处理弹窗
+            // ecr推送变更管理未完成--变更管理处理弹窗
             _that.$refs.changeContentModal.visible = true;
+          } else if (planFlag) {
+            _that.$message.warning(_that.$t('dvp.push-data-not-complete'));
+          } else if (changeFlag) {
+            _that.$message.warning(_that.$t('dvp.at-least-change-data'));
           } else {
             if (data) {
               if (dvpPlanStatus !== null) {
@@ -555,7 +563,7 @@ export default {
               if (dvpPlanStatus !== null  && materialsListStatus !== null) {
                 if (!dvpPlanStatus && !materialsListStatus) {
                   _that.$message.warning(_that.$t('dvp.check-data-complete-by-dvpPlan-and-materials'));
-                } 
+                }
               }
               if (changeState === '1') {
                 _that.$message.warning(_that.$t('dvp.check-data-complete-to-change-by-dvpPlan'));

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

@@ -142,6 +142,8 @@ export default {
   'dvp.web-require': 'Web require',
   'dvp.check-data-complete': 'The data is incomplete, please double check!',
   'dvp.check-change-data-complete': 'Change information not processed, please check again！',
+  'dvp.push-data-not-complete': 'There is trial not filled in the planning phase data, please go to change！',
+  'dvp.at-least-change-data': 'Please change at least one piece of data before submitting！',
   'dvp.please-enter-the-actual-delivery-time-of-the-sample-vehicle': 'Please enter the actual delivery time of the sample vehicle！',
   'dvp.please-enter-the-vehicle-VIN': 'Please enter the vehicle VIN！',
   'dvp.check-data-complete-by-dvpPlan': 'DVP plan incomplete filling, please double check!',

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

@@ -136,6 +136,8 @@ export default {
   'dvp.web-require': '网络要求',
   'dvp.check-data-complete': '数据填写不完整，请重新核对！',
   'dvp.check-change-data-complete': '变更信息未处理，请重新核对！',
+  'dvp.push-data-not-complete': '存在试验未填写计划阶段数据，请前往变更！',
+  'dvp.at-least-change-data': '请至少变更一条数据后提交！',
   'dvp.please-enter-the-actual-delivery-time-of-the-sample-vehicle': '请输入样车实际提供时间！',
   'dvp.please-enter-the-vehicle-VIN': '请输入车辆VIN！',
   'dvp.check-data-complete-by-dvpPlan': 'DVP计划填写不完整，请重新核对！',