mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重写上传文件的模板展示，及js方法，图片、PDF文件支持在线查看功能，其他文件下载查看，系统整体提升了文件更能的操作体验。

Browse Source 
修复了客户模块的日志展示错误bug，发票到账模块支持上传附件功能，可以上传到账凭据等资料。
This commit is contained in:
hdm 2023-04-17 23:33:39 +08:00
parent 338038c8b4
commit 699aed4ef1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/finance/controller/Income.php
View File

@ -155,6 +155,11 @@ class Income extends BaseController
$fileArray = Db::name('File')->where('id','in',$detail['file_ids'])->select(); $fileArray = Db::name('File')->where('id','in',$detail['file_ids'])->select();
$detail['fileArray'] = $fileArray; $detail['fileArray'] = $fileArray;
} }
if($detail['other_file_ids'] !=''){
$fileArrayOther = Db::name('File')->where('id','in',$detail['other_file_ids'])->select();
$detail['fileArrayOther'] = $fileArrayOther;
}
$detail['not_income'] = ($detail['amount']*100 - $detail['enter_amount']*100)/100; $detail['not_income'] = ($detail['amount']*100 - $detail['enter_amount']*100)/100;
//已到账的记录 //已到账的记录
$detail['income'] = InvoiceIncome::field('i.*,a.name as admin') $detail['income'] = InvoiceIncome::field('i.*,a.name as admin')

4
app/finance/view/income/add.html
View File

@ -253,7 +253,7 @@ function gouguInit() {
other_file_ids:val other_file_ids:val
}, },
success: function (e) { success: function (e) {
//location.reload(); location.reload();
} }
}) })
}, },
@ -263,7 +263,7 @@ function gouguInit() {
type:'post', type:'post',
data:{ data:{
id:$('[name="id"]').val(), id:$('[name="id"]').val(),
//other_file_ids:val other_file_ids:val
}, },
success: function (e) { success: function (e) {
location.reload(); location.reload();