no message

src/api/business/info.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询企业租户列表
+export function listInfo(query) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getInfo(id) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/info/' + id,
+    method: 'get'
+  })
+}
+export function getInfoByTenantId() {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/info/tenantId',
+    method: 'get'
+  })
+}
+export function addInfo(data) {
+  request.defaults.baseURL = '/ezhizao-yzbh-nancial'
+  return request({
+    url: '/business/info',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateInfo(data) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/info',
+    method: 'put',
+    data: data
+  })
+}
+
+export function delInfo(id) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/info/' + id,
+    method: 'delete'
+  })
+}

src/api/business/invoice.js

@@ -1,6 +1,5 @@
 import request from '@/utils/request'
-
-// 查询企业租户列表
+import { download } from '@/utils/request'
 export function listInvoice(query) {
   request.defaults.baseURL = '/ezhizao-yzbh-financial'
   return request({
@@ -10,7 +9,6 @@ export function listInvoice(query) {
   })
 }
 
-// 查询企业租户详细
 export function getInvoice(id) {
   request.defaults.baseURL = '/ezhizao-yzbh-financial'
   return request({
@@ -19,7 +17,6 @@ export function getInvoice(id) {
   })
 }
 
-// 新增企业租户
 export function addInvoice(data) {
   request.defaults.baseURL = '/ezhizao-yzbh-financial'
   return request({
@@ -29,9 +26,8 @@ export function addInvoice(data) {
   })
 }
 
-// 修改企业租户
 export function updateInvoice(data) {
-  request.defaults.baseURL = '/ezhizao-yzbh-sys'
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
   return request({
     url: '/business/invoice',
     method: 'put',
@@ -39,7 +35,6 @@ export function updateInvoice(data) {
   })
 }
 
-// 删除企业租户
 export function delInvoice(id) {
   request.defaults.baseURL = '/ezhizao-yzbh-sys'
   return request({
@@ -47,3 +42,31 @@ export function delInvoice(id) {
     method: 'delete'
   })
 }
+export function getCollectionToAmount(id) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/invoice/getCollectionToAmount/' + id,
+    method: 'get'
+  })
+}
+
+
+export function getInfoByName(name) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/invoice/getInfoByName/' + name,
+    method: 'get'
+  })
+}
+
+
+export function exportInfo(query) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  download(
+    "business/invoice/export",
+    {
+      ...query,
+    },
+    `委托订单导出_${new Date().getTime()}.xlsx`
+  )
+}

src/views/business/crm/order/form.vue

@@ -1365,6 +1365,9 @@
             l.payAddress === 1 && l.addressStyle === 2 && l.addressAmount
               ? Number(l.addressAmount)
               : 0;
+              if(l.alterType ==="跨区变更" &&  l.addressStyle === 2 && l.addressAmount){
+                amount += Number(l.addressAmount)
+              }
           l.processes.forEach((v) => {
             amount += v.amount ? Number(v.amount) : 0;
           });

src/views/business/crm/order/index.vue

@@ -43,7 +43,7 @@
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="合同编号：" prop="contractNo">
-        <el-input v-model="queryParams.contractNo" size="small" placeholder="请输入合同编号：" clearable style="width: 120px"
+        <el-input v-model="queryParams.contractNo" size="small" placeholder="请输入合同编号" clearable style="width: 120px"
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="客户标签：" >

src/views/business/deduction/index.vue

@@ -60,7 +60,7 @@
     <el-table v-loading="loading" :data="list" size="small" border height="100%"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="客户名" prop="companyName" min-width="250" align="center" />
+      <el-table-column label="客户名" prop="companyName" min-width="250" align="center" fixed="left"  />
       <el-table-column label="来源" align="center" prop="fromCompanyName"  v-if="tenant.versionId === '4'" />
       <el-table-column label="受委托方" align="center" prop="toTenantName" min-width="130" v-if="tenant.versionId !== '4'" />
       <el-table-column label="纳税性质" prop="taxType" width="100" align="center" />
@@ -99,7 +99,7 @@
           <span v-if="scope.row.status === 5">已申报</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" width="220" align="center">
+      <el-table-column label="操作" fixed="right" width="150" align="center">
         <template #default="scope">
           <div v-if="scope.row.deductible === 1">
             <div v-if="(scope.row.status === 0 || scope.row.status === 4) &&

src/views/business/financial/payment/index.vue

@@ -85,7 +85,7 @@
       />
       <el-table-column
         v-if="getShowStatus(3)"
-        label="订单号"
+        label="合同号"
         prop="formNo"
         min-width="200"
         align="center"

src/views/business/invoice/ContractChoice.vue

@@ -0,0 +1,187 @@
+<template>
+    <el-dialog v-model="visible" width="680px" append-to-body draggable :close-on-click-modal="false">
+        <template #header>
+            <div class="dialog-title-container">
+                <span class="title-label" style="color: white"><i class="el-icon-document" style="color: white" />
+                    合同选择</span>
+                <i class="el-icon-close" @click="close" />
+            </div>
+        </template>
+        <!-- 功能按钮 -->
+        <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
+            <el-form-item label="客户名称：" prop="companyName">
+                <el-input v-model="queryParams.companyName" size="small" placeholder="请输入客户名称" clearable
+                    style="width: 120px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="合同编号：" prop="contractNo">
+                <el-input v-model="queryParams.contractNo" size="small" placeholder="请输入合同编号" clearable
+                    style="width: 120px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="服务类型：" prop="serviceType">
+                <el-select size="small" v-model="queryParams.serviceType" placeholder="服务类型" clearable
+                    style="width: 120px" @keyup.enter="handleQuery">
+                    <el-option v-for="item in serviceTypes" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery" size="small">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <div class="dialog-list-container">
+            <el-table :data="list" size="small" border height="400px" header-row-class-name="list-header-row"
+                row-class-name="list-row" @selection-change="handleSelectionChange">
+                <el-table-column v-if="multiple" type="selection" width="40" align="center" />
+                <el-table-column type="index" label="序号" width="46" align="center" />
+                <el-table-column label="合同编号" prop="contractNo" width="100" align="center" />
+                <el-table-column label="客户名称" prop="companyName" width="100" align="center" />
+                <el-table-column label="备注" prop="remark" header-align="center" />
+                <el-table-column v-if="!multiple" label="操作" width="50" align="center">
+                    <template #default="scope">
+                        <el-button link type="success" size="small"
+                            @click="handleSimpleSelected(scope.row)">选择</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <!-- <div class="pagination-container"> -->
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <!-- </div> -->
+    </el-dialog>
+</template>
+<script setup>
+    import { toRef } from 'vue'
+    import { listOrder } from "@/api/business/crm/contract";
+    const { proxy } = getCurrentInstance();
+    const props = defineProps({
+        width: {
+            type: String,
+            default: '800px'
+        },
+        multiple: {
+            type: Boolean,
+            default: () => false
+        }
+    })
+    const total = ref(0);
+    const emit = defineEmits(['choice']);
+    const { width, multiple } = toRefs(props)
+    const data = reactive({
+        visible: false,
+        query: {
+            pageNum: 1,
+            pageSize: 15,
+            total: 0
+        },
+        list: [],
+        selections: [],
+        options: {}
+    })
+    const queryParams = ref({
+        pageNum: 1,
+        pageSize: 20,
+        fromId: 0,
+        orderByColumn: "create_time",
+        category: null,
+        code: null,
+        name: null,
+        shortName: null,
+        companyName: null,
+        oldName: null,
+        owner: null,
+        phone: null,
+        email: null,
+        contactAddress: null,
+        source: null,
+        type: null,
+        socialCreditCode: null,
+        mainBusiness: null,
+        legalRepresentative: null,
+        foundationDate: null,
+        licenceDate: null,
+        businessStartDate: null,
+        businessEndDate: null,
+        isPermanentlyEffective: null,
+        registerMoney: null,
+        registerMoneyUnit: null,
+        provinceCode: null,
+        province: null,
+        cityCode: null,
+        city: null,
+        districtCode: null,
+        district: null,
+        address: null,
+        businessField: null,
+        taxType: null,
+        isZero: null,
+        competentTaxAuthority: null,
+        taxCollectorName: null,
+        taxCollectorPhone: null,
+        taxMonth: null,
+        openingBank: null,
+        bankAccount: null,
+        annualIncome: null,
+        governmentAccountNo: null,
+        governmentPassword: null,
+        socialSecurityAccountNo: null,
+        socialSecurityPassword: null,
+        employeePassword: null,
+        housingFundPassword: null,
+        housingFundUnitAccount: null,
+        housingFundDeductionPassword: null,
+        collectionMethod: null,
+        quotaAmount: null,
+        isPayOnWindow: null,
+        isFirstSocialSecurity: null,
+        isFirstHousingFund: null,
+        customerLabelId: [],
+        boss: null
+    });
+    const { visible, query, list, selections, options } = toRefs(data)
+
+    function open(input) {
+        visible.value = true;
+     
+        getList()
+    }
+    function close() {
+        visible.value = false;
+    }
+    const getList = () => {
+        listOrder(queryParams.value)
+            .then(res => {
+                total.value = res.total
+                list.value = res.rows
+           
+            }).catch(err => {
+                console.log(err)
+            })
+    }
+    function resetQuery() {
+        proxy.resetForm("queryRef");
+        handleQuery();
+    }
+    const handleMultipleSelected = () => {
+        emit('choice', selections.value)
+        close()
+    }
+
+    const handleSimpleSelected = (row) => {
+        emit('choice', row)
+        close()
+    }
+    /** 搜索按钮操作 */
+    function handleQuery() {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+    const handleSelectionChange = (choiceSelections) => {
+        selections.value = choiceSelections
+    }
+    getList()
+    defineExpose({
+        open,
+        close
+    })
+</script>

src/views/business/invoice/form.vue

@@ -3,137 +3,336 @@
     <div class="el-drawer__wrapper">
         <el-drawer :title="title" v-model="visible" direction="rtl" size="100%">
             <div class="page-container form-container">
-            <div class="form-btns-container">
+                <div class="form-btns-container">
                     <span class="title-label"><el-icon>
                             <Document />
-                        </el-icon> 项目信息</span>
-                <el-button-group>
-                    <el-button v-if="editStatus" type="primary" size="small" icon="Finished"
-                               @click="submitForm">保存</el-button>
-                    <el-button v-else type="warning" size="small" icon="Edit" @click="editStatus = true">编辑</el-button>
-                    <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
-                               @click="editStatus = false">取消编辑</el-button>
-                    <el-button v-if="form.id" type="success" size="small" @click="getForm">
-                        <i class="fa fa-refresh" aria-hidden="true" /> 刷新
-                    </el-button>
-                </el-button-group>
-                <div class="screen-btn" @click="handleScreen">
-                    <template v-if="!isFullscreen">
-                        <i class="fa fa-window-maximize" aria-hidden="true" />
-                        <!-- <span>全屏</span> -->
-                    </template>
-                    <template v-else>
-                        <i class="fa fa-window-restore" aria-hidden="true" />
-                        <!-- <span>还原</span> -->
-                    </template>
+                        </el-icon> 发票信息</span>
+                    <el-button-group>
+                        <el-button v-if="editStatus" type="primary" size="small" icon="Finished"
+                            @click="submitForm(0)">保存</el-button>
+
+                        <el-button v-if="editStatus" style="margin-left: 10px;" type="primary" size="small"
+                            icon="Finished" @click="submitForm(1)">提交</el-button>
+                        <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
+                            style="margin-left: 10px;" @click="editStatus = false">取消编辑</el-button>
+                        <div v-hasPermi="['business:invoice:edit']">
+                            <el-button v-if="!editStatus && form.status == 0" type="warning" size="small" icon="Edit"
+                                @click="editStatus = true">编辑</el-button>
+
+                        </div>
+
+                        <div style="display: flex; gap: 10px;">
+                            <el-button v-show="!editStatus && form.status == 1" type="danger" size="small" icon="Close"
+                                @click="refuseStatus">拒绝</el-button>
+                            <el-button v-show="!editStatus && form.status == 1" type="primary" size="small" icon="Check"
+                                @click="passStatus">通过</el-button>
+                            <el-button v-show="!editStatus && form.status == 1" type="warning" size="small"
+                                icon="SemiSelect" @click="returnStatus">退回</el-button>
+                        </div>
+
+
+                    </el-button-group>
+                    <div class="screen-btn" @click="handleScreen">
+                        <template v-if="!isFullscreen">
+                            <i class="fa fa-window-maximize" aria-hidden="true" />
+                            <!-- <span>全屏</span> -->
+                        </template>
+                        <template v-else>
+                            <i class="fa fa-window-restore" aria-hidden="true" />
+                            <!-- <span>还原</span> -->
+                        </template>
+                    </div>
+                    <div class="close-btn" @click="cancel">
+                        <i class="fa fa-times" aria-hidden="true" />
+                        <!-- <span>关闭</span> -->
+                    </div>
                 </div>
-                <div class="close-btn" @click="cancel">
-                    <i class="fa fa-times" aria-hidden="true" />
-                    <!-- <span>关闭</span> -->
+                <div class="Y-scrollbar" style="position: absolute; top: 32px; bottom: 0; width: 100%; overflow: auto">
                 </div>
+                <el-form ref="invoiceRef" class="master-container" :model="form" :rules="rules" label-width="150px">
+                    <el-row :gutter="30">
+                        <el-col :span="6">
+                            <el-form-item label="发票类型" prop="invoiceType">
+                                <el-select v-model="form.invoiceType" placeholder="请选择发票类型" size="small" clearable
+                                    v-if="editStatus">
+                                    <el-option label="增值税专用发票" :value="1"></el-option>
+                                    <el-option label="增值税普通发票" :value="2"></el-option>
+                                </el-select>
+                                <span v-else style="width: 100%">
+                                    {{ form.invoiceType == 1 ? '增值税专用发票' : '增值税普通发票' }}
+                                </span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row :gutter="30">
+                        <el-col :span="6">
+                            <el-form-item label="合同编号：" required>
+                                <el-input v-if="editStatus" style="width: 100%" v-model.trim="form.contractNo"
+                                    size="small" type="text" placeholder="请选择" :clearable="true">
+                                    <template #append>
+                                        <el-button icon="Search" @click="() => contractChoiceHandler()" />
+                                    </template>
+                                </el-input>
+                                <span v-else style="width: 100%">
+                                    <el-link :underline="false" type="primary" @click="handleContract(form)">{{
+                                        form.contractNo }}</el-link>
+                                </span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="可开票金额">
+                                {{allowAmount}}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="申请开票金额 " prop="allowInvoiceAmount">
+                                <el-input v-if="editStatus" v-model="form.allowInvoiceAmount" placeholder="申请开票金额"
+                                    size="small" />
+                                <span v-else>{{ form.allowInvoiceAmount }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="开票内容" prop="invoiceContent">
+                                <el-select v-if="editStatus" v-model="form.invoiceContent" placeholder="开票内容"
+                                    size="small">
+                                    <el-option v-for="item in invoice_type" :key="item.value" :label="item.label"
+                                        :value="item.id"></el-option>
+                                </el-select>
+                                <span v-else>{{ form.invoiceContent }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="开票方" prop="invoiceMy" required>
+                                <el-input v-if="editStatus" v-model="form.invoiceMy" placeholder="开票方" size="small" />
+                                <span v-else>{{ form.invoiceMy }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="社会信用代码" prop="myCreditSocietyCode" required>
+                                <el-input v-if="editStatus" v-model="form.myCreditSocietyCode" placeholder="社会信用代码"
+                                    size="small" />
+                                <span v-else>{{ form.myCreditSocietyCode }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="开票方地址、电话" prop="myAddress" required >
+                                <el-input v-if="editStatus" v-model="form.myAddress" placeholder="开票方地址、电话"
+                                    size="small" />
+                                <span v-else>{{ form.myAddress }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="开票方开户行及账号" prop="myAccount" required>
+                                <el-input v-if="editStatus" v-model="form.myAccount" placeholder="开票方开户行及账号"
+                                    size="small" />
+                                <span v-else>{{ form.myAccount }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="收票方" prop="invoiceOther" required>
+                                <el-input v-if="editStatus" v-model="form.invoiceOther" placeholder="请输入收票方"
+                                    size="small" />
+                                <span v-else>{{ form.invoiceOther }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="社会信用代码" prop="otherCreditSocietyCode" required>
+                                <el-input v-if="editStatus" v-model="form.otherCreditSocietyCode" size="small"
+                                    placeholder="社会信用代码" />
+                                <span v-else>{{ form.otherCreditSocietyCode }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="收票方地址、电话" prop="otherAddress" required>
+                                <el-input v-if="editStatus" v-model="form.otherAddress" placeholder="收票方地址、电话"
+                                    size="small" />
+                                <span v-else>{{ form.otherAddress }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="收票方开户行及账号" prop="otherAccount" required>
+                                <el-input v-if="editStatus" v-model="form.otherAccount" placeholder="收票方开户行及账号"
+                                    size="small" />
+                                <span v-else>{{ form.otherAccount }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6" v-if="!editStatus">
+                            <el-form-item label="申请人" prop="applierName">
+                                <span>{{ form.applierName }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6" v-if="!editStatus">
+                            <el-form-item label="申请时间" prop="applierTime">
+                                <span>{{ form.applierTime }}</span>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6" v-if="!editStatus">
+                            <el-form-item label="状态" prop="status">
+                                <span v-if="form.status == 0">未提交</span>
+                                <span v-if="form.status == 1">待开票</span>
+                                <span v-if="form.status == 2">已拒绝</span>
+                                <span v-if="form.status == 3">已开票</span>
+                            </el-form-item>
+                        </el-col>
+
+
+                    </el-row>
+                    <el-row :gutter="30">
+                        <el-col :span="12">
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-if="editStatus" v-model="form.remark" placeholder="请输入备注" size="small" />
+                                <span v-else>{{ form.remark }}</span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row :gutter="30" v-show="form.status == 2">
+                        <el-col :span="6">
+                            <el-form-item label="拒绝原因" prop="refuseReason">
+                                <span>{{ form.refuseReason }}</span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row :gutter="30" v-show="form.status == 3">
+                        <el-col :span="6">
+                            <el-form-item label="开票人" prop="remark">
+                                <span>{{ form.inoviceName }}</span>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="6">
+                            <el-form-item label="开票时间" prop="remark">
+                                <span>{{ form.inoviceTime }}</span>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="6">
+                            <el-form-item label="开票备注" prop="remark">
+                                <span>{{ form.remark }}</span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row v-show="form.status == 3">
+                        <el-form-item label="凭证文件">
+                            <img style="height: 148px; width: 148px" :src="`${baseUrl}/${form.evidenceFile}`"
+                                class="avatar" @click="openEvidience('evidenceFile')" />
+                        </el-form-item>
+
+                    </el-row>
+                </el-form>
             </div>
-            <div class="Y-scrollbar" style="position: absolute; top: 32px; bottom: 0; width: 100%; overflow: auto">
-            </div>
-            <el-form ref="invoiceRef" class="master-container" :model="form" :rules="rules" label-width="120px">
+        </el-drawer>
+
+        <el-dialog title="拒绝开票" v-model="refuseFlag" width="620px" append-to-body draggable
+            :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="refuseRules" label-width="100px">
                 <el-row :gutter="30">
-                                    <el-col :span="6">
-                                        <el-form-item label="申请开票金额" prop="allowInvoiceAmount">
-                                            <el-input  v-if="editStatus" v-model="form.allowInvoiceAmount" placeholder="请输入申请开票金额" />
-                                            <span v-else>{{ form.allowInvoiceAmount }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="发票信息">
-                                          <el-select v-if="editStatus" v-model="form.invoiceInfoId" placeholder="请选择发票信息" clearable>
-                                            <el-option v-for="item in invoiceInfoList" :key="item.id" :label="item.invoiceTitle" :value="item.id" />
-                                          </el-select>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="开票方" prop="invoiceMy">
-                                            <el-input  v-if="editStatus" v-model="form.invoiceMy" placeholder="请输入开票方" />
-                                            <span v-else>{{ form.invoiceMy }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="社会信用代码" prop="myCreditSocietyCode">
-                                            <el-input  v-if="editStatus" v-model="form.myCreditSocietyCode" placeholder="请输入社会信用代码" />
-                                            <span v-else>{{ form.myCreditSocietyCode }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="地址" prop="myAddress">
-                                            <el-input  v-if="editStatus" v-model="form.myAddress" placeholder="请输入地址" />
-                                            <span v-else>{{ form.myAddress }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="账号" prop="myAccount">
-                                            <el-input  v-if="editStatus" v-model="form.myAccount" placeholder="请输入账号" />
-                                            <span v-else>{{ form.myAccount }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="收票方" prop="invoiceOther">
-                                            <el-input  v-if="editStatus" v-model="form.invoiceOther" placeholder="请输入收票方" />
-                                            <span v-else>{{ form.invoiceOther }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="${comment}" prop="otherCreditSocietyCode">
-                                            <el-input  v-if="editStatus" v-model="form.otherCreditSocietyCode" placeholder="请输入${comment}" />
-                                            <span v-else>{{ form.otherCreditSocietyCode }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="${comment}" prop="otherAddress">
-                                            <el-input  v-if="editStatus" v-model="form.otherAddress" placeholder="请输入${comment}" />
-                                            <span v-else>{{ form.otherAddress }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="申请时间" prop="applierTime">
-                                            <el-date-picker v-if="editStatus" clearable
-                                                            v-model="form.applierTime"
-                                                            type="date"
-                                                            value-format="YYYY-MM-DD"
-                                                            placeholder="请选择申请时间">
-                                            </el-date-picker>
-                                            <span v--else>{{ form.applierTime }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="开票时间" prop="invoiceTime">
-                                            <el-date-picker v-if="editStatus" clearable
-                                                            v-model="form.invoiceTime"
-                                                            type="date"
-                                                            value-format="YYYY-MM-DD"
-                                                            placeholder="请选择开票时间">
-                                            </el-date-picker>
-                                            <span v--else>{{ form.invoiceTime }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="备注" prop="remark">
-                                            <el-input  v-if="editStatus" v-model="form.remark" placeholder="请输入备注" />
-                                            <span v-else>{{ form.remark }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="开票备注" prop="invoiceRemark">
-                                            <el-input  v-if="editStatus" v-model="form.invoiceRemark" placeholder="请输入开票备注" />
-                                            <span v-else>{{ form.invoiceRemark }}</span>
-                                        </el-form-item>
-                                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="拒绝原因" prop="refuseReason">
+                            <el-input v-model="form.refuseReason" placeholder="请输入拒绝原因" size="small" />
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
-            </div>
-        </el-drawer>
+            <template #footer>
+                <el-button type="primary" @click="changeStauts1">确 定</el-button>
+                <el-button @click="refuseFlag = false">取 消</el-button>
+            </template>
+        </el-dialog>
+
+        <el-dialog title="退回开票" v-model="returnFlag" width="620px" append-to-body draggable
+            :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="returnRules" label-width="100px">
+                <el-row :gutter="30">
+                    <el-col :span="12">
+                        <el-form-item label="退回原因" prop="refuseReason">
+                            <el-input v-model="form.refuseReason" placeholder="请输入退回原因" size="small" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <el-button type="primary" @click="changeStauts2">确 定</el-button>
+                <el-button @click="returnFlag = false">取 消</el-button>
+            </template>
+        </el-dialog>
+
+        <el-dialog title="开票审核通过" v-model="passFlag" width="50%" append-to-body draggable :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="passRules" label-width="100px">
+                <el-row :gutter="30">
+                    <el-col :span="8">
+                        <el-form-item label="收票方" prop="invoiceOther">
+                            <span>{{ form.invoiceOther }}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="社会信用代码" label-width="120px"  prop="otherCreditSocietyCode">
+                            <span>{{ form.otherCreditSocietyCode }}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="申请开票金额 " prop="allowInvoiceAmount">
+                            <span>{{ form.allowInvoiceAmount }}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开票人 " prop="allowInvoiceAmount">
+                            <span>{{useUserStore().user.nickName }}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="开票时间 " prop="invoiceTime" >
+                            <el-date-picker v-model.trim="form.invoiceTime" size="small" :clearable="true"
+                                style="width: 100%" format="YYYY-MM-DD" value-format="YYYY-MM-DD" align="center"
+                                type="date" placeholder="开票时间" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-col :span="24">
+                    <div class="details-btns-container">
+                        <el-form-item label="凭证文件" prop="evidenceFile" >
+                            <dragUpload :accept="accept" style="width:50%" @file="upload"
+                                v-if="form.evidenceFile == null || form.evidenceFile == ''" />
+                            <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${form.evidenceFile}`"
+                                class="avatar" @click="openEvidience('evidenceFile')" />
+                            <div v-if="!isView|| emptyForm.status !== 3">
+                                <el-icon :size="20" v-if="form.evidenceFile !== '' ||form.evidenceFile == null "
+                                    @click="form.evidenceFile = ''" class="delete-button">
+                                    <Delete />
+                                </el-icon>
+                            </div>
+                        </el-form-item>
+
+                    </div>
+                </el-col>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="开票备注" prop="invoiceRemark">
+                            <el-input type="textarea" v-model="form.invoiceRemark" placeholder="开票备注"
+                                :autosize="{ minRows: 2, maxRows: 4 }" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <el-button type="primary" @click="changeStauts3">确 定</el-button>
+                <el-button @click="passFlag = false">取 消</el-button>
+            </template>
+        </el-dialog>
+        <dialog-contract-choice ref="contractChoiceRef" @choice="contractChoiceHandle" />
+        <contract-form ref="contractRef" :get-list="getList" />
     </div>
 </template>
 <script setup>
-    import {getInvoice} from "@/api/business/invoice";
+    import { getInvoice, getCollectionToAmount, addInvoice, getInfoByName, updateInvoice } from "@/api/business/invoice";
+    import { getInfoByTenantId } from "@/api/business/info";
+    import DialogContractChoice from "./ContractChoice";
+    import { getToken, getTenant } from "@/utils/auth";
+    import contractForm from "@/views/business/crm/order/form.vue";
+    import dragUpload from "@/components/dragUpload"
+    import useUserStore from "@/store/modules/user";
+    import { uploadFile } from "@/api/tool/file";
     const { proxy } = getCurrentInstance()
+    const baseUrl = import.meta.env.VITE_APP_BASE_API;
     /** 父组件传参 */
     const props = defineProps({
         getList: {
@@ -141,23 +340,48 @@
             default: () => { }
         }
     })
+    const userStore = useUserStore();
     const { getList } = toRefs(props)
     /** 字典数组区 */
+    const { invoice_type } = proxy.useDict("invoice_type");
     /** 表单抽屉 页变量 */
     const title = ref("")
     const loading = ref(false)
     const multiple = ref(true)
     const visible = ref(false)
+    const refuseFlag = ref(false)
+    const returnFlag = ref(false)
+    const passFlag = ref(false)
     const editStatus = ref(false)
+    const allowAmount = ref(0)
+    const fileList = ref([]);
     const isFullscreen = ref(false)
     const webHost = import.meta.env.VITE_APP_BASE_API
     const data = reactive({
         form: {},
         rules: {
+            invoiceMy: [{ required: true, trigger: "blur", message: "请输入开票方" }],
+            myCreditSocietyCode: [{ required: true, trigger: "blur", message: "请输入社会信用代码" }],
+            myAddress: [{ required: true, trigger: "blur", message: "请输入开票方地址、电话" }],
+            myAccount: [{ required: true, trigger: "blur", message: "请输入开票方开户行及账号" }],
+            invoiceOther: [{ required: true, trigger: "blur", message: "请输入请输入收票方" }],
+            otherCreditSocietyCode: [{ required: true, trigger: "blur", message: "请输入社会信用代码" }],
+            otherAddress: [{ required: true, trigger: "blur", message: "请输入收票方地址、电话" }],
+            otherAddress: [{ required: true, trigger: "blur", message: "请输入收票方开户行及账号" }],
+        },
+        returnRules:{
+            refuseReason: [{ required: true, trigger: "blur", message: "请输入退回原因" }],
+        },
+        refuseRules:{
+            refuseReason:[{required: true, trigger: "blur", message: "请输入拒绝原因" }],
+        },
+        passRules:{
+            evidenceFile:[{required: true, trigger: "blur", message: "请上传图片" }],
+            invoiceTime:[{required: true, trigger: "change", message: "请选择开票时间" }],
         }
     });
-    const { form, rules } = toRefs(data);
-/***********************  方法区  ****************************/
+    const { form, rules,returnRules,refuseRules,passRules } = toRefs(data);
+    /***********************  方法区  ****************************/
     /** 打开抽屉 */
     function open(id) {
         reset();
@@ -166,14 +390,22 @@
             getInvoice(id).then(response => {
                 form.value = response.data;
                 editStatus.value = false
-                title.value = "修改项目信息"
+                title.value = "修改发票信息"
+                //通过合同id 查询出已收款的合同
+                getCollectionToAmount(form.value.contractId).then(res => {
+                    allowAmount.value = res.data
+                })
             })
         } else {
             editStatus.value = true
-            title.value = "添加项目信息"
+            title.value = "添加发票信息"
+            getCodeInfo()
         }
     }
+    function openEvidience() {
 
+        window.open(`${baseUrl}${form.value.evidenceFile}`);
+    }
     /** 取消按钮 */
     function cancel() {
         visible.value = false;
@@ -183,75 +415,188 @@
     /** 表单重置 */
     function reset() {
         form.value = {
-                        id: null,
-                        invoiceType: null,
-                        contractId: null,
-                        allowInvoiceAmount: null,
-                        invoiceContent: null,
-                        invoiceMy: null,
-                        myCreditSocietyCode: null,
-                        myAddress: null,
-                        myAccount: null,
-                        invoiceOther: null,
-                        otherCreditSocietyCode: null,
-                        otherAddress: null,
-                        applierId: null,
-                        applierTime: null,
-                        status: null,
-                        invoiceId: null,
-                        invoiceTime: null,
-                        remark: null,
-                        invoiceRemark: null,
-                        createTime: null,
-                        creatorId: null,
-                        updateTime: null,
-                        updaterId: null,
-                        deleted: null,
-                        version: null
+            id: null,
+            invoiceType: null,
+            contractId: null,
+            allowInvoiceAmount: null,
+            invoiceContent: null,
+            invoiceMy: null,
+            myCreditSocietyCode: null,
+            myAddress: null,
+            myAccount: null,
+            invoiceOther: null,
+            otherCreditSocietyCode: null,
+            otherAddress: null,
+            applierId: null,
+            applierTime: null,
+            status: null,
+            invoiceId: null,
+            invoiceTime: null,
+            remark: null,
+            invoiceRemark: null,
+            createTime: null,
+            creatorId: null,
+            updateTime: null,
+            updaterId: null,
+            deleted: null,
+            version: null
         };
         proxy.resetForm("invoiceRef");
     }
 
     /** 全屏缩放 */
     function handleScreen() {
-    const dom = document.querySelector('.list-container > .el-drawer__wrapper > .el-overlay')
-    isFullscreen.value = !isFullscreen.value
-    dom.style.position = isFullscreen.value ? 'fixed' : 'absolute'
+        const dom = document.querySelector('.list-container > .el-drawer__wrapper > .el-overlay')
+        isFullscreen.value = !isFullscreen.value
+        dom.style.position = isFullscreen.value ? 'fixed' : 'absolute'
     }
+    function handleContract() {
+        proxy.$refs.contractRef.open(form.value.contractId);
+    }
+    function getCodeInfo() {
+        getInfoByTenantId().then(res => {
+            if (res.data != null) {
+                form.value.myCreditSocietyCode = res.data.code
+                form.value.myAddress = res.data.address
+                form.value.myAccount = res.data.account
+                form.value.invoiceMy = res.data.name
+            }
+        })
+    }
+    function refuseStatus() {
 
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["invoiceRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
+        refuseFlag.value = true
+    }
+
+    function returnStatus() {
+
+        returnFlag.value = true
+    }
+
+    function passStatus() {
+        passFlag.value = true
+    }
+    function changeStauts1() {
+        if (form.value.refuseReason === "" || form.value.refuseReason == null) {
+            proxy.$modal.msgError("请填写拒绝原因");
+            return;
+        }
+        form.value.status = 2
+        updateInvoice(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功");
+            visible.value = false;
+            refuseFlag.value = false
+            getList.value()
+        });
+    }
+    /** 文件上传 */
+    function upload(param) {
+        const formData = new FormData();
+        formData.append("file", param);
+        uploadFile(formData).then((res) => {
+            if (res.code === 200) {
+                const file = {};
+                file.fileName = res.newFileName;
+                file.url = res.fileName;
+                file.originalFileName = res.originalFilename;
+                file.fileUrl = res.fileName;
+                fileList.value.push(file);
+                form.value.evidenceFile = file.fileUrl;
+                form.value.originalFileName = res.originalFilename;
+                form.value.fileName = res.newFileName;
+            }
+        });
+    }
+    function changeStauts2() {
+        if (form.value.refuseReason === "" || form.value.refuseReason == null) {
+            proxy.$modal.msgError("请填写退回原因");
+            return;
+        }
+        form.value.status = 0
+        updateInvoice(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功");
+            visible.value = false;
+            returnFlag.value = false
+            getList.value()
+        });
+    }
+    function changeStauts3() {
+        console.log(form.value.refuseReason);
+        
+        if (form.value.invoiceTime === "" || form.value.invoiceTime == null) {
+            proxy.$modal.msgError("请选择开票时间");
+            return;
+        }
+
+        if (form.value.evidenceFile === "" || form.value.evidenceFile == null) {
+            proxy.$modal.msgError("请上传图片");
+            return;
+        }
+        form.value.status = 3
         updateInvoice(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          visible.value = false;
-          getList.value()
+            proxy.$modal.msgSuccess("修改成功");
+            visible.value = false;
+            passFlag.value = false
+            getList.value()
         });
-      } else {
-        addInvoice(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          visible.value = false;
-          getList.value()
+    }
+    /** 提交按钮 */
+    function submitForm(status) {
+        if (form.value.contractNo === "" || form.value.contractNo == null) {
+            proxy.$modal.msgError("请选择合同");
+            return;
+        }
+        proxy.$refs["invoiceRef"].validate(valid => {
+            if (valid) {
+                form.value.status = status
+                if (form.value.id != null) {
+                    updateInvoice(form.value).then(response => {
+                        proxy.$modal.msgSuccess("修改成功");
+                        visible.value = false;
+                        getList.value()
+                    });
+                } else {
+                    addInvoice(form.value).then(response => {
+                        proxy.$modal.msgSuccess("新增成功");
+                        visible.value = false;
+                        getList.value()
+                    });
+                }
+            }
         });
-      }
     }
-  });
-}
+    function contractChoiceHandler() {
 
+        proxy.$refs.contractChoiceRef.open();
+    }
+    function contractChoiceHandle(info) {
+        form.value.contractId = info.id
+        form.value.contractNo = info.contractNo
+        form.value.invoiceOther = info.companyName
+        getInfoByName(info.companyName).then(res => {
+            if (res.data != null) {
+                form.value.otherCreditSocietyCode = res.data.code
+                form.value.otherAddress = res.data.address
+                form.value.otherAccount = res.data.account
+            }
+        })
+        //通过合同id 查询出已收款的合同
+        getCollectionToAmount(info.id).then(res => {
+            allowAmount.value = res.data
+        })
+    }
     /** 查询表单信息  */
     function getForm() {
-    loading.value = true
-    getInvoice(form.value.id).then(response => {
-        loading.value = false
-        form.value = response.data
-    })
+        loading.value = true
+        getInvoice(form.value.id).then(response => {
+            loading.value = false
+            form.value = response.data
+        })
     }
 
     /** 暴露给父组件的方法 */
     defineExpose({
         open
     })
-</script>
+</script>

src/views/business/invoice/index.vue

@@ -2,15 +2,10 @@
     <div class="page-container list-container">
         <!-- 功能按钮区 -->
         <div class="list-btns-container">
-            <el-button
-                    type="primary"
-                    size="small"
-                    icon="Plus"
-                    @click="handleAdd"
-                    v-hasPermi="['business:invoice:add']"
-            >新增</el-button>
+            <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+                v-hasPermi="['business:invoice:add']">新增</el-button>
 
-            <el-button
+            <!-- <el-button
                     type="success"
                     size="small"
                     icon="Edit"
@@ -26,150 +21,107 @@
                     :disabled="multiple"
                     @click="handleDelete"
                     v-hasPermi="['business:invoice:remove']"
-            >删除</el-button>
+            >删除</el-button> -->
 
-            <el-button
-                    type="warning"
-                    size="small"
-                    icon="Download"
-                    @click="handleExport"
-                    v-hasPermi="['business:invoice:export']"
-            >导出</el-button>
+            <el-button type="warning" size="small" icon="Download" @click="handleExport"
+                v-hasPermi="['business:invoice:export']">导出</el-button>
             <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
         </div>
         <!-- 搜索区 -->
-        <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
-                        <el-form-item label="申请开票金额：" prop="allowInvoiceAmount">
-                            <el-input
-                                    v-model="queryParams.allowInvoiceAmount"
-                                    placeholder="请输入申请开票金额"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="开票方：" prop="invoiceMy">
-                            <el-input
-                                    v-model="queryParams.invoiceMy"
-                                    placeholder="请输入开票方"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="社会信用代码：" prop="myCreditSocietyCode">
-                            <el-input
-                                    v-model="queryParams.myCreditSocietyCode"
-                                    placeholder="请输入社会信用代码"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="地址：" prop="myAddress">
-                            <el-input
-                                    v-model="queryParams.myAddress"
-                                    placeholder="请输入地址"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="账号：" prop="myAccount">
-                            <el-input
-                                    v-model="queryParams.myAccount"
-                                    placeholder="请输入账号"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="收票方：" prop="invoiceOther">
-                            <el-input
-                                    v-model="queryParams.invoiceOther"
-                                    placeholder="请输入收票方"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="${comment}：" prop="otherCreditSocietyCode">
-                            <el-input
-                                    v-model="queryParams.otherCreditSocietyCode"
-                                    placeholder="请输入${comment}"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="${comment}：" prop="otherAddress">
-                            <el-input
-                                    v-model="queryParams.otherAddress"
-                                    placeholder="请输入${comment}"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="申请时间：" prop="applierTime">
-                            <el-date-picker clearable
-                                            v-model="queryParams.applierTime"
-                                            type="date"
-                                            value-format="YYYY-MM-DD"
-                                            placeholder="请选择申请时间">
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="开票时间：" prop="invoiceTime">
-                            <el-date-picker clearable
-                                            v-model="queryParams.invoiceTime"
-                                            type="date"
-                                            value-format="YYYY-MM-DD"
-                                            placeholder="请选择开票时间">
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="开票备注：" prop="invoiceRemark">
-                            <el-input
-                                    v-model="queryParams.invoiceRemark"
-                                    placeholder="请输入开票备注"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
+        <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
+            <el-form-item label="开票方:" prop="invoiceMy">
+                <el-input size="small" v-model="queryParams.invoiceMy" style="width: 150px"  placeholder="请输入开票方" clearable
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="合同编号: " prop="contractNo">
+                <el-input size="small" v-model="queryParams.contractNo" style="width: 150px"  placeholder="合同编号" clearable
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="发票类型: " prop="invoiceType">
+                <el-select v-model="queryParams.invoiceType" placeholder="请选择发票类型" size="small" clearable style="width: 150px" >
+                    <el-option label="增值税专用发票" value="1"></el-option>
+                    <el-option label="增值税普通发票" value="2"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="状态:" prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择状态" size="small" clearable style="width: 150px" >
+                    <el-option label="未提交" value="0"></el-option>
+                    <el-option label="待开票" value="1"></el-option>
+                    <el-option label="已拒绝" value="2"></el-option>
+                    <el-option label="已开票" value="3"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="申请人: " prop="applierName">
+                <el-input size="small" v-model="queryParams.applierName" style="width: 150px"  placeholder="申请人" clearable
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item prop="dateFilter" label="申请时间:">
+                <el-date-picker v-model="queryParams.dateFilter" type="daterange" clearable size="small"
+                    format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
+                    end-placeholder="业务日期" style="width: 100%;"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="开票人:" prop="invoiceName">
+                <el-input size="small" v-model="queryParams.invoiceName" placeholder="请输入开票人" clearable style="width: 150px" 
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item prop="invoiceDateFilter" label="开票时间:">
+                <el-date-picker v-model="queryParams.invoiceDateFilter" type="daterange" clearable size="small"
+                    format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
+                    end-placeholder="业务日期" style="width: 100%;"></el-date-picker>
+            </el-form-item>
             <el-form-item>
-                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery" size="small">重置</el-button>
             </el-form-item>
-        </el-form>
 
+        </el-form>
         <!-- 列表区 -->
-        <el-table v-loading="loading" :data="invoiceList" size="small" border height="100%" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-                    <el-table-column label="${comment}" align="center" prop="id" />
-                    <el-table-column label="发票类型" align="center" prop="invoiceType" />
-                    <el-table-column label="申请开票金额" align="center" prop="allowInvoiceAmount" />
-                    <el-table-column label="发票信息" align="center" prop="invoiceContent" />
-                    <el-table-column label="开票方" align="center" prop="invoiceMy" />
-                    <el-table-column label="社会信用代码" align="center" prop="myCreditSocietyCode" />
-                    <el-table-column label="地址" align="center" prop="myAddress" />
-                    <el-table-column label="账号" align="center" prop="myAccount" />
-                    <el-table-column label="收票方" align="center" prop="invoiceOther" />
-                    <el-table-column label="${comment}" align="center" prop="otherCreditSocietyCode" />
-                    <el-table-column label="${comment}" align="center" prop="otherAddress" />
-                    <el-table-column label="申请时间" align="center" prop="applierTime" width="180">
-                        <template #default="scope">
-                            <span>{{ parseTime(scope.row.applierTime, '{y}-{m}-{d}') }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="0-未提交 1-待开票 2-已拒绝  3-已开票" align="center" prop="status" />
-                    <el-table-column label="开票时间" align="center" prop="invoiceTime" width="180">
-                        <template #default="scope">
-                            <span>{{ parseTime(scope.row.invoiceTime, '{y}-{m}-{d}') }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注" align="center" prop="remark" />
-                    <el-table-column label="开票备注" align="center" prop="invoiceRemark" />
+        <el-table v-loading="loading" :data="invoiceList" size="small" border height="100%">
+            <el-table-column type="index" width="55" align="center" />
+            <el-table-column label="收票方" align="center" prop="invoiceOther" width="200"></el-table-column>/>
+            <el-table-column label="合同编号" align="center" prop="contractNo" />
+            <el-table-column label="发票类型" align="center" prop="invoiceType">
+                <template #default="scope">
+                    <span v-if="scope.row.invoiceType == 1">增值税专用发票</span>
+                    <span v-if="scope.row.invoiceType == 2">增值税普通发票</span>
+                    <span v-if="scope.row.invoiceType == 3">增值税电子发票</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center" prop="allowInvoiceAmount" />
+            <el-table-column label="发票备注" align="center" prop="remark" />
+            <el-table-column label="状态" align="center" prop="status">
+                <template #default="scope">
+                    <el-link style="font-size: 12px;" type="warning" :underline="false"
+                        v-if="scope.row.status == 0">未提交</el-link>
+                    <el-link style="font-size: 12px;" type="primary" :underline="false"
+                        v-if="scope.row.status == 1">待开票</el-link>
+                    <el-link style="font-size: 12px;" type="danger" :underline="false"
+                        v-if="scope.row.status == 2">已拒绝</el-link>
+                    <el-link style="font-size: 12px;" type="success" :underline="false"
+                        v-if="scope.row.status == 3">已开票</el-link>
+                </template>
+            </el-table-column>
+            <el-table-column label="申请人" align="center" prop="applierName" />
+            <el-table-column label="申请时间" align="center" prop="applierTime" width="180">
+            </el-table-column>
+            <el-table-column label="开票人" align="center" prop="invoiceName" />
+            <el-table-column label="开票时间" align="center" prop="invoiceTime" />
+
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
-                    <el-button link type="warning" size="small" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:invoice:edit']">修改</el-button>
-                    <el-button link type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['business:invoice:remove']">删除</el-button>
+                    <el-button link type="warning" size="small" icon="Edit"
+                        @click="handleUpdate(scope.row)">查看</el-button>
+                    <!-- <el-button link type="warning" size="small" icon="Edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['business:invoice:edit']">修改</el-button> -->
+                    <!-- <el-button link type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['business:invoice:remove']">删除</el-button> -->
                 </template>
             </el-table-column>
         </el-table>
 
         <!-- 分页 -->
-        <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList"/>
+        <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
 
         <!-- 表单 -->
         <invoice-form ref="invoiceRef" :get-list="getList"></invoice-form>
@@ -177,7 +129,7 @@
 </template>
 
 <script setup name="Invoice">
-    import { listInvoice, delInvoice } from "@/api/business/invoice";
+    import { listInvoice, delInvoice, exportInfo } from "@/api/business/invoice";
     import invoiceForm from "./form"
     const { proxy } = getCurrentInstance()
     /** 字典数组区 */
@@ -190,32 +142,32 @@
     const multiple = ref(true);
     const total = ref(0);
     /** 查询对象 */
-   const queryParams=ref({
+    const queryParams = ref({
         pageNum: 1,
-        pageSize: 10,
-                    invoiceType: null,
-                    allowInvoiceAmount: null,
-                    invoiceContent: null,
-                    invoiceMy: null,
-                    myCreditSocietyCode: null,
-                    myAddress: null,
-                    myAccount: null,
-                    invoiceOther: null,
-                    otherCreditSocietyCode: null,
-                    otherAddress: null,
-                    applierTime: null,
-                    status: null,
-                    invoiceTime: null,
-                    invoiceRemark: null,
+        pageSize: 20,
+        invoiceType: null,
+        allowInvoiceAmount: null,
+        invoiceContent: null,
+        invoiceMy: null,
+        myCreditSocietyCode: null,
+        myAddress: null,
+        myAccount: null,
+        invoiceOther: null,
+        otherCreditSocietyCode: null,
+        otherAddress: null,
+        applierTime: null,
+        status: null,
+        invoiceTime: null,
+        invoiceRemark: null,
     })
 
-  /***********************  方法区  ****************************/
+    /***********************  方法区  ****************************/
 
     /** 查询企业租户列表 */
-   function getList() {
+    function getList() {
         loading.value = true;
         listInvoice(queryParams.value).then(response => {
-                invoiceList.value = response.rows;
+            invoiceList.value = response.rows;
             total.value = response.total;
             loading.value = false;
         });
@@ -242,7 +194,7 @@
 
     /** 新增按钮操作 */
     function handleAdd() {
-         proxy.$refs.invoiceRef.open()
+        proxy.$refs.invoiceRef.open()
     }
 
     /** 修改按钮操作 */
@@ -255,20 +207,17 @@
     /** 删除按钮操作 */
     function handleDelete(row) {
         const _ids = row.id || ids.value;
-        proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
+        proxy.$modal.confirm('是否确认删除选中的数据项？').then(function () {
             return delInvoice(_ids);
         }).then(() => {
             getList();
             proxy.$modal.msgSuccess("删除成功！");
-        }).catch(() => {});
+        }).catch(() => { });
     }
 
     /** 导出按钮操作 */
     function handleExport() {
-        proxy.download('business/invoice/export', {
-            ...queryParams.value
-        }, `invoice_${new Date().getTime()}.xlsx`)
+        exportInfo(queryParams.value)
     }
-
-   getList();
-</script>
+    getList();
+</script>