From 7c1f913851df2b76eff9f17ce49d4f6bb8bab5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 26 Nov 2021 16:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue | 129 ++++++------
 .../pages/standInvolveProjectDetail.vue       | 184 ++++++------------
 2 files changed, 125 insertions(+), 188 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 2cffa194f..01c8770b0 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -1,10 +1,9 @@
 <!--符合性详情-->
 <template>
   <div id="complianceDetails">
-    <!--不满足-->
-    <el-divider content-position="left" v-if="unfit.length">不满足</el-divider>
+    <!-- v-if="unfit.length"不满足-->
+    <el-divider content-position="left"  >不满足</el-divider>
     <el-table
-        v-if="unfit.length"
         ref="selection"
         :data="unfit"
         tooltip-effect="dark"
@@ -13,65 +12,57 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
       <el-table-column
-          prop="sarNumber"
-          label="标准号/条款号"
+          prop="standNumber"
+          label="标准号"
           align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="nonConfomity"
-          label="不满足内容"
+        prop="itemsNumber"
+        label="条款号"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="评估人"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="评估时间"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+          prop=""
+          label="不合规项目"
           align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="current"
-          label="我司现状"
+          prop=""
+          label="应对措施"
           align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="changeScheme"
-          label="更改方案"
+          prop=""
+          label="完成时间"
           align="center"
       >
       </el-table-column>
-      <el-table-column
-          prop="estimatedChangeCycle"
-          label="预估更改周期"
-          align="center"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="estimatedCost"
-          label="预估成本"
-          align="center"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="compPersonName"
-          label="评估人员"
-          align="center"
-          width="100px"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="compTime"
-          label="评估时间"
-          align="center"
-          width="100px"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="prcNum"
-          label="流程"
-          align="center"
-          width="170px"
-      >
-        <template slot-scope="scope">
-          <span class="table-jump" @click="processCenterClick(scope.row)">{{ scope.row.prcNum }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          prop="prcNum"-->
+<!--          label="流程"-->
+<!--          align="center"-->
+<!--          width="170px"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <span class="table-jump" @click="processCenterClick(scope.row)">{{ scope.row.prcNum }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!--待验证-->
     <el-divider content-position="left"  v-if="check.length">待验证</el-divider>
@@ -151,41 +142,45 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
       <el-table-column
-          prop="sarNumber"
-          label="标准号/条款号"
-          align="center"
+        prop="standNumber"
+        label="标准号"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="justified"
-          label="符合理由"
-          align="center"
+        prop="itemsNumber"
+        label="条款号"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="compPersonName"
-          label="评估人员"
-          align="center"
-          width="100px"
+        prop=""
+        label="评估人"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="compTime"
-          label="评估时间"
-          align="center"
-          width="100px"
+        prop=""
+        label="评估时间"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="prcNum"
-          label="流程"
+          prop=""
+          label="合规"
           align="center"
-          width="170px"
       >
-        <template slot-scope="scope">
-          <span class="table-jump" @click="processCenterClick(scope.row)">{{ scope.row.prcNum }}</span>
-        </template>
       </el-table-column>
+<!--      <el-table-column-->
+<!--          prop="prcNum"-->
+<!--          label="流程"-->
+<!--          align="center"-->
+<!--          width="170px"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <span class="table-jump" @click="processCenterClick(scope.row)">{{ scope.row.prcNum }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!--不涉及-->
     <el-divider content-position="left" v-if="notInvolve.length">不涉及</el-divider>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 10dc6566b..aa549aea3 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -48,7 +48,7 @@
         <el-table-column
           prop="standType"
           label="标准/政策类型"
-          width="120"
+          width="320"
         >
           <template slot-scope="scope">
             <div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
@@ -61,7 +61,7 @@
         <el-table-column
           prop="standNumber"
           label="标准/政策号"
-          width="180"
+          width="320"
         >
           <template slot-scope="scope">
             <a class="table-jump"
@@ -77,18 +77,13 @@
                @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="interpretationTime"
-          label="评估时间"
-        >
-        </el-table-column>
         <el-table-column
           fixed="right"
           label=""
-          width="50"
+          width="80"
           align="center">
           <template slot-scope="scope">
-            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
+            <el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -155,28 +150,40 @@
             :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
             <el-table-column
-              type="selection"
-              width="55"
+              type="index"
+              width="50"
               align="center">
             </el-table-column>
-<!--            <el-table-column-->
-<!--              width="150px"-->
-<!--              align="center"-->
-<!--              prop="productLineId"-->
-<!--              label="产品线">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              width="150px"-->
-<!--              align="center"-->
-<!--              prop="productId"-->
-<!--              label="项目编号">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              width="150px"-->
-<!--              align="center"-->
-<!--              prop="productName"-->
-<!--              label="项目名称">-->
-<!--            </el-table-column>-->
+            <el-table-column
+              width="150px"
+              align="center"
+              prop="projectNumber"
+              label="项目编号">
+            </el-table-column>
+            <el-table-column
+              width="150px"
+              align="center"
+              prop="projectName"
+              label="项目名称">
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              align="center"
+              prop="projectGroup"
+              label="项目群">
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              align="center"
+              prop="productLine"
+              label="产品线">
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              align="center"
+              prop="uname"
+              label="产品线责任人">
+            </el-table-column>
             <el-table-column
               width="150px"
               align="center"
@@ -201,98 +208,20 @@
               prop="clauseName"
               label="条款名称">
             </el-table-column>
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              prop="productType"-->
-<!--              label="在研产品">-->
-              <el-table-column
-                width="150px"
-                align="center"
-                prop="researchImplementationTime"
-                label="实施时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                width="150px"
-                align="center"
-                prop="researchCompliance"
-                label="合规">
-              </el-table-column>
-              <el-table-column
-                width="150px"
-                align="center"
-                label="不合规">
-                <el-table-column
-                  width="150px"
-                  align="center"
-                  prop="researchNonCompliance"
-                  label="不合规项目">
-                </el-table-column>
-                <el-table-column
-                  width="150px"
-                  align="center"
-                  prop="researchCountermeasures"
-                  label="应对措施">
-                </el-table-column>
-                <el-table-column
-                  width="150px"
-                  align="center"
-                  prop="researchCompletionTime"
-                  label="完成时间">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                  </template>
-                </el-table-column>
-              </el-table-column>
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              prop="center"-->
-<!--              label="在产产品">-->
-<!--              <el-table-column-->
-<!--                width="150px"-->
-<!--                align="center"-->
-<!--                prop="productionImplementationTime"-->
-<!--                label="实施时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.productionImplementationTime ? $moment(scope.row.productionImplementationTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                width="150px"-->
-<!--                align="center"-->
-<!--                prop="productionCompliance"-->
-<!--                label="合规(具体情况)">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                width="150px"-->
-<!--                align="center"-->
-<!--                label="不合规">-->
-<!--                <el-table-column-->
-<!--                        width="150px"-->
-<!--                        align="center"-->
-<!--                        prop="productionNonCompliance"-->
-<!--                        label="不合格项目">-->
-<!--                </el-table-column>-->
-<!--                <el-table-column-->
-<!--                  width="150px"-->
-<!--                  align="center"-->
-<!--                  prop="productionCountermeasures"-->
-<!--                  label="应对措施">-->
-<!--                </el-table-column>-->
-<!--                <el-table-column-->
-<!--                  width="150px"-->
-<!--                  align="center"-->
-<!--                  prop="productionCompletionTime"-->
-<!--                  label="完成时间">-->
-<!--                  <template slot-scope="scope">-->
-<!--                    <span>{{ scope.row.productionCompletionTime ? $moment(scope.row.productionCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
+            <el-table-column
+              width="150px"
+              align="center"
+              prop=""
+              label="合规评估结果">
+              <template slot-scope="scope">
+                <el-button @click="changeState(scope.row)">符合性状态</el-button>
+<!--                <div class="table-jump" @click="changeState(scope.row)">-->
+<!--                  <div v-if="scope.row.sarState === 1">符合</div>-->
+<!--                  <div v-if="scope.row.sarState === 2">不符合</div>-->
+<!--                  <div v-if="scope.row.sarState === 3"></div>-->
+<!--                </div>-->
+              </template>
+            </el-table-column>
           </el-table>
           <pagination
             :page="sarProStateTotalPage"
@@ -339,6 +268,19 @@ export default {
     };
   },
   methods: {
+    changeState (row) {
+      console.log(row);
+      let routeUrl = this.$router.resolve({
+        name: 'ComplianceDetails',
+        query: {
+          sarId: this.saveSarId,
+          productId: row.productId,
+          sarType: row.standType,
+          fromPage: 'product'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     searchStandAndLaws() {
       this.page = 1;
       this.queryStandAndLaws();