diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index e4ec51484..ec96f19d0 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -96,7 +96,7 @@
       </div>
     </div>
     <countryCardReleaseModel ref="countryCardReleaseModelRef"/>
-    <countryCardReleaseAdd ref="countryCardReleaseAddRef"/>
+    <countryCardReleaseAdd ref="countryCardReleaseAddRef" @countryCardReleaseAddForm="countryCardReleaseAddForm"/>
   </div>
 </template>
 
@@ -128,13 +128,13 @@
           {
             title: this.$t('applicableMarket'),
             align: 'center',
-            dataIndex: 'applicableMarket',
+            dataIndex: 'applyMarket',
             ellipsis: true
           },
           {
             title: this.$t('releaseStatus'),
             align: 'center',
-            dataIndex: 'releaseStatus',
+            dataIndex: 'releaseStatus_dictText',
             ellipsis: true
           },
           {
@@ -165,11 +165,15 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(page,pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()
       },
+      countryCardReleaseAddForm() {
+        this.pageNo = 1
+        this.getList()
+      },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -224,8 +228,8 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
-      edit() {
-        this.$refs.countryCardReleaseAddRef.edit()
+      edit(record) {
+        this.$refs.countryCardReleaseAddRef.edit(JSON.parse(JSON.stringify(record)))
       },
       subscribe(record) {
         let _this = this
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
index 164da146a..db4a9d6a0 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
@@ -43,25 +43,26 @@
           :loading="loading">
            <span slot="content" slot-scope="text,record,index">
                     <a-input class="box-input"
-                             v-if="false"
-                             v-model="record.problemLabel"
+                             v-if="record.lableType == 8"
+                             v-model="record.content"
                              :placeholder="$t('PleaseEnter')"/>
                     <a-select :placeholder="$t('PleaseSelect')"
                               style="width: 100%"
-                              v-if="false"
-                              v-model="record.projectNameId">
-                      <a-select-option v-for="(item, key) in record.projectNameList"
+                              v-else-if="record.lableType == 3"
+                              v-model="record.content">
+                      <a-select-option v-for="(item, key) in record.countryCardTempItemEOList"
                                        :key="key"
                                        :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
+                     <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                           {{ item.itemText}}
                      </span>
                       </a-select-option>
                     </a-select>
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('verifyDeliverableTemplate',index)">
-                  {{ (record.verifyDeliverableTemplate === 'null' || record.verifyDeliverableTemplate === '' ||
-                  record.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          v-else-if="record.lableType == 7"
+                          @click="clickButtonToUpload('content',index)">
+                  {{ (record.content === 'null' || record.content === '' ||
+                  record.content == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
            </span>
@@ -89,8 +90,10 @@
     data() {
       return {
         url: {
-          list: '',
-          deleteOne: ''
+          list: '/problemKnowledgeBase/countryCardTempEO/list',
+          deleteOne: '',
+          add: '/problemKnowledgeBase/countryCardManageReleaseEO/add',
+          edit: '/problemKnowledgeBase/countryCardManageReleaseDetailEO/editBatch'
         },
         title: '',
         formInline: {},
@@ -98,7 +101,7 @@
           applyMarket: [
             {
               required: true,
-              message: this.$t('LabelType') + this.$t('cannotEmpty'),
+              message: this.$t('applicableMarket') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ]
@@ -113,21 +116,23 @@
         columns: [
           {
             title: this.$t('LabelName'),
-            dataIndex: 'LabelName',
+            dataIndex: 'lableName',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 220
           },
           {
             title: this.$t('describe'),
-            dataIndex: 'describe',
+            dataIndex: 'description',
             align: 'center',
+            width: 260,
             ellipsis: true
           },
           {
             title: this.$t('content'),
             align: 'center',
             fixed: 'right',
-            width: 180,
+            width: 260,
             scopedSlots: { customRender: 'content' }
           }
         ]
@@ -139,11 +144,13 @@
       add() {
         this.visible = true
         this.title = this.$t('newlyAdded')
+        this.replacePage()
         this.getApplyMarketList()
       },
-      edit() {
+      edit(row) {
         this.visible = true
         this.title = this.$t('edit')
+        this.editReplacePage(row)
         this.getApplyMarketList()
       },
       getApplyMarketList() {
@@ -186,13 +193,54 @@
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-
+            let url = ''
+            if (this.title == this.$t('newlyAdded')) {
+              url = this.url.add
+            } else {
+              url = this.url.edit
+            }
+            this.confirmLoading = true
+            let content = []
+            this.dataList.forEach(res => {
+              content.push({
+                countryCardTempId: res.id,
+                description: res.description,
+                content: res.content
+              })
+            })
+            let query = {
+              countryCardManageReleaseDetailEOList: content,
+              applyMarket: this.formInline.applyMarket
+            }
+            postAction(url, query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('countryCardReleaseAddForm')
+              } else {
+                this.confirmLoading = false
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
           }
         })
       },
       replacePage() {
         this.loading = true
-        postAction(this.url.list, {}).then((res) => {
+        getAction(this.url.list, {}).then((res) => {
+          if (res.success) {
+            this.dataList = res.result || []
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.loading = false
+          }
+        })
+      },
+      editReplacePage(row) {
+        this.loading = true
+        getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { editReplacePage: row.id }).then((res) => {
           if (res.success) {
             this.dataList = res.result || []
             this.loading = false
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
index 90873d393..ef66a9780 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
@@ -124,7 +124,7 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile,deleteAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import optionMaintenance from './optionMaintenance'
 
   export default {
@@ -289,7 +289,7 @@
       },
       handleCancel() {
         this.visible = false
-        if (this.formInline.lableType == 3) {
+        if (this.formInline.lableType == 3 && !this.formInline.id) {
           deleteAction(this.url.deleteOne, { countryCardTempId: this.dropDownOptionsId }).then((res) => {
           })
         }