Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release

修复己方公司不能删除

Application/Admin/Controller/CompanyStatementController.class.php

@@ -106,6 +106,9 @@ class CompanyStatementController extends ThinkController
         if(isset($_REQUEST['company_belong'])){
             $map['company_belong'] = $_REQUEST['company_belong'];
         }
+        if(isset($_REQUEST['company_id'])){
+            $map['company_id'] = $_REQUEST['company_id'];
+        }
         if(isset($_REQUEST['verify_status'])){
             $map['verify_status'] = $_REQUEST['verify_status'];
         }
@@ -310,6 +313,7 @@ class CompanyStatementController extends ThinkController
             $v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=$change_status;
+            $v['op_time'] = time();
             $this->DBModel->save($v);
             $opname = $this->VerifyStatus[$change_status];
             addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>$opname,'url'=>U('lists')]);
@@ -519,6 +523,7 @@ class CompanyStatementController extends ThinkController
             $v['verify_log'][$op_pre.'_num']=$num;
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=$change_status;
+            $v['op_time']=time();
             $this->DBModel->save($v);
         }
     }

Application/Admin/Controller/ToolController.class.php

@@ -919,7 +919,6 @@ class ToolController extends ThinkController {
                 $this->error('参数异常');
             }
         }
-
         $res = M('company_info', 'tab_')->delete($id);
         if ($res === false) {
             $this->error('删除失败');

Application/Admin/View/CompanyStatement/lists.html

@@ -231,7 +231,7 @@
     </div>
     <div class="page">
         <if condition="$role_export_check eq true ">
-            <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+            <!-- <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a> -->
         </if>
         {$_page|default=''}
     </div>
@@ -265,24 +265,34 @@
         }
 
         $(function(){
-
+            var loop = 1;
             var company_id = "{$_GET['company_id']??0}";
             $("#company_type").on("change",function(){
                 var type =  $(this).find("option:selected").val();
-                var url = "{:U('Ajax/getCompanyList')}"+"&company_type="+type;
-                $.get(url,function(data){
-                    var company = data;
-                    var companystr = '<option value="">请选择合作公司</option>';
-                    for (var i in company) {
-                        if(company[i].id == company_id){
-                            companystr += "<option value='" + company[i].id + "' selected='selected'>" + company[i].name + "</option>"
-                        }else{
-                            companystr += "<option value='" + company[i].id + "'>" + company[i].name + "</option>"
+                if(type != ''){
+                    var url = "{:U('Ajax/getCompanyList')}"+"&company_type="+type;
+                    $.get(url,function(data){
+                        var company = data;
+                        var companystr = '<option value="">请选择合作公司</option>';
+                        for (var i in company) {
+                            if(company[i].id == company_id && loop==1){
+                                companystr += "<option value='" + company[i].id + "' selected='selected'>" + company[i].name + "</option>"
+                            }else{
+                                companystr += "<option value='" + company[i].id + "'>" + company[i].name + "</option>"
+                            }
                         }
-                    }
+                        $("#company_id").html(companystr);
+                        $("#company_id").select2();
+                        loop++;
+                    })
+                }else{
+                    var companystr = '<option value="">请先选择合作公司</option>';
                     $("#company_id").html(companystr);
                     $("#company_id").select2();
-                })
+                }
+                
+                
+                
             })
             $("#company_type").change();
 

Application/Admin/View/Tool/company_add.html

@@ -107,22 +107,13 @@
                     <button class="submit_btn ajax-post" id="submit" type="submit" target-form="form-horizontal" style="margin-left:210px;">
                         保存
                     </button>
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('Partner/lists')}" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('Tool/company_info')}" >
                         返回
                     </a>
                 </div>
             </form>
         </div>
     </div>
-    <div class="common_settings">
-        <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-        <form class="addShortcutIcon">
-            <input type="hidden" name="title" value="{$meta_title}">
-            <input type="hidden" name="url" value="Partner/add">
-        </form>
-        <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
-    </div>
-
 </block>
 
 <block name="script">

Application/Admin/View/Tool/company_info.html

@@ -39,7 +39,7 @@
         <div class="fl button_list">
             <div class="tools">
                 <a class="" href="{:U('company_add')}"><span class="button_icon button_icon1"></span>新增</a>
-                <a class="ajax-post confirm " target-form="ids" url="{:U('del')}"><span class="button_icon button_icon2"></span>删除</a>
+                <a class="ajax-post confirm " target-form="ids" url="{:U('company_del')}"><span class="button_icon button_icon2"></span>删除</a>
             </div>
         </div>
 <!--        <div class="jssearch fl cf search_list" >-->