更新代码

src/assets/css/base.css

@@ -2,20 +2,8 @@
   margin: 0;
   padding: 0;
 }
-table {
+.tableDetail {
   border: 1px solid #ebeef6;
   width: 100%;
 }
-th {
-  width: 120px;
-  /* color:rgb(70, 63, 63); */
-  text-align: center;
-  color: #606266;
-  font-weight: normal;
-}
-td {
-  width: 120px;
-  text-align: center;
-  color: #606266;
-  font-weight: normal;
-}
+

src/modules/payment/components/Channel.vue

 <!-- 支付详情-渠道信息 -->
 <template>
-  <table border="1" cellspacing="0" class="table">
-    <tr>
+  <table border="1" cellspacing="0" class="tableDetail">
+    <tr class="part">
       <th>不含税销售金额</th>
       <td>{{ dealList.sales_amount_excluding_tax }}</td>
       <th>渠道代理费提基数</th>
@@ -9,7 +9,7 @@
       <th>服务费规则</th>
       <td>{{ dealList.service_fee_rules }}</td>
     </tr>
-    <tr>
+    <tr class="title">
       <th>服务费比例</th>
       <td>{{ dealList.service_charge_ratio }}</td>
       <th>代理服务费</th>
@@ -17,7 +17,7 @@
       <th>代理服务费（不含税金额）</th>
       <td>{{ dealList.agency_service_fee_excluding_tax }}</td>
     </tr>
-    <tr>
+    <tr class="title">
       <th>户名</th>
       <td>{{ dealList.channel_account_name }}</td>
       <th>账号</th>
@@ -25,7 +25,7 @@
       <th>开户行</th>
       <td>{{ dealList.channel_bank_of_deposit }}</td>
     </tr>
-    <tr>
+    <tr class="title">
       <th>渠道税率</th>
       <td colspan="5">{{ dealList.channel_tax_rate }}</td>
     </tr>
@@ -42,5 +42,3 @@ export default {
   }
 }
 </script>
-
-

src/modules/payment/components/Collection.vue

 <!-- 支付详情-收款信息 -->
 <template>
-  <table border="1" cellspacing="0" class="table">
+  <table border="1" cellspacing="0" class="tableDetail">
     <tr>
       <th>应缴金额</th>
       <td>{{ dealList.bill_total }}</td>

src/modules/payment/components/Order.vue

 <!-- 支付详情-订单信息 -->
 <template>
   <div>
-    <table border="1" cellspacing="0" class="table">
+    <table border="1" cellspacing="0" class="tableDetail">
       <tr>
         <th>订单用户名称</th>
         <td>{{ dealList.name }}</td>
         <td>订单编号</td>
         <td>{{ dealList.id }}</td>
         <td>支付状态</td>
-        <td>{{ getStatus(val) }}</td>
+        <td>{{ dealList.payment_status_name }}</td>
       </tr>
       <tr>
         <th>备注</th>

src/modules/payment/components/Student.vue

 <!-- 支付详情-学员信息 -->
 <template>
   <div v-bind="$attrs">
-    <table border="1" width="1500px" cellspacing="0" class="table">
+    <table border="1" width="1500px" cellspacing="0" class="tableDetail">
       <tr>
         <th>学员姓名</th>
         <td>{{ dealList.name }}</td>

src/modules/payment/components/Ticket.vue

@@ -90,7 +90,7 @@ export default {
     }
   },
   mounted() {
-    this.invioceList = this.dealList.invoices_list || []
+    this.invioceList = this.dealList.invoices_list
   }
 }
 </script>

src/modules/payment/components/TicketForm.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <h3>支付信息</h3>
-    <table border="1" width="860px" cellspacing="0" class="table">
+    <table border="1" width="860px" cellspacing="0" class="tableDetail">
       <tr>
         <th>客户姓名</th>
         <td>{{ row.payer_name }}</td>
@@ -53,7 +53,7 @@
         </el-form-item>
         <el-form-item label="发票类型" prop="invoice_type">
           <!-- change事件 -->
-          <el-select v-model="form.invioce_type" placeholder="请选择发票类型" size="small">
+          <el-select v-model="form.invoice_type" placeholder="请选择发票类型" size="small">
             <el-option label="普通纸质发票" :value="1"></el-option>
             <el-option label="普通电子发票" :value="2"></el-option>
             <!-- 纸质专票企业可以开 -->
@@ -68,7 +68,7 @@
           <el-input v-model="form.taxpayer_identifier"></el-input>
         </el-form-item>
         <!-- 企业纸质显示 -->
-        <div v-show="form.taxpayer_type === 2 && form.invioce_type === '3'">
+        <div v-show="form.taxpayer_type === 2 && form.invoice_type === '3'">
           <el-form-item label="地址" prop="taxpayer_address">
             <el-input v-model="form.taxpayer_address"></el-input>
           </el-form-item>
@@ -89,7 +89,7 @@
           <span>请填写邮箱地址，方便接收电子发票</span>
         </el-form-item>
         <!-- 电子发票显示邮箱 -->
-        <el-form-item label="邮寄地址" prop="recipient_address" v-show="form.invioce_type === '2'">
+        <el-form-item label="邮寄地址" prop="recipient_address" v-show="form.invoice_type === '2'">
           <el-input v-model="form.recipient_address"></el-input>
         </el-form-item>
         <el-form-item label="收件人名称" prop="recipient_name">
@@ -151,21 +151,21 @@ export default {
         sales_rep_user_id_name: ''
       },
       rules: {
-        invioce_type: [{ message: '请选择发票类型', trigger: 'change' }],
-        taxpayer_name: [{ message: '请输入纳税人名称', trigger: 'blur' }],
+        invoice_type: [{ message: '请选择发票类型', required: true, trigger: 'change' }],
+        taxpayer_name: [{ message: '请输入纳税人名称', required: true, trigger: 'blur' }],
         taxpayer_identifier: [
-          { message: '请输入纳税人识别号', trigger: 'blur' },
-          { min: 19, max: 19, message: '长度在 19 个字符', trigger: 'blur' }
+          { message: '请输入纳税人识别号', required: true, trigger: 'blur' },
+          { min: 19, max: 19, message: '长度在 19 个字符', required: true, trigger: 'blur' }
         ],
-        taxpayer_address: [{ message: '请输入纳税人地址', trigger: 'blur' }],
-        taxpayer_mobile: [{ message: '请输入电话', trigger: 'blur' }],
-        taxpayer_bank_name: [{ message: '请输入开户行', trigger: 'blur' }],
-        taxpayer_bank_account: [{ message: '请输入银行账号', trigger: 'blur' }],
-        taxpayer_remark: [{ message: '请输入备注', trigger: 'blur' }],
-        recipient_address: [{ message: '请输入邮箱地址', trigger: 'blur' }],
-        recipient_name: [{ message: '请输入收件人名称', trigger: 'blur' }],
-        recipient_mobile: [{ message: '请输入收件人手机号', trigger: 'blur' }],
-        sales_rep_user_id_name: [{ message: '请输入跟进人', trigger: 'blur' }]
+        taxpayer_address: [{ message: '请输入纳税人地址', required: true, trigger: 'blur' }],
+        taxpayer_mobile: [{ message: '请输入电话', required: true, trigger: 'blur' }],
+        taxpayer_bank_name: [{ message: '请输入开户行', required: true, trigger: 'blur' }],
+        taxpayer_bank_account: [{ message: '请输入银行账号', required: true, trigger: 'blur' }],
+        // taxpayer_remark: [{ message: '请输入备注', required: true, trigger: 'blur' }],
+        recipient_address: [{ message: '请输入邮箱地址', required: true, trigger: 'blur' }],
+        recipient_name: [{ message: '请输入收件人名称', required: true, trigger: 'blur' }],
+        recipient_mobile: [{ message: '请输入收件人手机号', required: true, trigger: 'blur' }],
+        sales_rep_user_id_name: [{ message: '请输入跟进人', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -175,7 +175,7 @@ export default {
   watch: {
     'form.taxpayer_type': function (oldVal, val) {
       if (val !== oldVal) {
-        this.form.invioce_type = ''
+        this.form.invoice_type = ''
       }
     },
     history: {

src/modules/payment/views/Deal.vue

 <template>
   <div>
     <app-card title="支付明细信息">
-      <table border="1" width="100%" cellspacing="0">
+      <table border="1" width="100%" cellspacing="0" class="tableDetail">
         <tr>
           <th>支付人姓名</th>
           <td>{{ row.payer_name }}</td>

src/modules/payment/views/List.vue

@@ -104,8 +104,7 @@ import History from '../components/History.vue'
 import { getCondition, getPayList, allowCreate, createNewTicket, drawBack, cancelTicket, download } from '../api'
 import XLSX from 'xlsx'
 import { funDownload } from '@/utils/util'
-import fileDownload from 'js-file-download'
-
+import queryString from 'query-string'
 export default {
   components: { AppCard, AppList, TicketForm, ShareQrcode, History },
   data() {
@@ -156,12 +155,9 @@ export default {
             first_payment_time_from: '',
             first_payment_time_to: '',
             final_payment_time_from: '',
-            final_payment_time_to: '',
-            page: '',
-            'per-page': ''
+            final_payment_time_to: ''
           },
-          beforeRequest: this.beforeRequest,
-          callback: this.callback
+          beforeRequest: this.beforeRequest
         },
         filters: [
           // 项目
@@ -209,7 +205,7 @@ export default {
             options: this.conditionList.type,
             prop: 'type',
             labelKey: 'value',
-            valKey: 'key',
+            valueKey: 'key',
             multiple: true,
             collapseTags: true,
             placeholder: '费用类型'
@@ -268,7 +264,8 @@ export default {
           { type: 'selection', minWidth: '50px', fixed: 'left' },
           { label: '客户名称', prop: 'name', minWidth: 100 },
           { label: '项目', prop: 'project_id_name', align: 'center', minWidth: 100 },
-          { label: '支付状态', prop: 'payment_status', align: 'center', minWidth: 100 },
+          { label: '支付状态', prop: 'payment_status_name', align: 'center', minWidth: 100 },
+          { label: '费用类型', prop: 'type_name', align: 'center', minWidth: 100 },
           { label: '首次缴费时间', prop: 'first_payment_time', align: 'center', minWidth: 200 },
           { label: '末次缴费时间', prop: 'final_payment_time', align: 'center', minWidth: 200 },
           { label: '应缴金额', prop: 'bill_total', align: 'center', minWidth: 100 },
@@ -309,7 +306,7 @@ export default {
           },
           {
             label: '发票状态',
-            prop: 'invoiceStatusView',
+            prop: 'invoice_status_name',
             align: 'center',
             minWidth: 100
           },
@@ -337,16 +334,6 @@ export default {
       }
       return params
     },
-    callback(data) {
-      console.log(data)
-      data.forEach(item => {
-        // item.project = this.findName(this.conditionList.project_id, item.project_id, 'project_id', 'name')
-        // item.paymentStatuView = this.findName(this.conditionList.payment_status, item.payment_status, 'key', 'value')
-        // item.channelView = this.findName(this.conditionList.channel_id, item.channel_id, 'channel_id', 'title')
-        item.invoiceStatusView = this.findName(this.conditionList.invoice_status, item.invoice_status, 'key', 'value')
-      })
-      return data
-    },
     handleSelect(val) {
       this.history = val
       this.dialogVisible = false
@@ -514,17 +501,10 @@ export default {
     },
     // 导出全部
     exportAll() {
-      // console.log(this.tableOptions.remote.params)
       download(this.tableOptions.remote.params).then(res => {
-        console.log(res + ' ----')
-        fileDownload(res, '订单列表.xlsx')
-      })
-    },
-    findName(option, item, findKey, reName) {
-      const found = option.find(findItem => {
-        return parseInt(findItem[findKey]) === parseInt(item)
+        const params = queryString.stringify(this.tableOptions.remote.params)
+        window.open(`/api/finance/v1/invoices/download?${params}`)
       })
-      return found ? found[reName] : item
     }
   }
 }

src/modules/payment/views/PayDetail.vue

 <template>
   <el-card>
-    <table border="1" width="100%" cellspacing="0">
+    <table border="1" width="100%" cellspacing="0" class="tableDetail">
       <tr>
         <th>支付人姓名</th>
         <td>{{ row.payer_name }}</td>