From 6f89d5cb13bdbde3934d251155a8daa324caf1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 5 Dec 2021 17:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E4=BF=AE=E6=94=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmqdqr/step2.vue       |  5 ++--
 .../pages/creatProcess/xmqdqr/step3.vue       |  5 ++--
 .../pages/creatProcess/xmqdqr/step4.vue       |  5 ++--
 .../localProductsOrProjectLibrary/index.vue   | 24 +++++++++++++------
 .../pages/details.vue                         |  6 ++---
 .../pages/rectificationDatabase.vue           | 19 ++++++++++-----
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 3c6393c96..62939e368 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -67,7 +67,7 @@
         <el-table
           :data="dataList"
           border
-          ref="selection"
+          ref="standSelection"
           height="65%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
@@ -1009,12 +1009,13 @@ export default {
           this.projectStand.map(item => {
             let index;
             index = this.dataList.findIndex(items => {
-              return items.standId === item.standId;
+              return items.id  === item.id;
             });
             if (index > -1) {
               this.dataList.splice(index, 1);
             }
           });
+          this.$refs.standSelection.clearSelection()
         }).catch(() => {
         });
       }
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index f86e24020..dc0ac6366 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -59,7 +59,7 @@
         <el-table
           :data="dataList"
           border
-          ref="selection"
+          ref="standSelection"
           height="65%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
@@ -1015,12 +1015,13 @@ export default {
           this.projectStand.map(item => {
             let index;
             index = this.dataList.findIndex(items => {
-              return items.standId === item.standId;
+              return items.id === item.id;
             });
             if (index > -1) {
               this.dataList.splice(index, 1);
             }
           });
+          this.$refs.standSelection.clearSelection()
         }).catch(() => {
         });
       }
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index b3842c57e..55565e755 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -59,7 +59,7 @@
         <el-table
           :data="dataList"
           border
-          ref="selection"
+          ref="standSelection"
           height="65%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
@@ -1016,12 +1016,13 @@ export default {
           this.projectStand.map(item => {
             let index;
             index = this.dataList.findIndex(items => {
-              return items.standId === item.standId;
+              return items.id === item.id;
             });
             if (index > -1) {
               this.dataList.splice(index, 1);
             }
           });
+          this.$refs.standSelection.clearSelection()
         }).catch(() => {
         });
       }
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 29dc85311..b100be5e9 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -87,9 +87,9 @@
         ref="multipleTable"
         :data="localProTableList"
         tooltip-effect="dark"
-        style="width: 100%;height: inherit"
+        style="width: 100%"
         border
-        :max-height="400"
+        max-height="600"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">
@@ -97,18 +97,23 @@
           show-overflow-tooltip
           prop="projectPlatfor"
           align="center"
+          fixed="left"
+          min-width="100"
           label="产品平台">
         </el-table-column>
         <el-table-column
           prop="projectNumber"
           align="center"
-          width="90"
+          fixed="left"
+          min-width="150"
           label="项目编号">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="projectName"
           align="center"
+          fixed="left"
+          min-width="300"
           label="项目名称">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
@@ -142,7 +147,7 @@
           show-overflow-tooltip
           prop="productLine"
           label="产品线"
-          min-width="120"
+          min-width="160"
           align="center"
         >
         </el-table-column>
@@ -184,7 +189,7 @@
           align="center"
           label="项目经理">
         </el-table-column>
-        <el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
+        <el-table-column label="" fixed="right"  width="50" :resizable="false" label="操作" align="center">
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
               <el-dropdown trigger="click" @command="handleCommand">
@@ -1638,9 +1643,14 @@ export default {
     }
   }
 }
-
+///deep/ .el-table--scrollable-x .el-table__body-wrapper {
+//  overflow-x: scroll;
+//}
+///deep/.el-table__fixed {
+//  height: 48px !important;
+//}
 /deep/.el-table .el-table__body-wrapper {
-  height: 86%;
+  height: 84%;
 }
 ::v-deep .el-drawer__header {
   & > span:first-child {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index f7142f3af..0854650a0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -37,10 +37,10 @@
           </el-row>
           <el-row style="margin-top: 10px">
             <el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
-            <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
-            <el-col :span="5" :push="1"> 项目计划开始时间: <span
+            <el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
+            <el-col :span="5" :push="2"> 项目计划开始时间: <span
               class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
-            <el-col :span="5" :push="2">项目计划完成时间: <span
+            <el-col :span="4" :push="3">项目计划完成时间: <span
               class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
           </el-row>
         </div>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index fe11fec51..d8715f4d2 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -91,6 +91,7 @@
             tooltip-effect="dark"
             height="100%"
             border
+            max-height="100%"
             class="table"
             v-loading="myLoading.loadData"
             @selection-change="standSelectChange"
@@ -106,7 +107,7 @@
             <el-table-column
               prop="standSerialNumber"
               fixed="left"
-              width="180"
+              min-width="180"
               label="标准号">
               <template slot-scope="scope">
                 <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
@@ -115,7 +116,7 @@
             <el-table-column
               prop="standName"
               fixed="left"
-              width="200"
+              min-width="300"
               show-overflow-tooltip
               label="标准名称">
               <template slot-scope="scope">
@@ -124,12 +125,12 @@
             </el-table-column>
             <el-table-column
               prop="itemsNum"
-              width="75"
+              min-width="100"
               label="条款号">
             </el-table-column>
             <el-table-column
               prop="itemsName"
-              width="180"
+              min-width="300"
               show-overflow-tooltip
               label="条款名称">
             </el-table-column>
@@ -145,7 +146,7 @@
             </el-table-column>
             <el-table-column
               prop="productName"
-              width="180"
+              min-width="300"
               show-overflow-tooltip
               label="项目名称">
             </el-table-column>
@@ -186,7 +187,7 @@
                 {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50">
+            <el-table-column label="操作"  align="center" width="50">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">
@@ -1187,6 +1188,12 @@ export default {
   color: #606266 !important;
 }
 #rectification-dataBase {
+  /deep/ .el-table__fixed {
+    height: 100% !important; //设置高优先，以覆盖内联样式
+  }
+  /deep/ .el-table__fixed-right {
+    height: 100% !important; //设置高优先，以覆盖内联样式
+  }
   /deep/ .table-wrap {
     .el-table__fixed {
       height: calc(~'100% - 20px') !important;