瀏覽代碼

Merge remote-tracking branch 'origin/master'

LiFei 5 年之前
父節點
當前提交
4bdd4ec4c9
共有 2 個文件被更改,包括 251 次插入0 次删除
  1. 3 0
      src/views/hwaccount/HwAccountManager.vue
  2. 248 0
      src/views/hwsupervise/HwHainanCompanyList.vue

+ 3 - 0
src/views/hwaccount/HwAccountManager.vue

@@ -83,6 +83,9 @@
               <template v-if="record.isDrawback === 1">
                 {{text?text+'(已退款)':text===0?text+'(已退款)':'--'}}
               </template>
+              <template v-else-if="record.type === 1">
+                --
+              </template>
               <template v-else>
                 {{text?text:text===0?text:'--'}}
               </template>

+ 248 - 0
src/views/hwsupervise/HwHainanCompanyList.vue

@@ -0,0 +1,248 @@
+<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-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-range-picker
+                  style="width: 100%"
+                  v-model="queryParam.paymentResultTimeRange"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                  @ok="onDateOk"
+                  :allowClear="allowClear"
+                />
+              </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'"/>-->
+              <!--</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>
+
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+
+      <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>
+        </span>
+
+        <span slot="action1" slot-scope="text, record">
+           <a @click="handleEdit(record)">{{record.name}}</a>
+        </span>
+
+
+      </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>
+  </div>
+</template>
+
+<script>
+
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { filterObj } from '@/utils/util';
+  import { getAction,postAction,deleteAction,downFile } from '@/api/manage'
+  import HwHainanUserInfoModal from './modules/HwHainanUserInfoModal'
+  import HwTaxPaymentList from './HwTaxPaymentList'
+
+
+  export default {
+    name: "HwHainanCompanyList",
+    mixins:[JeecgListMixin],
+    components: {
+      HwTaxPaymentList,
+      HwHainanUserInfoModal
+
+    },
+    data () {
+      return {
+        sumNetPayment:0.00,
+        sumTaxFee:0.00,
+        description: 'hw_userinfo管理页面',
+        allowClear:false,
+        // 查询条件
+        queryParam: {
+          paymentResultTimeRange:[],
+        },
+        // 表头
+        columns: [
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name',
+            scopedSlots: { customRender: 'action1' },
+          },
+          {
+            title:'身份证号',
+            align:"center",
+            dataIndex: 'idcardNumber'
+          },
+          {
+            title:'接单数',
+            align:"center",
+            dataIndex: 'paymentNumber'
+          },
+          {
+            title:'收入总额(不含税)',
+            align:"center",
+            dataIndex: 'personalNetPayment'
+          },
+          {
+            title:'纳税总额',
+            align:"center",
+            dataIndex: 'personalTaxFee'
+          },
+
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/hwuser/hwUser/haiNanInfolist",
+          exportXlsUrl: "/hwuser/hwUser/exportXls",
+        },
+        dictOptions:{
+        } 
+      }
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}`;
+      }
+    },
+    methods: {
+      getQueryParams(){
+        console.log(this.queryParam.paymentResultTimeRange)
+        var param = Object.assign({}, this.queryParam,this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        delete param.paymentResultTimeRange; // 时间参数不传递后台
+        return filterObj(param);
+      },
+      initDictConfig(){
+      },
+      onDateChange: function (value, dateString) {
+        console.log(dateString[0],dateString[1]);
+        this.queryParam.paymentResultTime_begin=dateString[0]+" 00:00:00";
+        this.queryParam.paymentResultTime_end=dateString[1] +" 23:59:59";
+      },
+      onDateOk(value) {
+        console.log(value);
+      },
+
+
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error('请设置url.list属性!')
+          return
+        }
+        if(arg){
+          this.ipagination.current=arg
+        }
+        var params = this.getQueryParams()//查询条件
+        this.loading = true
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records
+            this.ipagination.total = res.result.total;
+            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)
+          }
+          this.loading = false
+        })
+      },
+
+      returnFloat(value){
+        var value=Math.round(parseFloat(value)*100)/100;
+        var s=value.toString().split(".");
+        if(s.length==1){
+          value=value.toString()+".00";
+          return value;
+        }
+        if(s.length>1){
+          if(s[1].length<2){
+            value=value.toString()+"0";
+          }
+          return value;
+        }
+      },
+      viewTaxPayment(record){
+        record.paymentResultTime_begin=this.queryParam.paymentResultTime_begin
+        record.paymentResultTime_end=this.queryParam.paymentResultTime_end
+        this.$refs.modalTaxPaymentForm.edit(record)
+        this.$refs.modalTaxPaymentForm.title = '完税明细'
+        this.$refs.modalTaxPaymentForm.disableSubmit = false
+      }
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>