Merge remote-tracking branch 'origin/master'

src/views/charge-query/index.vue

@@ -16,14 +16,8 @@
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-						<a-select
-							v-model="form.payorId"
-							placeholder="请选择保险公司"
-							allowClear
-							show-search
-							mode="multiple"
-							:filterOption="filterCode"
-						>
+            <a-select v-model="form.payorIds" placeholder="请选择保险公司" allowClear  show-search   mode="multiple"
+				:filterOption="filterCode">
               <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
                 {{ item.longName }}
               </a-select-option>
@@ -41,27 +35,30 @@
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="收费时间">
-						<a-range-picker
-							format="YYYY-MM-DD"
-							v-model="form.dateRange"
-							:placeholder="['开始时间', '结束时间']"
-							@change="onSelectVisitTime"
-						/>
+            <a-range-picker format="YYYY-MM-DD" v-model="form.dateRange" :placeholder="['开始时间','结束时间']"  @change="onSelectVisitTime" />
           </a-form-model-item>
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="是否已关联寄送单">
             <a-select v-model="form.isSend" placeholder="请选择是否已关联寄送单" allowClear>
-							<a-select-option value="Y" allow-clear> 是 </a-select-option>
-							<a-select-option value="N" allow-clear> 否 </a-select-option>
+              <a-select-option  value="Y" allow-clear>
+                是
+              </a-select-option>
+              <a-select-option  value="N" allow-clear>
+                否
+              </a-select-option>
             </a-select>
           </a-form-model-item>
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="是否已回款">
             <a-select v-model="form.isEobBack" placeholder="请选择是否已回款" allowClear>
-							<a-select-option value="Y" allow-clear> 是 </a-select-option>
-							<a-select-option value="N" allow-clear> 否 </a-select-option>
+              <a-select-option  value="Y" allow-clear>
+                是
+              </a-select-option>
+              <a-select-option  value="N" allow-clear>
+                否
+              </a-select-option>
             </a-select>
           </a-form-model-item>
         </a-col>