style:样式修改

src/modules/invoice/api.js

@@ -26,3 +26,7 @@ export function deposit() {
 export function downloadInvoices(params) {
   return httpRequest.get('/api/finance/v1/invoices/download', { params, responseType: 'blob' })
 }
+// 确认销售领取
+export function confirmReceive(data) {
+  return httpRequest.post('/api/finance/v1/invoices/confirm-receive', data)
+}

src/modules/invoice/views/List.vue

@@ -43,8 +43,15 @@
         </el-row>
         <template v-slot:table-x="{ row }">
           <router-link target="_blank" :to="{ name: 'paymentView', params: { id: row.payment_id } }">
-            <el-button type="text">查看</el-button>
+            <el-button type="primary">查看</el-button>
           </router-link>
+          <el-button
+            type="primary"
+            @click="confirmReceived(row)"
+            v-show="row.invoice_type === '2'"
+            style="margin-left: 10px"
+            >确认领取</el-button
+          >
         </template>
         <template #footer>
           <span>已选择{{ multipleSelection.length }}条</span>
@@ -68,7 +75,7 @@ import AppList from '@/components/base/AppList.vue'
 import AppCard from '@/components/base/AppCard.vue'
 import DistributionDialog from '../components/DistributionDialog.vue'
 // 接口
-import { getInvoiceList, getCondition, deposit } from '../api'
+import { getInvoiceList, getCondition, deposit, confirmReceive } from '../api'
 import XLSX from 'xlsx'
 import fileDownload from 'js-file-download'
 import queryString from 'query-string'
@@ -204,8 +211,10 @@ export default {
           { label: '票据跟进人', prop: 'sales_rep_user_id_name', align: 'center', minWidth: '100px' },
           { label: '发票申请日期', prop: 'invoice_application_time', align: 'center', minWidth: '150px' },
           { label: '开票时间', prop: 'invoice_issuing_time', align: 'center', minWidth: '150px' },
-          { label: '开票状态', prop: 'invoiceStatusViewName', align: 'center', minWidth: '100px' },
-          { label: '操作', slots: 'table-x', align: 'center', fixed: 'right', minWidth: '100px' }
+          { label: '发票状态', prop: 'invoiceStatusViewName', align: 'center', minWidth: '100px' },
+          { label: '票据领取状态', prop: 'receive_status', align: 'center', minWidth: '100px' },
+          { label: '票据领取时间', prop: 'receive_time', align: 'center', minWidth: '100px' },
+          { label: '操作', slots: 'table-x', align: 'center', fixed: 'right', minWidth: '200px' }
         ]
       }
     }
@@ -246,6 +255,18 @@ export default {
       }
       return params
     },
+    // 确认领取
+    confirmReceived(row) {
+      const params = {
+        invoices_id: row.id
+      }
+      confirmReceive(params).then(res => {
+        if (res.code === 0) {
+          this.$message.success('发票领取成功')
+          this.$refs.list.refetch()
+        }
+      })
+    },
     // 分配票据跟进人弹窗
     dialogHide() {
       this.isShowDialog = false

src/modules/payment/components/TicketForm.vue

 <!-- 开具发票-->
 <template>
   <div>
-    <h3 style="margin-bottom: 20px">支付信息</h3>
+    <h3 style="margin-bottom: 20px; margin-left: 10px">支付信息</h3>
     <table border="1" width="860px" cellspacing="0" class="tableDetail">
       <tr>
         <th>客户姓名</th>
@@ -50,7 +50,8 @@
     </el-form>
     <el-form label-width="120px" ref="ruleForm" :model="form" :rules="rules" style="margin-top: 20px">
       <div class="type" style="border: 1px solid #ebeef5; margin-bottom: 10px; padding-right: 50px">
-        <el-form-item label="发票信息" class="title">
+        <el-form-item class="title" style="margin-top: 10px">
+          <span style="display: inline-block; font-size: 19px; font-weight: 800; margin-left: -110px">发票信息</span>
           <el-button type="text" style="float: right" @click="$emit('history')">历史开票信息</el-button>
         </el-form-item>
         <el-form-item label="发票类型" prop="invoice_type">
@@ -110,9 +111,10 @@
         <el-form-item label="备注">
           <el-input disabled :placeholder="row.payer_name"></el-input>
         </el-form-item>
-        <el-form-item label="收票信息">
-          <!-- <span>请填写邮箱地址，方便接收电子发票</span> -->
-        </el-form-item>
+        <h3 style="margin-bottom: 20px; margin-left: 10px">收票信息</h3>
+        <!-- <el-form-item label="收票信息"> -->
+        <!-- <span>请填写邮箱地址，方便接收电子发票</span> -->
+        <!-- </el-form-item> -->
         <!-- 电子发票显示邮箱 -->
         <el-form-item
           label="邮箱"

src/modules/payment/views/List.vue

@@ -70,7 +70,7 @@
       </template>
     </app-list>
     <!-- 开具发票 -->
-    <el-dialog title="开具发票" :visible.sync="ticketVisible" width="900px" append-to-body :destroy-on-close="true">
+    <el-drawer title="开具发票" :visible.sync="ticketVisible" size="60%" append-to-body :destroy-on-close="true">
       <TicketForm
         :history="history"
         @history="handleHistory"
@@ -79,10 +79,10 @@
         @createTicket="handleCreateTicket"
         :row="row"
       />
-      <el-dialog
+      <el-drawer
+        size="20%"
         title="历史开票信息"
         :visible.sync="historyVisible"
-        width="460px"
         top="15px"
         append-to-body
         :destroy-on-close="true"
@@ -90,8 +90,8 @@
         :modal="false"
       >
         <History v-if="historyVisible" :hasSearch="true" @select="handleSelect" />
-      </el-dialog>
-    </el-dialog>
+      </el-drawer>
+    </el-drawer>
     <!-- 开票二维码 -->
     <ShareQrcode :visible.sync="codeVisible" :value="shareUrl" />
   </app-card>
@@ -267,7 +267,7 @@ export default {
           { label: '实缴金额', prop: 'amount_need_to_pay', align: 'center', minWidth: 100 },
           { label: '手续费', prop: 'service_charge', align: 'center', minWidth: 100 },
           { label: '到账金额', prop: 'amount_received', align: 'center', minWidth: 100 },
-          { label: '代缴金额', prop: 'amount_waiting_for_pay', align: 'center', minWidth: 100 },
+          { label: '待缴金额', prop: 'amount_waiting_for_pay', align: 'center', minWidth: 100 },
           { label: '跟进人', prop: 'sales_rep_user_id_name', align: 'center', minWidth: 100 },
           { label: '渠道', prop: 'channel_id_name', align: 'center', minWidth: 300 },
           { label: '交易流水号', prop: 'txn_id_list', align: 'center', minWidth: 300 },
@@ -340,11 +340,10 @@ export default {
       this.row = row
       this.id = row.id
       // 学费
-        if (row.real_invoice_status === '1') {
-          this.ticketVisible = true
-        } else {
-          this.$message.error('当前不可开发票')
-        }
+      if (row.real_invoice_status === 1) {
+        this.ticketVisible = true
+      } else {
+        this.$message.error('当前不可开发票')
       }
     },
     // 作废发票
@@ -365,7 +364,7 @@ export default {
       })
     },
     qrCode(row) {
-      if (row.real_invoice_status === '1') {
+      if (row.real_invoice_status === 1) {
         this.shareUrl = `${import.meta.env.VITE_SHARE_URL}/h5/payment/invoice?id=${row.id}&remark=${
           row.payer_name
         }&name=${row.sales_rep_user_id_name}`