hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

去掉无用的模板文件

Browse Source 
封装ajax提示方法
This commit is contained in:
hawind
2021-03-20 05:06:27 +08:00
parent bd9c315d7e
commit c564147f20
68 changed files with 664 additions and 21421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/CustomerCost/Controllers/ReportController.php
+3 -3
View File
@@ -17,7 +17,7 @@ class ReportController extends DefaultController
$sdate = date('Y-m-01');
$edate = date('Y-m-d');
$search = search_form([],
[['form_type' => 'date2', 'name' => '日期', 'field' => 'date', 'value' => [$sdate, $edate], 'options' => []],
[['form_type' => 'date2', 'name' => '订单日期', 'field' => 'date', 'value' => [$sdate, $edate], 'options' => []],
['form_type' => 'text', 'name' => '订单编号', 'field' => 'm.sn', 'options' => []],
['form_type' => 'text', 'name' => '单据编号', 'field' => 'd.fee_src_sn', 'options' => []],
[
@@ -52,10 +52,10 @@ class ReportController extends DefaultController
c.code as customer_code,
c.name as customer_name,
ccc.name as category_name,
".sql_year_month('l.audit_date', 'ts')." as [ym]
".sql_year_month('m.created_at', 'ts')." as [ym]
")
->whereRaw('d.fee_src_sn is not null')
->groupBy(DB::raw('c.code,c.name,ccc.name,m.sn,d.fee_src_sn,d.fee_src_type_id,'.sql_year_month('l.audit_date', 'ts')));
->groupBy(DB::raw('c.code,c.name,ccc.name,m.sn,d.fee_src_sn,d.fee_src_type_id,'.sql_year_month('m.created_at', 'ts')));
foreach ($search['where'] as $where) {
if ($where['active']) {
app/Gdoo/CustomerCost/views/compen/create.blade.php
+1 -3
View File
@@ -34,9 +34,7 @@ var table = '{{$form["table"]}}';
var file = document.querySelector("#import_file").files[0];
var formData = new FormData();
formData.append('file', file);
var loading = layer.msg('数据提交中...', {
icon: 16, shade: 0.1, time: 1000 * 120
});
var loading = showLoading();
$.ajax(url, {
method: "post",
data: formData,
app/Gdoo/CustomerCost/views/rebate/create.blade.php
+1 -3
View File
@@ -35,9 +35,7 @@ var table = '{{$form["table"]}}';
var file = document.querySelector("#import_file").files[0];
var formData = new FormData();
formData.append('file', file);
var loading = layer.msg('数据提交中...', {
icon: 16, shade: 0.1, time: 1000 * 120
});
var loading = showLoading();
$.ajax(url, {
method: "post",
data: formData,
app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php
+1 -1
View File
@@ -60,7 +60,7 @@
gdoo.grids[table] = {grid: grid};
var action = new grid(table, '销售订单费用明细表');
var action = new gridAction(table, '销售订单费用明细表');
var panel = $('#' + table + '-controller');
panel.on('click', '[data-toggle="' + table + '"]', function() {