修改禅道已知bug

jero-web/src/common/lang/en-us.js

@@ -1134,7 +1134,7 @@ module.exports = {
   feedbackEvaluation: 'Feedback Evaluation',
   clauseEvaluation: 'Clause Evaluation',
   standardDocuments: 'Standard Documents',
-  pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list',
+  pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluator in the list',
   reviewComments: 'Review comments',
   PleaseCompleteList: 'Please complete the compliance results in the list',
   sponsorFeedback: 'Sponsor feedback',

jero-web/src/common/lang/zh-cn.js

@@ -1139,7 +1139,6 @@ module.exports = {
   feedbackEvaluation: '反馈评估',
   clauseEvaluation: '条款评估',
   standardDocuments: '标准文件',
-  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
   reviewComments: '审核意见',
   PleaseCompleteList: '请补全列表中符合性结果',
   sponsorFeedback: '发起人反馈',
@@ -1240,7 +1239,7 @@ module.exports = {
   feedbackEvaluation: '反馈评估',
   clauseEvaluation: '条款评估',
   standardDocuments: '标准文件',
-  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
+  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估人',
   reviewComments: '审核意见',
   PleaseCompleteList: '请补全列表中符合性结果',
   sponsorFeedback: '发起人反馈',

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

@@ -169,7 +169,7 @@
             dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
           }
           dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID
-          if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) {
+          if (!dataList[i].evaluatorIds) {
             this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
             return
           }
@@ -202,4 +202,23 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+  ::v-deep .ant-select-tree-treenode-switcher-close {
+    width: 255px;
+  }
+
+  ::v-deep .ant-select-tree-node-content-wrapper {
+    text-align: left;
+    float: right;
+    margin-top: -2px !important;
+  }
+
+  ::v-deep .ant-select-tree-title {
+    width: 100%;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
 </style>

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

@@ -49,7 +49,7 @@
       </div>
       <a-table
         :columns="columns"
-        rowKey="id"
+        :rowKey="(record)=>JSON.stringify(record)"
         :scroll="{x: '100%'}"
         :data-source="dataList"
         :pagination="false"
@@ -174,10 +174,10 @@
       },
       getRowList(value) {
         if (value && value.itemId) {
-          this.selectedRowKeys =  this.selectedRowKeys.filter(res=>{
-             return value.itemId != res
+          this.selectedRowKeys = this.selectedRowKeys.filter(res => {
+            return !res.includes(value.itemId)
           })
-          this.selectedRowKeysData =  this.selectedRowKeysData.filter(res=>{
+          this.selectedRowKeysData = this.selectedRowKeysData.filter(res => {
             return value.itemId != res.id
           })
         }
@@ -239,8 +239,14 @@
         }
       },
       onSelectChange(value, record) {
+        this.selectedRowKeysData = []
         this.selectedRowKeys = value
-        this.selectedRowKeysData = record
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.selectedRowKeys.forEach(res => {
+            this.selectedRowKeysData.push(JSON.parse(res))
+          })
+        }
+        // this.selectedRowKeysData = record
       }
     }
   }

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

@@ -10,7 +10,7 @@
         ref="table"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:500}"
         :data-source="dataSource"
         :columns="columns"
       >
@@ -26,18 +26,21 @@
         <span slot="nameTechnicalDocument" slot-scope="text,result">
               <a-input class="box-input"
                        :maxLength="100"
-                       v-model="result.technicalFileName"
+                       onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                       v-model.trim="result.technicalFileName"
                        :placeholder="$t('PleaseEnter')+$t('nameTechnicalDocument')"/>
         </span>
         <span slot="chapter" slot-scope="text,result">
            <a-textarea :placeholder="$t('pleaseEnter')+$t('chapter')"
-                       v-model="result.section"
+                       v-model.trim="result.section"
+                       onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                        :maxLength="300"
                        :rows="2"/>
         </span>
         <span slot="opinion" slot-scope="text,result">
           <a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
-                      v-model="result.opinion"
+                      v-model.trim="result.opinion"
+                      onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                       :maxLength="300"
                       :rows="2"/>
         </span>
@@ -75,7 +78,8 @@
         </span>
         <span slot="sponsorFeedback" slot-scope="text,result">
              <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
-                         v-model="result.sponsorFeedback"
+                         v-model.trim="result.sponsorFeedback"
+                         onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                          :maxLength="300"
                          :rows="2"/>
         </span>