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

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',

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({
+                if (val.lableType == 3) {
-                  lableName: val.content,
+                  res1.list.push({
-                  lableType: val.lableType
+                    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>

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.lawsContact = this.userInfo().id
-          this.formInline.lawsContactName = this.userInfo().id
+          this.formInline.lawsContactName = this.userInfo().username
           this.formInline = { ...this.formInline }
         }
       })

jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue

@@ -384,4 +384,21 @@
     height: 38px;
     margin-top: 4px;
   }
+
+  ::v-deep .ant-select-tree-treenode-switcher-close {
+    width: 255px;
+  }
+
+  ::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;
+  }
 </style>

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'
           },

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">
+        <span slot="standardTitle" slot-scope="text,record" :title="text">
-            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : 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()

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,7 +296,9 @@ export default {
       pageSize: 10,
       pageNo: 1,
       disabled:false,
+      manager:false,
       total: 0,
+      addSub:true,
       tableData: [],
       selectedRowKeys: [],
       dataSource: [],
@@ -503,8 +505,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
@@ -613,6 +616,7 @@ export default {
       this.form = {}
       let supFolder = ''
       this.supFolder = this.nodeItem.key
+      this.addSub = false
       this.menuRightVisible = true
 
     },
@@ -622,6 +626,7 @@ export default {
       this.form = {}
       let supFolder = ''
       this.supFolder = this.nodeItem.key
+      this.addSub = true
       this.menuRightVisible = true
     },
     //树形修改
@@ -680,6 +685,7 @@ export default {
       if (!this.isEdit) {
           let params = {
             supFolder: this.supFolder,
+            addSub: this.addSub,
             ...this.form
           }
           this.$refs.ruleForm.validate(valid => {