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

去掉无用的参数

Browse Source 
修改表单构建关联字段的逻辑
修改外部插件说明
This commit is contained in:
hawind
2021-03-01 03:02:47 +08:00
parent 2418516c49
commit eebbdf279e
63 changed files with 1273 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Promotion/Controllers/PromotionController.php
+1 -1
View File
@@ -441,7 +441,7 @@ class PromotionController extends WorkflowController
promotion.id,
promotion.customer_id,
customer_id_customer.region_id,
customer_id_region_id_customer_region.name as region_name,
region_id_customer_region.name as region_name,
customer_id_customer.code as customer_code,
customer_id_customer.name as customer_name,
customer_id_customer.warehouse_contact,
app/Gdoo/Promotion/Models/PromotionCash.php
+3 -3
View File
@@ -27,10 +27,10 @@ class PromotionCash extends BaseModel
$total_num = DB::table('order')->count('id');
$master['customer_id'] = $cash->promotion->customer_id;
$master['customer_id'] = $cash->promotion->customer_id;
$master['flow_step_id'] = 1;
$master['number'] = 'CXDX-'.date('Y-m').'-'.($total_num + 1);
$master['add_time'] = time();
$master['number'] = 'CXDX-'.date('Y-m').'-'.($total_num + 1);
$master['add_time'] = time();
$orderId = DB::table('order')->insertGetId($master);
foreach ($cash->datas as $data) {
app/Gdoo/Promotion/views/promotion/dialog.blade.php
+1 -1
View File
@@ -43,7 +43,7 @@ var params = JSON.parse('{{json_encode($query)}}');
{cellClass:'text-center', field: 'master_status', cellRenderer: 'htmlCellRenderer', headerName: '状态', width: 160},
{cellClass:'text-center', field: 'customer_code', headerName: '客户编码', width: 120},
{field:'customer_name', headerName: '客户名称', width: 160},
{cellClass:'text-center',field:'region_name', headerName: '销售团队', width: 120},
{cellClass:'text-center',field:'region_name', headerName: '销售组', width: 120},
{cellClass:'text-right',field:'apply_money', headerName: '申请费用', width: 100},
{cellClass:'text-right',field:'verification_cost', headerName: '批复费用', width: 100},
{cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}