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

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue

@@ -62,7 +62,8 @@
            <span slot="content" slot-scope="text,record,index">
                     <a-input class="box-input"
                              v-if="record.lableType == 8"
-                             v-model="record.content"
+                             v-model.trim="record.content"
+                             :maxLength="100"
                              :placeholder="$t('PleaseEnter')"/>
                     <a-select :placeholder="$t('PleaseSelect')"
                               style="width: 100%"
@@ -126,7 +127,7 @@
         },
         visible: false,
         selectedRowKeys: [],
-        dataList: [{}],
+        dataList: [],
         loading: false,
         confirmLoading: false,
         index: '',

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue

@@ -92,7 +92,7 @@
         contentList: [],
         displayList: [],
         queryCountryList: [],
-        countryCardViewList:[],
+        countryCardViewList: [],
         applyMarkets: '',
         url: {
           list: '/problemKnowledgeBase/countryCardTempEO/list',
@@ -182,10 +182,17 @@
           res.countryCardManageReleaseDetailEOList.forEach((val, index1) => {
             this.contentList.forEach(res1 => {
               if (res1.name == val.lableName) {
-                res1.list.push({
-                  lableName: val.content,
-                  lableType: val.lableType
-                })
+                if (val.lableType == 3) {
+                  res1.list.push({
+                    lableName: val.contentDropDownValue,
+                    lableType: val.lableType
+                  })
+                } else {
+                  res1.list.push({
+                    lableName: val.content,
+                    lableType: val.lableType
+                  })
+                }
               }
             })
           })

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -133,8 +133,9 @@
                   <div class="title-text">
                     <span class="title-text-text">{{$t('content')}}</span>
                   </div>
-                  <a-form-model-item style="height: 300px" class="itemModel" prop="content">
+                  <a-form-model-item style="height: 357px" class="itemModel itemModel-explain" prop="content">
                     <quill-editor
+                      v-model="formInline.content"
                       style="height: 300px"
                       :content="formInline.content"
                       :options="editorOption"
@@ -245,7 +246,7 @@
             {
               max: 5000,
               message: this.$t('content') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
-              trigger: 'change'
+              trigger: 'blur'
             }
           ]
         },
@@ -582,4 +583,7 @@
     box-sizing: border-box;
   }
 
+  ::v-deep .itemModel-explain .ant-form-explain {
+    margin-top: 60px
+  }
 </style>