From 3317d397ba5fefe006e0e09c2e369f9a5c23972e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 28 Mar 2023 11:53:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B=E9=A1=B5-=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=B8=8D=E7=BE=8E=E8=A7=82=20?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5=E5=AD=97=E4=BD=93=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E3=80=81=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE=E4=B8=8E?=
 =?UTF-8?q?UI=E5=9B=BE=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   |   2 +-
 .../CollectionTypeDisabled/index.vue          |   2 +-
 .../components/circulationHistory.vue         | 116 +++++++++++++++++-
 3 files changed, 115 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 7d87e51ab..f1749be35 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -1106,7 +1106,7 @@
   }
 
   .selectWid {
-    min-width: 150px;
+    /*min-width: 150px;*/
     width: 100%;
   }
 
diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue
index 5e34d66c8..8369d66cd 100644
--- a/jero-web/src/components/CollectionTypeDisabled/index.vue
+++ b/jero-web/src/components/CollectionTypeDisabled/index.vue
@@ -980,7 +980,7 @@
   }
 
   .selectWid {
-    min-width: 150px;
+    /*min-width: 150px;*/
     width: 100%;
   }
 
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index a4fdce5b5..181c85c0a 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -40,6 +40,11 @@
         <span slot="approvalResult" slot-scope="text,result">
             {{approvalResult[text]}}
         </span>
+        <span slot="resultofhandling" slot-scope="text,result">
+            <span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
+                 {{result.operatorResultName}}
+            </span>
+        </span>
         <span slot="approvalFile" slot-scope="text,result">
               <span class="viewFile"
                     @click="viewFileClick(result.approvalFile)"
@@ -78,6 +83,17 @@
       return {
         loading: false,
         dataSource: [],
+        statusClass: {
+          'Accepted': 'AcceptedClass',
+          'Rejected': 'RejectedClass',
+          'Transfer': 'TransferClass',
+          'Returned': 'ReturnedClass',
+          'Adopt': 'AdoptClass',
+          'Compliance': 'ComplianceClass',
+          'Non-Compliance': 'NonComplianceClass',
+          'To be tracked': 'trackedClass',
+          'NA': 'NAClass'
+        },
         regulatoryCertificationTaskPlanList: [
           {
             status: '1',
@@ -131,6 +147,7 @@
             align: 'left',
             width: 160,
             ellipsis: true,
+            scopedSlots: { customRender: 'resultofhandling' }
           },
           {
             title: this.$t('feedback'),
@@ -164,7 +181,7 @@
             this.dataSource = res.result || []
             if (this.dataSource.length > 0) {
               let taskData = this.dataSource[this.dataSource.length - 1]
-              if (this.queryProject.TaskKey == 'fqlc'){
+              if (this.queryProject.TaskKey == 'fqlc') {
                 this.regulatoryCertificationTaskPlanList.forEach(val => {
                   if (val.name == this.$t('initiatingProcess')) {
                     val.status = '2'
@@ -200,7 +217,7 @@
                 })
               }
               if (this.queryProject.TaskKey == 'fggcssh') {
-                if (taskData.operatorResult == 'Adopt'){
+                if (taskData.operatorResult == 'Adopt') {
                   this.regulatoryCertificationTaskPlanList.forEach(val => {
                     if (val.name == this.$t('initiatingProcess')) {
                       val.status = '1'
@@ -214,7 +231,7 @@
                       val.status = '1'
                     }
                   })
-                }else{
+                } else {
                   this.regulatoryCertificationTaskPlanList.forEach(val => {
                     if (val.name == this.$t('initiatingProcess')) {
                       val.status = '1'
@@ -248,6 +265,7 @@
 
 <style scoped lang="less">
   @import '~@assets/less/common.less';
+
   .box {
     padding: 0 0 24px 0;
     box-sizing: border-box;
@@ -331,6 +349,7 @@
         }
       }
     }
+
     .process-content-content:first-child {
       padding: 0 10px 0 0;
     }
@@ -338,6 +357,7 @@
     .process-content-content:last-child {
       padding: 0 0 0 10px;
     }
+
     .process-content-right-xian {
       height: 2px;
       width: calc(100% - 27px);
@@ -346,4 +366,94 @@
       top: 16px;
     }
   }
+
+  .AcceptedClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .RejectedClass {
+    background: #fdeaea;
+    color: #E83030;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .TransferClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .ReturnedClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .AdoptClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .ComplianceClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .NonComplianceClass {
+    background: #fdeaea;
+    color: #E83030;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .trackedClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .NAClass {
+    background: #f1f1f3;
+    color: #707486;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
 </style>
\ No newline at end of file

From bc62a79e3e4552468f1c009786bd4b709c98184b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 28 Mar 2023 11:58:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/auxiliaryupgradehavechanged.vue             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 95dddff3b..dac7607bd 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -99,7 +99,6 @@ export default {
           align: 'left',
           dataIndex: 'functionname',
           ellipsis: true,
-          width: 170,
           scopedSlots: { customRender: 'functionname' },
         },
         {
@@ -140,7 +139,7 @@ export default {
           align: 'left',
           dataIndex: 'functionalchangedescription',
           ellipsis: true,
-          width: 170,
+          width: 230,
           scopedSlots: { customRender: 'functionalchangedescription' },
         },
         {
@@ -148,7 +147,7 @@ export default {
           align: 'left',
           dataIndex: 'variationofapplicableconditions',
           ellipsis: true,
-          width: 170,
+          width: 230,
           scopedSlots: { customRender: 'variationofapplicableconditions' },
         },
         {
@@ -156,7 +155,7 @@ export default {
           align: 'left',
           dataIndex: 'upgradetheelectroniccontrollerinvolved',
           ellipsis: true,
-          width: 170,
+          width: 230,
           scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' },
         },
         {