root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix]销售管理 财务管理 

修改销售订单的国内开票和国外开票页面
修改国税发票的列表页面，去掉多余的按钮
修改国税发票上传发的国内页面。修改上传组件的js方法
dev
liuxiaoxu 3 months ago
parent
75d9d9c3b1
commit
62ed50bd73
5 changed files with 56 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
  2. 21
      ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmb.html
  3. 11
      ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmbDetail.html
  4. 19
      ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRmb.html
  5. 19
      ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUsd.html

18
ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
View File

@ -78,15 +78,15 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="financial:taxInvoice:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="financial:taxInvoice:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="financial:taxInvoice:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="financial:taxInvoice:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>

21
ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmb.html
View File

@ -264,6 +264,16 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js" />
<!-- buffer.min.js 和 filetype.min.js 是必需的，按列出的顺序进行高级 MIME 类型分析和更正确
预览。这是自 v5.5.0 以来可用的功能，如果您想确保解析文件 mime 类型，则需要此功能
即使本地文件的扩展名命名不正确，也能正确。这将确保更正确地预览
选定的文件（注意：这将涉及在本地扫描文件内容时产生的少量处理开销）。如果你
不要加载这些脚本，那么 MIME 类型解析将主要使用文件名中的扩展名派生
以及一些基本的文件内容解析签名。-->
<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/buffer.min.js” type=“text/javascript”></script>
<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/filetype.min.js” type=“text/javascript”></script>
<!--可选地，如果您需要翻译您的语言，请包含以下所述的区域设置文件（将LANG.js替换为您的语言区域设置）-->
<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/locales/zh.js”></script>
<script th:inline="javascript"> <script th:inline="javascript">
var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]]; var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]];
@ -378,10 +388,11 @@
// 单图上传 // 单图上传
$(".file-upload").fileinput({ $(".file-upload").fileinput({
uploadUrl: ctx + "common/uploadSingleFile", uploadUrl: ctx + "common/uploadSingleFile",
language: 'zh', //设置语言
maxFileCount: 1, maxFileCount: 1,
autoReplace: true, autoReplace: true,
allowedFileExtensions: ['bmp', 'gif', 'jpg', 'jpeg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'html', 'htm', 'txt', 'text', 'rar', 'zip', 'gz', 'bz2', 'pdf', 'bpmn', 'bar', 'db'], allowedFileExtensions: ['bmp', 'gif', 'jpg', 'jpeg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'html', 'htm', 'txt', 'text', 'rar', 'zip', 'gz', 'bz2', 'pdf', 'bpmn', 'bar', 'db'],
previewFileType: ['image', 'txt', 'text', 'pdf', 'bpmn', 'bar', 'db',"doc","docx"], previewFileType: ['image', 'txt', 'text', 'pdf', 'bpmn', 'bar', 'db','doc','docx'],
showUpload: false, // 不显示上传按钮 showUpload: false, // 不显示上传按钮
showCaption: false, // 不显示标题 showCaption: false, // 不显示标题
showRemove: true, // 显示移除按钮 showRemove: true, // 显示移除按钮
@ -390,10 +401,10 @@
removeIcon: "<i class='fa fa-trash'></i>", // 移除按钮图标 removeIcon: "<i class='fa fa-trash'></i>", // 移除按钮图标
browseLabel: "选择文件", // 浏览按钮文本 browseLabel: "选择文件", // 浏览按钮文本
removeLabel: "删除", // 移除按钮文本 removeLabel: "删除", // 移除按钮文本
layoutTemplates: { preferIconicPreview: true, // this will force thumbnails to display icons for following file extensions
main2: "{preview}\n" + uploadExtraData: {
"{remove}\n" + img_key: "1000",
"{browse}" img_keywords: "happy, nature",
} }
}).on('filepreupload', function (event, data, previewId, index) { }).on('filepreupload', function (event, data, previewId, index) {
// 在文件上传前的处理 // 在文件上传前的处理

11
ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmbDetail.html
View File

@ -264,6 +264,17 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js" />
<!--可选地，如果您需要翻译您的语言，请包含以下所述的区域设置文件（将LANG.js替换为您的语言区域设置）-->
<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/locales/zh.js”></script>
<!-- buffer.min.js 和 filetype.min.js 是必需的，按列出的顺序进行高级 MIME 类型分析和更正确
预览。这是自 v5.5.0 以来可用的功能，如果您想确保解析文件 mime 类型，则需要此功能
即使本地文件的扩展名命名不正确，也能正确。这将确保更正确地预览
选定的文件（注意：这将涉及在本地扫描文件内容时产生的少量处理开销）。如果你
不要加载这些脚本，那么 MIME 类型解析将主要使用文件名中的扩展名派生
以及一些基本的文件内容解析签名。-->
<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/buffer.min.js” type=“text/javascript”></script>
<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/filetype.min.js” type=“text/javascript”></script>
<script th:inline="javascript"> <script th:inline="javascript">
var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]]; var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]];

19
ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html → ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRmb.html
View File

@ -430,15 +430,16 @@
title: '财务员', title: '财务员',
field: 'financeMembers', field: 'financeMembers',
}, },
{ // {
title: '操作', // title: '操作',
align: 'center', // align: 'center',
formatter: function(value, row, index) { // formatter: function(value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> '); // actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); // return actions.join('');
} // }
}] // }
]
}; };
$.table.init(options); $.table.init(options);
}); });

19
ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUSD.html → ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUsd.html
View File

@ -430,15 +430,16 @@
title: '财务员', title: '财务员',
field: 'financeMembers', field: 'financeMembers',
}, },
{ // {
title: '操作', // title: '操作',
align: 'center', // align: 'center',
formatter: function(value, row, index) { // formatter: function(value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> '); // actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); // return actions.join('');
} // }
}] // }
]
}; };
$.table.init(options); $.table.init(options);
}); });
Write Preview
Loading…
Cancel
Save