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

jero-web/src/components/SelectedBy/index.vue

@@ -48,10 +48,10 @@
         type: Object,
         default: {}
       },
-      title:{
+      title: {
         type: String,
-        default:''
-      },
+        default: ''
+      }
     },
     data() {
       return {
@@ -102,7 +102,12 @@
         this.visibleTree = false
       },
       handleSubmit() {
-        this.$emit('SelectedByForm',this.userIds.join(','))
+        if (this.userIds && this.userIds.length > 0) {
+          this.submitLoading = true
+          this.$emit('SelectedByForm', this.userIds.join(','))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
       onSearch(e) {
         this.gData = []
@@ -171,7 +176,7 @@
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;
-    z-index:100;
+    z-index: 100;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;

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

@@ -175,6 +175,12 @@
             dataIndex: 'releaseStatus_dictText',
             ellipsis: true
           },
+          {
+            title: this.$t('creater'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true
+          },
           {
             title: this.$t('operation'),
             align: 'center',

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

@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-<!--           <span style="line-height: 66px;display: inline-block;float: left">-->
-<!--             <a-icon type="arrow-left" @click="back" style="margin-right: 6px;"/>-->
-<!--           </span>-->
+          <!--           <span style="line-height: 66px;display: inline-block;float: left">-->
+          <!--             <a-icon type="arrow-left" @click="back" style="margin-right: 6px;"/>-->
+          <!--           </span>-->
           {{queryForm.title}}
         </div>
         <div class="doc-detail-right">
@@ -156,8 +156,23 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
-      SelectedByForm() {
-
+      SelectedByForm(userIds) {
+        let query = {
+          userIds: userIds,
+          departIds: userIds,
+          problemKnowledgeBaseId: this.queryForm.id,
+          problemKnowledgeBaseTitle: this.queryForm.title
+        }
+        postAction('/problemKnowledgeBase/problemKnowledgeBaseEO/forward', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.SelectedByRef.visible = false
+            this.$refs.SelectedByRef.submitLoading = false
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.$refs.SelectedByRef.submitLoading = false
+          }
+        })
       },
       queryById() {
         let query = {

jero-web/src/views/dashboard/components/myList.vue

@@ -10,7 +10,7 @@
     <div class="myList-box-content" v-if="dataSource.length > 0">
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
-          <span class="top-text" :title="item.prcNum">{{item.prcNum}}</span>
+          <span class="top-text" :title="item.prcName">{{item.prcName}}</span>
           <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>
         </div>
         <div class="button">
@@ -43,7 +43,9 @@
         dataSource: [],
         loading: false,
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess')
+          1: this.$t('taskConfirmationProcess'),
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         }
       }
     },

jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue

@@ -10,8 +10,8 @@
                   <div class="title-text" :title="$t('title')">
                     <span>{{$t('title')}}</span>
                   </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                           v-model="queryParams.title"></a-input>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                           v-model="queryParams.title"></j-input>
                 </div>
               </a-col>
               <span style="float: right;overflow: hidden;margin-right: 11px"
@@ -60,7 +60,10 @@
               </div>
               <!--                    </a-tooltip>-->
             </div>
-            <div @click="CancelCollectionClick" class="text-text-right-text">{{$t('CancelCollection')}}</div>
+            <div @click="CancelCollectionClick(item)"
+                 :title="$t('CancelCollection')"
+                 class="text-text-right-text">{{$t('CancelCollection')}}
+            </div>
           </div>
         </div>
       </a-checkbox-group>
@@ -98,7 +101,8 @@
         loading: false,
         queryParams: {},
         url: {
-          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page'
+          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/queryCollectPageList',
+          deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/deleteBatch'
         }
       }
     },
@@ -107,7 +111,6 @@
     },
     watch: {
       checkboxText: function(value) {
-        console.log(value)
         this.conList.forEach(val => {
           val.checked = false
         })
@@ -159,9 +162,11 @@
           this.$confirm({
             content: _this.$t('BatchCancelCollection'),
             onOk() {
-              getAction('', {}).then((res) => {
+              let checkboxText = JSON.parse(JSON.stringify(_this.checkboxText))
+              deleteAction(_this.url.deleteBatch, { ids: checkboxText.join(',') }).then((res) => {
                 if (res.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.checkboxText = []
                   _this.getList()
                 } else {
                   _this.$message.warning(res.message)
@@ -178,7 +183,7 @@
         this.$confirm({
           content: _this.$t('confirmCancelCollection'),
           onOk() {
-            getAction('', {}).then((res) => {
+            deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()
@@ -221,7 +226,7 @@
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {
                 if (val.content) {
-                  val.contentOne = this.getText(val.content)
+                  val.content = this.getText(val.content)
                 }
               })
             }

jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue

@@ -48,6 +48,7 @@
                                 <a-input-number class="box-input"
                                                 :placeholder="$t('PleaseEnter')+item.db_field_txt"
                                                 :disabled="disabled"
+                                                :min="0"
                                                 v-model="formInline[item.db_field_name]"  :max="99999999"/>
                               </a-form-model-item>
                             </div>

jero-web/src/views/documentTools/documentTranslation/components/addModel.vue

@@ -58,8 +58,9 @@
                   <a-select-option v-for="(item, key) in translationResultsList"
                                    :key="key"
                                    :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.dbFieldTxt">
-                           {{ item.dbFieldTxt }}
+                     <span style="display: inline-block;width: 100%"
+                           :title="language == 'zh-cn' ? item.dbFieldTxt:item.dbFieldEnName">
+                           {{ language == 'zh-cn' ? item.dbFieldTxt:item.dbFieldEnName }}
                      </span>
                   </a-select-option>
                 </a-select>
@@ -94,7 +95,8 @@
         </a-row>
       </a-form-model>
     </a-modal>
-    <uploadFile ref="uploadFile" :restrictUploads="true" :Uploadable="'.docx,.doc,'" :isMultiple="true" @uploadSuccess="uploadSuccess"/>
+    <uploadFile ref="uploadFile" :restrictUploads="true" :Uploadable="'.docx,.doc,'" :isMultiple="true"
+                @uploadSuccess="uploadSuccess"/>
     <standardData ref="standardDataRef" @standardDataForm="standardDataForm"/>
   </div>
 </template>
@@ -155,10 +157,12 @@
         },
         ids: [],
         translationResultsList: [],
-        LanguageList: []
+        LanguageList: [],
+        language: ''
       }
     },
     mounted() {
+      this.language = localStorage.getItem('language')
       this.getTextStatus()
     },
     methods: {