root/cwhelp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增值税页面修改

Browse Source
This commit is contained in:
hjc
2019-11-18 16:53:50 +08:00
parent a8b0c4a2a1
commit 7fe32afd3f
17 changed files with 240 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/admin.iml
-9
View File
@@ -4,15 +4,6 @@
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
admin/src/main/resources/static/js/main.js
+37
View File
@@ -405,10 +405,32 @@ layui.use(['element', 'form', 'layer', 'upload'], function () {
$('#invoiceMoney').val(res.data['invoiceMoney']);
$('#taxAmount').val(res.data['taxAmount']);
$('#totalAmount').val(res.data['totalAmount']);
$('#totalAmountCn').val(res.data['totalAmountCn']);
form.render("select");
hide.val(res.data['invoiceImg']);
item.addClass('succeed');
/* 实体模型操作 */
var entity = $("#entity");
var goods = res.data['bssGoods'];
for(var i=0; i<goods.length; i++){
var element = entity.children("tr:last-child").clone();
element.find("input[name='name']").val(goods[i].name);
element.find("input[name='specification']").val(goods[i].specification);
element.find("input[name='unit']").val(goods[i].unit);
element.find("input[name='num']").val(goods[i].num);
element.find("input[name='unitPrice']").val(goods[i].unitPrice);
element.find("input[name='detailAmount']").val(goods[i].detailAmount);
element.find("input[name='taxRate']").val(goods[i].taxRate);
element.find("input[name='taxAmount']").val(goods[i].taxAmount);
entity.append(element);
// element.children(".entity-number").click();
$.each(entity.children(), function (key, val) {
$(val).children(".entity-number").text(key + 1);
});
}
form.render();
}else {
hide.remove();
item.addClass('error');
@@ -424,4 +446,19 @@ layui.use(['element', 'form', 'layer', 'upload'], function () {
$(this).parent('.upload-item').remove();
});
/* 解决时间控件弹不出 */
layui.use('laydate', function(){
var laydate = layui.laydate;
//同时绑定多个
lay('.test-item').each(function(){
laydate.render({
elem: this
,format:'yyyy-MM-dd'
,type:'date'
,trigger: 'click'
});
});
});
});
admin/src/main/resources/templates/business/vatInvoice/add.html
+8 -2
View File
@@ -12,7 +12,7 @@
</ul>
<div class="layui-tab-content" style="height: 100%;">
<div class="layui-tab-item layui-show">
<!-- <form th:action="@{/bss/vatInvoice/add}">-->
<form th:action="@{/bss/vatInvoice/add}">
<fieldset id="basic" class="layui-elem-field layui-form">
<legend class="code-legend">基本信息</legend>
<div class="layui-field-box">
@@ -49,7 +49,7 @@
<div class="layui-inline">
<label class="layui-form-label required">发票日期</label>
<div class="layui-input-inline">
<input type="text" name="invoiceDate" class="layui-input" id="laydate" placeholder="yyyy-MM-dd" lay-key="1">
<input type="text" name="invoiceDate" class="layui-input test-item" id="laydate" placeholder="yyyy-MM-dd" lay-key="1">
</div>
</div>
<div class="layui-inline">
@@ -78,6 +78,12 @@
<input type="text" id="totalAmount" name="totalAmount" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label required">价税合计(大写)</label>
<div class="layui-input-inline">
<input type="text" id="totalAmountCn" name="totalAmountCn" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-form-item">
admin/src/main/resources/templates/business/vatInvoice/detail.html
+7 -4
View File
@@ -26,8 +26,11 @@
<tr>
<th>校验码</th>
<td th:text="${bssVatInvoice.checkCode}"></td>
<th>机器编码</th>
<td th:text="${bssVatInvoice.machineNo}"></td>
<!--<th>机器编码</th>
<td th:text="${bssVatInvoice.machineNo}"></td>-->
<th>发票类型</th>
<td th:if="${bssVatInvoice.invoiceType} eq '0'">增值税普通发票</td>
<td th:if="${bssVatInvoice.invoiceType} eq '1'">增值税专用发票</td>
</tr>
<tr>
<th>发票金额</th>
@@ -43,9 +46,9 @@
</tr>
<tr>
<th>购买方纳税人信息</th>
<td th:text="${bssVatInvoice?.buyTaxInfo?.name}"></td>
<td th:text="${bssVatInvoice.buyTaxInfo.name}"></td>
<th>销售方纳税人信息</th>
<td th:text="${bssVatInvoice?.salerTaxInfo?.name}"></td>
<td th:text="${bssVatInvoice.salerTaxInfo.name}"></td>
</tr>
<tr>
<th>创建时间</th>
admin/src/main/resources/templates/business/vatInvoice/edit.html
+24 -15
View File
@@ -4,78 +4,87 @@
</head>
<body>
<div class="layui-form timo-compile">
<form th:action="@{/bss/vatInvoice/add}">
<form th:action="@{/bss/vatInvoice/edit}">
<input type="hidden" name="id" th:if="${bssVatInvoice}" th:value="${bssVatInvoice.id}">
<div class="layui-form-item">
<label class="layui-form-label">发票类型</label>
<div class="layui-input-inline">
<select id="invoiceType" name="invoiceType" lay-filter="invoiceType" >
<option th:selected="${bssVatInvoice.invoiceType} eq '0'" value="0">增值税普通发票</option>
<option th:selected="${bssVatInvoice.invoiceType} eq '1'" value="1">增值税专用发票</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">发票代码</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="invoiceCode" placeholder="请输入发票代码" th:value="${bssVatInvoice?.invoiceCode}">
<input class="layui-input" type="text" name="invoiceCode" placeholder="请输入发票代码" th:value="${bssVatInvoice.invoiceCode}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">发票号码</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="invoiceNo" placeholder="请输入发票号码" th:value="${bssVatInvoice?.invoiceNo}">
<input class="layui-input" type="text" name="invoiceNo" placeholder="请输入发票号码" th:value="${bssVatInvoice.invoiceNo}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">发票日期</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="invoiceDate" placeholder="请输入发票日期" th:value="${bssVatInvoice?.invoiceDate}">
<input class="layui-input" type="text" name="invoiceDate" placeholder="请输入发票日期" th:value="${bssVatInvoice.invoiceDate}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">校验码</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="checkCode" placeholder="请输入校验码" th:value="${bssVatInvoice?.checkCode}">
<input class="layui-input" type="text" name="checkCode" placeholder="请输入校验码" th:value="${bssVatInvoice.checkCode}">
</div>
</div>
<div class="layui-form-item">
<!--<div class="layui-form-item">
<label class="layui-form-label">机器编码</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="machineNo" placeholder="请输入机器编码" th:value="${bssVatInvoice?.machineNo}">
<input class="layui-input" type="text" name="machineNo" placeholder="请输入机器编码" th:value="${bssVatInvoice.machineNo}">
</div>
</div>
</div>-->
<div class="layui-form-item">
<label class="layui-form-label">发票金额</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="invoiceMoney" placeholder="请输入发票金额" th:value="${bssVatInvoice?.invoiceMoney}">
<input class="layui-input" type="text" name="invoiceMoney" placeholder="请输入发票金额" th:value="${bssVatInvoice.invoiceMoney}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">税额</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="taxAmount" placeholder="请输入税额" th:value="${bssVatInvoice?.taxAmount}">
<input class="layui-input" type="text" name="taxAmount" placeholder="请输入税额" th:value="${bssVatInvoice.taxAmount}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">总金额</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="totalAmount" placeholder="请输入总金额" th:value="${bssVatInvoice?.totalAmount}">
<input class="layui-input" type="text" name="totalAmount" placeholder="请输入总金额" th:value="${bssVatInvoice.totalAmount}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">总金额(大写)</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="totalAmountCn" placeholder="请输入总金额(大写)" th:value="${bssVatInvoice?.totalAmountCn}">
<input class="layui-input" type="text" name="totalAmountCn" placeholder="请输入总金额(大写)" th:value="${bssVatInvoice.totalAmountCn}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">购买方纳税人信息</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="buyTaxInfo" placeholder="请输入购买方纳税人信息" th:value="${bssVatInvoice?.buyTaxInfo?.name}">
<input class="layui-input" type="text" name="buyTaxInfo" placeholder="请输入购买方纳税人信息" th:value="${bssVatInvoice.buyTaxInfo?.name}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">销售方纳税人信息</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="salerTaxInfo" placeholder="请输入销售方纳税人信息" th:value="${bssVatInvoice?.salerTaxInfo?.name}">
<input class="layui-input" type="text" name="salerTaxInfo" placeholder="请输入销售方纳税人信息" th:value="${bssVatInvoice.salerTaxInfo?.name}">
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea placeholder="请输入内容" class="layui-textarea" name="remark">[[${bssVatInvoice?.remark}]]</textarea>
<textarea placeholder="请输入内容" class="layui-textarea" name="remark">[[${bssVatInvoice.remark}]]</textarea>
</div>
</div>
<div class="layui-form-item timo-finally">
admin/src/main/resources/templates/business/vatInvoice/index.html
+5 -1
View File
@@ -61,7 +61,11 @@
<tr th:each="item:${list}">
<td><label class="timo-checkbox"><input type="checkbox" th:value="${item.id}">
<i class="layui-icon layui-icon-ok"></i></label></td>
<td th:text="${item.invoiceType}">发票类型</td>
<!--<td th:text="${item.invoiceType}">发票类型</td>-->
<!-- update by hjc -->
<td th:if="${item.invoiceType} eq '0'">增值税普通发票</td>
<td th:if="${item.invoiceType} eq '1'">增值税专用发票</td>
<td th:text="${item.invoiceCode}">发票代码</td>
<td th:text="${item.invoiceNo}">发票号码</td>
<td th:text="${item.invoiceDate}">发票日期</td>