From ca7d96eb9500dd80d86fc0a939c3be0dd2f4e526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 16:40:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue | 55 ++++++++++++++++++-
 .../components/solicitopinions/index.vue      | 11 +++-
 src/pages/home2/index.vue                     |  3 -
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 4cb725b59..252f9d06a 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -1,7 +1,7 @@
 <!--符合性详情-->
 <template>
   <div id="complianceDetails">
-    <el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1"  >暂无评估结果</el-divider>
+    <el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1 && noFit.length < 1"  >暂无评估结果</el-divider>
     <!-- 不满足-->
     <el-divider content-position="left" v-if="unfit.length"  >不满足</el-divider>
       <el-table
@@ -10,7 +10,7 @@
         :data="unfit"
         tooltip-effect="dark"
         border
-        style="width: 100%; min-height: 400px; margin-bottom: 30px;"
+        style="width: 100%; min-height: 250px; margin-bottom: 30px;"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
         <el-table-column
@@ -71,7 +71,7 @@
          :data="fit"
          tooltip-effect="dark"
          border
-         style="width: 100%; min-height: 400px; margin-bottom: 30px;"
+         style="width: 100%; min-height: 250px; margin-bottom: 30px;"
          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
          <el-table-column
@@ -107,6 +107,48 @@
        </el-table>
 <!--    <pagination :page="page" :total="total" @pageChange="pageChange"-->
 <!--                @pageSizeChange="pageSizeChange"></pagination>-->
+    <!--不涉及-->
+    <el-divider content-position="left" v-if="noFit.length">不涉及</el-divider>
+    <el-table
+      ref="selection"
+      v-if="noFit.length"
+      :data="noFit"
+      tooltip-effect="dark"
+      border
+      style="width: 100%; min-height: 260px; margin-bottom: 30px;"
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+        fontWeight: 'bold', height: '48px'}">
+      <el-table-column
+        prop="standNumber"
+        label="标准号/条款号"
+        width="160"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="researchNonCompliance"
+        label="不涉及"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="evaluationPeople"
+        label="评估人"
+        width="160"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="evaluationTime"
+        label="评估时间"
+        width="160"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.evaluationTime ? $moment(scope.row.evaluationTime).format('YYYY-MM-DD') : '' }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
     <loading :loading="loading">加载中...</loading>
   </div>
 </template>
@@ -118,6 +160,7 @@ export default {
       loading: false,
       fit: [], // 满足
       unfit: [], // 不满足
+      noFit: [], //不涉及
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -152,6 +195,12 @@ export default {
                 item.standNumber = item.standardItem
               }
             })
+            this.noFit = res.data.noFit.records
+            this.noFit.forEach(item => {
+              if(item.standardItem){
+                item.standNumber = item.standardItem
+              }
+            })
           } else {
             this.$message.warning(res.message)
           }
diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue
index c01a2fe4e..882219024 100644
--- a/src/pages/home2/components/solicitopinions/index.vue
+++ b/src/pages/home2/components/solicitopinions/index.vue
@@ -32,11 +32,16 @@
         </template>
       </el-table-column>
       <el-table-column
-              prop="endTime"
-              width="120"
-              label="结束时间">
+        prop="endTime"
+        width="120"
+        label="结束时间">
       </el-table-column>
     </el-table>
+    <div
+      style="height: 20px;background-color: #fff;text-align: right;color: #4788c0; position: absolute; bottom: 5px; right: 5px">
+      <span style="margin-right: 10px;cursor: pointer;font-size: 12px"
+            @click="$router.push('standardForComments')">更多 ⋙</span>
+    </div>
   </div>
 </template>
 
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index bb26a0be7..482136a58 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -22,9 +22,6 @@
            </el-tabs>
          </div>
        </div>
-       <div style="height: 20px;background-color: #fff;text-align: right;color: #4788c0">
-         <span style="margin-right: 10px;cursor: pointer;font-size: 12px" @click="$router.push('standardForComments')">更多 ⋙</span>
-       </div>
      </div>
     <div class="right_wrapper">
       <nav-menu></nav-menu>

From faa510e0c87227d801c63e01d3b81df734429bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Feb 2022 17:01:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 60ea457ae..f5f01c585 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -376,6 +376,13 @@ export default {
               }
             })
           });
+          this.dataList.forEach(item => {
+            if(item.children){
+              item.children.forEach(items => {
+                this.$set(items,'standType',item.standType)
+              })
+            }
+          })
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;