DVP 基本信息-变更管理 调试

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

@@ -25,8 +25,7 @@
                   :filter-option="handleFilterDataList"
                   :options="versionNoList"
                   :placeholder="$t('base.info.please-select-version')"
-                  allowClear
-                  mode="multiple">
+                  allowClear>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -72,14 +71,14 @@
         </a-form>
       </a-row>
       <!-- 表格 -->
-      <a-row class="mb12">
+      <div class="mb12" :style="{ height: tableHeight }">
         <a-table
           :columns='tableColumns'
           :dataSource='tableData'
           :loading='tableLoading'
           :pagination='pagination'
           :rowKey='(record, index) => { return index; }'
-          :scroll='{ x: 1850 }'
+          :scroll='{ x: 1850, y: tableHeightValue - 200 }'
           size="small"
           @change='handlePageChange'>
           <template slot='action' slot-scope='row'>
@@ -101,7 +100,7 @@
             <span>{{ (pagination.current - 1) * pagination.pageSize + index + 1 }}</span>
           </template>
         </a-table>
-      </a-row>
+      </div>
     </a-col>
     <!-- 变更内容查看和编辑弹框 -->
     <change-content-modal ref="changeContentModal" @initData="initData"/>
@@ -252,17 +251,53 @@ export default {
         showQuickJumper: true
       },
       /** 版本下拉选数据 */
-      versionNoList: [],
+      versionNoList: [
+        {
+          label: 1,
+          value: 1
+        },
+        {
+          label: 2,
+          value: 2
+        },
+        {
+          label: 3,
+          value: 3
+        },
+        {
+          label: 4,
+          value: 4
+        },
+        {
+          label: 5,
+          value: 5
+        },
+        {
+          label: 6,
+          value: 6
+        },
+        {
+          label: 7,
+          value: 7
+        }
+      ],
       /** 搜索-变更时间-开始时间 */
       changeTimeStart: undefined,
       /** 搜索-变更时间-结束时间 */
-      changeTimeEnd: undefined
+      changeTimeEnd: undefined,
+      /** 表格高度 */
+      tableHeight: window.innerHeight - 200 + 'px',
+      tableHeightValue: window.innerHeight - 352,
     };
   },
 
   mounted() {
     this.initData();
     this.initSelectData();
+    window.onresize = () => {
+      this.tableHeight = window.innerHeight - 200 + 'px';
+      this.tableHeightValue = window.innerHeight - 352;
+    };
   },
 
   methods: {
@@ -280,7 +315,9 @@ export default {
         version: this.formData.versionNo,
         userName: this.formData.changePerson,
         changeTimeStart: this.changeTimeStart,
-        changeTimeEnd: this.changeTimeEnd
+        changeTimeEnd: this.changeTimeEnd,
+        pageNo: this.pagination.pageNo,
+        pageSize: this.pagination.pageSize
       };
       this.$api.getChangePageList(data).then( res => {
         if (res.flag) {

src/views/fullVehicle/baseInfo/changeManagement/index.vue

@@ -25,8 +25,7 @@
                     :filter-option="handleFilterDataList"
                     :options="versionNoList"
                     :placeholder="$t('base.info.please-select-version')"
-                    allowClear
-                    mode="multiple">
+                    allowClear>
                   </a-select>
                 </a-form-item>
               </a-col>
@@ -72,14 +71,14 @@
           </a-form>
         </a-row>
       <!-- 表格 -->
-        <a-row class="mb12">
+        <div class="mb12" :style="{ height: tableHeight }">
           <a-table
             :columns='tableColumns'
             :dataSource='tableData'
             :loading='tableLoading'
             :pagination='pagination'
             :rowKey='(record, index) => { return index; }'
-            :scroll='{ x: 1850 }'
+            :scroll='{ x: 1850, y: tableHeightValue - 200 }'
             size="small"
             @change='handlePageChange'>
             <template slot='action' slot-scope='row'>
@@ -101,7 +100,7 @@
               <span>{{ (pagination.current - 1) * pagination.pageSize + index + 1 }}</span>
             </template>
           </a-table>
-        </a-row>
+        </div>
     </a-col>
     <!-- 变更内容查看和编辑弹框 -->
     <change-content-modal ref="changeContentModal" @initData="initData"/>
@@ -252,17 +251,53 @@ export default {
         showQuickJumper: true
       },
       /** 版本下拉选数据 */
-      versionNoList: [],
+      versionNoList: [
+        {
+          label: 1,
+          value: 1
+        },
+        {
+          label: 2,
+          value: 2
+        },
+        {
+          label: 3,
+          value: 3
+        },
+        {
+          label: 4,
+          value: 4
+        },
+        {
+          label: 5,
+          value: 5
+        },
+        {
+          label: 6,
+          value: 6
+        },
+        {
+          label: 7,
+          value: 7
+        }
+      ],
       /** 搜索-变更时间-开始时间 */
       changeTimeStart: undefined,
       /** 搜索-变更时间-结束时间 */
-      changeTimeEnd: undefined
+      changeTimeEnd: undefined,
+      /** 表格高度 */
+      tableHeight: window.innerHeight - 200 + 'px',
+      tableHeightValue: window.innerHeight - 352,
     };
   },
 
   mounted() {
     this.initData();
     this.initSelectData();
+    window.onresize = () => {
+      this.tableHeight = window.innerHeight - 200 + 'px';
+      this.tableHeightValue = window.innerHeight - 352;
+    };
   },
 
   methods: {
@@ -280,7 +315,9 @@ export default {
         version: this.formData.versionNo,
         userName: this.formData.changePerson,
         changeTimeStart: this.changeTimeStart,
-        changeTimeEnd: this.changeTimeEnd
+        changeTimeEnd: this.changeTimeEnd,
+        pageNo: this.pagination.pageNo,
+        pageSize: this.pagination.pageSize
       };
       this.$api.getChangePageList(data).then( res => {
         if (res.flag) {

src/views/systemDVP/baseInfo/changeManagement/index.vue

@@ -25,8 +25,7 @@
                   :filter-option="handleFilterDataList"
                   :options="versionNoList"
                   :placeholder="$t('base.info.please-select-version')"
-                  allowClear
-                  mode="multiple">
+                  allowClear>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -72,14 +71,14 @@
         </a-form>
       </a-row>
       <!-- 表格 -->
-      <a-row class="mb12">
+      <div class="mb12" :style="{ height: tableHeight }" >
         <a-table
           :columns='tableColumns'
           :dataSource='tableData'
           :loading='tableLoading'
           :pagination='pagination'
           :rowKey='(record, index) => { return index; }'
-          :scroll='{ x: 1850 }'
+          :scroll='{ x: 1850, y: tableHeightValue - 200 }'
           size="small"
           @change='handlePageChange'>
           <template slot='action' slot-scope='row'>
@@ -101,7 +100,7 @@
             <span>{{ (pagination.current - 1) * pagination.pageSize + index + 1 }}</span>
           </template>
         </a-table>
-      </a-row>
+      </div>
     </a-col>
     <!-- 变更内容查看和编辑弹框 -->
     <change-content-modal ref="changeContentModal" @initData="initData"/>
@@ -252,17 +251,53 @@ export default {
         showQuickJumper: true
       },
       /** 版本下拉选数据 */
-      versionNoList: [],
+      versionNoList: [
+        {
+          label: 1,
+          value: 1
+        },
+        {
+          label: 2,
+          value: 2
+        },
+        {
+          label: 3,
+          value: 3
+        },
+        {
+          label: 4,
+          value: 4
+        },
+        {
+          label: 5,
+          value: 5
+        },
+        {
+          label: 6,
+          value: 6
+        },
+        {
+          label: 7,
+          value: 7
+        }
+      ],
       /** 搜索-变更时间-开始时间 */
       changeTimeStart: undefined,
       /** 搜索-变更时间-结束时间 */
-      changeTimeEnd: undefined
+      changeTimeEnd: undefined,
+      /** 表格高度 */
+      tableHeight: window.innerHeight - 200 + 'px',
+      tableHeightValue: window.innerHeight - 352,
     };
   },
 
   mounted() {
     this.initData();
     this.initSelectData();
+    window.onresize = () => {
+      this.tableHeight = window.innerHeight - 200 + 'px';
+      this.tableHeightValue = window.innerHeight - 352;
+    };
   },
 
   methods: {
@@ -280,7 +315,9 @@ export default {
         version: this.formData.versionNo,
         userName: this.formData.changePerson,
         changeTimeStart: this.changeTimeStart,
-        changeTimeEnd: this.changeTimeEnd
+        changeTimeEnd: this.changeTimeEnd,
+        pageNo: this.pagination.pageNo,
+        pageSize: this.pagination.pageSize
       };
       this.$api.getChangePageList(data).then( res => {
         if (res.flag) {

src/views/systemDVP/dvpPlan/index.vue

@@ -159,7 +159,7 @@
             :columns='tableColumns'
             :dataSource='tableData'
             :rowKey='(record, index) => { return index; }'
-            :scroll='{ x: tableColumns, y: tableHeightValue }'
+            :scroll='{ x: tableWidth, y: tableHeightValue }'
             :pagination='pagination'
             :loading='tableLoading'
             @change='handlePageChange'