From 718d5a707a37ff967059f4e4fc7c2648480f18d7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 09:30:12 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/countryCardReleaseAdd.vue        |  5 +++--
 .../components/countryCardView.vue              | 17 ++++++++++++-----
 .../components/problemKnowledgeBaseAdd.vue      |  8 ++++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
index 301721aff..5ba9e0e3c 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
+++ b/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: '',
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
index ace355e4f..0e804b721 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+++ b/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
+                  })
+                }
               }
             })
           })
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 4b5d678f1..c954fe235 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/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>
\ No newline at end of file

From 8d009c6b15dcc072dc73ff2457040de8fb48e7bd Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 11 Aug 2022 09:32:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js            | 2 +-
 jero-web/src/views/externalReports/index.vue | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7596c76db..04fce3a33 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -475,7 +475,7 @@ module.exports = {
   away: 'Collapse',
   toDoProcess: 'To Do',
   processDone: 'Completed',
-  sentProcess: 'Create',
+  sentProcess: 'Initiated',
   monitoringProcess: 'Monitor',
   ConfirmDeployment: 'Confirm Deployment?',
   terminationProcess: 'Termination Process',
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index b714d81cd..82ea5c65e 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -40,7 +40,7 @@
                     <span v-else :title="title">
                       {{title && title.length > 18?title.slice(0,17)+'...':title}}
                     </span>
-                    <template #overlay >
+                    <template #overlay v-if='manager'>
                       <a-menu  @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
                         <a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}}</a-menu-item>
                         <a-menu-item key="4" @click="orgAdds" v-has="'externalReports:folder'" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
@@ -296,6 +296,7 @@ export default {
       pageSize: 10,
       pageNo: 1,
       disabled:false,
+      manager:false,
       total: 0,
       tableData: [],
       selectedRowKeys: [],
@@ -503,8 +504,9 @@ export default {
       getAction(`extRepo/extRepoFolder/list`, {}).then(res => {
         if (res.success) {
           // this.data = this.toTree(res.result)
-          this.data = res.result
+          this.data = res.result.list
           this.menuId = this.data[0].key
+          this.manager = res.result.manager
           console.log(this.menuId)
           let queryParam = {
             supFolder: this.menuId

From 2e3c94de2aa941fb15b1d7c59564d3a575fab7b5 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 09:50:14 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modules/defaultTemplate.vue         |  4 ++--
 .../components/modules/fillAdd.vue                 | 12 ++++++++++++
 .../components/modules/fillTable.vue               |  5 +++--
 .../documentTools/documentTranslation/index.vue    | 14 ++++++++------
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index d091d3d9b..ace3619da 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -391,8 +391,8 @@
           this.formInline = { ...this.formInline }
         } else {
           this.formInline = {}
-          this.formInline.lawsContact = this.userInfo().username
-          this.formInline.lawsContactName = this.userInfo().id
+          this.formInline.lawsContact = this.userInfo().id
+          this.formInline.lawsContactName = this.userInfo().username
           this.formInline = { ...this.formInline }
         }
       })
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index ca2803ca7..ffa3a6543 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -384,4 +384,16 @@
     height: 38px;
     margin-top: 4px;
   }
+
+  ::v-deep .ant-select-tree-treenode-switcher-close {
+    width: 255px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  ::v-deep .ant-select-tree-node-content-wrapper{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index df745bf88..55010c29d 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -84,12 +84,13 @@
             title: this.$t('chineseTitle'),
             align: 'center',
             dataIndex: 'titleCn',
-            width: 210
+            ellipsis: true,
+            width: 320
           },
           {
             title: this.$t('englishTitle'),
             align: 'center',
-            width: 210,
+            width: 320,
             ellipsis: true,
             dataIndex: 'titleEn'
           },
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index e0521ba0c..aea26d78f 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -100,8 +100,8 @@
              v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
-        <span slot="title" slot-scope="text,record" :title="text">
-            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+        <span slot="standardTitle" slot-scope="text,record" :title="text">
+            {{ text}}
         </span>
         <span slot="translationLanguage" slot-scope="text,record"
               :title="record.sourceLanguage_dictText +' -- '+record.targetLanguage_dictText">
@@ -150,7 +150,7 @@
         },
         toggleSearchStatus: false,
         loading: false,
-        dataSource: [{}],
+        dataSource: [],
         selectedRowKeys: [],
         total: 0,
         pageSize: 10,
@@ -164,14 +164,16 @@
             align: 'center',
             dataIndex: 'serialNumber',
             width: 170,
-            scopedSlots: { customRender: 'title' }
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardTitle' }
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
             width: 170,
-            scopedSlots: { customRender: 'title' }
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardTitle' }
           },
           {
             title: this.$t('TextStatus'),
@@ -254,7 +256,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(page,pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

From 3d498fc459f7e92bb0ee1e7e147499878ccb5104 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 11 Aug 2022 09:51:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=90=E6=96=87=E4=BB=B6=E5=A4=B9=E6=88=96=E5=90=8C=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/externalReports/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 82ea5c65e..5c19aec74 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -298,6 +298,7 @@ export default {
       disabled:false,
       manager:false,
       total: 0,
+      addSub:true,
       tableData: [],
       selectedRowKeys: [],
       dataSource: [],
@@ -615,6 +616,7 @@ export default {
       this.form = {}
       let supFolder = ''
       this.supFolder = this.nodeItem.key
+      this.addSub = false
       this.menuRightVisible = true
 
     },
@@ -624,6 +626,7 @@ export default {
       this.form = {}
       let supFolder = ''
       this.supFolder = this.nodeItem.key
+      this.addSub = true
       this.menuRightVisible = true
     },
     //树形修改
@@ -682,6 +685,7 @@ export default {
       if (!this.isEdit) {
           let params = {
             supFolder: this.supFolder,
+            addSub: this.addSub,
             ...this.form
           }
           this.$refs.ruleForm.validate(valid => {

From d7a8e4a34f58b036bfaba952dc09f9e3f7db4b0b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 10:13:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulationReport/components/modules/fillAdd.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index ffa3a6543..3f9010c48 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -387,11 +387,16 @@
 
   ::v-deep .ant-select-tree-treenode-switcher-close {
     width: 255px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
   }
-  ::v-deep .ant-select-tree-node-content-wrapper{
+
+  ::v-deep .ant-select-tree-node-content-wrapper {
+    float: right;
+    margin-top: -2px!important;
+  }
+
+  ::v-deep .ant-select-tree-title {
+    width: 100%;
+    display: block;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;