【update】-来款企业可以多选查询

src/components/company/BusinessSelect.vue

@@ -35,7 +35,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: isMultiple ? 'checkbox' : 'radio'}"
         @change="handleTableChange"
         class="j-table-force-nowrap">
         <template slot="htmlSlot" slot-scope="text">
@@ -71,6 +71,12 @@ export default {
     memberNature: {
       type: Number,
       default: null
+    },
+    // 是否多选-默认false
+    isMultiple: {
+      type:Boolean,
+      required:false,
+      default:false
     }
   },
   data() {
@@ -134,7 +140,6 @@ export default {
           if (res.result.total) {
             this.ipagination.total = res.result.total
             //清空列表选中
-            this.onClearSelected()
           } else {
             this.ipagination.total = 0
           }
@@ -158,10 +163,29 @@ export default {
     close() {
       this.visible = false
       this.selectedCompany = {}
+      if (this.isMultiple) {
+        this.selectedCompany = []
+      }
+      this.onClearSelected()
     },
     onSelectChange(selectedRowKeys, selectionRows) {
-      this.selectedCompany = selectionRows[0]
+      console.log('---this.selectedCompany----', selectedRowKeys, selectionRows)
+      if(!this.isMultiple) {
+        this.selectedCompany = selectionRows[0]
+      } else {
+        // selectionRows只会返回当前页数据的返回，所以多选的时候需要比对各个数据是否存在，不存在的话就从当前数据中查询推入selectedCompany中
+        let resultArr = []
+        selectionRows.forEach(row => {
+          let ele = this.selectedCompany.find(ele => ele.id === row.id)
+          if(!ele) {
+            resultArr.push(row)
+          }
+        })
+        this.selectedCompany = [...this.selectedCompany, ...resultArr]
+        // this.selectedCompany = selectionRows
+      }
       this.selectedRowKeys = selectedRowKeys
+
     },
     /*
     * 重写一下查询  之前调用的是混入的查询
@@ -175,6 +199,11 @@ export default {
       this.queryParam = {}
       this.loadData(1)
     }
+  },
+  created() {
+    if (this.isMultiple) {
+      this.selectedCompany = []
+    }
   }
 }
 </script>

src/components/company/CompanySelect.vue

@@ -2,14 +2,14 @@
   <div class="company-select">
     <a-row>
       <a-col :span="20">
-        <a-input @click="chooseBusiness" :value="value[valueKey]" v-bind="$attrs" :readOnly="true" unselectable="on"></a-input>
+        <a-input @click="chooseBusiness" :title="value[valueKey]" :value="value[valueKey]" v-bind="$attrs" :readOnly="true" unselectable="on"></a-input>
       </a-col>
       <a-col :span="4" class="form-btn" v-if="canAdd">
         <a-button v-bind="$attrs" icon="plus" @click="addCompany"></a-button>
       </a-col>
     </a-row>
 
-    <business-select ref="businessSelect" @ok="handleOk" v-bind="$attrs"></business-select>
+    <business-select ref="businessSelect" @ok="handleOk" v-bind="$attrs" :is-multiple="isMultiple"></business-select>
     <business-management-module ref="businessAdd" @ok="addCompanyOk"></business-management-module>
   </div>
 </template>
@@ -50,6 +50,12 @@ export default {
       type:Boolean,
       required:false,
       default:false
+    },
+    // 是否多选-默认false
+    isMultiple: {
+      type:Boolean,
+      required:false,
+      default:false
     }
   },
   methods: {
@@ -71,9 +77,22 @@ export default {
      * @param value
      */
     handleOk(value) {
-      let company = {
-        id: value.id,
-        companyName: value.companyName
+      console.log('--------value---------', 'value')
+      let company = {id: undefined, companyName: undefined}
+      // 多选的时候 全部放在一起，以逗号分隔
+      if (this.isMultiple) {
+        if(value.length > 0) {
+          let ids = [], nameArr = []
+          value.forEach(item => {
+            ids.push(item.id)
+            nameArr.push(item.companyName)
+          })
+          company.id = ids.join()
+          company.companyName= nameArr.join()
+        }
+      } else {
+        company.id = value.id
+        company.companyName= value.companyName
       }
       this.$emit('change', company)
     },

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -13,9 +13,13 @@
         <a-row v-if="defaultChargeWay">
           <a-col>
             <a-form-item label="工作组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
-              <a-select placeholder="请选择工作组项目"
-                        v-decorator="['workingGroupId',validatorRules.workingGroupId]"
-                        :maxLength='50'>
+              <a-select
+                placeholder="请选择工作组项目"
+                show-search
+                v-decorator="['workingGroupId',validatorRules.workingGroupId]"
+                :maxLength='50'
+                :filter-option="filterOption"
+              >
                 <a-select-option v-for="item in workingGroupList" :key="item.id" :value="item.id">
                   {{ item.workingGroupProject }}
                 </a-select-option>
@@ -971,7 +975,13 @@ export default {
       this.$nextTick(() => {
         this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
       })
-    }
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
   }
 }
 </script>

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue

@@ -9,7 +9,7 @@
           <a-row>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="来款企业" :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-bottom: -1px">
-                <company-select :can-add="false" placeholder="请选择来款企业"
+                <company-select isMultiple :can-add="false" placeholder="请选择来款企业"
                                 v-model="queryParam.chargeCompany"></company-select>
               </a-form-item>
             </a-col>