From 3de4aa185a23ee6bbed87ece64f7e10606791d72 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 7 Jul 2021 17:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=82=E5=9C=BA=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AuthManagerController.class.php           |  2 +-
 .../View/AuthManager/authmarketmember.html    | 20 +++++++++++++++----
 Application/Admin/View/AuthManager/index.html |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php
index 577327e58..d709568a9 100644
--- a/Application/Admin/Controller/AuthManagerController.class.php
+++ b/Application/Admin/Controller/AuthManagerController.class.php
@@ -624,7 +624,7 @@ class AuthManagerController extends AdminController{
 
             $data = json_encode($data);
 
-            $AuthGroup->where(['id'=>$gid])->syncSave(['market_percentage'=>$data]);
+            $AuthGroup->where(['id'=>$gid])->save(['market_percentage'=>$data]);
 
             $this->success("编辑成功",U("index"));
 
diff --git a/Application/Admin/View/AuthManager/authmarketmember.html b/Application/Admin/View/AuthManager/authmarketmember.html
index 9e0431df0..14b53155b 100644
--- a/Application/Admin/View/AuthManager/authmarketmember.html
+++ b/Application/Admin/View/AuthManager/authmarketmember.html
@@ -47,13 +47,13 @@
 						<tr>
 							<td class="l" style="padding-left: 15px;">开发业绩提成比例：</td>
 							<td class="r table_radio">
-								<input type="text" name="develop_commission_ratio" id="develop_commission_ratio" value="{$data['develop_commission_ratio']}" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}">
+								<input type="text" name="develop_commission_ratio" id="develop_commission_ratio" value="{$data['develop_commission_ratio']}">
 							</td>
 						</tr>
 						<tr>
 							<td class="l" style="padding-left: 15px;">维护业绩提成比例：</td>
 							<td class="r table_radio">
-								<input type="text" name="maintain_commission_ratio" id="maintain_commission_ratio" value="{$data['maintain_commission_ratio']}" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}">
+								<input type="text" name="maintain_commission_ratio" id="maintain_commission_ratio" value="{$data['maintain_commission_ratio']}">
 							</td>
 						</tr>
 						<tr>
@@ -85,14 +85,14 @@
 						<tr>
 							<td class="l" style="padding-left: 15px;">开发考核奖金比例：</td>
 							<td class="r table_radio">
-								<input type="text" name="appraisal_bonuses_ratio" id="appraisal_bonuses_ratio" value="{$data['appraisal_bonuses_ratio']}" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}">
+								<input type="text" name="appraisal_bonuses_ratio" id="appraisal_bonuses_ratio" value="{$data['appraisal_bonuses_ratio']}">
 							</td>
 						</tr>
 
 						<tr>
 							<td class="l" style="padding-left: 15px;">维护考核奖金比例：</td>
 							<td class="r table_radio">
-								<input type="text" name="maintain_appraisal_bonuses_ratio" id="maintain_appraisal_bonuses_ratio" value="{$data['maintain_appraisal_bonuses_ratio']}" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}">
+								<input type="text" name="maintain_appraisal_bonuses_ratio" id="maintain_appraisal_bonuses_ratio" value="{$data['maintain_appraisal_bonuses_ratio']}">
 							</td>
 						</tr>
 
@@ -160,5 +160,17 @@
 	});
     //导航高亮
     highlight_subnav('{:U('AuthManager/index')}');
+	$("#develop_commission_ratio,#maintain_commission_ratio,#appraisal_bonuses_ratio,#maintain_appraisal_bonuses_ratio").keyup(function() {
+        var val = $(this).val();
+        var reg = /^(\-|\+)?\d+(\.\d*)?$/g;
+
+        if (val == '-') {
+            return;
+        }
+
+        if( !reg.test(val)){
+            $(this).val(0)
+        }
+   });
 </script>
 </block>
diff --git a/Application/Admin/View/AuthManager/index.html b/Application/Admin/View/AuthManager/index.html
index 425ca02f4..4f79999c7 100644
--- a/Application/Admin/View/AuthManager/index.html
+++ b/Application/Admin/View/AuthManager/index.html
@@ -54,7 +54,7 @@
 				<if condition="!IS_SUBSITE">
 					<a href="{:U('AuthManager/category?group_name='.$vo['title'].'&group_id='.$vo['id'])}" >分类授权</a>
 					<a href="{:U('AuthManager/dataempower?group_name='.$vo['title'].'&group_id='.$vo['id'])}" >数据授权</a>
-						<if condition="$vo['id'] eq 11 or $vo['id'] eq 12 or $vo['id'] eq 21">
+						<if condition="$vo['id'] eq 11 or $vo['id'] eq 12 or $vo['id'] eq 21 or $vo['id'] eq 25">
 							<a href="{:U('AuthManager/AuthMarketMember?group_name='.$vo['title'].'&group_id='.$vo['id'])}" >市场专员分成</a>
 						</if>
 				</if>