解决冲突

src/views/financialStatistics/commodityPayment.vue

@@ -7,6 +7,7 @@ import {getSimpleServiceList} from '@/api/financialMana'
 import {downloadByFlow} from '@/utils/common-methods'
 
 const moment = inject('$moment')
+  const timeTypeData=[{label:'开票日期',value:1},{label:'到款日期',value:2},{label:'开票日期&到款日期',value:3}]
   const dateButtonData=[{text:'近1月',tabId:1},{text:'近2月',tabId:2},{text:'近3月',tabId:3}]
 
   // const groupList=ref([])
@@ -20,8 +21,8 @@ const moment = inject('$moment')
     service_types:'',
     start_date:moment().startOf('year').format('YYYY-MM-DD') || '',
     end_date:moment(new Date()).format('YYYY-MM-DD') || '',
-    // 1-开票时间 2-到款时间
-    // time_type:1,
+    // 1-开票日期&到款日期 2-开票日期 3-到款日期
+    time_type:"",
     // 1-已开票
     has_invoice:'',
     // 1-已到款
@@ -310,6 +311,10 @@ const moment = inject('$moment')
             :class="[index==0?'first-button':index==(dateButtonData.length-1)?'last-button':'inner-button',currentDateTab==item.tabId?'selectTab':'']" 
             @click="changeDateType(item.tabId)">{{ item.text }}</el-button>
           </div>
+          <el-select v-model="searchParams.time_type" placeholder="请选择日期类型" @change="searchCommodityP"
+          style="width: 200px;">
+            <el-option :label="item.label" :value="item.value" v-for="item in timeTypeData" :key="item.value"></el-option>
+          </el-select>
         </div>
         <el-select v-model="searchParams.has_invoice" placeholder="请选择开票状态" clearable 
          class="search-item" @change="searchCommodityP" >
@@ -493,8 +498,7 @@ const moment = inject('$moment')
       margin-left: -30px;
       display: flex;
       align-items: center;
-      flex-wrap: wrap;
-      
+      flex-wrap: wrap; 
       .search-item{
         width: 200px;
         margin: 0 0 8px 30px;
@@ -504,6 +508,7 @@ const moment = inject('$moment')
         align-items: center;
         margin: 0 0 8px 30px;
         .composition-button-tabs{
+          margin-right: 20px;
 
           .date-button{
             height: 40px;