Merge branch 'refs/heads/feature/email_interface_feature' into develop

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CREDIT_STATUS.sql

@@ -7,6 +7,7 @@ set feedback off
 set define off
 
 <!--授信状态字段-->
+
 BEGIN
 
 sys_code_pkg.delete_sys_code('CREDIT_STATUS');
@@ -14,6 +15,7 @@ sys_code_pkg.insert_sys_code('CREDIT_STATUS', '授信状态', '授信状态', '
 sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','ENABLE','启用','ZHS','');
 sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','FREZZING','审批冻结','ZHS','');
 sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','DISABLE','停用','ZHS','');
+sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','REFUSE','审批拒绝','ZHS','');
 
 END;
 /

src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview

@@ -80,13 +80,13 @@ $Purpose: 商业伙伴授信维护
             }
             //启用和审批冻结判断
             var credit_status=datas[0].data.credit_status;
-            if(credit_status!='ENABLE'&&credit_status!='DISABLE'){
-                $L.showInfoMessage("提示",'请选择状态为启用和停用的数据！',null,null)
+            if(credit_status!='ENABLE'&&credit_status!='DISABLE'&&credit_status!='REFUSE'){
+                $L.showInfoMessage("提示",'请选择状态为启用,停用和审批拒绝的数据！',null,null)
                 return;
             }
             //角色判断 00215 营业内勤
             //00213   营业担当
-            if(user_code==''||user_code==undefined){
+           if(user_code==''||user_code==undefined){
                 $L.showInfoMessage("提示",'只有营业内勤和营业担当才能操作数据！');
                 return;
             }

src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview

@@ -57,7 +57,7 @@ $Purpose: 商业伙伴授信维护
                 return;
             }
             //角色判断
-            //  002 营业本部长
+             //002 营业本部长
             if(user_code==''||user_code==undefined){
                 $L.showInfoMessage("提示",'只有营业本部长才能操作数据！');
                 return;