elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time

Browse Source
master
chenzhi 5 years ago
parent 853c938edb aabc0703df
commit 91510679b0
10 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/PayMerchantController.class.php
Unescape Escape View File

@ -38,8 +38,8 @@ class PayMerchantController extends ThinkController
$map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); $map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399));
} }
if ($_REQUEST['game_id']) { if ($_REQUEST['account']) {
$map['game_id'] = $_REQUEST['game_id']; $map['merchant.account'] = $_REQUEST['account'];
} }
if ($_REQUEST['name']) { if ($_REQUEST['name']) {

2
Application/Admin/Controller/SpendController.class.php
Unescape Escape View File

@ -72,7 +72,7 @@ class SpendController extends ThinkController
unset($_REQUEST['pay_game_status']); unset($_REQUEST['pay_game_status']);
} }
if (isset($_REQUEST['merchant_id'])) { if ($_REQUEST['merchant_id']) {
$map['merchant_id'] = $_REQUEST['merchant_id']; $map['merchant_id'] = $_REQUEST['merchant_id'];
unset($_REQUEST['merchant_id']); unset($_REQUEST['merchant_id']);
} }

3
Application/Admin/View/Partner/add.html
Unescape Escape View File

@ -48,6 +48,7 @@
<td class="r"> <td class="r">
<input type="text" class="txt time time1" name="contract_start_time" value="" placeholder="请选择开始时间"> <input type="text" class="txt time time1" name="contract_start_time" value="" placeholder="请选择开始时间">
-<input type="text" class="txt time time2" name="contract_end_time" value="" placeholder="请选择结束时间"> -<input type="text" class="txt time time2" name="contract_end_time" value="" placeholder="请选择结束时间">
<span class="notice-text" style="float: none;">结束时间不选默认永久</span>
</td> </td>
</tr> </tr>
@ -56,6 +57,7 @@
<td class="r"> <td class="r">
<input type="text" class="txt time time3" name="validity_start_time" value="" placeholder="生效开始时间"> <input type="text" class="txt time time3" name="validity_start_time" value="" placeholder="生效开始时间">
-<input type="text" class="txt time time4" name="validity_end_time" value="" placeholder="生效结束时间"> -<input type="text" class="txt time time4" name="validity_end_time" value="" placeholder="生效结束时间">
<span class="notice-text" style="float: none;">结束时间不选默认永久</span>
</td> </td>
</tr> </tr>
@ -385,6 +387,7 @@
return false; return false;
}); });
$(".time3").datetimepicker("setDate", new Date());
$('.time4').datetimepicker({ $('.time4').datetimepicker({
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',

2
Application/Admin/View/Partner/edit.html
Unescape Escape View File

@ -48,6 +48,7 @@
<td class="r"> <td class="r">
<input type="text" class="txt time time1" name="contract_start_time" value="{$data.contract_start_time}" placeholder="请选择开始时间"> <input type="text" class="txt time time1" name="contract_start_time" value="{$data.contract_start_time}" placeholder="请选择开始时间">
-<input type="text" class="txt time time2" name="contract_end_time" value="{$data.contract_end_time}" placeholder="请选择结束时间"> -<input type="text" class="txt time time2" name="contract_end_time" value="{$data.contract_end_time}" placeholder="请选择结束时间">
<span class="notice-text" style="float: none;">结束时间不选默认永久</span>
</td> </td>
</tr> </tr>
@ -56,6 +57,7 @@
<td class="r"> <td class="r">
<input type="text" class="txt time time3" name="validity_start_time" value="{$data.validity_start_time}" placeholder="生效开始时间"> <input type="text" class="txt time time3" name="validity_start_time" value="{$data.validity_start_time}" placeholder="生效开始时间">
-<input type="text" class="txt time time4" name="validity_end_time" value="{$data.validity_end_time}" placeholder="生效结束时间"> -<input type="text" class="txt time time4" name="validity_end_time" value="{$data.validity_end_time}" placeholder="生效结束时间">
<span class="notice-text" style="float: none;">结束时间不选默认永久</span>
</td> </td>
</tr> </tr>

6
Application/Admin/View/PayMerchant/index.html
Unescape Escape View File

@ -73,7 +73,7 @@
<h3 class="page_title">支付方式统计</h3> <h3 class="page_title">支付方式统计</h3>
<!-- <p class="description_text">说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，<span style="color:red">充值方式统计</span>一栏统计<span style="color:red">平台币直充总金额</span></p>--> <!-- <p class="description_text">说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，<span style="color:red">充值方式统计</span>一栏统计<span style="color:red">平台币直充总金额</span></p>-->
<div class="fr"> <div class="fr">
<a href="PayChannel/index">游戏充值统计</a> <a href="{:U('PayChannel/index')}">游戏充值统计</a>
<a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a> <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>
<a class="tabchose">支付方式统计</a> <a class="tabchose">支付方式统计</a>
</div> </div>
@ -253,7 +253,7 @@
无 无
</if> </if>
<volist name="sum_radio" id="sum_radio"> <volist name="sum_radio" id="sum_radio">
{$sum_radio.name}：{$sum_radio.ratio|default = 0}% &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp {$sum_radio.name}({$sum_radio.merchant_way})：{$sum_radio.ratio|default = 0}% &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</volist> </volist>
</td> </td>
</tr> </tr>
@ -288,7 +288,7 @@
$("#account").select2(); $("#account").select2();
//导航高亮 //导航高亮
highlight_subnav('{:U('PayMerchant/index')}'); highlight_subnav('{:U('PayChannel/index')}');
function showWindow() { function showWindow() {
layer.open({ layer.open({

6
Application/Admin/View/PaymentMerchant/rules.html
Unescape Escape View File

@ -99,7 +99,7 @@
<br> <br>
<div class="input-list input-list-promote search_label_rehab"> <div class="input-list input-list-promote search_label_rehab">
<select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width:200px;"> <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width:200px;">
<option value="0">支付宝配置商户</option> <option value="0">支付宝支付配置商户</option>
<?php foreach($aliMerchants as $merchant):?> <?php foreach($aliMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?></option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
<?php endforeach;?> <?php endforeach;?>
@ -107,7 +107,7 @@
</div> </div>
<div class="input-list input-list-promote search_label_rehab"> <div class="input-list input-list-promote search_label_rehab">
<select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width:200px;"> <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width:200px;">
<option value="0">支付宝配置商户</option> <option value="0">微信支付配置商户</option>
<?php foreach($weixinMerchants as $merchant):?> <?php foreach($weixinMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?></option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
<?php endforeach;?> <?php endforeach;?>
@ -115,7 +115,7 @@
</div> </div>
<div class="input-list input-list-promote search_label_rehab"> <div class="input-list input-list-promote search_label_rehab">
<select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width:200px;"> <select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width:200px;">
<option value="0">支付宝配置商户</option> <option value="0">快捷支付配置商户</option>
<?php foreach($expressMerchants as $merchant):?> <?php foreach($expressMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?></option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
<?php endforeach;?> <?php endforeach;?>

19
Application/Admin/View/PromoteCompany/add.html
Unescape Escape View File

@ -167,16 +167,9 @@
<tr> <tr>
<td class="l">合同期限:</td> <td class="l">合同期限:</td>
<td class="r" > <td class="r" >
<div class="input-list" style="margin:0;"> <input type="text" class="txt time" id="contact_begin" name="contact_begin" placeholder="合同开始时间">
<input type="text" readonly id="contact_begin" name="contact_begin" class="" value="{:I('contact_begin')}" &nbsp;-&nbsp;<input type="text" class="txt time" id="contact_end" name="contact_end" placeholder="合同结束时间">
placeholder="合同开始时间" /> <span class="notice-text" style="float: none;">结束时间不选默认永久</span>
&nbsp;-&nbsp;
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="contact_end" name="contact_end" class="" value="{:I('contact_end')}"
placeholder="合同结束时间" />
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
</td> </td>
</tr> </tr>
@ -490,7 +483,7 @@
return false; return false;
}); });
$('#datetimepicker').datetimepicker({ $('#contact_end').datetimepicker({
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
language: "zh-CN", language: "zh-CN",
minView: 2, minView: 2,
@ -515,7 +508,7 @@
if(isNaN(end)) {return false;} if(isNaN(end)) {return false;}
if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time3').val('');return false;}
return false; return false;
}); });
@ -532,7 +525,7 @@
if(isNaN(start)) {return false;} if(isNaN(start)) {return false;}
if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time4').val('');return false;}
return false; return false;
}); });

35
Application/Admin/View/PromoteCompany/edit.html
Unescape Escape View File

@ -166,16 +166,9 @@
<tr> <tr>
<td class="l">合同期限:</td> <td class="l">合同期限:</td>
<td class="r" > <td class="r" >
<div class="input-list" style="margin:0;"> <input type="text" class="txt time" id="contact_begin" name="contact_begin" value="{$data.contact_begin}" placeholder="合同开始时间">
<input type="text" readonly id="contact_begin" name="contact_begin" class="" value="{$data.contact_begin}" &nbsp;-&nbsp;<input type="text" class="txt time" id="contact_end" name="contact_end" value="{$data.contact_end}" placeholder="合同结束时间">
placeholder="合同开始时间" /> <span class="notice-text" style="float: none;">结束时间不选默认永久</span>
&nbsp;-&nbsp;
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="contact_end" name="contact_end" class="" value="{$data.contact_end}"
placeholder="合同结束时间" />
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -564,7 +557,7 @@
return false; return false;
}); });
$('#datetimepicker').datetimepicker({ $('#contact_end').datetimepicker({
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
language: "zh-CN", language: "zh-CN",
minView: 2, minView: 2,
@ -588,10 +581,28 @@
if(isNaN(end)) {return false;} if(isNaN(end)) {return false;}
if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time3').val('');return false;}
return false; return false;
}); });
$('.time4').datetimepicker({
format: 'yyyy-mm-dd',
language:"zh-CN",
minView: "month",
autoclose:true
}).change(function(){
var end = new Date($(this).val()).getTime();
var start = new Date($('.time3').val()).getTime();
if(isNaN(start)) {return false;}
if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time4').val('');return false;}
return false;
});
$('.iconfont-btn-add').click(function (e) { $('.iconfont-btn-add').click(function (e) {
var delBtn = $('.iconfont-btn-del'); var delBtn = $('.iconfont-btn-del');
var html = ''; var html = '';

18
Application/Admin/View/StatementMangement/rewardManageList.html
Unescape Escape View File

@ -171,16 +171,16 @@
<!-- 表头 --> <!-- 表头 -->
<thead> <thead>
<tr> <tr>
<th>游戏名</th> <th style="width: 100px;">游戏名</th>
<th>游戏合作方</th> <th style="width: 100px;">游戏合作方</th>
<th>结算时间</th> <th >结算时间</th>
<th>奖惩确认时间</th> <th>奖惩确认时间</th>
<th>事件说明</th> <th style="width: 150px;" >事件说明</th>
<th>奖惩性质</th> <th>奖惩性质</th>
<!-- 惩罚方 --> <!-- 惩罚方 -->
<th>奖惩类别</th> <th>奖惩类别</th>
<th>结算公司类型</th> <th>结算公司类型</th>
<th>结算方</th> <th style="width: 100px;">结算方</th>
<th>会长账号</th> <th>会长账号</th>
<th>奖惩金额</th> <th>奖惩金额</th>
<th>结算方式</th> <th>结算方式</th>
@ -188,7 +188,7 @@
<!-- 奖励方 --> <!-- 奖励方 -->
<th>奖惩类别</th> <th>奖惩类别</th>
<th>结算公司类型</th> <th>结算公司类型</th>
<th>结算方</th> <th style="width: 100px;">结算方</th>
<th>会长账号</th> <th>会长账号</th>
<th>奖惩金额</th> <th>奖惩金额</th>
<th>结算方式</th> <th>结算方式</th>
@ -264,9 +264,9 @@
<td rowspan="{$data['maxCount']}">{:get_admin_name($data['creater_id'])}</td> <td rowspan="{$data['maxCount']}">{:get_admin_name($data['creater_id'])}</td>
<td rowspan="{$data['maxCount']}"> <td rowspan="{$data['maxCount']}">
<a href="{:U('StatementMangement/rewardManageDetail',array('id'=>$data['id']))}">查看 </a> <a style="padding: 0px;" href="{:U('StatementMangement/rewardManageDetail',array('id'=>$data['id']))}">查看 </a>
<a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a> <a style="padding: 0px;" href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a>
<a class="confirm ajax-get" href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id'], 'delete'=>1))}">删除 </a> <a style="padding: 0px;" class="confirm ajax-get" href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id'], 'delete'=>1))}">删除 </a>
</td> </td>
</tr> </tr>
<?php else:?> <?php else:?>

27
Application/Admin/View/StatementMangement/rewardManageSave.html
Unescape Escape View File

@ -67,6 +67,8 @@
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script> <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"charset="UTF-8"></script> <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"charset="UTF-8"></script>
<script type="text/javascript" src="__STATIC__/laydate/laydate.js"></script> <script type="text/javascript" src="__STATIC__/laydate/laydate.js"></script>
<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
<script type="text/javascript" src="__JS__/select2.min.js"></script>
<div class="tab-wrap" id='pop-form' hidden> <div class="tab-wrap" id='pop-form' hidden>
<div class="tab-content tabcon1711"> <div class="tab-content tabcon1711">
<!-- 表单 --> <!-- 表单 -->
@ -209,7 +211,7 @@
<td class="reward-td promote-account"><?=$details[1][$i]['promote_account'] ?? '-'?></td> <td class="reward-td promote-account"><?=$details[1][$i]['promote_account'] ?? '-'?></td>
<td class="reward-td settlement-type"><?=$settlementTypes[$details[1][$i]['settlement_type']] ?? '-'?></td> <td class="reward-td settlement-type"><?=$settlementTypes[$details[1][$i]['settlement_type']] ?? '-'?></td>
<td class='reward-amount reward-td amount'><?=$details[1][$i]['amount'] ?? '-'?></td> <td class='reward-amount reward-td amount'><?=$details[1][$i]['amount'] ?? '-'?></td>
<td class='reward-opt reward-td opt'><?php if (isset($details[1][$i])): php?><a onclick="removeItem(this, 'reward')">删除</a><?php else: php?><a onclick="openForm()">添加</a><?php endif; php?></td> <td class='reward-opt reward-td opt'><?php if (isset($details[1][$i])): php?><a onclick="removeItem(this, 'reward')">删除</a><?php else: php?> <?php endif; php?></td>
<!-- 惩罚信息 --> <!-- 惩罚信息 -->
<td class="punish-data-info" hidden> <td class="punish-data-info" hidden>
@ -220,7 +222,7 @@
<td class="punish-td promote-account"><?=$details[2][$i]['promote_account'] ?? ''?></td> <td class="punish-td promote-account"><?=$details[2][$i]['promote_account'] ?? ''?></td>
<td class="punish-td settlement-type"><?=$settlementTypes[$details[2][$i]['settlement_type']] ?? ''?></td> <td class="punish-td settlement-type"><?=$settlementTypes[$details[2][$i]['settlement_type']] ?? ''?></td>
<td class='punish-amount punish-td amount'><?=$details[2][$i]['amount'] ?? ''?></td> <td class='punish-amount punish-td amount'><?=$details[2][$i]['amount'] ?? ''?></td>
<td class='punish-opt punish-td opt'><?php if (isset($details[2][$i])): php?><a onclick="removeItem(this, 'punish')">删除</a><?php else: php?><a onclick="openForm()">添加</a><?php endif; php?></td> <td class='punish-opt punish-td opt'><?php if (isset($details[2][$i])): php?><a onclick="removeItem(this, 'punish')">删除</a><?php else: php?> <?php endif; php?></td>
</tr> </tr>
<?php endfor;?> <?php endfor;?>
<tr id='total-amount'> <tr id='total-amount'>
@ -229,13 +231,13 @@
<td></td> <td></td>
<td>合计</td> <td>合计</td>
<td id='total-reward-amount'>{$data['rewardAmount']}</td> <td id='total-reward-amount'>{$data['rewardAmount']}</td>
<td><a onclick="openForm()">添加</a></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td>合计</td> <td>合计</td>
<td id='total-punish-amount'>{$data['punishAmount']}</td> <td id='total-punish-amount'>{$data['punishAmount']}</td>
<td><a onclick="openForm()">添加</a></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -341,6 +343,8 @@
$(".user-account:last").after(a); $(".user-account:last").after(a);
}); });
$(".select_gallery").select2();
$(document).on('click', '.bnt_remove', function(){ $(document).on('click', '.bnt_remove', function(){
$(this).parents('li').remove(); $(this).parents('li').remove();
countAmount(); countAmount();
@ -373,6 +377,7 @@
title:"新增", title:"新增",
area:['30%','60%'], area:['30%','60%'],
content: $('#pop-form'), content: $('#pop-form'),
zIndex: 1,
end : function(){ end : function(){
$('#item-form')[0].reset() // 重置数据 $('#item-form')[0].reset() // 重置数据
$('#form-company-name').attr('readonly', false); $('#form-company-name').attr('readonly', false);
@ -401,7 +406,7 @@
if (index < 6) { if (index < 6) {
$(item).html(''); $(item).html('');
} else { } else {
$(item).html('<a onclick="openForm()">添加</a>') //$(item).html('<a onclick="openForm()">添加</a>')
} }
}); });
} }
@ -443,7 +448,7 @@
<td class="reward-td promote-account"></td> <td class="reward-td promote-account"></td>
<td class="reward-td settlement-type"></td> <td class="reward-td settlement-type"></td>
<td class='reward-amount reward-td amount'></td> <td class='reward-amount reward-td amount'></td>
<td class='reward-opt reward-td opt'><a onclick="openForm()">添加</a></td> <td class='reward-opt reward-td opt'></td>
<!-- 惩罚信息 --> <!-- 惩罚信息 -->
<td class="punish-data-info" hidden> <td class="punish-data-info" hidden>
@ -454,7 +459,7 @@
<td class="punish-td promote-account"></td> <td class="punish-td promote-account"></td>
<td class="punish-td settlement-type"></td> <td class="punish-td settlement-type"></td>
<td class='punish-amount punish-td amount'></td> <td class='punish-amount punish-td amount'></td>
<td class='punish-opt punish-td opt'><a onclick="openForm()">添加</a></td> <td class='punish-opt punish-td opt'></td>
</tr>`; </tr>`;
$('#total-amount').before(newNodeHtml); $('#total-amount').before(newNodeHtml);
emptyNode = $('.table-body tr,.empty-'+type_dec+':first'); emptyNode = $('.table-body tr,.empty-'+type_dec+':first');
@ -533,7 +538,9 @@
$("#form-company-name").val(''); $("#form-company-name").val('');
} else if (companyType == 1) { // 上游公司没有下级会长 } else if (companyType == 1) { // 上游公司没有下级会长
var promoteData = "<option value='0' selected>其他</option>"; var promoteData = "<option value='0' selected>其他</option>";
$("#form-promote-account").empty();
$('#form-promote-account').html(promoteData); $('#form-promote-account').html(promoteData);
$("#form-promote-account").select2();
$("#form-promote-account-input").attr("readonly",false) $("#form-promote-account-input").attr("readonly",false)
$("#form-company-name").attr("readonly",true) $("#form-company-name").attr("readonly",true)
$("#form-company-name").val($('#form-company-id option:selected').text()); $("#form-company-name").val($('#form-company-id option:selected').text());
@ -547,7 +554,9 @@
$.each(response.data, function(index, item){ $.each(response.data, function(index, item){
promoteData += "<option value='"+item.account+"' >"+item.account+"</option>"; promoteData += "<option value='"+item.account+"' >"+item.account+"</option>";
}); });
$("#form-promote-account").empty();
$('#form-promote-account').html(promoteData); $('#form-promote-account').html(promoteData);
$("#form-promote-account").select2();
$("#form-promote-account-input").attr("readonly",false) $("#form-promote-account-input").attr("readonly",false)
$("#form-company-name").attr("readonly",true) $("#form-company-name").attr("readonly",true)
$("#form-company-name").val($('#form-company-id option:selected').text()); $("#form-company-name").val($('#form-company-id option:selected').text());
@ -562,7 +571,9 @@
// 如果公司类型为内部的时候，公司部门仅其他 // 如果公司类型为内部的时候，公司部门仅其他
if (companyType == 3) { if (companyType == 3) {
var companyData = "<option value='0' selected>其他</option>"; var companyData = "<option value='0' selected>其他</option>";
$("#form-company-id").empty();
$('#form-company-id').html(companyData); $('#form-company-id').html(companyData);
$("#form-company-id").select2();
$("#form-company-name").attr("readonly",false) $("#form-company-name").attr("readonly",false)
} else { } else {
$.ajax({ $.ajax({
@ -574,7 +585,9 @@
$.each(response.info, function(index, item){ $.each(response.info, function(index, item){
companyData += "<option value='"+item.id+"' >"+item.name+"</option>"; companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
}); });
$("#form-company-id").empty();
$('#form-company-id').html(companyData); $('#form-company-id').html(companyData);
$("#form-company-id").select2();
$("#form-company-name").attr("readonly",true) $("#form-company-name").attr("readonly",true)
//$('#company_id').html(companyData); //$('#company_id').html(companyData);
promoteChange(); promoteChange();

Write Preview
Loading…
Cancel
Save