From 27541ae206a8f997a8d88755e941d4225a5388be Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Mon, 16 Dec 2024 09:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=95=86=E8=AF=84=E4=BB=B7/?=
 =?UTF-8?q?=E5=88=86=E5=8C=85=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BB=B7=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=AE=8C=E6=88=90=E4=BE=9D=E7=84=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=AA=E8=AF=84=E4=BB=B7=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/subeva/SubProjectMapper.xml        |  2 +-
 .../SubProjectEvaNewFrom.js                   | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
index fe2edf1..de1241f 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubProjectMapper.xml
@@ -222,7 +222,7 @@ FROM
 
     <insert id="insertFbevaSubProject" parameterType="com.bonus.bmw.subeva.entity.SubEvaBean">
         insert into fbeva_sub_project (id,eva_month,eva_score,eva_name,eva_date,contract_id,eva_year,eva_id)
-        values (#{uuid},#{evaMonth},#{avgScore},#{evaName},#{evaDate},#{contractId},#{evaYear},#{evaId})
+        values (#{uuid},#{evaMonth},#{evaToal},#{evaName},#{evaDate},#{contractId},#{evaYear},#{evaId})
     </insert>
     <insert id="insertFbevaSubProjectdetails" parameterType="com.bonus.bmw.subeva.entity.SubEvaBean">
         insert into fbeva_sub_projectdetails(sub_pro_id,eva_id,eva_score,contract_id,person_name,person_id)
diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/SubProjectEvaluate/SubProjectEvaNewFrom.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/SubProjectEvaluate/SubProjectEvaNewFrom.js
index fc5e04e..a276b9e 100644
--- a/modules/bmw/src/main/resources/static/js/work/SettingManage/SubProjectEvaluate/SubProjectEvaNewFrom.js
+++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/SubProjectEvaluate/SubProjectEvaNewFrom.js
@@ -82,7 +82,12 @@ function setDataScore(data){
         for (let i = 0; i < data.length ; i++) {
             score = data[i].evaScore;
             if (score != null && score !== '' && score !== undefined) {
-                countScore = countScore + parseInt(score);
+                if($("#c1" + i).val() == "1") {
+                    countScore = countScore + parseInt(score);
+                }else if($("#c1" + i).val() == "2") {
+                    countScore = countScore - parseInt(score);
+                }
+
             }
             $("#b0" + i).val(score);
             reason = data[i].reason;
@@ -219,6 +224,7 @@ function evaItemInit(data) {
         html += '<th rowspan="1" colspan="1">10</th>';
         html += '<th rowspan="1" colspan="1"><input id="b00" required onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
         html += '<th rowspan="1" colspan="1"><input id="r00" class="textInput" type="text"></th>';
+        html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c10" value="1"></td>';
     html += '</tr>';
 
     html += '<tr>';
@@ -228,6 +234,7 @@ function evaItemInit(data) {
         html += '<th rowspan="1" colspan="1">20</th>';
         html += '<th rowspan="1" colspan="1"><input id="b01" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
         html += '<th rowspan="1" colspan="1"><input id="r01" class="textInput" type="text"></th>';
+        html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c11" value="1"></td>';
     html += '</tr>';
 
     html += '<tr>';
@@ -237,6 +244,7 @@ function evaItemInit(data) {
         html += '<th rowspan="1" colspan="1">10</th>';
         html += '<th rowspan="1" colspan="1"><input id="b02" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
         html += '<th rowspan="1" colspan="1"><input id="r02" class="textInput" type="text"></th>';
+        html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c12" value="1"></td>';
     html += '</tr>';
 
     html += '<tr>';
@@ -246,6 +254,7 @@ function evaItemInit(data) {
         html += '<th rowspan="1" colspan="1">10</th>';
         html += '<th rowspan="1" colspan="1"><input id="b03" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
         html += '<th rowspan="1" colspan="1"><input id="r03" class="textInput" type="text"></th>';
+        html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c13" value="1"></td>';
     html += '</tr>';
 
     //----------------------------------------------------------------
@@ -259,6 +268,7 @@ function evaItemInit(data) {
     html += '<th rowspan="1" colspan="1">20</th>';
     html += '<th rowspan="1" colspan="1"><input id="b04" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
     html += '<th rowspan="1" colspan="1"><input id="r04" class="textInput" type="text"></th>';
+    html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c14" value="1"></td>';
     html += '</tr>';
 
     html += '<tr>';
@@ -271,6 +281,7 @@ function evaItemInit(data) {
     html += '<th rowspan="1" colspan="1">10</th>';
     html += '<th rowspan="1" colspan="1"><input id="b05" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
     html += '<th rowspan="1" colspan="1"><input id="r05" class="textInput" type="text"></th>';
+    html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c15" value="1"></td>';
     html += '</tr>';
 
     html += '<tr>';
@@ -279,6 +290,7 @@ function evaItemInit(data) {
     html += '<th rowspan="1" colspan="1">10</th>';
     html += '<th rowspan="1" colspan="1"><input id="b06" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
     html += '<th rowspan="1" colspan="1"><input id="r06" class="textInput" type="text"></th>';
+    html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c16" value="1"></td>';
     html += '</tr>';
 
     //----------------------------------------------------------------
@@ -292,6 +304,7 @@ function evaItemInit(data) {
     html += '<th rowspan="1" colspan="1">10</th>';
     html += '<th rowspan="1" colspan="1"><input id="b07" required onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
     html += '<th rowspan="1" colspan="1"><input id="r07" class="textInput" type="text"></th>';
+    html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c17" value="1"></td>';
     html += '</tr>';
 
     //----------------------------------------------------------------
@@ -303,6 +316,7 @@ function evaItemInit(data) {
     html += '<th rowspan="1" colspan="1">0</th>';
     html += '<th rowspan="1" colspan="1"><input id="b08" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
     html += '<th rowspan="1" colspan="1"><input id="r08" class="textInput" type="text"></th>';
+    html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c18" value="2"></td>';
     html += '</tr>';
 
     html += '<tr>';
@@ -313,6 +327,7 @@ function evaItemInit(data) {
     html += '<th rowspan="1" colspan="1">0</th>';
     html += '<th rowspan="1" colspan="1"><input id="b09" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,\'\')}else{this.value=this.value.replace(/\\D/g,\'\')}" onafterpaste="isNums()" class="textInput" type="text"></th>';
     html += '<th rowspan="1" colspan="1"><input id="r09" class="textInput" type="text"></th>';
+    html += '<td hidden=""><input class="textInput" readonly="" type="text" id="c19" value="2"></td>';
     html += '</tr>';
 
     $("#tb0").append(html);
@@ -323,8 +338,9 @@ function subBottomEvaInit() {
     let html;
     html += '<tr>';
         html += '<th rowspan="1" colspan="5">分包商评价得分</th>';
-        html += '<th rowspan="1" colspan="1"><input id="a03" class="textInput" type="text"></th>';
-        html += '<th rowspan="1" colspan="1"><input class="textInput" type="text"></th>';
+        html += '<th rowspan="1" colspan="1"><input id="a03" class="textInput" type="text" readonly=""></th>';
+        html += '<th rowspan="1" colspan="1"><input class="textInput" type="text" readonly=""></th>';
+        html += '<td><input style=" text-align: left;border: transparent !important;" type="text" readonly="" id="total"></td>';
     html += '</tr>';
 
     $("#tb0").append(html);