零部件DVP需求变更 整体提交

src/App.vue

@@ -506,6 +506,8 @@ export default {
         let frequencyFlag = false; // DVP频次完整标记
         let changeFlag = false; // 变更处理完成标记
         let dvpId = _that.$store.getters.dvpId;
+        let materialsEngineerId = undefined; // 材料工程师id
+        let testEngineerId = undefined; // 试验工程师id
         await _that.$api.dvpPlanFullCheck({
           dvpId: dvpId,
           dvpType: _that.dvpType
@@ -516,6 +518,8 @@ export default {
             changeFlag = res.message === "change";
           } else {
             _that.checkDataFlag = true;
+            materialsEngineerId = res.data.materialsEngineerId;
+            testEngineerId = res.data.testEngineerId;
           }
         });
         if (!_that.checkDataFlag) {
@@ -555,6 +559,10 @@ export default {
               // 零部件DVP 计划/验证审批
               _that.submitApprovalTitle = _that.$t('dvp.part-dvp-approval');
               _that.$refs.submitApproval.inputArgs.approveType = '71';
+              // 材料工程师
+              _that.$refs.submitApproval.inputArgs.materialsEngineerId = materialsEngineerId;
+              // 试验工程师
+              _that.$refs.submitApproval.inputArgs.testEngineerId = testEngineerId;
             } else if (_that.headerFlag === 2 && _that.libStep === 2) {
               // 系统DVP 验证审批
               _that.submitApprovalTitle = _that.$t('dvp.system-dvp-verify-approval');

src/components/SubmitApprovalModal/SubmitApprovalModal.vue

@@ -125,6 +125,7 @@
 										@search='handleUserSearch'
 										allowClear
 										showSearch
+										:disabled="userTask.isDisabled"
 										v-decorator="[
 											'userName'+ userTask.key,
 											{
@@ -133,7 +134,8 @@
 														required: userTask.required,
 														message: $t('dvp.please-select-approver')
 													}
-												]
+												],
+												initialValue: userTask.isDisabled ? partDvpDefault(userTask) : undefined
 											},
 										]"
 									>
@@ -155,6 +157,7 @@
 										type='primary'
 										shape='circle'
 										icon='plus'
+										:disabled="userTask.isDisabled"
 										@click='add(userTask.key)'
 									/>
 									<a-button
@@ -162,6 +165,7 @@
 										type='dashed'
 										shape='circle'
 										icon='minus'
+										:disabled="userTask.isDisabled"
 										@click='remove(userTask.key)'
 									/>
 								</a-form-item>
@@ -220,6 +224,12 @@ export default {
 			},
 			/** 用户集合 */
 			userList: [],
+			/** 零部件dvp内置审批信息 */
+			userListForPart: [],
+			/** 材料工程师信息 */
+			materialsEngineerInfo: undefined,
+			/** 试验工程师信息 */
+			testEngineerInfo: undefined,
 			/** 表单创建 */
 			form: this.$form.createForm(this, { name: 'dynamic_rule' }),
 			/** 用户任务集合 */
@@ -251,6 +261,13 @@ export default {
 				this.userTaskList = [];
 				this.getWfProcessList();
 				this.handleUserSearch();
+				// 零部件DVP 计划/验证审批
+				if (this.inputArgs.approveType === '71') {
+					// 材料工程师
+					this.handleUserSearchForPart(this.inputArgs.materialsEngineerId, 1);
+					// 试验工程师
+					this.handleUserSearchForPart(this.inputArgs.testEngineerId, 2);
+				}
 				// 获取延期信息
 				if (this.inputArgs.delayFlag) {
 					this.getDelayInfo();
@@ -427,12 +444,26 @@ export default {
 									key: uuidv4(),
 									groupKey: uuidv4(),
 									name: node.text,
-									required: true
+									required: true,
+									isDisabled: false
 								};
 								userTask[node.properties.assignee] = node.properties.assignee;
 								_that.userTaskList.push(userTask);
 							}
 						}
+						// 零部件DVP 计划/验证审批内置试验工程师、材料工程师审批
+						if (_that.inputArgs.approveType === '71') {
+							// 材料工程师审批节点
+							let materialsEngineerTask = _that.userTaskList[_that.userTaskList.length - 1];
+							// 材料工程师/试验工程师审批步骤不可修改
+							materialsEngineerTask.isDisabled = true;
+							_that.handleUserChange(_that.inputArgs.materialsEngineerId, materialsEngineerTask, 1);
+							// 添加审批人
+							_that.add(materialsEngineerTask.key);
+							// 试验工程师审批节点
+							let testEngineerTask = _that.userTaskList[_that.userTaskList.length - 1];
+							_that.handleUserChange(_that.inputArgs.testEngineerId, testEngineerTask, 2);
+						}
 					}
 				} else {
 					_that.$notification.error({ message: res.message });
@@ -451,12 +482,24 @@ export default {
 				option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
 			);
 		},
+		/**
+		 * 零部件计划/验证审批，材料工程师/试验工程师默认设置
+		 * @param userTask 审批任务节点
+		 */
+		partDvpDefault(userTask) {
+			let keys = Object.keys(userTask);
+			let key = keys.filter(key => {
+				return key.indexOf('userTaskName') !== -1;
+			});
+			return userTask[key];
+		},
 		/**
 		 * 处理用户选择
 		 * @param val 选择用户ID
 		 * @param userTask 用户任务节点
+		 *  @param num 1 材料工程师 2 试验工程师
 		 */
-		handleUserChange(val, userTask) {
+		handleUserChange(val, userTask, num) {
 			let keys = Object.keys(userTask);
 			let k = '', v = '';
 			keys = keys.filter(key => {
@@ -470,12 +513,19 @@ export default {
 			if (!v) {
 				v = k.replaceAll('userTask', 'userTaskName');
 			}
-			this.userList.forEach(item => {
-				if (item.value === val) {
-					userTask[v] = item.name;
-				}
-			});
-      this.handleUserSearch(undefined);
+			// 零部件DVP 计划/验证审批
+			if (this.inputArgs.approveType === '71') {
+				this.$nextTick(() => {
+					userTask[v] = num === 1 ? this.materialsEngineerInfo.name : this.testEngineerInfo.name;
+				});
+			} else {
+				this.userList.forEach(item => {
+					if (item.value === val) {
+						userTask[v] = item.name;
+					}
+				});
+				this.handleUserSearch(undefined);
+			}
 		},
 		/**
 		 * 处理用户检索
@@ -502,6 +552,39 @@ export default {
 					}
 				});
 		},
+		/**
+		 * 零部件dvp材料工程师/试验工程师信息检索
+		 * @param val userId
+		 * @param num 1 材料工程师 2 试验工程师
+		 */
+		handleUserSearchForPart(val, num) {
+			let _that = this;
+				_that.$api.getUserPageList({
+					pageNo: 1,
+					pageSize: 10,
+					userId: val
+				}).then(res => {
+					if (res.flag) {
+						let resData = res.data.data;
+						_that.userListForPart = [];
+						_that.userListForPart = resData.map(item => {
+							return {
+								name: item.userName + '/' + item.account + '/' + item.departmentName,
+								value: item.userId
+							};
+						});
+						if (num === 1) {
+							// 材料工程师
+							_that.materialsEngineerInfo = _that.userListForPart[0];
+						} else {
+							// 试验工程师
+							_that.testEngineerInfo = _that.userListForPart[0];
+						}
+					} else {
+						_that.$notification.error({ message: res.message });
+					}
+				});
+		},
 		/**
 		 * 处理延期至 -- 时间选择变化
 		 * @param date

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

@@ -53,6 +53,7 @@ export default {
   'plan.dvp.number-of-samples': 'Number Of Samples',
   'plan.dvp.sample-type': 'Sample Type',
   'plan.dvp.reason-for-disagreement': 'Reason for disagreement',
+  'plan.dvp.review.comments': 'Review Comments',
   'plan.dvp.sample-type.soft-modules': 'Soft modules',
   'plan.dvp.sample-type.hard-module': 'Hard module',
   'plan.dvp.sample-type.fixture-parts': 'Fixture parts',
@@ -123,6 +124,7 @@ export default {
   'verity.dvp.test.result.analysis': 'Test Results And Analysis',
   'verity.dvp.improvement.measures': 'Improvement Measures And Plans',
   'verity.dvp.material.list.number': 'Material Report Number',
+  'verity.dvp.review.comments': 'Review Comments',
 
   'dvp.appearance': 'Appearance',
   'dvp.standard': 'Standard',

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

@@ -52,6 +52,7 @@ export default {
   'plan.dvp.number-of-samples': '样本数量',
   'plan.dvp.sample-type': '样件类型',
   'plan.dvp.reason-for-disagreement': '不认可原因',
+  'plan.dvp.review.comments': '评审意见',
   'plan.dvp.sample-type.soft-modules': '软模件',
   'plan.dvp.sample-type.hard-module': '硬模件',
   'plan.dvp.sample-type.fixture-parts': '工装件',
@@ -84,6 +85,7 @@ export default {
   'verity.dvp.test.result.analysis': '测试结果及分析',
   'verity.dvp.improvement.measures': '改进措施及计划',
   'verity.dvp.material.list.number': '材料报告编号',
+  'verity.dvp.review.comments': '评审意见',
   /** 零部件DVP计划  */
   'plan.dvp.test-plan': '试验计划',
   'plan.dvp.test-project': '试验项目',

src/views/componentsDVP/baseInfo/baseInfo/index.vue

@@ -2,22 +2,13 @@
   <a-card class="back-card">
     <!-- 编辑 -->
     <a-button
-      v-if="$api.btnPms && !isEdit"
+      v-if="$api.btnPms"
       class="mr-24"
       slot="extra"
       type="primary"
       @click="doEdit()" >
       {{ $t('global-btn.edit') }}
     </a-button>
-    <!-- 保存 -->
-    <a-button
-      v-if="$api.btnPms && isEdit"
-      class="mr-24"
-      slot="extra"
-      type="primary"
-      @click="doSave()">
-        {{ $t('global-btn.save') }}
-    </a-button>
     <div class="pad-12">
       <a-form layout="inline">
         <a-row :gutter="24">
@@ -94,73 +85,19 @@
           <!-- 产品工程师 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('workbench.product-engineer')">
-              <span v-if="!isEdit" class="ml8">{{ baseInfo.productEngineer }}</span>
-              <a-select
-                v-else
-                class="select-width"
-                v-model="productEngineer"
-                :filter-option="filterOption"
-                :options="engineerList"
-                :placeholder="$t('workbench.please-enter-product-engineer')"
-                showSearch
-                @change="changeProductEngineer"
-              >
-                <a-icon slot="suffixIcon" type="search"/>
-                <a-select-option
-                  v-for="item in engineerList"
-                  :key="item.productEngineerId"
-                >
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
+              <span class="ml8">{{ baseInfo.owner }}</span>
             </a-form-item>
           </a-col>
           <!-- 材料工程师 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('workbench.material-engineer')">
-              <span v-if="!isEdit" class="ml8">{{ baseInfo.materialsEngineer }}</span>
-              <a-select
-                v-else
-                class="select-width"
-                v-model="materialEngineer"
-                :filter-option="filterOption"
-                :options="engineerList"
-                :placeholder="$t('workbench.please-enter-material-engineer')"
-                showSearch
-                @change="changeMaterialEngineer"
-              >
-                <a-icon slot="suffixIcon" type="search"/>
-                <a-select-option
-                  v-for="item in engineerList"
-                  :key="item.materialsEngineerId"
-                >
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
+              <span class="ml8">{{ baseInfo.materialsEngineer }}</span>
             </a-form-item>
           </a-col>
-          <!-- 零部件工程师 -->
+          <!-- 试验工程师 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('workbench.parts-engineer')">
-              <span v-if="!isEdit" class="ml8">{{ baseInfo.partEngineer }}</span>
-              <a-select
-                v-else
-                class="select-width"
-                v-model="partsEngineer"
-                :filter-option="filterOption"
-                :options="engineerList"
-                :placeholder="$t('workbench.please-enter-parts-engineer')"
-                showSearch
-                @change="changePartsEngineer"
-              >
-                <a-icon slot="suffixIcon" type="search"/>
-                <a-select-option
-                  v-for="item in engineerList"
-                  :key="item.partEngineerId"
-                >
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
+              <span class="ml8">{{ baseInfo.testEngineer }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -188,19 +125,13 @@ export default {
     return {
       dvpId: undefined,    //dvpId
       baseInfo: {},        //基本信息
-      isEdit: false,      // 编辑标识
       productEngineer: undefined,   // 产品工程师
       materialEngineer: undefined,   // 材料工程师
-      partsEngineer: undefined,   // 零件工程师
-      productEngineerId: undefined,   // 产品工程师Id
-      materialsEngineerId: undefined,   // 材料工程师Id
-      partsEngineerId: undefined,   // 零件工程师Id
-      engineerList: []      // 工程师字典
+      partsEngineer: undefined   // 零件工程师
     };
   },
   mounted() {
     this.initBaseInfo();
-    this.getEngineer();
   },
   methods: {
     //获取基本信息
@@ -217,62 +148,15 @@ export default {
         }
       })
     },
-    // 保存
-    doSave() {
-      console.log(this.baseInfo.materialsEngineerId)
-      //基本信息保存请求参数-目前只能更改工程师
-      let basicInfoData = {
-        dvpId: this.$store.getters.dvpId,
-        productEngineerId: this.productEngineerId,
-        materialsEngineerId: this.materialEngineerId ,
-        partEngineerId: this.partsEngineerId,
-        dvpType: 2,
-      };
-      //保存基本信息-工程师
-      this.$api.updateDvpBasicInformation(basicInfoData).then(res => {
-        if (res.flag) {
-          this.$message.success(this.$t('plan.dvp.operation-succeeded'), 1);
-          this.initBaseInfo();
-          this.isEdit = !this.isEdit;
-        } else{
-          this.$message.error(this.$t('plan.dvp.operation-failed'), 1);
-        }
-      });
-    },
     // 编辑
     doEdit() {
+      let isOwner = this.baseInfo.isOwner;
       let infoUrl = '/dvp/componentsDVP/edit?dvpId='
         + this.$route.query.dvpId
-        + '&lookFlag=2';
+        + '&lookFlag=2'
+        + '&isOwner=' + isOwner;
       let backUrl = this.$api.fmUrl + '/#' + infoUrl
       window.open(backUrl, '_top')
-    },
-    //获取工程师下拉选项
-    getEngineer(){
-      this.$api.getAllUsers().then(res => {
-        if (res.flag) {
-          let userList = res.data;
-          userList.forEach(item => {
-            let options = {
-              label: item.fullname,  //后端返回的不是驼峰命名，所以这样写
-              value: item.userId
-            };
-            this.engineerList.push(options);
-          });
-        }
-      });
-    },
-    // 产品工程师下拉选项变换时
-    changeProductEngineer(value) {
-      this.productEngineerId = value;
-    },
-    // 材料工程师下拉选项变换时
-    changeMaterialEngineer(value) {
-      this.materialEngineerId = value;
-    },
-    // 零部件工程师下拉选项变换时
-    changePartsEngineer(value) {
-      this.partsEngineerId = value;
     },
 		// 下拉选项过滤
 		filterOption(input, option) {

src/views/componentsDVP/baseInfo/partsInfo/index.vue

@@ -73,7 +73,6 @@ export default {
         showSizeChanger: true, // 显示可改变每页数量
         pageSizeOptions: ["10", "20", "50", "100", "200"], // 每页数量选项
         onShowSizeChange: (current, pageSize) => (this.pageSize = pageSize), // 改变每页数量时更新显示
-        // onChange: (page, pageSize) => self.changePage(page, pageSize), //点击页码事件
         total: 0, //总条数
         position: 'bottom',
       },
@@ -205,15 +204,16 @@ export default {
         }
         _this.tableData = res.data.data || [];
         _this.pagination.total = res.data.total || 0;
+        _this.pagination.pageNo = res.data.pageNo;
+        _this.pagination.pageSize = res.data.pageSize;
       }).finally(() => {
         _this.tempFormData = {};
         _this.tableLoading = false;
-        console.log(_this.pagination.total)
       });
     },
     // 分页触发
     handleTableChange(pagination) {
-      this.pagination.pageCurrent = pagination.current;
+      this.pagination.current = pagination.current;
       this.pagination.pageSize = pagination.pageSize;
       this.tempFormData = { ...this.queryParam };
       this.getDvpPartInfoList();
@@ -270,4 +270,4 @@ export default {
 .pad12 {
   padding: 12px;
 }
-</style>
+</style>

src/views/componentsDVP/dvpPlan/edit.vue

@@ -484,11 +484,11 @@ export default {
           align: 'center',
           ellipsis: true
         },
-        // 不认可原因
+        // 评审意见
         {
-          title: this.$t('plan.dvp.reason-for-disagreement'),
+          title: this.$t('plan.dvp.review.comments'),
           width: 100,
-          dataIndex: 'planDenyCause',
+          dataIndex: 'planReviewComment',
           align: 'center',
           ellipsis: true
         },

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

@@ -461,7 +461,7 @@ export default {
         message.push(_that.$t('global-btn.please-enter') + _that.$t('base.info.Test-standards'));
       }
       // 不是FMEA推送数据且选择非等效试验，就进行校验计划结束时间，其他情况不校验
-      if (_that.dataSource !== '2' && _that.editParam.isEquivalent === 0) {
+      if (_that.dataSource !== '2' && _that.editParam.isCarryOut === 1 && _that.editParam.isEquivalent === 0) {
         // 计划结束时间
         if (!_that.editParam.planEndTime) {
           message.push(_that.$t('global-btn.please-select') + _that.$t('plan.dvp.scheduled-end-time'));
@@ -545,6 +545,7 @@ export default {
         this.editParam.testFrequency = undefined;
         this.editParam.sampleNumber = undefined;
         this.editParam.sampleType = undefined;
+        this.editParam.planEndTime = undefined;
       } else {
         this.isCarryOutFlag = false;
         this.editParam.isEquivalent = 0;

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

@@ -282,6 +282,7 @@ export default {
       this.tableHeight = window.innerHeight - 352 + 'px';
       this.tableHeightValue = window.innerHeight - 352;
     };
+    this.initData();
   },
   methods: {
 

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

@@ -274,6 +274,7 @@ export default {
       this.tableHeight = window.innerHeight - 352 + 'px';
       this.tableHeightValue = window.innerHeight - 352;
     };
+    this.initData();
   },
   methods: {
 

src/views/componentsDVP/dvpPlan/index.vue

@@ -83,7 +83,7 @@
           </a-row>
         </a-form>
       </a-card>
-      <a-card class="layout-card cardOverFlow" :style="{ height: tableHeight }">
+      <a-card class="layout-card" :style="{ height: tableHeight }">
         <a-form-item class='tr' >
           <!-- 上传材料清单 -->
           <a-button @click='uploadMaterialList' :disabled="isLook" type="primary" class="mr10">
@@ -235,7 +235,7 @@ export default {
       columnsWidth: 0,
       /** 表格高度 */
       tableHeight: window.innerHeight - 352 + 'px',
-      tableHeightValue: window.innerHeight - 352,
+      tableHeightValue: window.innerHeight - 542,
       /** 表格加载状态 */
       tableLoading: false,
       /** 表格数据 */
@@ -431,7 +431,7 @@ export default {
     this.getDvpTestOwnerList();
     window.onresize = () => {
       this.tableHeight = window.innerHeight - 352 + 'px';
-      this.tableHeightValue = window.innerHeight - 352;
+      this.tableHeightValue = window.innerHeight - 542;
     };
     // 监听页面窗体大小变化
     window.addEventListener('resize', this.handleResize);
@@ -684,6 +684,11 @@ export default {
      */
     toggleAdvance() {
       this.advanceExpand = !this.advanceExpand;
+      if(this.advanceExpand){
+        this.tableHeightValue -= 57
+      } else {
+        this.tableHeightValue = window.innerHeight - 542;
+      }
     },
 
     /**
@@ -937,11 +942,6 @@ export default {
   padding: 12px;
 }
 
-.cardOverFlow {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
 .table-mr {
   margin-top: 12px;
 }

src/views/componentsDVP/verify/dvpVerify.vue

@@ -114,7 +114,7 @@
     </a-row>
     <a-row class="mt10">
       <!-- 表格部分 -->
-      <a-card class="p12 cardOverFlow" :style="{ height: tableHeight }">
+      <a-card class="p12" :style="{ height: tableHeight }">
         <template slot="extra">
           <!-- 上传材料报告 -->
           <a-button class="mr12" type="primary" :disabled="isLook" @click='uploadMaterial' style="right: 6px">
@@ -142,7 +142,7 @@
           :loading="tableLoading"
           size="small"
           @change="handleOuterTableChange"
-          :scroll="{ x: tableWidth, y: tableHeightValue }"
+          :scroll="{ x: tableWidth, y: tableHeightValue}"
           bordered
           :components='components'>
           <!-- 序号列 -->
@@ -602,11 +602,11 @@ export default {
           dataIndex: 'modifiedMeasure',
           ellipsis: true
         },
-        // 不认可原因
+        // 评审意见
         {
-          title: this.$t('plan.dvp.reason-for-disagreement'),
-          width: 100,
-          dataIndex: 'verifyDenyCause',
+          title: this.$t('verity.dvp.review.comments'),
+          width: 150,
+          dataIndex: 'verifyReviewComment',
           align: 'center',
           ellipsis: true
         },
@@ -674,7 +674,7 @@ export default {
       materialFileList: [],
       /** 高度计算 */
       tableHeight: window.innerHeight - 352 + 'px',
-      tableHeightValue: window.innerHeight - 380,
+      tableHeightValue: window.innerHeight - 560,
       /** 批量编辑按钮是否disabled */
       batchEditButtonDisabled: false
     }
@@ -719,7 +719,7 @@ export default {
     this.list()
     window.onresize = () => {
       this.tableHeight = window.innerHeight - 352 + 'px';
-      this.tableHeightValue = window.innerHeight - 380;
+      this.tableHeightValue = window.innerHeight - 560;
     };
     // 监听页面窗体大小变化
     window.addEventListener('resize', this.handleResize);
@@ -1106,6 +1106,11 @@ export default {
      */
     toggleAdvance() {
       this.advanceExpand = !this.advanceExpand;
+      if(this.advanceExpand) {
+        this.tableHeightValue -= 100
+      } else {
+        this.tableHeightValue = window.innerHeight - 560;
+      }
     },
     // 上传材料报告
     uploadMaterial() {

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

@@ -286,7 +286,7 @@ export default {
       },
       /** 表格高度 */
       tableHeight: window.innerHeight - 421 + 'px',
-      tableHeightValue: window.innerHeight - 421,
+      tableHeightValue: window.innerHeight - 621,
       // 表格总宽度
       tableWidth: 0,
       //表格各列宽度总和
@@ -486,7 +486,7 @@ export default {
     this.initSelectList();
     window.onresize = () => {
       this.tableHeight = window.innerHeight - 421 + 'px';
-      this.tableHeightValue = window.innerHeight - 421;
+      this.tableHeightValue = window.innerHeight - 621;
     };
     this.getProjectNodeList();
     // 监听页面窗体大小变化
@@ -647,6 +647,11 @@ export default {
      */
     toggleAdvance() {
       this.advanceExpand = !this.advanceExpand;
+      if(this.advanceExpand) {
+        this.tableHeightValue -= 100
+      } else {
+        this.tableHeightValue = window.innerHeight - 621;
+      }
     },
     /**
      * 新建DVP计划试验数据

src/views/fullVehicle/verify/dvpVerify.vue

@@ -109,7 +109,7 @@
       </a-card>
     </a-row>
     <a-row class="mt10">
-      <a-card class="p12 cardOverFlow" :style="{ height: tableHeight }">
+      <a-card class="p12" :style="{ height: tableHeight }">
         <template slot="extra">
           <!-- 导出 -->
           <a-button class="exporBtn" @click='exportFile' style="right: 10px">
@@ -518,7 +518,7 @@ export default {
       fileList: [],
       /** 高度计算 */
       tableHeight: window.innerHeight - 352 + 'px',
-      tableHeightValue: window.innerHeight - 352,
+      tableHeightValue: window.innerHeight - 560,
       // 表格总宽度
       tableWidth: 0,
       //表格各列宽度总和
@@ -569,7 +569,7 @@ export default {
     this.list()
     window.onresize = () => {
       this.tableHeight = window.innerHeight - 352 + 'px';
-      this.tableHeightValue = window.innerHeight - 352;
+      this.tableHeightValue = window.innerHeight - 560;
     };
     // 监听页面窗体大小变化
     window.addEventListener('resize', this.handleResize);
@@ -891,6 +891,11 @@ export default {
     // 收起/展开
     toggleAdvance() {
       this.advanceExpand = !this.advanceExpand;
+      if(this.advanceExpand) {
+        this.tableHeightValue -= 100
+      } else {
+        this.tableHeightValue = window.innerHeight - 560;
+      }
     },
     /***
      * 查看试验报告并下载
@@ -926,10 +931,6 @@ export default {
 .topCard {
   padding: 0 12px;
 }
-.cardOverFlow {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
 .exporBtn {
   margin-top: -12px;
   margin-right: -24px;

src/views/systemDVP/dvpPlan/index.vue

@@ -476,7 +476,7 @@ export default {
       },
       /** 表格高度 */
       tableHeight: window.innerHeight - 352 + 'px',
-      tableHeightValue: window.innerHeight - 352,
+      tableHeightValue: window.innerHeight - 560,
       // 表格总宽度
       tableWidth: 0,
       //表格各列宽度总和
@@ -808,7 +808,7 @@ export default {
     this.getProjectNodeList();
     window.onresize = () => {
       this.tableHeight = window.innerHeight - 352 + 'px';
-      this.tableHeightValue = window.innerHeight - 352;
+      this.tableHeightValue = window.innerHeight - 560;
     };
     // 监听页面窗体大小变化
     window.addEventListener('resize', this.handleResize);
@@ -966,6 +966,11 @@ export default {
      */
     toggleAdvance() {
       this.advanceExpand = !this.advanceExpand;
+      if(this.advanceExpand) {
+        this.tableHeightValue -= 180
+      } else {
+        this.tableHeightValue = window.innerHeight - 560;
+      }
     },
 
     /**

src/views/systemDVP/verify/dvpVerify.vue

@@ -84,7 +84,7 @@
       </a-card>
     </a-row>
     <a-row class="mt10">
-      <a-card class="p12 card-overFlow" :style="{ height: tableHeight }">
+      <a-card class="p12" :style="{ height: tableHeight }">
         <template slot="extra">
           <!-- 导出 -->
           <a-button class="exportBtn" @click='exportFile' style="right: 10px">
@@ -680,7 +680,7 @@ export default {
       isFinishDisabled: true,
       /** 高度计算 */
       tableHeight: window.innerHeight - 350 + 'px',
-      tableHeightValue: window.innerHeight - 350,
+      tableHeightValue: window.innerHeight - 560,
       editTableHeightValue: window.innerHeight - 900,
       // 表格总宽度
       tableWidth: 0,
@@ -794,7 +794,7 @@ export default {
     this.initSystemDvpVerifyList()
     window.onresize = () => {
       this.tableHeight = window.innerHeight - 350 + 'px';
-      this.tableHeightValue = window.innerHeight - 350;
+      this.tableHeightValue = window.innerHeight - 560;
     };
     // 监听页面窗体大小变化
     window.addEventListener('resize', this.handleResize);
@@ -1123,6 +1123,11 @@ export default {
      */
     toggleAdvance() {
       this.advanceExpand = !this.advanceExpand;
+      if(this.advanceExpand) {
+        this.tableHeightValue -= 100
+      } else {
+        this.tableHeightValue = window.innerHeight - 560;
+      }
     },
 
     /** 编辑 保存 */