From 0a6c8f35dd375196fe153d55af2dfa5914dbf906 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 1 Jul 2022 13:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   |  7 +++++++
 .../src/components/tableCollection/index.vue  | 21 +++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 927db8970..c6cd18823 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -740,4 +740,11 @@
   .add--number {
     width: 101%;
   }
+
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65);
+  }
+  .ant-select-disabled{
+    color: rgba(0, 0, 0, 0.65);
+  }
 </style>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 4f2b96002..b138f5948 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -47,7 +47,8 @@
       </a-table>
     </div>
     <!--  修改工程接口人--->
-    <a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='620px' :footer="null" @cancel="cancleImports">
+    <a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='620px' :footer="null"
+             @cancel="cancleImports">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -244,7 +245,12 @@
     },
     methods: {
       rowClassName(row, index) {
-        return row.changeFlag == '1' ? 'yellow' : 'red'
+        if (row.changeFlag == '1') {
+          return 'rowClassRedYellow'
+        }
+        if (row.delFlag == '1') {
+          return 'rowClassRed'
+        }
       },
       // 查看配置详细信息
       onClickSee(val) {
@@ -361,7 +367,7 @@
         getAction(this.url.getLoginUserType, params).then((res) => {
           if (res.success) {
             this.getTableList(res.result[0].value)
-            this.$emit('LoginUserType', res.result,this.currentPersonRole)
+            this.$emit('LoginUserType', res.result, this.currentPersonRole)
           }
         })
       },
@@ -481,7 +487,7 @@
           }
         })
       },
-      cancleoperationFailed(){
+      cancleoperationFailed() {
         this.selectedRowKeys = []
       },
       getTableList(currentPersonRole) {
@@ -671,6 +677,7 @@
   .resize-table-th {
     position: relative;
   }
+
   .table-draggable-handle {
     /* width: 10px !important; */
     height: 100% !important;
@@ -683,4 +690,10 @@
     transform: none !important;
     bottom: 0;
   }
+  .rowClassRed{
+     background: #f3d9de;
+  }
+  .rowClassRedYellow{
+      background: yellow;
+  }
 </style>