From 4cab7273d5c1251d3b232001bc2b42a9de0995e5 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 20 Oct 2022 09:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9B=B4=E5=A4=9A=E6=97=A0?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/release2/index.vue            | 9 ++++++---
 src/pages/home2/components/releaseBuss2/index.vue        | 9 ++++++---
 src/pages/home2/components/releaseQA2/index.vue          | 9 ++++++---
 src/pages/home2/components/releaseUs2/index.vue          | 9 ++++++---
 .../processCenter/pages/creatProcess/qbfs/step3.vue      | 2 +-
 src/pages/processCenter/pages/phone/wbsm/step3.vue       | 8 +-------
 6 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/pages/home2/components/release2/index.vue b/src/pages/home2/components/release2/index.vue
index eec067b36..da0e972ef 100644
--- a/src/pages/home2/components/release2/index.vue
+++ b/src/pages/home2/components/release2/index.vue
@@ -14,8 +14,11 @@
               :data="standardReleaseList"
               tooltip-effect="dark"
               border
-              style="cursor:pointer;"
-              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+              height="90%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
           <el-table-column
                   label="序号"
                   type="index"
@@ -63,7 +66,7 @@ export default {
         loading: false,
         pageVerify: false,
         page: 1,
-        pageSize: 10,
+        pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
         putTime: '',
         standardReleaseList: [],  //标准发布数据
diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue
index cc029042a..f0e975e9b 100644
--- a/src/pages/home2/components/releaseBuss2/index.vue
+++ b/src/pages/home2/components/releaseBuss2/index.vue
@@ -14,8 +14,11 @@
               :data="standardReleaseList"
               tooltip-effect="dark"
               border
-              style="cursor:pointer;"
-              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+              height="90%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
           <el-table-column
                   label="序号"
                   type="index"
@@ -63,7 +66,7 @@ export default {
       loading: false,
       pageVerify: false,
       page: 1,
-      pageSize: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       putTime: '',
       standardReleaseList: [],  //标准发布数据
diff --git a/src/pages/home2/components/releaseQA2/index.vue b/src/pages/home2/components/releaseQA2/index.vue
index eff31d03d..1cae5169e 100644
--- a/src/pages/home2/components/releaseQA2/index.vue
+++ b/src/pages/home2/components/releaseQA2/index.vue
@@ -14,8 +14,11 @@
               :data="standardReleaseList"
               tooltip-effect="dark"
               border
-              style="cursor:pointer;"
-              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+              height="90%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
           <el-table-column
                   label="分类"
                   align="center"
@@ -63,7 +66,7 @@ export default {
       loading: false,
       pageVerify: false,
       page: 1,
-      pageSize: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       putTime: '',
       standardReleaseList: [],  //标准问答数据
diff --git a/src/pages/home2/components/releaseUs2/index.vue b/src/pages/home2/components/releaseUs2/index.vue
index 92cbe8a8f..c58c831d9 100644
--- a/src/pages/home2/components/releaseUs2/index.vue
+++ b/src/pages/home2/components/releaseUs2/index.vue
@@ -14,8 +14,11 @@
               :data="standardReleaseList"
               tooltip-effect="dark"
               border
-              style="cursor:pointer;"
-              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+              height="90%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
           <el-table-column
                   label="序号"
                   type="index"
@@ -64,7 +67,7 @@ export default {
       loading: false,
       pageVerify: false,
       page: 1,
-      pageSize: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       putTime: '',
       standardReleaseList: [],  //标准发布数据
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
index 8a36121e1..7faced8e9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -172,7 +172,7 @@ export default {
         let fileObj = await this.processEditFile(this.qbfsForm.FSD)
         if (fileObj) {
           const editFileInfo = fileObj
-          if (editFileInfo && editFileInfo.editStatus === '1') {
+          if (editFileInfo && (editFileInfo.editStatus === '1' || editFileInfo && editFileInfo.editStatus === '0')) {
             callback()
           } else {
             callback(new Error('请先在线编辑,再提交流程！'))
diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue
index 9048f5d37..198520da3 100644
--- a/src/pages/processCenter/pages/phone/wbsm/step3.vue
+++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue
@@ -14,13 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <el-table
-          :data="dataList"
-          border
-          ref="entryTable"
-          height="90%"
-          style="width: 100%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+           >
           <el-table-column
             prop="code"
             min-width="180"