Merge remote-tracking branch 'origin/master'

src/views/hwpayment/modules/HwPaymentErrorPeopleListModal.vue

@@ -89,7 +89,7 @@
             dataIndex: 'idcardNumber'
           },
           {
-            title: '实付金额',
+            title: '付款金额',
             align: 'left',
             dataIndex: 'netPayment',
             customRender: (value,record) => {

src/views/hwsupervise/HwHainanCompanyList.vue

@@ -1,23 +1,12 @@
 <template>
   <div class="page-header-index-wide">
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <a-form-item label="姓名">
-              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
-            </a-form-item>
-          </a-col>
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="身份证号">
-                <a-input placeholder="请输入身份证号" :maxlength="18" v-model="queryParam.idcardNumber"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="8">
-              <a-form-item label="日期">
+              <a-form-item label="统计月份">
                 <a-range-picker
                   style="width: 100%"
                   v-model="queryParam.paymentResultTimeRange"
@@ -30,63 +19,74 @@
               </a-form-item>
             </a-col>
 
-          <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="商户名称">
+                <a-input placeholder="请输入商户名称" v-model="queryParam.paymentCompany"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="税号">
+                <a-input placeholder="请输入税号" v-model="queryParam.dutyParagraph"></a-input>
+              </a-form-item>
+            </a-col>
+
+
+
+            <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
-                <!--{{ toggleSearchStatus ? '收起' : '展开' }}-->
-                <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--{{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
               <!--</a>-->
             </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;display: flex;flex-direction: row">
-      <div style="display: flex;flex-direction: column"><i class="anticon anticon-info-circle ant-alert-icon"></i> 收入总额（不含税）合计 <a style="font-weight: 600">{{ sumNetPayment}}元</a></div>
-
-      <div style="display: flex;flex-direction: column;margin-left: 30%;"><i class="anticon anticon-info-circle ant-alert-icon"></i> 纳税总计 <a style="font-weight: 600">{{ sumTaxFee}}元</a></div>
-    </div>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
 
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;display: flex;flex-direction: row">
+        <div style="display: flex;flex-direction: column"><i class="anticon anticon-info-circle ant-alert-icon"></i> 开票总额合计 <a style="font-weight: 600">{{ sumNetPayment}}元</a></div>
+      </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
 
+      <!-- 操作按钮区域 -->
+      <div class="table-operator">
+        <a-button type="primary" icon="download" @click="handleExportXls1('合作商户')">导出</a-button>
 
-    </div>
+      </div>
 
-    <!-- table区域-begin -->
-    <div>
+      <!-- table区域-begin -->
+      <div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        @change="handleTableChange">
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <a @click="viewTaxPayment(record)" >完税明细</a>
+          <a @click="viewTaxPayment(record)" >开票明细</a>
         </span>
 
-        <span slot="action1" slot-scope="text, record">
-           <a @click="handleEdit(record)">{{record.name}}</a>
+          <span slot="action1" slot-scope="text, record">
+           <a @click="handleEdit(record)">江苏开心工作科技有限公司</a>
         </span>
 
 
-      </a-table>
-    </div>
+        </a-table>
+      </div>
 
-    <hw-hainan-user-info-modal ref="modalForm" @ok="modalFormOk"></hw-hainan-user-info-modal>
-    <hw-tax-payment-list ref="modalTaxPaymentForm" @ok="modalFormOk"></hw-tax-payment-list>
-  </a-card>
+      <hw-hainan-user-info-modal ref="modalForm" @ok="modalFormOk"></hw-hainan-user-info-modal>
+      <hw-tax-payment-list ref="modalTaxPaymentForm" @ok="modalFormOk"></hw-tax-payment-list>
+    </a-card>
   </div>
 </template>
 
@@ -97,6 +97,7 @@
   import { getAction,postAction,deleteAction,downFile } from '@/api/manage'
   import HwHainanUserInfoModal from './modules/HwHainanUserInfoModal'
   import HwTaxPaymentList from './HwTaxPaymentList'
+  import moment from "moment"
 
 
   export default {
@@ -115,38 +116,36 @@
         allowClear:false,
         // 查询条件
         queryParam: {
-          paymentResultTimeRange:[],
+          paymentResultTimeRange:[moment(new Date(new Date().getFullYear(),new Date().getMonth(),1), 'YYYY/MM/DD'), moment(new Date(), 'YYYY/MM/DD')],
+          paymentResultTime_begin:new Date(new Date().getFullYear(),new Date().getMonth(),1).toLocaleDateString()+" 00:00:00",
+          paymentResultTime_end:new Date().toLocaleDateString() +" 23:59:59",
         },
         // 表头
         columns: [
           {
-            title:'姓名',
+            title:'商户名称',
             align:"center",
-            dataIndex: 'name',
+            dataIndex: 'companyName',
             scopedSlots: { customRender: 'action1' },
           },
           {
-            title:'身份证号',
+            title:'税号',
             align:"center",
-            dataIndex: 'idcardNumber'
+            dataIndex: 'dutyParagraph'
           },
           {
-            title:'接单数',
+            title:'发单数',
             align:"center",
-            dataIndex: 'paymentNumber'
+            dataIndex: 'paymentNumber',
+            sorter: true
           },
           {
-            title:'收入总额（不含税）',
+            title:'开票总额',
             align:"center",
-            dataIndex: 'personalNetPayment'
+            dataIndex: 'personalNetPayment',
+            sorter: true
           },
           {
-            title:'纳税总额',
-            align:"center",
-            dataIndex: 'personalTaxFee'
-          },
-
-          {
             title: '操作',
             dataIndex: 'action',
             align:"center",
@@ -154,11 +153,11 @@
           }
         ],
         url: {
-          list: "/hwuser/hwUser/haiNanInfolist",
-          exportXlsUrl: "/hwuser/hwUser/exportXls",
+          list: "/saasmanager/hwPlatformCompany/companyList",
+          exportXlsUrl: "/hwuser/hwUser/exportXlsHainan",
         },
         dictOptions:{
-        } 
+        }
       }
     },
     computed: {
@@ -202,14 +201,11 @@
           if (res.success) {
             this.dataSource = res.result.records
             this.ipagination.total = res.result.total;
-            if( res.result.records.length>0){
+            if( res.result.records.length > 0){
               this.sumNetPayment=this.returnFloat(res.result.records[0].sumNetPayment)
-              this.sumTaxFee=this.returnFloat(res.result.records[0].sumTaxFee)
             }else{
               this.sumNetPayment=this.returnFloat(0)
-              this.sumTaxFee=this.returnFloat(0)
             }
-
           }
           if (res.code === 510) {
             this.$message.warning(res.message)
@@ -238,7 +234,29 @@
         this.$refs.modalTaxPaymentForm.edit(record)
         this.$refs.modalTaxPaymentForm.title = '完税明细'
         this.$refs.modalTaxPaymentForm.disableSubmit = false
-      }
+      },
+      handleExportXls1(){
+        let param = this.getQueryParams()//查询条件
+        downFile(this.url.exportXlsUrl,param).then((data)=>{
+          if (!data) {
+            this.$message.warning("文件下载失败")
+            return
+          }
+          if (typeof window.navigator.msSaveBlob !== 'undefined') {
+            window.navigator.msSaveBlob(new Blob([data]), this.description+'.xls')
+          }else{
+            let url = window.URL.createObjectURL(new Blob([data]))
+            let link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', this.description+'.xls')
+            document.body.appendChild(link)
+            link.click()
+            document.body.removeChild(link); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          }
+        })
+      },
 
     }
   }