Merge branch 'bug-fix'

src/views/financialStatistics/commodityPayment.vue

@@ -26,7 +26,7 @@ const moment = inject('$moment')
     start_date:moment().startOf('year').format('YYYY-MM-DD') || '',
     end_date:moment(new Date()).format('YYYY-MM-DD') || '',
     // 1-开票日期 2-到款日期 3-开票日期&到款日期
-    time_type:1,
+    time_type:'',
     // 1-已开票
     has_invoice:'',
     // 1-已到款
@@ -137,8 +137,8 @@ const moment = inject('$moment')
     commodityPList()
   }
 
-  const dataExport=(value)=>{
-    getInvoicePaymentList({...searchParams,is_export:1,list_param:value}).then(res=>{
+  const dataExport=()=>{
+    getInvoicePaymentList({...searchParams,is_export:1,list_param:0}).then(res=>{
       downloadByFlow(res,'xlsx','商品到款统计表')
     })
   }
@@ -374,10 +374,10 @@ const moment = inject('$moment')
                     业务收入金额<el-icon color="white" size="16" style="margin: 0 4px;"><svg-Icon name="svgIcon-financial-info"></svg-Icon></el-icon> ：
                   </div>
                   <template #content>
-                    <div style="text-align: center;">
-                      当前销售和日期筛选条件下所有已开票金额（包括已开票已到款
+                    <div>
+                      业务收入金额=已开票已到款金额+已开票未到款金额+未开票已到款金额
                       <br />
-                      和已开票未到款）和已到款金额（未开票已到款）的总和
+                      【日期类型、开票状态、到款状态为空时】
                     </div>
                   </template>
                 </el-tooltip>
@@ -428,16 +428,7 @@ const moment = inject('$moment')
             </div>
           </div>
         </div>
-        <el-dropdown trigger="click" popper-class="classifyFandQ" size="large"  @command="dataExport">
-          <el-button style="margin-bottom: 10px;" size="large" class="element-common-button">导出</el-button>
-          <template #dropdown>
-            <el-dropdown-menu>
-              <el-dropdown-item :command="0">FICC&权益</el-dropdown-item>
-              <el-dropdown-item :command="1">FICC</el-dropdown-item>
-              <el-dropdown-item :command="2">权益</el-dropdown-item>
-            </el-dropdown-menu>
-          </template>
-        </el-dropdown>
+        <el-button style="margin-bottom: 10px;" size="large" class="element-common-button" @click="dataExport">导出</el-button>
         
       </div>
       <div class="table-zone">
@@ -452,7 +443,7 @@ const moment = inject('$moment')
           </el-table-column>
           <el-table-column label="是否新客户" prop="contract_type" align="center">
             <template #default="{row}">
-              {{ row.contract_type==1?'是':'否' }}
+              {{ row.contract_type==0?'/':row.contract_type==1?'是':'否' }}
             </template>
           </el-table-column>
           <el-table-column label="合同有效期" prop="date" align="center" show-overflow-tooltip ></el-table-column>