From 707cf898a263d8053bd68e8f02ee616f6a6349ee Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 24 Aug 2021 15:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93=E6=96=87=E4=BB=B6id=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step4.vue       |  6 +++++
 .../pages/creatProcess/wfhxzg/step1.vue       | 22 +++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 2cbe932a9..4f1126628 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -261,6 +261,7 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
+        fileIds: '',
         listType: "", //区分是哪个清单
         listName: "", //清单名称
         descriptionList: "", //清单说明
@@ -358,6 +359,11 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        let filesId = []
+        item.fileName.forEach(itemIds =>{
+          filesId.push(itemIds.id)
+        })
+        this.listForm.fileId = filesId.join(',')
         item.fileName.forEach(itemId => {
           this.fileIds = itemId.id
           this.getFileInfo();
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index e095c2f12..47fbb736a 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -204,7 +204,7 @@
           tooltip-effect="dark"
           style="width: 100%"
           border
-          height="100%"
+          height="150%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="selectedChange"
@@ -233,7 +233,7 @@
       </el-table>
       <pagination
         style="position: relative;"
-        :page="pageNo"
+        :page="queryUnqualidiedData.pageNo"
         :total="total"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
@@ -283,13 +283,10 @@ export default {
       standModel: false,
       // 总数
       total: 0,
-      // 当前页数
-      pageNo: 1,
       // 查询未符合项整改数据库数据
       queryUnqualidiedData: {
-        pageNo: 1,
-        pageSize: 10,
-        total: 0,
+        current: 1,
+        size: this.$store.getters.userInfo.configContent,
         closeState: '1',
         standId: '',
         standSerialNumber: '', // 标准号/名称
@@ -344,6 +341,12 @@ export default {
     //点击新增事件
     addList() {
       dicTypeData().then(res => {
+        if (this.pageNo !== undefined) {
+          this.queryUnqualidiedData.current = this.pageNo
+        }
+        if (this.size !== undefined) {
+          this.queryUnqualidiedData.size = this.size
+        }
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         standUnqualified(this.queryUnqualidiedData).then(res => {
           this.unqualidiedData = res.data.records
@@ -553,8 +556,9 @@ export default {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange () {
-      this.getTableByPage()
+    pageSizeChange (pageSize) {
+      this.size = pageSize
+      this.getTableByPage(pageSize)
     },
   }
 }