From 3914fd068973dc3f57e25e72e7253e786a87d16c Mon Sep 17 00:00:00 2001
From: qinzexin <“731344816@qq.com”>
Date: Mon, 9 Jun 2025 16:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=86=E6=95=B0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/lang/zh-cn/score/log.php |  2 +-
 application/admin/view/score/log/add.html  | 26 ++++++++++++----------
 application/common/model/score/Log.php     | 10 ++++++---
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/application/admin/lang/zh-cn/score/log.php b/application/admin/lang/zh-cn/score/log.php
index c9a61a0..d92b52d 100644
--- a/application/admin/lang/zh-cn/score/log.php
+++ b/application/admin/lang/zh-cn/score/log.php
@@ -5,7 +5,7 @@ return [
     'Score_employee_id' => '员工id',
     'User_id'           => '用户id',
     'Score_team_id'     => '队伍id',
-    'Name'              => '具体项目',
+    'Name'              => '具体项目名',
     'Score'             => '分值',
     'Images'            => '多图',
     'Desc'              => '备注',
diff --git a/application/admin/view/score/log/add.html b/application/admin/view/score/log/add.html
index bcdfcda..7a665a3 100644
--- a/application/admin/view/score/log/add.html
+++ b/application/admin/view/score/log/add.html
@@ -47,18 +47,20 @@
 <!--            <input id="c-score_team_id" data-rule="required" data-source="score/team/index" class="form-control selectpage" name="row[score_team_id]" type="text" value="">-->
 <!--        </div>-->
 <!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-name" class="form-control" name="row[name]" type="text">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="0">-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" class="form-control" name="row[name]" type="text">
+            <span style="color: red">( 非必填，不填写则积分规则名称会自动填写 )</span>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="0">
+             <span style="color: red">( 非必填，不填写则积分规则分數会自动填写 )</span>
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
diff --git a/application/common/model/score/Log.php b/application/common/model/score/Log.php
index 025eda0..56bb99b 100644
--- a/application/common/model/score/Log.php
+++ b/application/common/model/score/Log.php
@@ -154,6 +154,9 @@ class Log extends BaseModel
                  $way = explode(",",$score_event["way"]);
                  if($check){
                      if(!in_array( "free",$way))throw new \Exception(__('该积分项不允许申请'));
+                     if(!empty( $params["score"])) throw new \Exception(__('积分项不允许手动输入'));
+                     if(!empty( $params["name"])) throw new \Exception(__('积分项名稱不允许手动输入'));
+
                  }
 
                  //进行频次判断
@@ -243,11 +246,12 @@ class Log extends BaseModel
 
 
 
+                $params["name"] = $params["name"] ?? "";
+                $params["score"] = $params["score"] ?? "";
 
 
-
-                $params["name"] = $score_event["name"];
-                $params["score"] = $score_event["score"];
+                $params["name"]  = $params["name"] ?: $score_event["name"];
+                $params["score"] = $params["score"] ?: $score_event["score"];
             }
 
             if(!$user_id) throw new \Exception(__('用户需登录'));