解决禅道bug59435 、 59407

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -25,7 +25,7 @@
             <!--              {{$t('engineerFeedbackResults')}}-->
             <!--            </div>-->
             <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
-              <div class="table-operator">
+              <div class="table-operator" v-if="item.id">
                 <div class="operator-text" style="float: left;font-size: 16px">
                   {{$t('engineer')+item.createBy+$t('feedbackResults')}}
                 </div>
@@ -110,7 +110,7 @@
       }
     },
     mounted() {
-      document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults')
+      document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
       this.getList()
     },
     methods: {
@@ -118,10 +118,10 @@
         let query = {
           firstInitiation: '2',
           whetherTobring: '2',
-          processBackground:this.$route.query.processBackground || '',
+          processBackground: this.$route.query.processBackground || '',
-          remark:this.$route.query.remark || '',
+          remark: this.$route.query.remark || '',
-          standId:this.$route.query.standId,
+          standId: this.$route.query.standId,
-          lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId
+          lawsTechnologyEvaluationId: this.$route.query.lawsTechnologyEvaluationId
         }
         let newUrl = this.$router.resolve({
           path: '/evaluationInitiationProcess',
@@ -146,6 +146,11 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length == 0) {
+              this.dataSource.push({
+                name: ''
+              })
+            }
             this.loading = false
           } else {
             this.dataSource = []

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

@@ -118,9 +118,9 @@
       @cancel="visible = false"
     >
       <template slot="footer">
-        <a-button type="primary" @click="fullTextCommentsEdit">
+<!--        <a-button type="primary" @click="fullTextCommentsEdit">-->
-          {{$t('edit')}}
+<!--          {{$t('edit')}}-->
-        </a-button>
+<!--        </a-button>-->
         <a-button type="primary" :loading="confirmLoading" @click="fullTextCommentsSubmit">
           {{$t('submit')}}
         </a-button>
@@ -133,7 +133,6 @@
           <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
                         v-model.trim="formInlineText.comment"
-                        :disabled="fullTextDisabled"
                         :rows="4"/>
           </a-form-model-item>
         </div>
@@ -256,11 +255,11 @@
       },
       addFullTextCommentClick() {
         this.visible = true
-        if (this.formInlineText.comment) {
+        // if (this.formInlineText.comment) {
-          this.fullTextDisabled = true
+        //   this.fullTextDisabled = true
-        } else {
+        // } else {
-          this.fullTextDisabled = false
+        //   this.fullTextDisabled = false
-        }
+        // }
       },
       turnOffAutomaticMatchingClick() {
         this.isMatching = !this.isMatching