Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -47,7 +47,8 @@
             <div class="detail-content-content" v-for="(item,index) in resultData.resList">
               <a-checkbox :value="item.id" class="detail-checkbox">
               </a-checkbox>
-              <div class="detail-content-content-text">
+              <div class="detail-content-content-text"
+                   :class="{'detail-content-content-text-color':checkboxList.join(',').includes(item.id)}">
                 <div class="detail-content-content-text-left"
                      :class="{'detail-content-content-text-dis':isDisplay}">
                   <div class="detail-content-left">
@@ -64,7 +65,7 @@
                     </div>
                     <div class="detail-content-left-button" v-html="item.itemsTextRight"></div>
                   </div>
-                  <div class="detail-content-bottom">
+                  <div class="detail-content-bottom" :class="{'detail-content-bottom-color':checkboxList.join(',').includes(item.id)}">
                     <div class="detail-content-bottom-left"
                          :class="{'detail-content-bottom-left-text':language == 'en-us' ? true:false}"
                          :title="$t('comparisonDifferenceComment')">
@@ -89,7 +90,7 @@
           <div class="detail-content-content">
             <a-checkbox @change="fullCheckboxChange" v-model="fullCheckbox" class="detail-checkbox">
             </a-checkbox>
-            <div class="detail-content-content-text">
+            <div class="detail-content-content-text" :class="{'detail-content-content-text-color':fullCheckbox}">
               <div class="detail-content-content-text-left"
                    :class="{'detail-content-content-text-dis':isDisplay}">
                 <div class="detail-content-content-text-left-text" :title="resultData.comments">
@@ -533,6 +534,11 @@
     }
   }
 
+  .detail-content-content-text-color {
+    border: 1px solid #00B3BE;
+    background: rgba(0,179,190,0.0300);
+  }
+
   .detail-content-left {
     width: 50%;
     display: inline-block;
@@ -571,7 +577,9 @@
     border-radius: 4px;
     float: left;
   }
-
+  .detail-content-bottom-color{
+    background: rgba(0,179,190,0.0300);
+  }
   .detail-content-bottom-left {
     width: 115px;
     font-size: 14px;

jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue

@@ -327,7 +327,7 @@
           if (detailRightColor && detailRightColor.length > 0) {
             detailRightColor[0].classList.remove('detail-content-content-right-data-color-right')
           }
-          if (item.targetStand && item.targetStand >= 0) {
+          if (item.targetStand > -1) {
             let detailContent = document.getElementsByClassName('detail-content-content-right-right-top')
             let detailRight = document.getElementsByClassName('detail-content-content-right-data-right')
             this.dataRight = this.resultData.textRight[item.targetStand]
@@ -357,7 +357,7 @@
           if (detailLeftColor && detailLeftColor.length > 0) {
             detailLeftColor[0].classList.remove('detail-content-content-right-data-color')
           }
-          if (item.targetStand && item.targetStand >= 0) {
+          if (item.targetStand > -1) {
             this.dataLeft = this.resultData.textLeft[item.targetStand]
             let detailContent = document.getElementsByClassName('detail-content-content-right-top')
             let detailLeft = document.getElementsByClassName('detail-content-content-right-data')

jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue

@@ -26,34 +26,46 @@
 
   export default {
     name: 'regulatoryCirculationHistory',
+    props: {
+      isTrue: {
+        type: Boolean,
+        default: false
+      }
+    },
     data() {
       return {
         dataSource: [],
         loading: false,
-        columns: [
+        columnsAll: [
           {
             title: this.$t('OperationContent'),
             dataIndex: 'taskDefinitionKeyName',
             align: 'center',
-            width: '25%'
+            width: '20%'
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'approvalOpinion',
+            align: 'center',
+            width: '20%'
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'createBy',
             align: 'center',
-            width: '25%'
+            width: '20%'
           },
           {
             title: this.$t('role'),
             dataIndex: 'operatorRoleName',
             align: 'center',
-            width: '25%'
+            width: '20%'
           },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'center',
-            width: '25%',
+            width: '20%',
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
@@ -64,6 +76,20 @@
     mounted() {
       this.getList()
     },
+    computed: {
+      columns() {
+        let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
+        if (!this.isTrue) {
+          for (let i = 0; i < columnsAll.length; i++) {
+            if (columnsAll[i].title == this.$t('opinion')) {
+              columnsAll.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnsAll
+      }
+    },
     methods: {
       getList() {
         let query = {

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -34,7 +34,7 @@
           @submit="submit"
           @sendBack="sendBack"
         />
-        <circulationHistory v-if="isDisplay"/>
+        <circulationHistory :isTrue="true" v-if="isDisplay"/>
       </div>
     </div>
     <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>