diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index b838257a9..7bebcf677 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -346,7 +346,6 @@ class StatementMangementController extends ThinkController ') ->where($map) ->join('tab_reward_detail as rd on rd.record_id = r.id', 'LEFT')->select(); - if ($list) { $record = []; foreach ($list as $item) { @@ -529,12 +528,14 @@ class StatementMangementController extends ThinkController $this->success('保存成功', U('StatementMangement/rewardManageList')); } } else { + $data['create_time'] = time(); $data['creater_id'] = is_login(); $ins = M('reward_record', 'tab_')->add($data); + $record_id = M('reward_record', 'tab_')->getLastInsID(); foreach ($settlmentSet as $item) { - $item['record_id'] = M('reward_record', 'tab_')->getLastInsID(); + $item['record_id'] = $record_id; M('reward_detail', 'tab_')->add($item); } diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html index 52785a868..229298338 100644 --- a/Application/Admin/View/StatementMangement/rewardManageList.html +++ b/Application/Admin/View/StatementMangement/rewardManageList.html @@ -125,7 +125,7 @@
- +
@@ -410,11 +410,13 @@ { var companyId = $('#detail_company_id').val(); var companyType = $('#detail_company_type').val(); + $('#detail_company_name').attr('disabled', true).hide(); //var companyType = $('#form-company-type').val(); // 如果公司类型为内部的时候,公司部门仅其他 if (companyType == 3) { var companyData = ""; $('#detail_company_id').html(companyData); + $('#detail_company_name').attr('disabled', false).show(); //$("#detail_company_name").attr("readonly",false) $('#detail_company_id').change(); } else { diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html index 77e42a8d7..3bded8877 100644 --- a/Application/Admin/View/StatementMangement/rewardManageSave.html +++ b/Application/Admin/View/StatementMangement/rewardManageSave.html @@ -541,7 +541,7 @@ promoteData += ""; }); $('#form-promote-account').html(promoteData); - $("#form-promote-account-input").attr("readonly",true) + $("#form-promote-account-input").attr("readonly",false) $("#form-company-name").attr("readonly",true) $("#form-company-name").val($('#form-company-id option:selected').text()); }