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
2023-03-24 16:56:38 +08:00
parent 1daf1dcad0 eddac9197c
commit e115fc742e
30 changed files with 2081 additions and 1600 deletions
@@ -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 }