Skip to content

F
finance-manage
Commit ae455a49 authored by 蒋凌峰's avatar 蒋凌峰 😉
Browse files
Options

提交

parent 8254fab6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 263 additions and 193 deletions
ruoyi-system/src/main/resources/mapper/finance/FncInvoiceMapper.xml
View file @ ae455a49
......@@ -5,29 +5,33 @@
<mapper namespace="com.ruoyi.system.mapper.FncInvoiceMapper">
<sql id="querySql">
select <include refid="allField"/>
select
<include refid="allField"/>
from fnc_invoice A
<include refid="search"/>
</sql>
<select id="queryList" resultType="com.ruoyi.system.domain.vo.FncInvoiceVo">
<include refid="querySql"/>
<include refid="querySql"></include>
<where>
<if test="entity.companyId != null and entity.companyId != 0">
and A.company_id = #{entity.companyId}
</if>
<if test="entity.companyName != null and entity.companyName != ''">
and A.company_name like concat('%', #{entity.companyName}, '%')
</if>
<if test="entity.invoiceType != null and entity.invoiceType != 0">
and A.invoice_type = #{entity.invoiceType}
<if test="entity.invoiceType != null">
and A.invoice_type = #{entity.invoiceType,jdbcType=INTEGER}
</if>
<if test="entity.invoiceNature != null and entity.invoiceNature != 0">
and A.invoice_nature = #{entity.invoiceNature}
<if test="entity.invoiceNature != null">
and A.invoice_nature = #{entity.invoiceNature,jdbcType=INTEGER}
</if>
<if test="entity.depName != null and entity.depName != ''">
and A.dep_name like concat('%', #{entity.depName}, '%')
</if>
<if test="entity.invoiceDate != null and entity.invoiceDate != 0">
<if test="entity.invoiceDate != null and entity.invoiceDate != ''">
and A.invoice_date = #{entity.invoiceDate}
</if>
<if test="entity.buyName != null and entity.buyName != ''">
......@@ -57,16 +61,16 @@
<if test="entity.projectOrInvoiceNo != null and entity.projectOrInvoiceNo != ''">
and A.project_or_invoice_no like concat('%', #{entity.projectOrInvoiceNo}, '%')
</if>
<if test="entity.amountSum != null and entity.amountSum != 0">
<if test="entity.amountSum != null and entity.amountSum != ''">
and A.amount_sum = #{entity.amountSum}
</if>
<if test="entity.taxSum != null and entity.taxSum != 0">
<if test="entity.taxSum != null and entity.taxSum != ''">
and A.tax_sum = #{entity.taxSum}
</if>
<if test="entity.amountTaxCapital != null and entity.amountTaxCapital != ''">
and A.amount_tax_capital like concat('%', #{entity.amountTaxCapital}, '%')
</if>
<if test="entity.amountTaxLower != null and entity.amountTaxLower != 0">
<if test="entity.amountTaxLower != null and entity.amountTaxLower != ''">
and A.amount_tax_lower = #{entity.amountTaxLower}
</if>
<if test="entity.saleName != null and entity.saleName != ''">
......@@ -99,6 +103,8 @@
<if test="entity.drawer != null and entity.drawer != ''">
and A.drawer like concat('%', #{entity.drawer}, '%')
</if>
</where>
order by A.create_time desc
</select>
......
ruoyi-ui/src/views/finance/invoice/index.vue
View file @ ae455a49
......@@ -5,7 +5,7 @@
<el-form-item label="公司名称" prop="companyName">
<!-- <el-input v-model="queryParams.companyName" placeholder="请输入公司名称" clearable
@keyup.enter.native="handleQuery" /> -->
<el-select v-model="queryParams.companyName" placeholder="请选择公司名称" clearable>
<el-select v-model="queryParams.companyId" placeholder="请选择公司名称" clearable>
<el-option v-for="item in companyList" :key="item.companyId" :label="item.companyName"
:value="item.companyId">
</el-option>
......@@ -27,7 +27,7 @@
</el-form-item>
<el-form-item label="发票日期" prop="invoiceDate">
<el-date-picker clearable v-model="queryParams.invoiceDate" type="date"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择发票日期">
value-format="yyyy-MM-dd" placeholder="请选择发票日期">
</el-date-picker>
</el-form-item>
......@@ -63,12 +63,22 @@
<!-- <el-table-column label="发票id" align="center" prop="invoiceId" /> -->
<!-- <el-table-column label="公司id" align="center" prop="companyId" /> -->
<el-table-column label="公司名称" align="center" prop="companyName" />
<el-table-column label="发票类型" align="center" prop="invoiceType" />
<el-table-column label="发票性质" align="center" prop="invoiceNature" />
<el-table-column label="发票类型" align="center" prop="invoiceType">
<template slot-scope="scope">
<el-tag type="info" v-if="scope.row.invoiceType == 0">普通发票</el-tag>
<el-tag type="info" v-else-if="scope.row.invoiceType == 1">增值税专用发票</el-tag>
</template>
</el-table-column>
<el-table-column label="发票性质" align="center" prop="invoiceNature">
<template slot-scope="scope">
<el-tag type="info" v-if="scope.row.invoiceNature == '0'">进项</el-tag>
<el-tag type="info" v-else-if="scope.row.invoiceNature == '1'">出项</el-tag>
</template>
</el-table-column>
<el-table-column label="部门名称" align="center" prop="depName" />
<el-table-column label="发票日期" align="center" prop="invoiceDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.invoiceDate) }}</span>
<span>{{ scope.row.invoiceDate }}</span>
</template>
</el-table-column>
<el-table-column label="购买方名称" align="center" prop="buyName" />
......@@ -83,7 +93,7 @@
<el-table-column label="项目编号/发票号码" align="center" prop="projectOrInvoiceNo" /> -->
<el-table-column label="合计金额" align="center" prop="amountSum" />
<el-table-column label="合计税额" align="center" prop="taxSum" />
<el-table-column label="价税合计" align="center" prop="amountTaxCapital" />
<el-table-column label="价税合计(大写)" align="center" prop="amountTaxCapital" />
<el-table-column label="价税合计" align="center" prop="amountTaxLower" />
<!-- <el-table-column label="销售方纳税人识别号" align="center" prop="saleTaxpayerNo" />
<el-table-column label="销售方地址" align="center" prop="saleAddress" />
......@@ -411,7 +421,9 @@
<el-col :span="15" :offset="0" style="height: 500px;">
<body style="height: 100%">
<el-button type="primary" v-print="printObj">打印</el-button>
<body style="height: 100%" id="printDiv">
<div class="toptip c-red">
模板样式仅供参考，不可用于实际开票依据！
</div>
......@@ -465,11 +477,11 @@
<label>纳税人识别号：</label><span class="f-big">{{form.buyTaxpayerNo}}</span>
</li>
<li>
<label>地址、&nbsp;电话：</label><span class="f-small">{{form.buyAddress}}
<label>地址、&nbsp;电话：</label><span class="f-small" style="font-size:15px">{{form.buyAddress}}
{{form.buyPhone}}</span>
</li>
<li>
<label>开户行及账号：</label><span class="f-small">{{form.buyBankDeposit}}
<label>开户行及账号：</label><span class="f-small" style="font-size:15px">{{form.buyBankDeposit}}
{{form.buyBankAccount}} </span>
</li>
</ul>
......@@ -700,11 +712,11 @@
<label>纳税人识别号：</label><span class="f-big">{{form.saleTaxpayerNo}}</span>
</li>
<li>
<label>地址、&nbsp;电话：</label><span class="f-small2">{{form.saleAddress}}
<label>地址、&nbsp;电话：</label><span class="f-small2" style="font-size:15px">{{form.saleAddress}}
{{form.salePhone}}</span>
</li>
<li>
<label>开户行及账号：</label><span class="f-small">{{form.saleBankDeposit}}
<label>开户行及账号：</label><span class="f-small" style="font-size:15px">{{form.saleBankDeposit}}
{{form.saleBankAccount}}</span>
</li>
</ul>
......@@ -750,7 +762,8 @@ export default {
name: "Invoice",
filters: {
typeFilter(value,this_) {
if(!value) {
if(value === "" || value === undefined || value === null) {
console.log(value)
return ""
}
return this_.invoiceTypeList.find((item, index, array) => {
......@@ -758,7 +771,7 @@ export default {
}).label
},
natureFilter(value,this_) {
if(!value) {
if(value === "" || value === undefined || value === null) {
return ""
}
return this_.invoiceNatureList.find((item, index, array) => {
......@@ -771,13 +784,13 @@ export default {
this_:this,
//发票类型
invoiceTypeList: [
{ label: "普通发票", value: "0" },
{ label: "增值税专用发票", value: "1" },
{ label: "普通发票", value: 0 },
{ label: "增值税专用发票", value: 1 },
],
//发票性质
invoiceNatureList: [
{ label: "进项", value: "0" },
{ label: "出项", value: "1" },
{ label: "进项", value: 0 },
{ label: "出项", value: 1 },
],
// 根路径
baseURL: process.env.VUE_APP_BASE_API,
......@@ -805,6 +818,10 @@ export default {
title: "",
// 是否显示弹出层
open: false,
printObj: {
id: "printDiv",
popTitle: "发票打印",
},
// 查询参数
queryParams: {
......@@ -1376,9 +1393,11 @@ label {
}
.headerMiddle {
width: 300px;
margin: auto;
width: 50%;
margin-left: 200px;
text-align: right;
}
.headerMiddle h1 {
......@@ -1387,8 +1406,9 @@ label {
padding-bottom: 22px;
}
.headerRight {
width: 300px;
margin: auto;
width: 50%;
margin-right: 230px;
}
.headerRight h1 {
font-size: 32px;
......
ruoyi-ui/src/views/system/menu/index.vue
View file @ ae455a49
......@@ -309,6 +309,11 @@ export default {
},
// 表单参数
form: {},
//打印参数
printObj: {
id: "printDiv",
popTitle: "发票打印",
},
// 表单校验
rules: {
menuName: [
......
sql/ry-vue.sql
View file @ ae455a49
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment