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

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

@@ -92,8 +92,8 @@ export default {
   'plan.dvp.template-add': 'Template Adding',
   'plan.dvp.project-fmea-add': 'Project FMEA Adding',
   'plan.dvp.history-dvp-add': 'Historical Project Adding',
-  'plan.dvp.non-equivalent-experiment': 'Non Equivalent Experiment',
-  'plan.dvp.equivalent-experiment': 'Equivalent Experiment',
+  'plan.dvp.non-equivalent-experiment': 'Non Equivalent Test',
+  'plan.dvp.equivalent-experiment': 'Equivalent Test',
   'plan.dvp.push-to-component-DVP-template': 'Push To Component DVP Template',
   'plan.dvp.whether-to-push-to-component-template': 'Whether To Push To Component Template',
   'plan.dvp.equivalent-experiment-report-number': 'Equivalent Experiment Report Number',

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

@@ -110,8 +110,8 @@ export default {
   'plan.dvp.template-add': '模板添加',
   'plan.dvp.project-fmea-add': '项目FMEA添加',
   'plan.dvp.history-dvp-add': '历史项目添加',
-  'plan.dvp.non-equivalent-experiment': '非等效实验',
-  'plan.dvp.equivalent-experiment': '等效实验',
+  'plan.dvp.non-equivalent-experiment': '非等效试验',
+  'plan.dvp.equivalent-experiment': '等效试验',
   'plan.dvp.push-to-component-DVP-template': '推送至零部件DVP模板',
   'plan.dvp.whether-to-push-to-component-template': '是否推送至零部件模板',
   'plan.dvp.equivalent-experiment-report-number': '等效实验报告编号',

src/views/componentsDVP/verify/dvpVerify.vue

@@ -82,6 +82,7 @@
             <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
+                  mode="multiple"
                   v-model="queryParam.isEquivalent"
                   :placeholder="$t('global-btn.please-select') + $t('plan.dvp.is-it-an-equivalent-test')"
                   :defaultValue="'1'"
@@ -413,7 +414,7 @@ export default {
         testResult: undefined,          // 试验结果
         testReportCode: undefined,      // 试验报告编号
         isPass: undefined,               // 是否通过
-        isEquivalent: '1'                // 是否等效实验 默认查非等效
+        isEquivalent: undefined                // 是否等效实验 默认查全部数据
       },
       /** 分页实体 */
       pagination: {
@@ -902,7 +903,7 @@ export default {
       this.queryParam.testEndEndTime = undefined;
       this.queryParam.testResult = undefined;
       this.queryParam.testReportCode = undefined;
-      this.queryParam.isEquivalent = '1';
+      this.queryParam.isEquivalent = undefined;
       this.list();
     },
     /**