合并冲突

src/views/main/BookingLedger/list/modules/formLabel.vue

@@ -66,7 +66,7 @@
         :dropdown-match-select-width="false"
         :dropdown-style="{ width: '200px' }"
         v-model="value"
-        option-label-prop="value"
+        option-label-prop="label"
         @select="completeSelect"
         @focus="completeChangeFirst"
         @change="debounce(completeChange, 300, $event)"
@@ -80,7 +80,7 @@
           </a-select-option>
         </template>-->
         <template slot="dataSource">
-          <a-select-option v-for="(item, index) in dataSourceList" :key="index" :value="item[labelData.showLabel]">
+          <a-select-option v-for="(item, index) in dataSourceList" :key="`${index}-${item[labelData.showLabel]}`" :value="`${index}-${item[labelData.showLabel]}`" :label="item[labelData.showLabel]">
             <div>
               <div class="title"> {{ item[labelData.showLabel] }} </div>
             </div>
@@ -257,9 +257,10 @@ export default {
       }
     },
     completeSelect (value) {
+      const val = value.split('-')[1]
       this.$emit('change', {
         form: this.labelData,
-        value: value || ''
+        value: val || ''
       })
     },
     completeChange (value) {