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

---
 .../components/Standardselection/index.vue    | 38 ++++++++++---------
 .../src/components/libraryAddForm/index.vue   |  9 ++---
 .../splitting/modules/SplitAddForm.vue        | 16 ++++----
 .../virtualList/components/editModel.vue      |  8 ++--
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue
index acdd3b18e..5ddfe0d58 100644
--- a/jero-web/src/components/Standardselection/index.vue
+++ b/jero-web/src/components/Standardselection/index.vue
@@ -27,7 +27,7 @@
         />
         <a-table
           :columns="columns"
-          rowKey="id"
+          rowKey="serial_number"
           :scroll="{x: 1500}"
           :data-source="dataList"
           :pagination="false"
@@ -132,7 +132,7 @@
           if (res.success) {
             this.dataList = res.result.records
             this.total = res.result.total
-            this.selectedRowKeys = this.standard[this.query.db_field_name + '_id'] ? this.standard[this.query.db_field_name + '_id'].split(',') : []
+            this.selectedRowKeys = this.standard[this.query.db_field_name] ? this.standard[this.query.db_field_name].split(',') : []
           } else {
             this.dataList = []
           }
@@ -143,15 +143,16 @@
       },
       handleSubmit() {
         let content = []
-        let replace_standard_id = []
-        if (this.content && this.content.length > 0) {
-          this.content.forEach(res => {
-            content.push(res.serial_number)
-            replace_standard_id.push(res.id)
-          })
+        // 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(','))
-          this.$emit('changecontent', this.content)
+          // this.$emit('change', this.query.db_field_name, replace_standard_id.join(','))
+          // this.$emit('changecontent', this.content)
           this.visible = false
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
@@ -161,15 +162,16 @@
         this.$emit('input', event.target.value)
       },
       onSelectChange(value) {
+        console.log(value)
         this.selectedRowKeys = value
-        this.content = []
-        value.forEach(val => {
-          this.dataList.forEach((res) => {
-            if (res.id === val) {
-              this.content.push(res)
-            }
-          })
-        })
+        // this.content = []
+        // value.forEach(val => {
+        //   this.dataList.forEach((res) => {
+        //     if (res.id === val) {
+        //       this.content.push(res)
+        //     }
+        //   })
+        // })
       },
       searchQuery(queryParam) {
         let queryParamQuery = JSON.parse(JSON.stringify(queryParam))
diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue
index 9272d8500..5de0dc6dd 100644
--- a/jero-web/src/components/libraryAddForm/index.vue
+++ b/jero-web/src/components/libraryAddForm/index.vue
@@ -163,7 +163,6 @@
                   </div>
                   <a-form-model-item class="itemModel" :prop="item.db_field_name">
                     <Standardselection :query="item"
-                                       @change="StandardselectionChange"
                                        :disabled="disabled"
                                        :standard="formInline"
                                        v-model="formInline[item.db_field_name]"/>
@@ -473,10 +472,10 @@
         this.type = 'add'
         this.getForm()
       },
-      StandardselectionChange(value, id) {
-        this.formInline[value + '_id'] = id
-        this.formInline = { ...this.formInline }
-      },
+      // StandardselectionChange(value, id) {
+      //   this.formInline[value + '_id'] = id
+      //   this.formInline = { ...this.formInline }
+      // },
       PersonnelSelectionChange(value, id) {
         this.formInline[value + '_id'] = id
         this.formInline = { ...this.formInline }
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 87feb3d0a..e410c78e5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -169,8 +169,6 @@
                               </div>
                               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                                 <Standardselection :query="item"
-                                                   @changecontent='changeContent'
-                                                   @change="StandardselectionChange"
                                                    :disabled="disabled"
                                                    :standard="formInline"
                                                    v-model="formInline[item.db_field_name]"/>
@@ -1128,19 +1126,19 @@
         this.type = 'add'
 
       },
-      changeContent(val) {
-        this.standardSelectionContent = val
-      },
-      StandardselectionChange(value, id) {
+      // changeContent(val) {
+      //   this.standardSelectionContent = val
+      // },
+      // StandardselectionChange(value, id) {
         // todo
         // this.valueItem = value
         // if(this.formInline[value] !== undefined) {
         //   this.formArrayName = this.formInline[value].split(',')
         //   this.formArrayId = id.split(',')
         // }
-          this.formInline[value + '_id'] = id
-          this.formInline = { ...this.formInline }
-      },
+        //   this.formInline[value + '_id'] = id
+        //   this.formInline = { ...this.formInline }
+      // },
       PersonnelSelectionChange(value, id) {
         this.formInline[value + '_id'] = id
         this.formInline = { ...this.formInline }
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 041074641..e2c78c696 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -629,10 +629,10 @@
           this.$refs.ruleForm.validateField([value])
         })
       },
-      StandardselectionChange(value, id) {
-        this.formInline[value + '_id'] = id
-        this.formInline = { ...this.formInline }
-      },
+      // StandardselectionChange(value, id) {
+      //   this.formInline[value + '_id'] = id
+      //   this.formInline = { ...this.formInline }
+      // },
       dateChange(item) {
         this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
       },