Merge branch 'CD_techPool_334'

src/views/financialStatistics/commodityPayment.vue

@@ -7,6 +7,7 @@ import {getServiceList} 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_type:'',
     start_date:'',
     end_date:'',
-    // 1-开票时间 2-到款时间
-    // time_type:1,
+    // 1-开票日期&到款日期 2-开票日期 3-到款日期
+    time_type:"",
     // 1-已开票
     has_invoice:'',
     // 1-已到款
@@ -271,12 +272,12 @@ const moment = inject('$moment')
     <div id="commodity-payment-container" class="commodity-payment-container">
       <div class="search-zone">
         <el-input v-model="searchParams.keyword" placeholder="请输入客户名称/销售" clearable class="search-zone-item"
-        @input="searchCommodityP" :prefix-icon="Search" ></el-input>
-        <el-select v-model="searchParams.sell_group_id" placeholder="请选择销售组别" clearable style="width: 200px;"
+        @input="searchCommodityP" :prefix-icon="Search" style="width: 240px;"></el-input>
+        <el-select v-model="searchParams.sell_group_id" placeholder="请选择销售组别" clearable
         @change="searchCommodityP" class="search-zone-item">
           <el-option :label="item.group_name" :value="item.group_id" v-for="item in groupList"></el-option>
         </el-select>
-        <el-select v-model="searchParams.service_type" placeholder="请选择套餐信息" clearable style="width: 200px;"
+        <el-select v-model="searchParams.service_type" placeholder="请选择套餐信息" clearable
         @change="searchCommodityP" class="search-zone-item">
           <el-option :label="item.title" :value="item.service_template_id" v-for="item in serviceList"></el-option>
         </el-select>
@@ -289,14 +290,18 @@ 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;" clearable>
+            <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 
-        style="width: 200px;" class="search-zone-item" @change="searchCommodityP">
+         class="search-zone-item" @change="searchCommodityP">
           <el-option label="未开票" :value="0"></el-option>
           <el-option label="已开票" :value="1"></el-option>
         </el-select>
         <el-select v-model="searchParams.has_payment" placeholder="请选择到款状态" clearable
-        style="width: 200px;margin-bottom: 10px;" @change="searchCommodityP">
+        style="margin-bottom: 10px;" @change="searchCommodityP">
           <el-option label="未到款" :value="0"></el-option>
           <el-option label="已到款" :value="1"></el-option>
         </el-select>
@@ -467,15 +472,17 @@ const moment = inject('$moment')
       display: flex;
       align-items: center;
       flex-wrap: wrap;
+      margin-right: -30px;
       .search-zone-item{
-        width: 240px;
+        width: 200px;
         margin: 0 30px 10px 0;
       }
       .date-box{
         display: flex;
         align-items: center;
-        margin: 0 40px 8px 0;
+        margin: 0 40px 10px 0;
         .composition-button-tabs{
+          margin-right: 20px;
 
           .date-button{
             height: 40px;