+
diff --git a/admin/src/main/resources/templates/business/vatInvoice/index.html b/admin/src/main/resources/templates/business/vatInvoice/index.html
index 7543991..78d19f7 100644
--- a/admin/src/main/resources/templates/business/vatInvoice/index.html
+++ b/admin/src/main/resources/templates/business/vatInvoice/index.html
@@ -61,7 +61,11 @@
|
- 发票类型 |
+
+
+ 增值税普通发票 |
+ 增值税专用发票 |
+
发票代码 |
发票号码 |
发票日期 |
diff --git a/common/common.iml b/common/common.iml
index 1e2b0d4..03c9d13 100644
--- a/common/common.iml
+++ b/common/common.iml
@@ -4,19 +4,12 @@
-
-
-
-
-
-
-
diff --git a/component/actionLog/actionLog.iml b/component/actionLog/actionLog.iml
new file mode 100644
index 0000000..094de14
--- /dev/null
+++ b/component/actionLog/actionLog.iml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/component/excel/excel.iml b/component/excel/excel.iml
index 3000602..c888e8a 100644
--- a/component/excel/excel.iml
+++ b/component/excel/excel.iml
@@ -4,11 +4,6 @@
-
-
-
-
-
diff --git a/component/fileUpload/fileUpload.iml b/component/fileUpload/fileUpload.iml
index 8a583ce..68100c4 100644
--- a/component/fileUpload/fileUpload.iml
+++ b/component/fileUpload/fileUpload.iml
@@ -4,11 +4,6 @@
-
-
-
-
-
diff --git a/component/jwt/jwt.iml b/component/jwt/jwt.iml
index a4a1cb8..75baf36 100644
--- a/component/jwt/jwt.iml
+++ b/component/jwt/jwt.iml
@@ -4,11 +4,6 @@
-
-
-
-
-
diff --git a/component/shiro/shiro.iml b/component/shiro/shiro.iml
index bb20ff6..ad223b7 100644
--- a/component/shiro/shiro.iml
+++ b/component/shiro/shiro.iml
@@ -4,11 +4,6 @@
-
-
-
-
-
diff --git a/component/thymeleaf/thymeleaf.iml b/component/thymeleaf/thymeleaf.iml
index 768c242..d598572 100644
--- a/component/thymeleaf/thymeleaf.iml
+++ b/component/thymeleaf/thymeleaf.iml
@@ -4,11 +4,6 @@
-
-
-
-
-
diff --git a/devtools/devtools.iml b/devtools/devtools.iml
index 560510f..eb6ac2e 100644
--- a/devtools/devtools.iml
+++ b/devtools/devtools.iml
@@ -4,11 +4,6 @@
-
-
-
-
-
diff --git a/devtools/src/main/resources/static/js/generate.code.js b/devtools/src/main/resources/static/js/generate.code.js
index 8593f18..ee3141c 100644
--- a/devtools/src/main/resources/static/js/generate.code.js
+++ b/devtools/src/main/resources/static/js/generate.code.js
@@ -126,17 +126,17 @@ layui.use(['element', 'form', 'layer', 'formSelects'], function () {
$(".field-add").on("click", function () {
var element = entity.children("tr:last-child").clone();
element.find("input, select").val("");
- element.find("[name='type']").val("1");
- var random = Math.random()*10000;
- element.find("[xm-select]").attr("xm-select", random);
+ // element.find("[name='type']").val("1");
+ // var random = Math.random()*10000;
+ // element.find("[xm-select]").attr("xm-select", random);
if(field == null){
entity.append(element);
}else {
$(field).parent().after(element);
}
- element.children(".entity-number").click();
- form.render();
- formSelects.render(random);
+ // element.children(".entity-number").click();
+ // form.render();
+ // formSelects.render(random);
resetNumber();
});
// 删除字段
@@ -146,7 +146,7 @@ layui.use(['element', 'form', 'layer', 'formSelects'], function () {
return;
}
$(field).parent().remove();
- entity.children("tr:last-child").children(".entity-number").click();
+ // entity.children("tr:last-child").children(".entity-number").click();
resetNumber();
}
});
@@ -189,12 +189,21 @@ layui.use(['element', 'form', 'layer', 'formSelects'], function () {
entity.children().each(function (key, trNode) {
var field = {};
field.name = $(trNode).find("[name='name']").val();
- field.title = $(trNode).find("[name='title']").val();
- field.type = $(trNode).find("[name='type']").val();
- field.query = $(trNode).find("[name='query']").val();
- field.show = $(trNode).find("[name='show']").is(':checked');
- var xmId = $(trNode).find(".entity-verify select").attr("xm-select");
- field.verify = formSelects.value(xmId, 'val');
+ // field.title = $(trNode).find("[name='title']").val();
+ // field.type = $(trNode).find("[name='type']").val();
+ // field.query = $(trNode).find("[name='query']").val();
+ // field.show = $(trNode).find("[name='show']").is(':checked');
+ // var xmId = $(trNode).find(".entity-verify select").attr("xm-select");
+ // field.verify = formSelects.value(xmId, 'val');
+
+ // add by hjc
+ field.specification = $(trNode).find("[name='specification']").val();
+ field.unit = $(trNode).find("[name='unit']").val();
+ field.num = $(trNode).find("[name='num']").val();
+ field.unitPrice = $(trNode).find("[name='unitPrice']").val();
+ field.detailAmount = $(trNode).find("[name='detailAmount']").val();
+ field.taxRate = $(trNode).find("[name='taxRate']").val();
+ field.taxAmount = $(trNode).find("[name='taxAmount']").val();
fieldList[key] = field;
});
return fieldList;
diff --git a/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssVatInvoice.java b/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssVatInvoice.java
index 3f7b15c..cb715f4 100644
--- a/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssVatInvoice.java
+++ b/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssVatInvoice.java
@@ -57,6 +57,7 @@ public class BssVatInvoice implements Serializable {
private String totalAmountCn;
//发票类型
+ //增值税普通发票 0; 增值税专用发票 1
@Column(name = "invoice_type")
private Integer invoiceType;
diff --git a/modules/system/system.iml b/modules/system/system.iml
index bc9ea84..c0b7046 100644
--- a/modules/system/system.iml
+++ b/modules/system/system.iml
@@ -4,11 +4,6 @@
-
-
-
-
-