Merge branch 'master' into dev_2nd_LCYH

# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

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

@@ -83,6 +83,7 @@
         visible: false,
         confirmLoading: false,
         selectedRowKeys: [],
+        selectedRowList: [],
         content: [],
         loading: false,
         queryParam: {},
@@ -149,16 +150,17 @@
         this.visible = false
       },
       handleSubmit() {
-        let content = []
-        // let replace_standard_id = []
+        let serial_number = []
+        let replace_standard_id = []
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          let content = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          // this.content.forEach(res => {
-          //   content.push(res.serial_number)
-          //   replace_standard_id.push(res.id)
-          // })
-          this.$emit('input', content.join(','))
-          // this.$emit('change', this.query.db_field_name, replace_standard_id.join(','))
+          // let content = JSON.parse(JSON.stringify(this.selectedRowList))
+          this.selectedRowList.forEach(res => {
+            serial_number.push(res.serial_number)
+            replace_standard_id.push(res.id)
+          })
+          this.$emit('input', serial_number.join(','))
+          console.log(replace_standard_id)
+          this.$emit('change', this.query.db_field_name, replace_standard_id.join(','))
           // this.$emit('changecontent', this.content)
           this.visible = false
         } else {
@@ -168,9 +170,11 @@
       indexclick(event) {
         this.$emit('input', event.target.value)
       },
-      onSelectChange(value) {
+      onSelectChange(value,row) {
         console.log(value)
+        console.log(row)
         this.selectedRowKeys = value
+        this.selectedRowList = row
         // this.content = []
         // value.forEach(val => {
         //   this.dataList.forEach((res) => {

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

@@ -169,6 +169,7 @@
                     <Standardselection :query="item"
                                        :disabled="disabled"
                                        :standard="formInline"
+                                       @change="StandardselectionChange"
                                        v-model="formInline[item.db_field_name]"/>
                   </a-form-model-item>
                 </div>
@@ -832,10 +833,11 @@
         this.type = 'add'
         this.getForm()
       },
-      // StandardselectionChange(value, id) {
-      //   this.formInline[value + '_id'] = id
-      //   this.formInline = { ...this.formInline }
-      // },
+      StandardselectionChange(value, id) {
+        console.log(id)
+        this.formInline[value + '_id'] = id
+        this.formInline = { ...this.formInline }
+      },
       PersonnelSelectionChange(value, id) {
         this.formInline[value + '_id'] = id
         this.formInline = { ...this.formInline }